Fix ordering

hashicorp · Mar 9, 2022 · c6848e3 · c6848e3
1 parent 8917416
commit c6848e3
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/ui/app/routes/vault/cluster.js b/ui/app/routes/vault/cluster.js
@@ -53,12 +53,7 @@ export default Route.extend(ModelBoundaryRoute, ClusterRoute, {
       // eslint-disable-next-line no-console
       console.error('Cannot use Cloud Admin Namespace flag with OSS Vault');
     }
-    if (typeof managedRoot === 'string') {
-      let managed = getManagedNamespace(namespace, managedRoot);
-      if (managed !== namespace) {
-        this.transitionTo({ queryParams: { namespace: managed } });
-      }
-    } else if (!namespace && currentTokenName && !Ember.testing) {
+    if (!namespace && currentTokenName && !Ember.testing) {
       // if no namespace queryParam and user authenticated,
       // use user's root namespace to redirect to properly param'd url
       const storage = getStorage().getItem(currentTokenName);
@@ -67,6 +62,11 @@ export default Route.extend(ModelBoundaryRoute, ClusterRoute, {
       if (namespace) {
         this.transitionTo({ queryParams: { namespace } });
       }
+    } else if (managedRoot !== null) {
+      let managed = getManagedNamespace(namespace, managedRoot);
+      if (managed !== namespace) {
+        this.transitionTo({ queryParams: { namespace: managed } });
+      }
     }
     this.namespaceService.setNamespace(namespace);
     const id = this.getClusterId(params);