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 be163e65a6..b09f47211a 100644 --- a/ui/packages/consul-ui/app/components/hashicorp-consul/index.hbs +++ b/ui/packages/consul-ui/app/components/hashicorp-consul/index.hbs @@ -1,88 +1,81 @@ - + <:notifications as |app|> -{{#each flashMessages.queue as |flash|}} - - {{#if flash.dom}} - {{{flash.dom}}} - {{else}} -{{#let (lowercase flash.type) (lowercase flash.action) as |status type|}} - - - - {{capitalize status}}! - - - -

- {{#if (eq type 'logout')}} - {{#if (eq status 'success') }} - You are now logged out. - {{else}} - There was an error logging out. - {{/if}} - {{else if (eq type 'authorize')}} - {{#if (eq status 'success') }} - You are now logged in. - {{else}} - There was an error, please check your SecretID/Token - {{/if}} + {{#each flashMessages.queue as |flash|}} + + {{#if flash.dom}} + {{{flash.dom}}} {{else}} - {{#if (or (eq type 'use') (eq flash.model 'token'))}} - - {{else if (eq flash.model 'intention')}} - - {{else if (eq flash.model 'role')}} - - {{else if (eq flash.model 'policy')}} - - {{/if}} + {{#let (lowercase flash.type) (lowercase flash.action) as |status type|}} + + + + {{capitalize status}}! + + + +

+ {{#if (eq type 'logout')}} + {{#if (eq status 'success')}} + You are now logged out. + {{else}} + There was an error logging out. + {{/if}} + {{else if (eq type 'authorize')}} + {{#if (eq status 'success')}} + You are now logged in. + {{else}} + There was an error, please check your SecretID/Token + {{/if}} + {{else}} + {{#if (or (eq type 'use') (eq flash.model 'token'))}} + + {{else if (eq flash.model 'intention')}} + + {{else if (eq flash.model 'role')}} + + {{else if (eq flash.model 'policy')}} + + {{/if}} + {{/if}} +

+
+
+ {{/let}} {{/if}} -

- - -{{/let}} - {{/if}} -
-{{/each}} + + {{/each}} <:home-nav> - + <:main-nav> @@ -99,147 +92,110 @@ @partition={{@partition}} @nspace={{@nspace}} @partitions={{this.partitions}} - @onchange={{action (mut this.partitions) value="data"}} + @onchange={{action (mut this.partitions) value='data'}} /> -{{#if (can 'access overview')}} + {{#if (can 'access overview')}}
  • - + Overview
  • -{{/if}} -{{#if (can "read services")}} + {{/if}} + {{#if (can 'read services')}}
  • - Services + Services
  • -{{/if}} -{{#if (can "read nodes")}} + {{/if}} + {{#if (can 'read nodes')}}
  • - Nodes + Nodes
  • -{{/if}} -{{#if (can "read kv")}} + {{/if}} + {{#if (can 'read kv')}}
  • - Key/Value + Key/Value
  • -{{/if}} -{{#if (can "read intentions")}} -
  • - Intentions + {{/if}} + {{#if (can 'read intentions')}} +
  • + Intentions
  • -{{/if}} - - + {{/if}} + + <:complementary-nav>
      - -
    • - - - Help - - - - - Consul v{{env 'CONSUL_VERSION'}} - - - - Documentation - - - - - HashiCorp Learn - - - -
    • + + + Help + + + + + Consul v{{env 'CONSUL_VERSION'}} + + + + Documentation + + + + - - Provide Feedback - - - - - -
    • -
    • - - Settings - -
    • - - - + HashiCorp Learn + + + + + + + + +
    • + + Settings + +
    • + + +
    <:main> - {{yield (hash - login=(if this.tokenSelector this.tokenSelector (hash open=undefined close=undefined)) - )}} + {{yield + (hash login=(if this.tokenSelector this.tokenSelector (hash open=undefined close=undefined))) + }} <:content-info>