diff --git a/changelog/12478.txt b/changelog/12478.txt
new file mode 100644
index 000000000..3a0e302c8
--- /dev/null
+++ b/changelog/12478.txt
@@ -0,0 +1,3 @@
+```release-note:fix
+ui: fix missing navbar items on login to namespace
+```
\ No newline at end of file
diff --git a/ui/app/routes/vault/cluster.js b/ui/app/routes/vault/cluster.js
index c9403be2a..e523bd395 100644
--- a/ui/app/routes/vault/cluster.js
+++ b/ui/app/routes/vault/cluster.js
@@ -110,5 +110,17 @@ export default Route.extend(ModelBoundaryRoute, ClusterRoute, {
}
return true;
},
+ loading(transition) {
+ if (transition.queryParamsOnly || Ember.testing) {
+ return;
+ }
+ // eslint-disable-next-line ember/no-controller-access-in-routes
+ let controller = this.controllerFor('vault.cluster');
+ controller.set('currentlyLoading', true);
+
+ transition.finally(function() {
+ controller.set('currentlyLoading', false);
+ });
+ },
},
});
diff --git a/ui/app/templates/vault/cluster.hbs b/ui/app/templates/vault/cluster.hbs
index 97c8bf8e8..4cbd1f616 100644
--- a/ui/app/templates/vault/cluster.hbs
+++ b/ui/app/templates/vault/cluster.hbs
@@ -113,16 +113,20 @@
{{/flash-message}}
{{/each}}
-{{#if showNav}}
-
-
-
+{{#if currentlyLoading}}
+
{{else}}
- {{outlet}}
-{{/if}}
+ {{#if showNav}}
+
+
+
+ {{else}}
+ {{outlet}}
+ {{/if}}
+{{/if}}
\ No newline at end of file