ancestorKeysForKey always returns an array (#6205)

hashicorp · Aug 1, 2019 · 0271486 · 0271486
1 parent c07213f
commit 0271486
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/ui/app/components/key-value-header.js b/ui/app/components/key-value-header.js
@@ -47,7 +47,7 @@ export default Component.extend({
     const showCurrent = this.get('showCurrent');
     const ancestors = utils.ancestorKeysForKey(baseKey);
     const parts = utils.keyPartsForKey(baseKey);
-    if (!ancestors) {
+    if (ancestors.length === 0) {
       crumbs.push({
         label: baseKey,
         text: this.stripTrailingSlash(baseKey),

diff --git a/ui/app/components/namespace-picker.js b/ui/app/components/namespace-picker.js
@@ -126,7 +126,7 @@ export default Component.extend({
   // gets set as  'lastMenuLeaves' in the ember concurrency task above
   menuLeaves: computed('namespacePath', 'namespaceTree', function() {
     let ns = this.get('namespacePath');
-    let leaves = ancestorKeysForKey(ns) || [];
+    let leaves = ancestorKeysForKey(ns);
     leaves.push(ns);
     leaves = this.maybeAddRoot(leaves);
 

diff --git a/ui/app/lib/key-utils.js b/ui/app/lib/key-utils.js
@@ -35,7 +35,7 @@ function ancestorKeysForKey(key) {
     parentKey = parentKeyForKey(parentKey);
   }
 
-  return ancestors.length ? ancestors : null;
+  return ancestors;
 }
 
 export default {

diff --git a/ui/app/mixins/with-nav-to-nearest-ancestor.js b/ui/app/mixins/with-nav-to-nearest-ancestor.js
@@ -15,7 +15,7 @@ export default Mixin.create({
   navToNearestAncestor: task(function*(key) {
     let ancestors = utils.ancestorKeysForKey(key);
     let errored = false;
-    let nearest = ancestors && ancestors.pop();
+    let nearest = ancestors.pop();
     while (nearest) {
       try {
         let transition = this.transitionToRoute('vault.cluster.secrets.backend.list', nearest);