From 0c66bbf2b4e6c8729e3cf99c3d5fa8feb36b715a Mon Sep 17 00:00:00 2001 From: Valeriia Ruban Date: Wed, 22 Feb 2023 13:05:15 -0800 Subject: [PATCH] [UI] CC-4031: change from Action, a and button to hds::Button (#16251) --- .changelog/16251.txt | 3 + .../consul/token/selector/index.hbs | 18 +- .../consul/lock-session/form/index.hbs | 47 +++-- .../consul/lock-session/list/index.hbs | 34 ++-- .../app/templates/dc/nodes/show/sessions.hbs | 28 +-- .../components/consul/nspace/form/index.hbs | 39 ++-- .../app/templates/dc/nspaces/index.hbs | 26 ++- .../consul/partition/form/index.hbs | 47 +++-- .../app/templates/dc/partitions/index.hbs | 12 +- .../consul/peer/address/list/index.hbs | 2 +- .../consul/peer/address/list/index.scss | 3 + .../consul/peer/bento-box/index.hbs | 2 +- .../peer/form/generate/actions/index.hbs | 13 +- .../components/consul/peer/form/index.scss | 9 - .../peer/form/initiate/actions/index.hbs | 9 +- .../consul/peer/form/token/actions/index.hbs | 28 +-- .../peer/form/token/fieldsets/index.hbs | 12 +- .../app/components/consul/peer/index.scss | 1 + .../app/templates/dc/peers/index.hbs | 43 ++-- .../app/templates/dc/peers/show/addresses.hbs | 34 ++-- .../app/templates/dc/peers/show/exported.hbs | 34 ++-- .../app/templates/dc/peers/show/imported.hbs | 35 ++-- .../app/components/app-view/index.scss | 3 +- .../app/components/auth-form/index.hbs | 8 +- .../app/components/buttons/index.scss | 17 -- .../app/components/buttons/skin.scss | 15 -- .../confirmation-dialog/layout.scss | 3 +- .../components/consul/acl/disabled/index.hbs | 20 +- .../consul/intention/form/fieldsets/index.hbs | 61 +++--- .../consul/intention/form/index.hbs | 78 +++---- .../notice/custom-resource/index.hbs | 8 +- .../intention/notice/permissions/index.hbs | 10 +- .../intention/permission/form/index.hbs | 31 ++- .../app/components/consul/kv/form/index.hbs | 75 ++++--- .../consul/node/agentless-notice/index.hbs | 25 +-- .../components/delete-confirmation/index.hbs | 17 +- .../app/components/empty-state/README.mdx | 32 +-- .../app/components/empty-state/index.hbs | 11 +- .../app/components/empty-state/index.scss | 3 - .../app/components/error-state/index.hbs | 54 ++--- .../app/components/form-elements/index.scss | 12 +- .../app/components/modal-dialog/index.hbs | 12 +- .../app/components/modal-dialog/layout.scss | 2 - .../app/components/modal-dialog/skin.scss | 16 +- .../app/components/oidc-select/index.hbs | 20 +- .../app/components/oidc-select/index.scss | 4 +- .../app/components/policy-selector/index.hbs | 67 ++++-- .../app/components/role-selector/index.hbs | 76 ++++--- .../app/components/role-selector/index.js | 6 + .../app/mixins/with-blocking-actions.js | 8 +- ui/packages/consul-ui/app/styles/app.scss | 6 +- .../app/styles/base/reset/system.scss | 19 +- .../app/styles/routes/dc/acls/index.scss | 3 - .../styles/routes/dc/overview/license.scss | 8 - .../routes/dc/overview/serverstatus.scss | 19 +- .../consul-ui/app/styles/typography.scss | 1 - .../templates/dc/acls/auth-methods/index.hbs | 20 +- .../app/templates/dc/acls/policies/-form.hbs | 89 +++++--- .../app/templates/dc/acls/policies/index.hbs | 26 ++- .../app/templates/dc/acls/roles/-form.hbs | 154 ++++++++------ .../app/templates/dc/acls/roles/index.hbs | 26 ++- .../app/templates/dc/acls/tokens/-form.hbs | 71 ++++--- .../app/templates/dc/acls/tokens/edit.hbs | 31 ++- .../app/templates/dc/acls/tokens/index.hbs | 6 +- .../app/templates/dc/intentions/index.hbs | 26 ++- .../consul-ui/app/templates/dc/kv/index.hbs | 33 ++- .../app/templates/dc/nodes/index.hbs | 34 ++-- .../app/templates/dc/services/index.hbs | 26 +-- .../dc/services/instance/upstreams.hbs | 12 +- .../dc/services/show/intentions/index.hbs | 26 ++- .../app/templates/dc/show/license.hbs | 22 +- .../app/templates/dc/show/serverstatus.hbs | 9 +- ui/packages/consul-ui/package.json | 4 +- .../acceptance/dc/intentions/delete.feature | 2 +- .../tests/acceptance/dc/kvs/delete.feature | 2 +- .../dc/services/show/intentions/index.feature | 2 +- .../components/delete-confirmation-test.js | 4 +- .../tests/lib/page-object/createDeletable.js | 3 +- .../consul-ui/tests/pages/dc/acls/edit.js | 2 +- .../tests/pages/dc/acls/tokens/edit.js | 2 +- .../consul-ui/translations/routes/en-us.yaml | 40 ++-- ui/yarn.lock | 190 ++++++++++++++---- 82 files changed, 1270 insertions(+), 821 deletions(-) create mode 100644 .changelog/16251.txt create mode 100644 ui/packages/consul-peerings/app/components/consul/peer/address/list/index.scss diff --git a/.changelog/16251.txt b/.changelog/16251.txt new file mode 100644 index 0000000000..7aaf58011e --- /dev/null +++ b/.changelog/16251.txt @@ -0,0 +1,3 @@ +```release-note:improvement +ui: update from + />

Permissions

{{#if (gt item.Permissions.length 0) }} @@ -217,11 +218,23 @@

-
  • - Documentation +
  • +
    • -
  • - Read the guide +
  • +
    • @@ -249,22 +262,20 @@ - - + + + + diff --git a/ui/packages/consul-ui/app/components/consul/intention/form/index.hbs b/ui/packages/consul-ui/app/components/consul/intention/form/index.hbs index e58b1ffb3f..9334293a5c 100644 --- a/ui/packages/consul-ui/app/components/consul/intention/form/index.hbs +++ b/ui/packages/consul-ui/app/components/consul/intention/form/index.hbs @@ -80,22 +80,20 @@ as |item readonly|}}

    - - + + + + {{/let}} @@ -174,32 +172,30 @@ as |item readonly|}} @onchange={{api.change}} />
    - - + + + {{#if (not api.isCreate)}} {{#if (not-eq item.ID 'anonymous') }} - + data-test-delete + /> {{/if}} {{/if}} +
    {{else}} @@ -231,9 +228,12 @@ as |item readonly|}}

    -

    - Learn more about CRDs -

    +     {{/if}} diff --git a/ui/packages/consul-ui/app/components/consul/intention/notice/custom-resource/index.hbs b/ui/packages/consul-ui/app/components/consul/intention/notice/custom-resource/index.hbs index 0b629d4f58..8fe8655869 100644 --- a/ui/packages/consul-ui/app/components/consul/intention/notice/custom-resource/index.hbs +++ b/ui/packages/consul-ui/app/components/consul/intention/notice/custom-resource/index.hbs @@ -15,7 +15,13 @@ as |notice|>

    - Learn more about CRDs +

    \ No newline at end of file diff --git a/ui/packages/consul-ui/app/components/consul/intention/notice/permissions/index.hbs b/ui/packages/consul-ui/app/components/consul/intention/notice/permissions/index.hbs index 9e42632ba7..33d8233bfe 100644 --- a/ui/packages/consul-ui/app/components/consul/intention/notice/permissions/index.hbs +++ b/ui/packages/consul-ui/app/components/consul/intention/notice/permissions/index.hbs @@ -8,9 +8,13 @@ as |notice|>

    - - {{t "components.consul.intention.notice.permissions.footer"}} - +

    diff --git a/ui/packages/consul-ui/app/components/consul/intention/permission/form/index.hbs b/ui/packages/consul-ui/app/components/consul/intention/permission/form/index.hbs index f2b09732a2..91cbbbc565 100644 --- a/ui/packages/consul-ui/app/components/consul/intention/permission/form/index.hbs +++ b/ui/packages/consul-ui/app/components/consul/intention/permission/form/index.hbs @@ -134,23 +134,20 @@ as |group|> - - - + + + + \ No newline at end of file diff --git a/ui/packages/consul-ui/app/components/consul/kv/form/index.hbs b/ui/packages/consul-ui/app/components/consul/kv/form/index.hbs index 8ca9d738a5..08ed339123 100644 --- a/ui/packages/consul-ui/app/components/consul/kv/form/index.hbs +++ b/ui/packages/consul-ui/app/components/consul/kv/form/index.hbs @@ -60,29 +60,58 @@ {{/if}} - - {{#if api.isCreate}} -{{#if (not disabld)}} - -{{/if}} - - {{else}} -{{#if (not disabld)}} - -{{/if}} - -{{#if (not disabld)}} - - - - - - - - - {{/if}} -{{/if}} - + + + {{#if api.isCreate}} + {{#if (not disabld)}} + + {{/if}} + + + {{else}} + {{#if (not disabld)}} + + {{/if}} + + {{#if (not disabld)}} + + + + + + + + + {{/if}} + {{/if}} + + {{/let}} diff --git a/ui/packages/consul-ui/app/components/consul/node/agentless-notice/index.hbs b/ui/packages/consul-ui/app/components/consul/node/agentless-notice/index.hbs index 6ee6a31777..069dff276a 100644 --- a/ui/packages/consul-ui/app/components/consul/node/agentless-notice/index.hbs +++ b/ui/packages/consul-ui/app/components/consul/node/agentless-notice/index.hbs @@ -4,9 +4,13 @@

    {{t 'routes.dc.nodes.index.agentless.notice.header'}}

    - +

    @@ -14,15 +18,12 @@

    -

    - - {{t 'routes.dc.nodes.index.agentless.notice.footer'}} - -

    +     {{/if}} diff --git a/ui/packages/consul-ui/app/components/delete-confirmation/index.hbs b/ui/packages/consul-ui/app/components/delete-confirmation/index.hbs index df07485948..35b2de1719 100644 --- a/ui/packages/consul-ui/app/components/delete-confirmation/index.hbs +++ b/ui/packages/consul-ui/app/components/delete-confirmation/index.hbs @@ -1,7 +1,16 @@

    {{message}}

    - - + + + + \ No newline at end of file diff --git a/ui/packages/consul-ui/app/components/empty-state/README.mdx b/ui/packages/consul-ui/app/components/empty-state/README.mdx index 2e3d9e466d..ac684fdf99 100644 --- a/ui/packages/consul-ui/app/components/empty-state/README.mdx +++ b/ui/packages/consul-ui/app/components/empty-state/README.mdx @@ -44,23 +44,23 @@ function.

    -
  • - - Documentation on K/V - +
  • +
    • -
  • - - Read the guide - +
  • +
    • diff --git a/ui/packages/consul-ui/app/components/empty-state/index.hbs b/ui/packages/consul-ui/app/components/empty-state/index.hbs index fcbeeaa4f1..781f516eb0 100644 --- a/ui/packages/consul-ui/app/components/empty-state/index.hbs +++ b/ui/packages/consul-ui/app/components/empty-state/index.hbs @@ -17,7 +17,9 @@
    {{yield}} {{#if login}} - @@ -25,12 +27,7 @@ @src={{uri 'settings://consul:token'}} @onchange={{action (mut token) value="data"}} /> - {{#if token.AccessorID}} - Log in with a different token - {{else}} - Log in - {{/if}} - + {{/if}}
    {{/yield-slot}} diff --git a/ui/packages/consul-ui/app/components/empty-state/index.scss b/ui/packages/consul-ui/app/components/empty-state/index.scss index 72b821403c..7322580d69 100644 --- a/ui/packages/consul-ui/app/components/empty-state/index.scss +++ b/ui/packages/consul-ui/app/components/empty-state/index.scss @@ -16,6 +16,3 @@ %empty-state > ul > li > label > button { @extend %empty-state-anchor; } -%empty-state div > button { - @extend %primary-button; -} diff --git a/ui/packages/consul-ui/app/components/error-state/index.hbs b/ui/packages/consul-ui/app/components/error-state/index.hbs index d05bb30b6f..0496c67403 100644 --- a/ui/packages/consul-ui/app/components/error-state/index.hbs +++ b/ui/packages/consul-ui/app/components/error-state/index.hbs @@ -27,21 +27,25 @@

    -
  • - + - Go back - + @route='index' + @text='Go back' + @icon='chevron-left' + @iconPosition='trailing' + @size='small' + />
    • -
  • - + - Read the documentation - + @iconPosition='trailing' + @icon='docs-link' + @size='small' + />
    • @@ -68,21 +72,23 @@

    -
  • - + - Read the documentation - + @icon='docs-link' + @iconPosition='trailing' + @size='small' + />
    • -
  • - + - Follow the guide - + @icon='learn-link' + @iconPosition='trailing' + @size='small' + />
    • diff --git a/ui/packages/consul-ui/app/components/form-elements/index.scss b/ui/packages/consul-ui/app/components/form-elements/index.scss index 3ace8435f5..a1bf39ab08 100644 --- a/ui/packages/consul-ui/app/components/form-elements/index.scss +++ b/ui/packages/consul-ui/app/components/form-elements/index.scss @@ -1,6 +1,7 @@ @import './skin'; @import './layout'; -%form h2 { +%form h2, +.modal-dialog-body h2 { @extend %h200; } /* TODO: This is positioning the element */ @@ -41,9 +42,7 @@ label span { @extend %form-element-error; } // TODO: float right here is too specific, this is currently used just for the role/policy selectors -label.type-dialog { - @extend %anchor; - cursor: pointer; +.type-dialog { float: right; } .type-toggle { @@ -69,6 +68,11 @@ span.label { %main-content .type-text { @extend %form-element; } +%main-content .type-select > span, +%main-content .type-password > span, +%main-content label.type-text > span { + line-height: 2.2em; +} %app-view-content form:not(.filter-bar) [role='radiogroup'], %modal-window [role='radiogroup'] { @extend %radio-group; diff --git a/ui/packages/consul-ui/app/components/modal-dialog/index.hbs b/ui/packages/consul-ui/app/components/modal-dialog/index.hbs index 6cb2f944f9..b7205ad680 100644 --- a/ui/packages/consul-ui/app/components/modal-dialog/index.hbs +++ b/ui/packages/consul-ui/app/components/modal-dialog/index.hbs @@ -20,12 +20,14 @@ role="document" >
    - + @text='Close dialog' + @color='secondary' + @icon='x' + @size='small' + @isIconOnly={{true}} + /> {{yield (hash open=(action "open") diff --git a/ui/packages/consul-ui/app/components/modal-dialog/layout.scss b/ui/packages/consul-ui/app/components/modal-dialog/layout.scss index f82dd73c23..c8db0864cc 100644 --- a/ui/packages/consul-ui/app/components/modal-dialog/layout.scss +++ b/ui/packages/consul-ui/app/components/modal-dialog/layout.scss @@ -63,7 +63,5 @@ } %modal-window > header button { float: right; - width: 24px; - height: 24px; margin-top: -3px; } diff --git a/ui/packages/consul-ui/app/components/modal-dialog/skin.scss b/ui/packages/consul-ui/app/components/modal-dialog/skin.scss index 79ca00f18e..f22a211116 100644 --- a/ui/packages/consul-ui/app/components/modal-dialog/skin.scss +++ b/ui/packages/consul-ui/app/components/modal-dialog/skin.scss @@ -28,7 +28,7 @@ %modal-window > header { @extend %frame-gray-800; } -%modal-window > header > * { +%modal-window > header > *:not(button) { @extend %h200; } @@ -46,17 +46,3 @@ %modal-window > header { border-width: 1px; } - -%modal-window > header button { - cursor: pointer; - border: var(--decor-border-100); - /*%frame-gray-050??*/ - background-color: rgb(var(--tone-gray-050)); - border-color: rgb(var(--tone-gray-300)); - border-radius: var(--decor-radius-100); -} -%modal-window > header button::before { - @extend %with-cancel-plain-icon, %as-pseudo; - margin-left: -7px; - margin-top: -3px; -} diff --git a/ui/packages/consul-ui/app/components/oidc-select/index.hbs b/ui/packages/consul-ui/app/components/oidc-select/index.hbs index 3c9d4cb876..6f216550c8 100644 --- a/ui/packages/consul-ui/app/components/oidc-select/index.hbs +++ b/ui/packages/consul-ui/app/components/oidc-select/index.hbs @@ -49,12 +49,12 @@ {{! this belongs to the outer StateChart but we need }} {{! to understand validation state }} - - Choose provider - + /> @@ -105,10 +105,12 @@ - - Log in - - + {{/let}} {{/if}} diff --git a/ui/packages/consul-ui/app/components/oidc-select/index.scss b/ui/packages/consul-ui/app/components/oidc-select/index.scss index 203892d9f8..7fcdb2ac82 100644 --- a/ui/packages/consul-ui/app/components/oidc-select/index.scss +++ b/ui/packages/consul-ui/app/components/oidc-select/index.scss @@ -3,9 +3,7 @@ %oidc-select label { @extend %form-element; } -%oidc-select button:not(.reset) { - @extend %primary-button; -} + %oidc-select button.reset { @extend %anchor; @extend %p3; diff --git a/ui/packages/consul-ui/app/components/policy-selector/index.hbs b/ui/packages/consul-ui/app/components/policy-selector/index.hbs index 5ca0d27a6a..d449bd1c52 100644 --- a/ui/packages/consul-ui/app/components/policy-selector/index.hbs +++ b/ui/packages/consul-ui/app/components/policy-selector/index.hbs @@ -10,20 +10,22 @@ ...attributes > {{yield}} - + Apply an existing policy {{#yield-slot name='trigger'}} {{yield}} {{else}} - + /> {{!TODO: potentially call trigger something else}} {{!the modal has to go here so that if you provide a slot to trigger it doesn't get rendered}} - - + + + + {{/yield-slot}} @@ -161,15 +169,34 @@
    - +

    {{message}}

    - - - + + + +
    diff --git a/ui/packages/consul-ui/app/components/role-selector/index.hbs b/ui/packages/consul-ui/app/components/role-selector/index.hbs index 1054af5525..0923846e48 100644 --- a/ui/packages/consul-ui/app/components/role-selector/index.hbs +++ b/ui/packages/consul-ui/app/components/role-selector/index.hbs @@ -34,9 +34,15 @@ as |modal|> @items={{item.Policies}} > - + @@ -56,27 +62,40 @@ as |modal|>     -{{#if (eq state 'role')}} - - -{{else}} - - -{{/if}} + + {{#if (eq state 'role')}} + + + {{else}} + + + {{/if}} + @@ -94,12 +113,15 @@ as |modal|> Apply an existing role - + /> {{option.Name}} diff --git a/ui/packages/consul-ui/app/components/role-selector/index.js b/ui/packages/consul-ui/app/components/role-selector/index.js index 2034acf5fa..574fed5ec1 100644 --- a/ui/packages/consul-ui/app/components/role-selector/index.js +++ b/ui/packages/consul-ui/app/components/role-selector/index.js @@ -42,5 +42,11 @@ export default ChildSelectorComponent.extend({ this._super(...arguments); } }, + triggerStateCheckboxChange() { + //Triggers click event on checkbox + //The function has to be added to change the logic from -
  • - Documentation on auth methods +
  • +
    • -
  • - Read the API Docs +
  • +
    • diff --git a/ui/packages/consul-ui/app/templates/dc/acls/policies/-form.hbs b/ui/packages/consul-ui/app/templates/dc/acls/policies/-form.hbs index bb362b9785..5a776764ab 100644 --- a/ui/packages/consul-ui/app/templates/dc/acls/policies/-form.hbs +++ b/ui/packages/consul-ui/app/templates/dc/acls/policies/-form.hbs @@ -28,37 +28,58 @@ {{/if}} {{/if}}
    -{{#if (and create (can "create tokens")) }} + + {{#if (and create (can "create tokens")) }} {{! we only need to check for an empty name here as ember munges autofocus, once we have autofocus back revisit this}} - -{{ else }} - {{#if (can "write policy" item=item)}} - - {{/if}} -{{/if}} - -{{# if (and (not create) (can "delete policy" item=item) ) }} - + + {{ else }} + {{#if (can "write policy" item=item)}} + + {{/if}} + {{/if}} + + {{# if (and (not create) (can "delete policy" item=item) ) }} + - + - {{#if (gt items.length 0)}} - + > -

    Policy in Use

    +

    Policy in Use

    - This Policy is currently in use. If you choose to delete this Policy, it will be removed from the following {{items.length}} Tokens: + This Policy is currently in use. If you choose to delete this Policy, it will be removed from the + following {{items.length}} Tokens:

    @@ -66,15 +87,27 @@

    - - + + + + -     - {{else}} + + {{else}} - {{/if}} + {{/if}}     -     -{{/if}} +     + {{/if}} +
    diff --git a/ui/packages/consul-ui/app/templates/dc/acls/policies/index.hbs b/ui/packages/consul-ui/app/templates/dc/acls/policies/index.hbs index 583b896ed2..afaa7ce133 100644 --- a/ui/packages/consul-ui/app/templates/dc/acls/policies/index.hbs +++ b/ui/packages/consul-ui/app/templates/dc/acls/policies/index.hbs @@ -62,7 +62,11 @@ as |route|> {{#if (can "create policies")}} - Create + {{/if}} @@ -111,11 +115,23 @@ as |route|> }} -
  • - Documentation on policies +
  • +
    • -
  • - Take the tutorial +
  • +
    • diff --git a/ui/packages/consul-ui/app/templates/dc/acls/roles/-form.hbs b/ui/packages/consul-ui/app/templates/dc/acls/roles/-form.hbs index df5151a8e6..9130f7a3c9 100644 --- a/ui/packages/consul-ui/app/templates/dc/acls/roles/-form.hbs +++ b/ui/packages/consul-ui/app/templates/dc/acls/roles/-form.hbs @@ -6,71 +6,107 @@ @nspace={{nspace}} @partition={{partition}} /> -{{#if (not create)}} - - {{#if (gt loader.data.length 0)}} -

    Where is this role used?

    -

    - We're only able to show information for the primary datacenter and the current datacenter. This list may not show every case where this role is applied. -

    - + as |loader|> + {{#if (gt loader.data.length 0)}} +

    Where is this role used?

    +

    + We're only able to show information for the primary datacenter and the current datacenter. This list may not + show every case where this role is applied. +

    + + {{/if}} +     {{/if}} - -{{/if}} -
    -{{#if (and create (can "create roles")) }} - {{! we only need to check for an empty name here as ember munges autofocus, once we have autofocus back revisit this}} - -{{ else }} - {{#if (can "write role" item=item)}} - - {{/if}} -{{/if}} - -{{# if (and (not create) (can "delete role" item=item) ) }} +
    + + {{#if (and create (can "create roles")) }} + {{! we only need to check for an empty name here as ember munges autofocus, once we have autofocus back revisit this}} + + {{ else }} + {{#if (can "write role" item=item)}} + + {{/if}} + {{/if}} + + + {{# if (and (not create) (can "delete role" item=item) ) }} - - - - - {{#if (gt items.length 0)}} + + + + + {{#if (gt items.length 0)}} - -

    Role in Use

    -     - -

    - This Role is currently in use. If you choose to delete this Role, it will be removed from the following {{items.length}} Tokens: -

    - -

    - This action cannot be undone. {{message}} -

    -     - - - - -     - {{else}} - - {{/if}} -     + +

    Role in Use

    +     + +

    + This Role is currently in use. If you choose to delete this Role, it will be removed from the + following {{items.length}} Tokens: +

    + +

    + This action cannot be undone. {{message}} +

    +     + + + + + + + + {{else}} + + {{/if}} +     -{{/if}} -
    + {{/if}} + +
    diff --git a/ui/packages/consul-ui/app/templates/dc/acls/roles/index.hbs b/ui/packages/consul-ui/app/templates/dc/acls/roles/index.hbs index a1b76fb63f..95beee22d5 100644 --- a/ui/packages/consul-ui/app/templates/dc/acls/roles/index.hbs +++ b/ui/packages/consul-ui/app/templates/dc/acls/roles/index.hbs @@ -56,7 +56,11 @@ as |route|> {{#if (can "create roles")}} - Create + {{/if}} @@ -103,11 +107,23 @@ as |route|> }} -
  • - Documentation on roles +
  • +
    • -
  • - Read the API Docs +
  • +
    • diff --git a/ui/packages/consul-ui/app/templates/dc/acls/tokens/-form.hbs b/ui/packages/consul-ui/app/templates/dc/acls/tokens/-form.hbs index 00aa0f48eb..67a9850be0 100644 --- a/ui/packages/consul-ui/app/templates/dc/acls/tokens/-form.hbs +++ b/ui/packages/consul-ui/app/templates/dc/acls/tokens/-form.hbs @@ -1,30 +1,51 @@
    -{{#if (not (token/is-legacy item))}} - {{partial 'dc/acls/tokens/fieldsets'}} -{{else}} - {{partial 'dc/acls/tokens/fieldsets-legacy'}} -{{/if}} - {{!TODO: Make this into a slotted component}} -
    -{{#if (and create (can "create tokens")) }} - {{! new tokens can be saved without you filling anything in, old tokens remain using isPristine }} - -{{ else }} - {{#if (can "write token" item=item)}} - + {{#if (not (token/is-legacy item))}} + {{partial 'dc/acls/tokens/fieldsets'}} + {{else}} + {{partial 'dc/acls/tokens/fieldsets-legacy'}} {{/if}} -{{/if}} - - -{{# if (and (not create) (can "delete token" item=item token=token) ) }} + {{!TODO: Make this into a slotted component}} +
    + + {{#if (and create (can "create tokens")) }} + {{! new tokens can be saved without you filling anything in, old tokens remain using isPristine }} + + {{ else }} + {{#if (can "write token" item=item)}} + + {{/if}} + {{/if}} + + {{# if (and (not create) (can "delete token" item=item token=token) ) }} - - - - - - + + + + + + -{{/if}} -
    + {{/if}} + +
    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 e1f4c79292..f525ce2d39 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 @@ -52,23 +52,46 @@ as |dc partition nspace item create|}} {{#if (not create)}} + {{#if (not-eq item.AccessorID token.AccessorID)}} - +

    {{message}}

    - - + + + +     {{/if}} {{#if (can "duplicate token" item=item)}} - + {{/if}} +     {{/if}}     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 ffd05ffee0..25c1b4a9d8 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 @@ -59,7 +59,11 @@ as |route|> {{#if (can "create tokens")}} - Create + {{/if}} diff --git a/ui/packages/consul-ui/app/templates/dc/intentions/index.hbs b/ui/packages/consul-ui/app/templates/dc/intentions/index.hbs index 88406a1c43..0bba22a350 100644 --- a/ui/packages/consul-ui/app/templates/dc/intentions/index.hbs +++ b/ui/packages/consul-ui/app/templates/dc/intentions/index.hbs @@ -54,7 +54,11 @@ as |route|> {{#if (can 'create intentions')}} - Create + {{/if}} @@ -119,11 +123,23 @@ as |route|> }} -
  • - Documentation on intentions +
  • +
    • -
  • - Take the tutorial +
  • +
    • diff --git a/ui/packages/consul-ui/app/templates/dc/kv/index.hbs b/ui/packages/consul-ui/app/templates/dc/kv/index.hbs index ec0dc58497..0e571d6dbe 100644 --- a/ui/packages/consul-ui/app/templates/dc/kv/index.hbs +++ b/ui/packages/consul-ui/app/templates/dc/kv/index.hbs @@ -138,9 +138,18 @@ as |sort filters parent items|}} {{#if (can 'create kvs')}} {{#if (not-eq parent.Key '/') }} - Create + {{else}} - Create + {{/if}} {{/if}} @@ -191,11 +200,23 @@ as |sort filters parent items|}} }} -
  • - Documentation on K/V +
  • +
    • -
  • - Take the tutorial +
  • +
    • diff --git a/ui/packages/consul-ui/app/templates/dc/nodes/index.hbs b/ui/packages/consul-ui/app/templates/dc/nodes/index.hbs index 8459018cce..b918a29b66 100644 --- a/ui/packages/consul-ui/app/templates/dc/nodes/index.hbs +++ b/ui/packages/consul-ui/app/templates/dc/nodes/index.hbs @@ -88,25 +88,27 @@ }} -
  • - - {{t 'routes.dc.nodes.index.empty.documentation'}} - +
  • +
    • -
  • - - {{t 'routes.dc.nodes.index.empty.learn'}} - + @color='tertiary' + @icon='learn-link' + @iconPosition='trailing' + @size='small' + />
    • diff --git a/ui/packages/consul-ui/app/templates/dc/services/index.hbs b/ui/packages/consul-ui/app/templates/dc/services/index.hbs index c5d53cf301..1e47678735 100644 --- a/ui/packages/consul-ui/app/templates/dc/services/index.hbs +++ b/ui/packages/consul-ui/app/templates/dc/services/index.hbs @@ -118,21 +118,23 @@ as |sort filters items partition nspace|}} }} -
  • - + - Documentation on Services - + @icon='docs-link' + @iconPosition='trailing' + @size='small' + />
    • -
  • - + - Take the tutorial - + @icon='learn-link' + @iconPosition='trailing' + @size='small' + />
    • 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 c5282482fe..ab9a3efaea 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 @@ -58,9 +58,15 @@ as |route|> }} - {{t "routes.dc.services.instance.upstreams.tproxy-mode.footer" - htmlSafe=true - }} +

    + +

    {{/if}} 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 763e47e63a..85a90aeb55 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 @@ -44,7 +44,11 @@ as |route|>
    {{#if (can 'create intention for service' item=item.Service)}} - Create + {{/if}} {{#if (gt items.length 0) }} @@ -107,11 +111,23 @@ as |route|> }} -
  • - Documentation on intentions +
  • +
    • -
  • - Take the tutorial +
  • +
    • diff --git a/ui/packages/consul-ui/app/templates/dc/show/license.hbs b/ui/packages/consul-ui/app/templates/dc/show/license.hbs index 3b5861210e..db00969075 100644 --- a/ui/packages/consul-ui/app/templates/dc/show/license.hbs +++ b/ui/packages/consul-ui/app/templates/dc/show/license.hbs @@ -137,11 +137,23 @@ as |item|}} {{compute (fn route.t 'documentation.title')}}
    - {{compute (fn route.t 'documentation.body' - (hash - htmlSafe=true - ) - )}} +
    + + + +
    diff --git a/ui/packages/consul-ui/app/templates/dc/show/serverstatus.hbs b/ui/packages/consul-ui/app/templates/dc/show/serverstatus.hbs index dd2472ec80..6e8adf8998 100644 --- a/ui/packages/consul-ui/app/templates/dc/show/serverstatus.hbs +++ b/ui/packages/consul-ui/app/templates/dc/show/serverstatus.hbs @@ -87,12 +87,15 @@ as |item|}} >
    - {{compute (fn route.t 'tolerance.link' (hash - htmlSafe=true - ))}}

    {{compute (fn route.t 'tolerance.header')}}

    +
    div'), ...deletable({}, 'main form > div'), use: clickable('[data-test-use]'), - confirmUse: clickable('button.type-delete'), + confirmUse: clickable('[data-test-confirm-use]'), clone: clickable('[data-test-clone]'), policies: policySelector(), roles: roleSelector(), diff --git a/ui/packages/consul-ui/translations/routes/en-us.yaml b/ui/packages/consul-ui/translations/routes/en-us.yaml index f9cd5ad10d..33d618ac4a 100644 --- a/ui/packages/consul-ui/translations/routes/en-us.yaml +++ b/ui/packages/consul-ui/translations/routes/en-us.yaml @@ -5,8 +5,8 @@ dc: title: Server status unassigned: Unassigned Zones tolerance: - link: | - Learn how to improve fault tolerance + link-text: Learn how to improve fault tolerance + link: /architecture/improving-consul-resilience#strategies-to-increase-fault-tolerance header: Server fault tolerance immediate: header: Immediate @@ -34,25 +34,16 @@ dc:

    documentation: title: Learn More - body: | - - + links: + license-expiration: + text: License expiration + link: '/enterprise/license/faq#q-is-there-a-grace-period-when-licenses-expire' + renewing-license: + text: Renewing a license + link: '/enterprise/license/faq#q-how-can-i-renew-a-license' + applying-new-license: + text: Applying a new license + link: '/tutorials/nomad/hashicorp-enterprise-license?in=consul/enterprise' nodes: index: agentless: @@ -265,10 +256,9 @@ dc:

    The upstreams listed on this page have been defined in a proxy registration. There may be more upstreams, though, as "transparent" mode is enabled on this proxy.

    - footer: | -

    - Read the documentation -

    + footer: + link: "/connect/transparent-proxy" + text: Read the documentation empty: |

    This Service Instance has no Upstreams{items, select, diff --git a/ui/yarn.lock b/ui/yarn.lock index 96953879f6..13f277c65f 100644 --- a/ui/yarn.lock +++ b/ui/yarn.lock @@ -2927,6 +2927,15 @@ ember-cli-version-checker "^5.1.2" semver "^7.3.5" +"@embroider/addon-shim@^1.0.0": + version "1.8.4" + resolved "https://registry.yarnpkg.com/@embroider/addon-shim/-/addon-shim-1.8.4.tgz#0e7f32c5506bf0f3eb0840506e31c36c7053763c" + integrity sha512-sFhfWC0vI18KxVenmswQ/ShIvBg4juL8ubI+Q3NTSdkCTeaPQ/DIOUF6oR5DCQ8eO/TkIaw+kdG3FkTY6yNJqA== + dependencies: + "@embroider/shared-internals" "^2.0.0" + broccoli-funnel "^3.0.8" + semver "^7.3.8" + "@embroider/addon-shim@^1.5.0": version "1.8.3" resolved "https://registry.yarnpkg.com/@embroider/addon-shim/-/addon-shim-1.8.3.tgz#2368510b8ce42d50d02cb3289c32e260dfa34bd9" @@ -3147,6 +3156,20 @@ semver "^7.3.5" typescript-memoize "^1.0.1" +"@embroider/shared-internals@^2.0.0": + version "2.0.0" + resolved "https://registry.yarnpkg.com/@embroider/shared-internals/-/shared-internals-2.0.0.tgz#d8205ec6944362aeecfbb51143db352430ced316" + integrity sha512-qZ2/xky9mWm5YC6noOa6AiAwgISEQ78YTZNv4SNu2PFgEK/H+Ha/3ddngzGSsnXkVnIHZyxIBzhxETonQYHY9g== + dependencies: + babel-import-util "^1.1.0" + ember-rfc176-data "^0.3.17" + fs-extra "^9.1.0" + js-string-escape "^1.0.1" + lodash "^4.17.21" + resolve-package-path "^4.0.1" + semver "^7.3.5" + typescript-memoize "^1.0.1" + "@embroider/util@^0.39.1 || ^0.40.0 || ^0.41.0": version "0.41.0" resolved "https://registry.yarnpkg.com/@embroider/util/-/util-0.41.0.tgz#5324cb4742aa4ed8d613c4f88a466f73e4e6acc1" @@ -3399,19 +3422,25 @@ faker "^4.1.0" js-yaml "^3.13.1" -"@hashicorp/design-system-components@^1.0.4": - version "1.0.4" - resolved "https://registry.yarnpkg.com/@hashicorp/design-system-components/-/design-system-components-1.0.4.tgz#e258cad1a41b00db3363db25bfdafaa598326b98" - integrity sha512-aaOncgPH4yDEvQuFfOa/cwAOttxwbaEdaENEl+88EOi/HLUe0mdS2HgpC96w3sWhedE/xylCgSHz0DemIj5dJQ== +"@hashicorp/design-system-components@^1.6.0": + version "1.6.1" + resolved "https://registry.yarnpkg.com/@hashicorp/design-system-components/-/design-system-components-1.6.1.tgz#da04f1199cdce78dcf6591c3678377b87bd67424" + integrity sha512-nfuY5KLK3kQWRfrFOIEEoSSca6LwZ9Zss13glHHyAIFt/gJ1pjSpcYj2XTukdjfAvx70qwQbHPPaAUXZ00vtoA== dependencies: - "@hashicorp/design-system-tokens" "^1.0.0" - "@hashicorp/ember-flight-icons" "^2.0.12" - ember-auto-import "^2.4.1" + "@hashicorp/design-system-tokens" "^1.4.0" + "@hashicorp/ember-flight-icons" "^3.0.2" + dialog-polyfill "^0.5.6" + ember-auto-import "^2.4.2" + ember-cached-decorator-polyfill "^0.1.4" ember-cli-babel "^7.26.11" - ember-cli-htmlbars "^6.0.1" + ember-cli-htmlbars "^6.1.0" ember-cli-sass "^10.0.1" + ember-composable-helpers "^4.4.1" + ember-focus-trap "^1.0.1" ember-keyboard "^8.1.0" ember-named-blocks-polyfill "^0.2.5" + ember-style-modifier "^0.8.0" + ember-truth-helpers "^3.0.0" sass "^1.43.4" "@hashicorp/design-system-tokens@^1.0.0": @@ -3419,6 +3448,11 @@ resolved "https://registry.yarnpkg.com/@hashicorp/design-system-tokens/-/design-system-tokens-1.0.0.tgz#06ab55873ef444b0958a5192db310278c6501f0b" integrity sha512-akziX9jiHnQ8KfJA6s8l+98Ukz30C5Lw7BpSPeTduOmdOlJv1uP7w4TV0hC6VIDMDrJrxIF5Y/HnpSCdQGlxQA== +"@hashicorp/design-system-tokens@^1.4.0": + version "1.4.0" + resolved "https://registry.yarnpkg.com/@hashicorp/design-system-tokens/-/design-system-tokens-1.4.0.tgz#2d42bd7d9250b01f77618663b3b92004be840af7" + integrity sha512-xZI5lom+qPi5B4qUDgXcuTc+A8/NQdXXBoIfB7NUnY/GRp4kOkxNkgScPj8fvAFvUuLdiCAQhpLU54z1A/Q3cA== + "@hashicorp/ember-cli-api-double@^4.0.0": version "4.0.0" resolved "https://registry.yarnpkg.com/@hashicorp/ember-cli-api-double/-/ember-cli-api-double-4.0.0.tgz#fd6181229c589b4db93f1784d022db064c61ec76" @@ -3434,34 +3468,20 @@ pretender "^3.2.0" recursive-readdir-sync "^1.0.6" -"@hashicorp/ember-flight-icons@^2.0.12": - version "2.0.12" - resolved "https://registry.yarnpkg.com/@hashicorp/ember-flight-icons/-/ember-flight-icons-2.0.12.tgz#788adf7a4fedc468d612d35b604255df948f4012" - integrity sha512-8fHPGaSpMkr5dLWaruwbq9INwZCi2EyTof/TR/dL8PN4UbCuY+KXNqG0lLIKNGFFTj09B1cO303m5GUfKKDGKQ== +"@hashicorp/ember-flight-icons@^3.0.2": + version "3.0.2" + resolved "https://registry.yarnpkg.com/@hashicorp/ember-flight-icons/-/ember-flight-icons-3.0.2.tgz#8d884c07842a6c88df18ca680d7883a59222a2ba" + integrity sha512-WomQg1hw/IHA1N9hC77WbTNazVXqu2RdRoaVCGT99NTXQ4S7Bw7vhHheR4JAgt10ksMZFI3X/bJVHxFfjUCkSQ== dependencies: - "@hashicorp/flight-icons" "^2.10.0" + "@hashicorp/flight-icons" "^2.12.0" + ember-auto-import "^2.4.2" ember-cli-babel "^7.26.11" - ember-cli-htmlbars "^6.0.1" + ember-cli-htmlbars "^6.1.0" -"@hashicorp/ember-flight-icons@^3.0.0": - version "3.0.0" - resolved "https://registry.yarnpkg.com/@hashicorp/ember-flight-icons/-/ember-flight-icons-3.0.0.tgz#fddeb8adfb036aa3573c55b7236b34172b49cba9" - integrity sha512-+QrV38Ix9dWLwMzdVcMcSmFfeSVGvWvB+3OVBq3ltOTmnoLPIAx8LT9UDZUZ1wa65ciO+a1YzLMmwWnQgX/r9Q== - dependencies: - "@hashicorp/flight-icons" "^2.11.0" - ember-auto-import "^2.4.1" - ember-cli-babel "^7.26.11" - ember-cli-htmlbars "^6.0.1" - -"@hashicorp/flight-icons@^2.10.0": - version "2.10.0" - resolved "https://registry.yarnpkg.com/@hashicorp/flight-icons/-/flight-icons-2.10.0.tgz#24b03043bacda16e505200e6591dfef896ddacf1" - integrity sha512-jYUA0M6Tz+4RAudil+GW/fHbhZPcKCiIZZAguBDviqbLneMkMgPOBgbXWCGWsEQ1fJzP2cXbUaio8L0aQZPWQw== - -"@hashicorp/flight-icons@^2.11.0": - version "2.11.0" - resolved "https://registry.yarnpkg.com/@hashicorp/flight-icons/-/flight-icons-2.11.0.tgz#1500be99a42ee8512e7caece4bdae60ce8790577" - integrity sha512-teFkUY2di63JZ2gsegQgS+3f5YEP+GPuycB1Z2O+weInIrL33Ds0/J+lxFCmi2vkPAeY5xOnsclHYnhU6xOSmA== +"@hashicorp/flight-icons@^2.12.0": + version "2.12.0" + resolved "https://registry.yarnpkg.com/@hashicorp/flight-icons/-/flight-icons-2.12.0.tgz#48bc21f21678668ffe9147b181a2991d8b151fc7" + integrity sha512-PhjTTHCjoq4EJirifbxLxnxXnCRf1NUAYZ1WnFW8i0yOmmax6fgjsJRPlf0VIGsR8R7isFpjuy6gJ5c7mNhE0w== "@html-next/vertical-collection@^4.0.0": version "4.0.0" @@ -4874,6 +4894,11 @@ babel-import-util@^1.1.0: resolved "https://registry.yarnpkg.com/babel-import-util/-/babel-import-util-1.2.2.tgz#1027560e143a4a68b1758e71d4fadc661614e495" integrity sha512-8HgkHWt5WawRFukO30TuaL9EiDUOdvyKtDwLma4uBNeUSDbOO0/hiPfavrOWxSS6J6TKXfukWHZ3wiqZhJ8ONQ== +babel-import-util@^1.3.0: + version "1.3.0" + resolved "https://registry.yarnpkg.com/babel-import-util/-/babel-import-util-1.3.0.tgz#dc9251ea39a7747bd586c1c13b8d785a42797f8e" + integrity sha512-PPzUT17eAI18zn6ek1R3sB4Krc/MbnmT1MkZQFmyhjoaEGBVwNABhfVU9+EKcDSKrrOm9OIpGhjxukx1GCiy1g== + babel-loader@^8.0.6, babel-loader@^8.1.0: version "8.2.2" resolved "https://registry.yarnpkg.com/babel-loader/-/babel-loader-8.2.2.tgz#9363ce84c10c9a40e6c753748e1441b60c8a0b81" @@ -4950,6 +4975,13 @@ babel-plugin-ember-template-compilation@^1.0.0: magic-string "^0.25.7" string.prototype.matchall "^4.0.5" +babel-plugin-ember-template-compilation@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/babel-plugin-ember-template-compilation/-/babel-plugin-ember-template-compilation-2.0.0.tgz#41d895874ba6119dd461f61993c16d1154bf8a57" + integrity sha512-d+4jaB2ik0rt9TH0K9kOlKJeRBHEb373FgFMcU9ZaJL2zYuVXe19bqy+cWlLpLf1tpOBcBG9QTlFBCoImlOt1g== + dependencies: + babel-import-util "^1.3.0" + babel-plugin-filter-imports@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/babel-plugin-filter-imports/-/babel-plugin-filter-imports-4.0.0.tgz#068f8da15236a96a9602c36dc6f4a6eeca70a4f4" @@ -7717,6 +7749,11 @@ dezalgo@^1.0.0: asap "^2.0.0" wrappy "1" +dialog-polyfill@^0.5.6: + version "0.5.6" + resolved "https://registry.yarnpkg.com/dialog-polyfill/-/dialog-polyfill-0.5.6.tgz#7507b4c745a82fcee0fa07ce64d835979719599a" + integrity sha512-ZbVDJI9uvxPAKze6z146rmfUZjBqNEwcnFTVamQzXH+svluiV7swmVIGr7miwADgfgt1G2JQIytypM9fbyhX4w== + didyoumean@^1.2.2: version "1.2.2" resolved "https://registry.yarnpkg.com/didyoumean/-/didyoumean-1.2.2.tgz#989346ffe9e839b4555ecf5666edea0d3e8ad037" @@ -7991,7 +8028,7 @@ ember-auto-import@^1.5.3, ember-auto-import@^1.6.0: walk-sync "^0.3.3" webpack "^4.43.0" -ember-auto-import@^2.2.3, ember-auto-import@^2.4.1, ember-auto-import@^2.4.2: +ember-auto-import@^2.2.3, ember-auto-import@^2.4.2: version "2.4.2" resolved "https://registry.yarnpkg.com/ember-auto-import/-/ember-auto-import-2.4.2.tgz#d4d3bc6885a11cf124f606f5c37169bdf76e37ae" integrity sha512-REh+1aJWpTkvN42a/ga41OuRpUsSW7UQfPr2wPtYx56o/xoSNhVBXejy7yV9ObrkN7gogz6fs2xZwih5cOwpYg== @@ -8045,6 +8082,26 @@ ember-basic-dropdown@3.0.21, ember-basic-dropdown@^3.0.16: ember-style-modifier "^0.6.0" ember-truth-helpers "^2.1.0 || ^3.0.0" +ember-cache-primitive-polyfill@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/ember-cache-primitive-polyfill/-/ember-cache-primitive-polyfill-1.0.1.tgz#a27075443bd87e5af286c1cd8a7df24e3b9f6715" + integrity sha512-hSPcvIKarA8wad2/b6jDd/eU+OtKmi6uP+iYQbzi5TQpjsqV6b4QdRqrLk7ClSRRKBAtdTuutx+m+X+WlEd2lw== + dependencies: + ember-cli-babel "^7.22.1" + ember-cli-version-checker "^5.1.1" + ember-compatibility-helpers "^1.2.1" + silent-error "^1.1.1" + +ember-cached-decorator-polyfill@^0.1.4: + version "0.1.4" + resolved "https://registry.yarnpkg.com/ember-cached-decorator-polyfill/-/ember-cached-decorator-polyfill-0.1.4.tgz#f1e2c65cc78d0d9c4ac0e047e643af477eb85ace" + integrity sha512-JOK7kBCWsTVCzmCefK4nr9BACDJk0owt9oIUaVt6Q0UtQ4XeAHmoK5kQ/YtDcxQF1ZevHQFdGhsTR3JLaHNJgA== + dependencies: + "@glimmer/tracking" "^1.0.4" + ember-cache-primitive-polyfill "^1.0.1" + ember-cli-babel "^7.21.0" + ember-cli-babel-plugin-helpers "^1.1.1" + ember-can@^4.2.0: version "4.2.0" resolved "https://registry.yarnpkg.com/ember-can/-/ember-can-4.2.0.tgz#08bfec3b2b57aad3dc6e4dc36fe9692bd1794dab" @@ -8310,6 +8367,26 @@ ember-cli-htmlbars@^6.0.1: silent-error "^1.1.1" walk-sync "^2.2.0" +ember-cli-htmlbars@^6.1.0: + version "6.2.0" + resolved "https://registry.yarnpkg.com/ember-cli-htmlbars/-/ember-cli-htmlbars-6.2.0.tgz#18ec48ee1c93f9eed862a64eb24a9d14604f1dfc" + integrity sha512-j5EGixjGau23HrqRiW/JjoAovg5UBHfjbyN7wX5ekE90knIEqUUj1z/Mo/cTx/J2VepQ2lE6HdXW9LWQ/WdMtw== + dependencies: + "@ember/edition-utils" "^1.2.0" + babel-plugin-ember-template-compilation "^2.0.0" + babel-plugin-htmlbars-inline-precompile "^5.3.0" + broccoli-debug "^0.6.5" + broccoli-persistent-filter "^3.1.2" + broccoli-plugin "^4.0.3" + ember-cli-version-checker "^5.1.2" + fs-tree-diff "^2.0.1" + hash-for-dep "^1.5.1" + heimdalljs-logger "^0.1.10" + js-string-escape "^1.0.1" + semver "^7.3.4" + silent-error "^1.1.1" + walk-sync "^2.2.0" + ember-cli-inject-live-reload@^2.0.2: version "2.0.2" resolved "https://registry.yarnpkg.com/ember-cli-inject-live-reload/-/ember-cli-inject-live-reload-2.0.2.tgz#95edb543b386239d35959e5ea9579f5382976ac7" @@ -8730,6 +8807,16 @@ ember-compatibility-helpers@^1.2.5: fs-extra "^9.1.0" semver "^5.4.1" +ember-composable-helpers@^4.4.1: + version "4.5.0" + resolved "https://registry.yarnpkg.com/ember-composable-helpers/-/ember-composable-helpers-4.5.0.tgz#94febbdf4348e64f45f7a6f993f326e32540a61e" + integrity sha512-XjpDLyVPsLCy6kd5dIxZonOECCO6AA5sY5Hr6tYUbJg3s5ghFAiFWaNcYraYC+fL2yPJQAswwpfwGlQORUJZkw== + dependencies: + "@babel/core" "^7.0.0" + broccoli-funnel "2.0.1" + ember-cli-babel "^7.26.3" + resolve "^1.10.0" + ember-composable-helpers@^5.0.0: version "5.0.0" resolved "https://registry.yarnpkg.com/ember-composable-helpers/-/ember-composable-helpers-5.0.0.tgz#055bab3a3e234ab2917499b1465e968c253ca885" @@ -8862,6 +8949,14 @@ ember-factory-for-polyfill@^1.3.1: dependencies: ember-cli-version-checker "^2.1.0" +ember-focus-trap@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/ember-focus-trap/-/ember-focus-trap-1.0.1.tgz#a99565f6ce55d500b92a0965e79e3ad04219f157" + integrity sha512-ZUyq5ZkIuXp+ng9rCMkqBh36/V95PltL7iljStkma4+651xlAy3Z84L9WOu/uOJyVpNUxii8RJBbAySHV6c+RQ== + dependencies: + "@embroider/addon-shim" "^1.0.0" + focus-trap "^6.7.1" + ember-get-config@^0.3.0: version "0.3.0" resolved "https://registry.yarnpkg.com/ember-get-config/-/ember-get-config-0.3.0.tgz#a73a1a87b48d9dde4c66a0e52ed5260b8a48cfbd" @@ -9286,6 +9381,14 @@ ember-style-modifier@^0.6.0: ember-cli-babel "^7.21.0" ember-modifier "^2.1.0" +ember-style-modifier@^0.8.0: + version "0.8.0" + resolved "https://registry.yarnpkg.com/ember-style-modifier/-/ember-style-modifier-0.8.0.tgz#ef46b3f288e63e3d850418ea8dc6f7b12edde721" + integrity sha512-I7M+oZ+poYYOP7n521rYv7kkYZbxotL8VbtHYxLQ3tasRZYQJ21qfu3vVjydSjwyE3w7EZRgKngBoMhKSAEZnw== + dependencies: + ember-cli-babel "^7.26.6" + ember-modifier "^3.2.7" + ember-template-lint@^2.0.1: version "2.21.0" resolved "https://registry.yarnpkg.com/ember-template-lint/-/ember-template-lint-2.21.0.tgz#7e120abf309a8810eeed26c52377943faf15a95b" @@ -10405,6 +10508,13 @@ flush-write-stream@^1.0.0: inherits "^2.0.3" readable-stream "^2.3.6" +focus-trap@^6.7.1: + version "6.9.4" + resolved "https://registry.yarnpkg.com/focus-trap/-/focus-trap-6.9.4.tgz#436da1a1d935c48b97da63cd8f361c6f3aa16444" + integrity sha512-v2NTsZe2FF59Y+sDykKY+XjqZ0cPfhq/hikWVL88BqLivnNiEffAsac6rP6H45ff9wG9LL5ToiDqrLEP9GX9mw== + dependencies: + tabbable "^5.3.3" + focusable-selectors@^0.3.0: version "0.3.0" resolved "https://registry.yarnpkg.com/focusable-selectors/-/focusable-selectors-0.3.0.tgz#0cf0c617c0f130b3d421be6787acb95b0b4936c4" @@ -15578,6 +15688,13 @@ semver@^7.3.5: dependencies: lru-cache "^6.0.0" +semver@^7.3.8: + version "7.3.8" + resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.8.tgz#07a78feafb3f7b32347d725e33de7e2a2df67798" + integrity sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A== + dependencies: + lru-cache "^6.0.0" + send@0.17.1: version "0.17.1" resolved "https://registry.yarnpkg.com/send/-/send-0.17.1.tgz#c1d8b059f7900f7466dd4938bdc44e11ddb376c8" @@ -16405,6 +16522,11 @@ sync-disk-cache@^2.0.0: rimraf "^3.0.0" username-sync "^1.0.2" +tabbable@^5.3.3: + version "5.3.3" + resolved "https://registry.yarnpkg.com/tabbable/-/tabbable-5.3.3.tgz#aac0ff88c73b22d6c3c5a50b1586310006b47fbf" + integrity sha512-QD9qKY3StfbZqWOPLp0++pOrAVb/HbUi5xCc8cUo4XjP19808oaMiDzn0leBY5mCespIBM0CIZePzZjgzR83kA== + table@^6.0.9: version "6.8.0" resolved "https://registry.yarnpkg.com/table/-/table-6.8.0.tgz#87e28f14fa4321c3377ba286f07b79b281a3b3ca"