From 17438020f122872c25a84f8495447c9683fb86c5 Mon Sep 17 00:00:00 2001 From: John Cowen Date: Tue, 5 Jan 2021 10:05:59 +0000 Subject: [PATCH] ui: Accessibility scan improvements (#9485) * ui: Remove all vestiges of role=tabpanel * Switch out tablist role for a label, default to Secondary * Move healthcheckout-output headers to h2, ideally these would be outside the component * Add aria-label for empty button * Fix up non-unique ids in topology component * Temporarily fixup h2 in KV > LockSession * Fixup dl with no dt * h3 > h2 * Fix up page objects that were reliant on ids --- .../consul/health-check/list/index.hbs | 2 +- .../consul/health-check/list/skin.scss | 4 ++ .../consul/lock-session/form/index.hbs | 6 +- .../consul/lock-session/form/index.scss | 8 +++ .../components/consul/policy/list/index.hbs | 5 +- .../consul-ui/app/components/notice/skin.scss | 4 ++ .../app/components/tab-nav/index.hbs | 6 +- .../topology-metrics/down-lines/index.hbs | 59 +++++++++++++----- .../topology-metrics/down-lines/index.js | 6 ++ .../topology-metrics/popover/index.hbs | 1 + .../app/components/topology-metrics/skin.scss | 10 ++-- .../topology-metrics/up-lines/index.hbs | 60 ++++++++++++++----- .../topology-metrics/up-lines/index.js | 6 ++ .../consul-ui/app/styles/components.scss | 1 + .../app/styles/components/anchors.scss | 2 +- .../styles/components/app-view/layout.scss | 4 -- .../app/styles/components/app-view/skin.scss | 5 -- ui/packages/consul-ui/app/styles/layout.scss | 6 +- .../app/styles/routes/dc/services/index.scss | 6 +- .../app/templates/dc/acls/tokens/edit.hbs | 2 +- .../app/templates/dc/acls/tokens/index.hbs | 2 +- .../templates/dc/nodes/show/healthchecks.hbs | 2 - .../app/templates/dc/nodes/show/metadata.hbs | 4 +- .../app/templates/dc/nodes/show/rtt.hbs | 48 +++++++-------- .../app/templates/dc/nodes/show/services.hbs | 2 - .../app/templates/dc/nodes/show/sessions.hbs | 4 +- .../dc/services/instance/addresses.hbs | 55 +++++++++-------- .../dc/services/instance/exposedpaths.hbs | 14 ++--- .../dc/services/instance/healthchecks.hbs | 2 - .../dc/services/instance/metadata.hbs | 4 +- .../dc/services/instance/upstreams.hbs | 2 - .../templates/dc/services/show/instances.hbs | 2 - .../dc/services/show/intentions/index.hbs | 2 - .../templates/dc/services/show/routing.hbs | 10 ++-- .../templates/dc/services/show/services.hbs | 2 - .../app/templates/dc/services/show/tags.hbs | 4 +- .../templates/dc/services/show/topology.hbs | 2 - .../templates/dc/services/show/upstreams.hbs | 2 - .../consul-ui/app/templates/settings.hbs | 2 +- .../consul-ui/tests/pages/dc/nodes/show.js | 2 +- .../tests/pages/dc/services/instance.js | 2 +- 41 files changed, 213 insertions(+), 159 deletions(-) create mode 100644 ui/packages/consul-ui/app/components/consul/lock-session/form/index.scss diff --git a/ui/packages/consul-ui/app/components/consul/health-check/list/index.hbs b/ui/packages/consul-ui/app/components/consul/health-check/list/index.hbs index b196029f5c..450aa9aea6 100644 --- a/ui/packages/consul-ui/app/components/consul/health-check/list/index.hbs +++ b/ui/packages/consul-ui/app/components/consul/health-check/list/index.hbs @@ -7,7 +7,7 @@
  • -

    {{item.Name}}

    +

    {{item.Name}}

    {{#if (eq item.Kind "node")}} diff --git a/ui/packages/consul-ui/app/components/consul/health-check/list/skin.scss b/ui/packages/consul-ui/app/components/consul/health-check/list/skin.scss index 87ffad8309..cea1d04832 100644 --- a/ui/packages/consul-ui/app/components/consul/health-check/list/skin.scss +++ b/ui/packages/consul-ui/app/components/consul/health-check/list/skin.scss @@ -14,6 +14,10 @@ margin-right: 8px; } } +%healthcheck-output header > * { + @extend %h3; + font-size: $typo-header-300; +} %healthcheck-output dd em { @extend %pill; background-color: $gray-100; diff --git a/ui/packages/consul-ui/app/components/consul/lock-session/form/index.hbs b/ui/packages/consul-ui/app/components/consul/lock-session/form/index.hbs index bc4cd7027c..3eb0b8a163 100644 --- a/ui/packages/consul-ui/app/components/consul/lock-session/form/index.hbs +++ b/ui/packages/consul-ui/app/components/consul/lock-session/form/index.hbs @@ -7,7 +7,11 @@ as |api| > -
    +

    Lock Session

    diff --git a/ui/packages/consul-ui/app/components/consul/lock-session/form/index.scss b/ui/packages/consul-ui/app/components/consul/lock-session/form/index.scss new file mode 100644 index 0000000000..55c1b7d670 --- /dev/null +++ b/ui/packages/consul-ui/app/components/consul/lock-session/form/index.scss @@ -0,0 +1,8 @@ +.consul-lock-session-form { + h2 { + border-bottom: $decor-border-200; + border-color: $gray-200; + padding-bottom: .2em; + margin-bottom: .5em; + } +} diff --git a/ui/packages/consul-ui/app/components/consul/policy/list/index.hbs b/ui/packages/consul-ui/app/components/consul/policy/list/index.hbs index 738b581d6d..c4f5dfa3c1 100644 --- a/ui/packages/consul-ui/app/components/consul/policy/list/index.hbs +++ b/ui/packages/consul-ui/app/components/consul/policy/list/index.hbs @@ -5,8 +5,9 @@ as |item|> {{#if (eq (policy/typeof item) 'policy-management')}}
    +
    Type
    - + Global Management Policy
    @@ -17,7 +18,7 @@ as |item|>
    - Datacenters + Datacenters
    {{join ', ' (policy/datacenters item)}} diff --git a/ui/packages/consul-ui/app/components/notice/skin.scss b/ui/packages/consul-ui/app/components/notice/skin.scss index c3bcf37e0c..befc8b83a9 100644 --- a/ui/packages/consul-ui/app/components/notice/skin.scss +++ b/ui/packages/consul-ui/app/components/notice/skin.scss @@ -6,6 +6,10 @@ %notice::before { @extend %as-pseudo; } +%notice header > * { + @extend %h3; + font-size: $typo-header-300; +} %notice footer * { @extend %p3; font-weight: $typo-weight-bold; diff --git a/ui/packages/consul-ui/app/components/tab-nav/index.hbs b/ui/packages/consul-ui/app/components/tab-nav/index.hbs index 1e9d2d7cb3..691f7216d1 100644 --- a/ui/packages/consul-ui/app/components/tab-nav/index.hbs +++ b/ui/packages/consul-ui/app/components/tab-nav/index.hbs @@ -7,9 +7,11 @@ ) undefined }}} - role="tablist" + aria-label="Secondary" class={{concat 'tab-nav' (if isAnimatable ' animatable' '')}} - id={{guid}}> + id={{guid}} + ...attributes + >
      {{#each items as |item|}}
    • - + - + - + - + {{#each @lines as |line|}} {{#if (eq line.permission 'deny')}} {{else}} {{/if}} @@ -59,7 +88,7 @@ {{#if (or (not item.Intention.Allowed) item.Intention.HasPermissions)}} diff --git a/ui/packages/consul-ui/app/components/topology-metrics/down-lines/index.js b/ui/packages/consul-ui/app/components/topology-metrics/down-lines/index.js index 78db449157..4c7741b72b 100644 --- a/ui/packages/consul-ui/app/components/topology-metrics/down-lines/index.js +++ b/ui/packages/consul-ui/app/components/topology-metrics/down-lines/index.js @@ -1,9 +1,15 @@ import Component from '@glimmer/component'; import { tracked } from '@glimmer/tracking'; import { action } from '@ember/object'; +import { inject as service } from '@ember/service'; export default class TopoloyMetricsDownLines extends Component { @tracked iconPositions; + @service('dom') dom; + + get guid() { + return this.dom.guid(this); + } @action getIconPositions() { diff --git a/ui/packages/consul-ui/app/components/topology-metrics/popover/index.hbs b/ui/packages/consul-ui/app/components/topology-metrics/popover/index.hbs index 55bd5e150e..ad03bf9404 100644 --- a/ui/packages/consul-ui/app/components/topology-metrics/popover/index.hbs +++ b/ui/packages/consul-ui/app/components/topology-metrics/popover/index.hbs @@ -89,6 +89,7 @@ type="button" {{on 'click' (fn (optional this.popoverController.show))}} style={{{concat 'top:' @position.y 'px;left:' @position.x 'px;'}}} + aria-label={{if (eq @type 'deny') 'Add intention' 'View intention'}} >
    diff --git a/ui/packages/consul-ui/app/components/topology-metrics/skin.scss b/ui/packages/consul-ui/app/components/topology-metrics/skin.scss index 7f52c7e766..12a1f144e1 100644 --- a/ui/packages/consul-ui/app/components/topology-metrics/skin.scss +++ b/ui/packages/consul-ui/app/components/topology-metrics/skin.scss @@ -104,24 +104,24 @@ circle { fill: $white; } - #allow-arrow { + .allow-arrow { fill: $gray-300; stroke-linejoin: round; } path, - #allow-dot, - #allow-arrow { + .allow-dot, + .allow-arrow { stroke: $gray-300; stroke-width: 2; } path[data-permission='deny'] { stroke: $red-500; } - #deny-dot { + .deny-dot { stroke: $red-500; stroke-width: 2; } - #deny-arrow { + .deny-arrow { fill: $red-500; stroke: $red-500; stroke-linejoin: round; diff --git a/ui/packages/consul-ui/app/components/topology-metrics/up-lines/index.hbs b/ui/packages/consul-ui/app/components/topology-metrics/up-lines/index.hbs index 43085279f0..cb2bfefb2f 100644 --- a/ui/packages/consul-ui/app/components/topology-metrics/up-lines/index.hbs +++ b/ui/packages/consul-ui/app/components/topology-metrics/up-lines/index.hbs @@ -8,46 +8,76 @@ preserveAspectRatio="none" > - + - + - + - + {{#each @lines as |line|}} {{#if (eq line.permission 'deny')}} {{else}} {{/if}} @@ -59,7 +89,7 @@ {{#if (or (not item.Intention.Allowed) item.Intention.HasPermissions)}} diff --git a/ui/packages/consul-ui/app/components/topology-metrics/up-lines/index.js b/ui/packages/consul-ui/app/components/topology-metrics/up-lines/index.js index b90b73f32a..51bd4aab09 100644 --- a/ui/packages/consul-ui/app/components/topology-metrics/up-lines/index.js +++ b/ui/packages/consul-ui/app/components/topology-metrics/up-lines/index.js @@ -1,9 +1,15 @@ import Component from '@glimmer/component'; import { tracked } from '@glimmer/tracking'; import { action } from '@ember/object'; +import { inject as service } from '@ember/service'; export default class TopologyMetricsUpLines extends Component { @tracked iconPositions; + @service('dom') dom; + + get guid() { + return this.dom.guid(this); + } @action getIconPositions() { diff --git a/ui/packages/consul-ui/app/styles/components.scss b/ui/packages/consul-ui/app/styles/components.scss index 73c3037189..b1bafe475c 100644 --- a/ui/packages/consul-ui/app/styles/components.scss +++ b/ui/packages/consul-ui/app/styles/components.scss @@ -62,6 +62,7 @@ @import 'consul-ui/components/consul/external-source'; @import 'consul-ui/components/consul/kind'; @import 'consul-ui/components/consul/intention'; +@import 'consul-ui/components/consul/lock-session/form'; @import 'consul-ui/components/role-selector'; @import 'consul-ui/components/topology-metrics'; diff --git a/ui/packages/consul-ui/app/styles/components/anchors.scss b/ui/packages/consul-ui/app/styles/components/anchors.scss index d1a4ce320f..9714fc318c 100644 --- a/ui/packages/consul-ui/app/styles/components/anchors.scss +++ b/ui/packages/consul-ui/app/styles/components/anchors.scss @@ -18,7 +18,7 @@ a[rel*='external']::after { margin-left: 0.2em; } -[role='tabpanel'] > p:only-child [rel*='help']::after { +.tab-section > p:only-child [rel*='help']::after { content: none; } %main-content p a, diff --git a/ui/packages/consul-ui/app/styles/components/app-view/layout.scss b/ui/packages/consul-ui/app/styles/components/app-view/layout.scss index 358cd64e25..31676b0c4e 100644 --- a/ui/packages/consul-ui/app/styles/components/app-view/layout.scss +++ b/ui/packages/consul-ui/app/styles/components/app-view/layout.scss @@ -26,10 +26,6 @@ } /* content */ -%app-view-content h2 { - padding-bottom: 0.2em; - margin-bottom: 0.5em; -} %app-view-content-empty { margin-top: 0 !important; padding: 50px; diff --git a/ui/packages/consul-ui/app/styles/components/app-view/skin.scss b/ui/packages/consul-ui/app/styles/components/app-view/skin.scss index 713e3b9b87..cc252099b1 100644 --- a/ui/packages/consul-ui/app/styles/components/app-view/skin.scss +++ b/ui/packages/consul-ui/app/styles/components/app-view/skin.scss @@ -4,13 +4,9 @@ %app-view-title { border-bottom: $decor-border-100; } -%app-view-content h2, %app-view-content form:not(.filter-bar) fieldset { border-bottom: $decor-border-200; } -%app-view-content fieldset h2 { - border-bottom: none; -} %app-view-header h1 > em { color: $gray-600; } @@ -21,7 +17,6 @@ color: $gray-400; } %app-view-title, -%app-view-content h2, %app-view-content form:not(.filter-bar) fieldset { border-color: $gray-200; } diff --git a/ui/packages/consul-ui/app/styles/layout.scss b/ui/packages/consul-ui/app/styles/layout.scss index 99f8c7d0f3..786e100f8c 100644 --- a/ui/packages/consul-ui/app/styles/layout.scss +++ b/ui/packages/consul-ui/app/styles/layout.scss @@ -17,9 +17,9 @@ html[data-route$='edit'] .app-view > header + div > *:first-child { /* most tabs have margin after the tab bar, unless the tab has a filter bar */ /* if it is a filter bar and the thing after the filter bar is a p then it also */ /* needs a top margun :S */ -%app-view-content [role='tabpanel'] > *:first-child:not(.filter-bar):not(table), -%app-view-content [role='tabpanel'] > .filter-bar + p, -%app-view-content [role='tabpanel'] .consul-health-check-list { +%app-view-content .tab-section > *:first-child:not(.filter-bar):not(table), +%app-view-content .tab-section > .filter-bar + p, +%app-view-content .tab-section .consul-health-check-list { margin-top: 1.25em; } .consul-upstream-instance-list, diff --git a/ui/packages/consul-ui/app/styles/routes/dc/services/index.scss b/ui/packages/consul-ui/app/styles/routes/dc/services/index.scss index a886c028c2..e13631e503 100644 --- a/ui/packages/consul-ui/app/styles/routes/dc/services/index.scss +++ b/ui/packages/consul-ui/app/styles/routes/dc/services/index.scss @@ -8,11 +8,11 @@ html[data-route^='dc.services.instance'] .app-view > header dl { html[data-route^='dc.services.instance'] .app-view > header dt { font-weight: $typo-weight-bold; } -html[data-route^='dc.services.instance'] [role='tabpanel'] section:not(:last-child) { +html[data-route^='dc.services.instance'] .tab-section section:not(:last-child) { padding-bottom: 24px; border-bottom: 1px solid $gray-200; } -html[data-route^='dc.services.instance.metadata'] [role='tabpanel'] section h3, -html[data-route^='dc.services.instance.proxy'] [role='tabpanel'] section h3 { +html[data-route^='dc.services.instance.metadata'] .tab-section section h3, +html[data-route^='dc.services.instance.proxy'] .tab-section section h3 { margin: 24px 0 12px 0; } diff --git a/ui/packages/consul-ui/app/templates/dc/acls/tokens/edit.hbs b/ui/packages/consul-ui/app/templates/dc/acls/tokens/edit.hbs index f18a7cef32..ac071d27a1 100644 --- a/ui/packages/consul-ui/app/templates/dc/acls/tokens/edit.hbs +++ b/ui/packages/consul-ui/app/templates/dc/acls/tokens/edit.hbs @@ -64,7 +64,7 @@ @type="info" as |notice|> -

    Update

    +

    Update

    diff --git a/ui/packages/consul-ui/app/templates/dc/acls/tokens/index.hbs b/ui/packages/consul-ui/app/templates/dc/acls/tokens/index.hbs index 9c5e4314c6..19582e6312 100644 --- a/ui/packages/consul-ui/app/templates/dc/acls/tokens/index.hbs +++ b/ui/packages/consul-ui/app/templates/dc/acls/tokens/index.hbs @@ -60,7 +60,7 @@ @type="info" as |notice|> -

    Update

    +

    Update

    We have upgraded our ACL System to allow the creation of reusable policies that can be applied to tokens. Read more about the changes and how to upgrade legacy tokens in our documentation.

    diff --git a/ui/packages/consul-ui/app/templates/dc/nodes/show/healthchecks.hbs b/ui/packages/consul-ui/app/templates/dc/nodes/show/healthchecks.hbs index 48e5cc256a..0cb9d223dc 100644 --- a/ui/packages/consul-ui/app/templates/dc/nodes/show/healthchecks.hbs +++ b/ui/packages/consul-ui/app/templates/dc/nodes/show/healthchecks.hbs @@ -9,7 +9,6 @@ ) as |filters|}} {{#let (or sortBy "Status:asc") as |sort|}}
    -
    {{#if (gt item.Checks.length 0) }} -
    {{/let}} {{/let}} \ No newline at end of file diff --git a/ui/packages/consul-ui/app/templates/dc/nodes/show/metadata.hbs b/ui/packages/consul-ui/app/templates/dc/nodes/show/metadata.hbs index c8bc020fba..d97fd9740a 100644 --- a/ui/packages/consul-ui/app/templates/dc/nodes/show/metadata.hbs +++ b/ui/packages/consul-ui/app/templates/dc/nodes/show/metadata.hbs @@ -1,5 +1,4 @@ -
    -
    +
    {{#if item.Meta}} {{else}} @@ -11,5 +10,4 @@ {{/if}} -
    diff --git a/ui/packages/consul-ui/app/templates/dc/nodes/show/rtt.hbs b/ui/packages/consul-ui/app/templates/dc/nodes/show/rtt.hbs index 2767303d9c..cc1539259b 100644 --- a/ui/packages/consul-ui/app/templates/dc/nodes/show/rtt.hbs +++ b/ui/packages/consul-ui/app/templates/dc/nodes/show/rtt.hbs @@ -1,28 +1,26 @@ -
    -
    -
    -
    -
    - Minimum -
    -
    - {{format-number tomography.min maximumFractionDigits=2}}ms -
    -
    - Median -
    -
    - {{format-number tomography.median maximumFractionDigits=2}}ms -
    -
    - Maximum -
    -
    - {{format-number tomography.max maximumFractionDigits=2}}ms -
    -
    -
    - +
    +
    +
    +
    + Minimum +
    +
    + {{format-number tomography.min maximumFractionDigits=2}}ms +
    +
    + Median +
    +
    + {{format-number tomography.median maximumFractionDigits=2}}ms +
    +
    + Maximum +
    +
    + {{format-number tomography.max maximumFractionDigits=2}}ms +
    +
    +
    diff --git a/ui/packages/consul-ui/app/templates/dc/nodes/show/services.hbs b/ui/packages/consul-ui/app/templates/dc/nodes/show/services.hbs index 3f2c003f81..491a13c14f 100644 --- a/ui/packages/consul-ui/app/templates/dc/nodes/show/services.hbs +++ b/ui/packages/consul-ui/app/templates/dc/nodes/show/services.hbs @@ -9,7 +9,6 @@ {{#let (or sortBy "Status:asc") as |sort|}} {{#let (reject-by 'Service.Kind' 'connect-proxy' item.Services) as |items|}}
    -
    {{#if (gt items.length 0) }} -
    {{/let}} {{/let}} diff --git a/ui/packages/consul-ui/app/templates/dc/nodes/show/sessions.hbs b/ui/packages/consul-ui/app/templates/dc/nodes/show/sessions.hbs index ba4b0498c9..f96093a0b0 100644 --- a/ui/packages/consul-ui/app/templates/dc/nodes/show/sessions.hbs +++ b/ui/packages/consul-ui/app/templates/dc/nodes/show/sessions.hbs @@ -1,6 +1,5 @@ -
    -
    +
    {{#if (gt sessions.length 0)}} {{else}} @@ -12,5 +11,4 @@ {{/if}} -
    diff --git a/ui/packages/consul-ui/app/templates/dc/services/instance/addresses.hbs b/ui/packages/consul-ui/app/templates/dc/services/instance/addresses.hbs index 5c9e8417f1..6e11c73beb 100644 --- a/ui/packages/consul-ui/app/templates/dc/services/instance/addresses.hbs +++ b/ui/packages/consul-ui/app/templates/dc/services/instance/addresses.hbs @@ -1,29 +1,28 @@ -
    -
    - {{#if item.Service.TaggedAddresses }} - - - Tag - Address - - - {{#with (object-at 1 taggedAddress) as |address|}} - - {{object-at 0 taggedAddress}}{{#if (and (eq address.Address item.Address) (eq address.Port item.Port))}} (default){{/if}} - - - {{address.Address}}:{{address.Port}} - - {{/with}} - - - {{else}} -

    - There are no additional addresses. -

    - {{/if}} -
    +
    + {{#if item.Service.TaggedAddresses }} + + + Tag + Address + + + {{#with (object-at 1 taggedAddress) as |address|}} + + {{object-at 0 taggedAddress}}{{#if (and (eq address.Address item.Address) (eq address.Port item.Port))}} (default){{/if}} + + + {{address.Address}}:{{address.Port}} + + {{/with}} + + + {{else}} +

    + There are no additional addresses. +

    + {{/if}}
    diff --git a/ui/packages/consul-ui/app/templates/dc/services/instance/exposedpaths.hbs b/ui/packages/consul-ui/app/templates/dc/services/instance/exposedpaths.hbs index 34901d8c74..6175b9c459 100644 --- a/ui/packages/consul-ui/app/templates/dc/services/instance/exposedpaths.hbs +++ b/ui/packages/consul-ui/app/templates/dc/services/instance/exposedpaths.hbs @@ -1,10 +1,8 @@
    -
    - {{#if (gt proxy.Service.Proxy.Expose.Paths.length 0)}} -

    - The following list shows individual HTTP paths exposed through Envoy for external services like Prometheus. Read more about this in our documentation. -

    - - {{/if}} -
    +{{#if (gt proxy.Service.Proxy.Expose.Paths.length 0)}} +

    + The following list shows individual HTTP paths exposed through Envoy for external services like Prometheus. Read more about this in our documentation. +

    + +{{/if}}
    \ No newline at end of file diff --git a/ui/packages/consul-ui/app/templates/dc/services/instance/healthchecks.hbs b/ui/packages/consul-ui/app/templates/dc/services/instance/healthchecks.hbs index 5b52725baf..4b4545c112 100644 --- a/ui/packages/consul-ui/app/templates/dc/services/instance/healthchecks.hbs +++ b/ui/packages/consul-ui/app/templates/dc/services/instance/healthchecks.hbs @@ -9,7 +9,6 @@ ) as |filters|}} {{#let (or sortBy "Status:asc") as |sort|}}
    -
    {{#if (gt item.MeshChecks.length 0) }} @@ -54,7 +53,6 @@ -
    {{/let}} {{/let}} diff --git a/ui/packages/consul-ui/app/templates/dc/services/instance/metadata.hbs b/ui/packages/consul-ui/app/templates/dc/services/instance/metadata.hbs index 76645926ea..d2eceda871 100644 --- a/ui/packages/consul-ui/app/templates/dc/services/instance/metadata.hbs +++ b/ui/packages/consul-ui/app/templates/dc/services/instance/metadata.hbs @@ -1,5 +1,4 @@ -
    -
    +

    Tags

    {{#if (gt item.Tags.length 0) }} @@ -28,5 +27,4 @@ {{/if}}
    -
    diff --git a/ui/packages/consul-ui/app/templates/dc/services/instance/upstreams.hbs b/ui/packages/consul-ui/app/templates/dc/services/instance/upstreams.hbs index d36f1cfef0..6ea8d7c32f 100644 --- a/ui/packages/consul-ui/app/templates/dc/services/instance/upstreams.hbs +++ b/ui/packages/consul-ui/app/templates/dc/services/instance/upstreams.hbs @@ -1,5 +1,4 @@
    -
    {{#let (hash searchproperties=(if (not-eq searchproperty undefined) (split searchproperty ',') @@ -49,5 +48,4 @@ {{/let}} {{/let}} -
    \ No newline at end of file diff --git a/ui/packages/consul-ui/app/templates/dc/services/show/instances.hbs b/ui/packages/consul-ui/app/templates/dc/services/show/instances.hbs index a0251307e8..39e2fb59ef 100644 --- a/ui/packages/consul-ui/app/templates/dc/services/show/instances.hbs +++ b/ui/packages/consul-ui/app/templates/dc/services/show/instances.hbs @@ -1,5 +1,4 @@
    -
    {{#let (hash statuses=(if status (split status ',') undefined) sources=(if source (split source ',') undefined) @@ -54,5 +53,4 @@ {{/let}} {{/let}} -
    diff --git a/ui/packages/consul-ui/app/templates/dc/services/show/intentions/index.hbs b/ui/packages/consul-ui/app/templates/dc/services/show/intentions/index.hbs index 7456e16c3c..b8a7e22574 100644 --- a/ui/packages/consul-ui/app/templates/dc/services/show/intentions/index.hbs +++ b/ui/packages/consul-ui/app/templates/dc/services/show/intentions/index.hbs @@ -22,7 +22,6 @@ as |api|> ) as |filters|}} {{#let (or sortBy "Action:asc") as |sort|}}
    -
    Create @@ -78,7 +77,6 @@ as |api|> -
    {{/let}} {{/let}} diff --git a/ui/packages/consul-ui/app/templates/dc/services/show/routing.hbs b/ui/packages/consul-ui/app/templates/dc/services/show/routing.hbs index 134cc590db..d89c5a2843 100644 --- a/ui/packages/consul-ui/app/templates/dc/services/show/routing.hbs +++ b/ui/packages/consul-ui/app/templates/dc/services/show/routing.hbs @@ -1,9 +1,7 @@ -
    -
    - -
    +
    +
    diff --git a/ui/packages/consul-ui/app/templates/dc/services/show/services.hbs b/ui/packages/consul-ui/app/templates/dc/services/show/services.hbs index c28fb4aee2..dec7ccb527 100644 --- a/ui/packages/consul-ui/app/templates/dc/services/show/services.hbs +++ b/ui/packages/consul-ui/app/templates/dc/services/show/services.hbs @@ -1,6 +1,5 @@
    -
    {{#let (hash instances=(if instance (split instance ',') undefined) searchproperties=(if (not-eq searchproperty undefined) @@ -55,5 +54,4 @@ {{/let}} {{/let}} -
    diff --git a/ui/packages/consul-ui/app/templates/dc/services/show/tags.hbs b/ui/packages/consul-ui/app/templates/dc/services/show/tags.hbs index 016fe25b34..6013df45e9 100644 --- a/ui/packages/consul-ui/app/templates/dc/services/show/tags.hbs +++ b/ui/packages/consul-ui/app/templates/dc/services/show/tags.hbs @@ -1,5 +1,4 @@ -
    -
    +
    {{#let (flatten (map-by "Tags" items)) as |tags|}} {{#if (gt tags.length 0) }} @@ -13,5 +12,4 @@ {{/if}} {{/let}} -
    diff --git a/ui/packages/consul-ui/app/templates/dc/services/show/topology.hbs b/ui/packages/consul-ui/app/templates/dc/services/show/topology.hbs index d53af4e16d..67457639dc 100644 --- a/ui/packages/consul-ui/app/templates/dc/services/show/topology.hbs +++ b/ui/packages/consul-ui/app/templates/dc/services/show/topology.hbs @@ -1,6 +1,5 @@
    -
    {{#if (and (eq topology.Upstreams.length 0) (eq topology.Downstreams.length 0))}} @@ -37,5 +36,4 @@ @oncreate={{route-action 'createIntention'}} /> {{/if}} -
    diff --git a/ui/packages/consul-ui/app/templates/dc/services/show/upstreams.hbs b/ui/packages/consul-ui/app/templates/dc/services/show/upstreams.hbs index fc234ee72a..bb67a00447 100644 --- a/ui/packages/consul-ui/app/templates/dc/services/show/upstreams.hbs +++ b/ui/packages/consul-ui/app/templates/dc/services/show/upstreams.hbs @@ -1,6 +1,5 @@
    -
    {{#let (hash instances=(if instance (split instance ',') undefined) searchproperties=(if (not-eq searchproperty undefined) @@ -55,5 +54,4 @@ {{/let}} {{/let}} -
    diff --git a/ui/packages/consul-ui/app/templates/settings.hbs b/ui/packages/consul-ui/app/templates/settings.hbs index 69536eaa8d..c105ec03d4 100644 --- a/ui/packages/consul-ui/app/templates/settings.hbs +++ b/ui/packages/consul-ui/app/templates/settings.hbs @@ -10,7 +10,7 @@ @type="info" as |notice|> -

    Local Storage

    +

    Local Storage

    diff --git a/ui/packages/consul-ui/tests/pages/dc/nodes/show.js b/ui/packages/consul-ui/tests/pages/dc/nodes/show.js index 7be58fabfd..8bd9eceec8 100644 --- a/ui/packages/consul-ui/tests/pages/dc/nodes/show.js +++ b/ui/packages/consul-ui/tests/pages/dc/nodes/show.js @@ -29,6 +29,6 @@ export default function( actions: clickable('label'), ...deletable(), }), - metadata: collection('#metadata [data-test-tabular-row]', {}), + metadata: collection('.consul-metadata-list [data-test-tabular-row]', {}), }; } diff --git a/ui/packages/consul-ui/tests/pages/dc/services/instance.js b/ui/packages/consul-ui/tests/pages/dc/services/instance.js index b942c0b108..d24b19efda 100644 --- a/ui/packages/consul-ui/tests/pages/dc/services/instance.js +++ b/ui/packages/consul-ui/tests/pages/dc/services/instance.js @@ -21,7 +21,7 @@ export default function( exposedPaths: collection('[data-test-proxy-exposed-paths] > tbody tr', { combinedAddress: text('[data-test-combined-address]'), }), - addresses: collection('#addresses [data-test-tabular-row]', { + addresses: collection('.consul-tagged-addresses [data-test-tabular-row]', { address: text('[data-test-address]'), }), metadata: collection('.metadata [data-test-tabular-row]', {}),