diff --git a/ui/packages/consul-acls/app/components/consul/token/selector/index.hbs b/ui/packages/consul-acls/app/components/consul/token/selector/index.hbs
index 0a1d08f171eb..997f4bd62a78 100644
--- a/ui/packages/consul-acls/app/components/consul/token/selector/index.hbs
+++ b/ui/packages/consul-acls/app/components/consul/token/selector/index.hbs
@@ -72,8 +72,8 @@
@isHrefExternal={{false}}
/>
@@ -120,11 +120,14 @@
>
{{#if authDialog.token.AccessorID}}
-
{{/if}}
@@ -138,8 +141,8 @@
@isHrefExternal={{false}}
/>
diff --git a/ui/packages/consul-partitions/app/components/consul/partition/selector/index.hbs b/ui/packages/consul-partitions/app/components/consul/partition/selector/index.hbs
index 259b326f0bf5..b5fbef43ab07 100644
--- a/ui/packages/consul-partitions/app/components/consul/partition/selector/index.hbs
+++ b/ui/packages/consul-partitions/app/components/consul/partition/selector/index.hbs
@@ -7,26 +7,28 @@
@list
(if @partition (hash Name=@partition) (hash Name="default"))
(is-href "dc.partitions" @dc.Name)
- as |SNL partition isManaging|
+ (can "choose partitions" dc=@dc)
+ as |SNL partition isManaging canChoose|
}}
- {{#if (can "choose partitions" dc=@dc)}}
-
- Admin partition
-
+
+ Admin partition
+
+ {{#if canChoose}}
{{item.Name}}
-
-
- {{else}}
- Admin partition
-
-
- {{partition.Name}}
-
- {{/if}}
+ {{/if}}
+
{{/let}}
{{!--
{{#let
diff --git a/ui/packages/consul-ui/app/components/hashicorp-consul/index.hbs b/ui/packages/consul-ui/app/components/hashicorp-consul/index.hbs
index eef2977ae889..c35bc3539138 100644
--- a/ui/packages/consul-ui/app/components/hashicorp-consul/index.hbs
+++ b/ui/packages/consul-ui/app/components/hashicorp-consul/index.hbs
@@ -73,7 +73,7 @@
<:side-nav>
-
+
<:header>
<:logo>
@@ -87,7 +87,6 @@
<:actions>
-
-
(
},
};
page.navigation.authMenu = clickable('[data-test-auth-menu]');
- page.navigation.login = clickable('[data-test-auth-menu-signin]');
+ page.navigation.login = clickable('[data-test-auth-menu-login]');
page.navigation.dc = clickable('[data-test-datacenter-menu] button');
page.navigation.nspace = clickable('[data-test-nspace-menu] button');
page.navigation.manageNspaces = clickable(
diff --git a/ui/packages/consul-ui/app/components/nav-selector/index.hbs b/ui/packages/consul-ui/app/components/nav-selector/index.hbs
index 5b4538294233..354e1419ec69 100644
--- a/ui/packages/consul-ui/app/components/nav-selector/index.hbs
+++ b/ui/packages/consul-ui/app/components/nav-selector/index.hbs
@@ -17,6 +17,7 @@
class='consul-side-nav__selector-toggle'
@icon={{@icon}}
@text={{get @item @key}}
+ disabled={{eq @disabled true}}
/>
{{#if @description}}
diff --git a/ui/packages/consul-ui/translations/components/consul/en-us.yaml b/ui/packages/consul-ui/translations/components/consul/en-us.yaml
index 647d96f7f90e..a66dd2d7c529 100644
--- a/ui/packages/consul-ui/translations/components/consul/en-us.yaml
+++ b/ui/packages/consul-ui/translations/components/consul/en-us.yaml
@@ -70,6 +70,8 @@ acl:
management: Management
client: Client
token:
+ selector:
+ logged-in: "Logged in with ACL Token'
<'b class=consul-side-nav__acl-logged-in'>'{token}'<'/b'>'"
search-bar:
kind:
name: Type