diff --git a/ui-v2/app/components/aria-menu/index.hbs b/ui-v2/app/components/aria-menu/index.hbs index 8fa3ad5aed..9693a44edc 100644 --- a/ui-v2/app/components/aria-menu/index.hbs +++ b/ui-v2/app/components/aria-menu/index.hbs @@ -1,8 +1,10 @@ {{yield (action 'change') (action 'keypress') - (concat 'component-aria-menu-trigger-' guid) - (concat 'component-aria-menu-menu-' guid) - (if expanded 'true' undefined) (action 'keypressClick') + (hash + labelledBy=(concat 'component-aria-menu-trigger-' guid) + controls=(concat 'component-aria-menu-menu-' guid) + expanded=(if expanded 'true' undefined) + ) }} \ No newline at end of file diff --git a/ui-v2/app/components/aria-menu/index.js b/ui-v2/app/components/aria-menu/index.js index 78eca1e94f..6643c2bb6f 100644 --- a/ui-v2/app/components/aria-menu/index.js +++ b/ui-v2/app/components/aria-menu/index.js @@ -39,7 +39,6 @@ const MENU_ITEMS = '[role^="menuitem"]'; export default Component.extend({ tagName: '', dom: service('dom'), - router: service('router'), guid: '', expanded: false, orientation: 'vertical', @@ -56,9 +55,6 @@ export default Component.extend({ this.$menu = this.dom.element(`#${COMPONENT_ID}menu-${this.guid}`); const labelledBy = this.$menu.getAttribute('aria-labelledby'); this.$trigger = this.dom.element(`#${labelledBy}`); - this._routelisteners.add(this.router, { - routeWillChange: () => this.actions.close.apply(this, [{}]), - }); }, willDestroyElement: function() { this._super(...arguments); diff --git a/ui-v2/app/components/hashicorp-consul/index.hbs b/ui-v2/app/components/hashicorp-consul/index.hbs index c9fb5bdd83..4433ea5538 100644 --- a/ui-v2/app/components/hashicorp-consul/index.hbs +++ b/ui-v2/app/components/hashicorp-consul/index.hbs @@ -17,7 +17,7 @@ {{#if (and (eq nspaces.length 1) (not canManageNspaces)) }} {{nspace.Name}} {{ else }} - + {{nspace.Name}} @@ -29,25 +29,39 @@ {{/if}} -
  • - Namespaces - -
    • + {{#let components.MenuItem components.MenuSeparator as |MenuItem MenuSeparator|}} + + + Namespaces + + + {{#each (reject-by 'DeletedAt' nspaces) as |item|}} -
  • - {{item.Name}} -
    • + + + {{item.Name}} + + {{/each}} {{#if canManageNspaces }} -
  • -
  • - Manage namespaces -
    • + + + + Manage Namespaces + + {{/if}} + {{/let}}     {{/if}} @@ -57,24 +71,34 @@ {{#if (or (not dcs) (eq dcs.length 1)) }} {{dc.Name}} {{ else }} - + {{dc.Name}} -
  • - Datacenters - -
    • + {{#let components.MenuItem components.MenuSeparator as |MenuItem MenuSeparator|}} + + + Datacenters + + + {{#each (sort-by 'Name' dcs) as |item|}} -
  • - {{item.Name}} -
    • + + + {{item.Name}} + + {{/each}} + {{/let}}     @@ -101,21 +125,38 @@