diff --git a/ui/app/components/loading-dropdown-option.hbs b/ui/app/components/loading-dropdown-option.hbs new file mode 100644 index 0000000000..8f93edc19d --- /dev/null +++ b/ui/app/components/loading-dropdown-option.hbs @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/ui/app/models/role-jwt.js b/ui/app/models/role-jwt.js index 9a68051a48..0d8e2ec1a2 100644 --- a/ui/app/models/role-jwt.js +++ b/ui/app/models/role-jwt.js @@ -15,7 +15,7 @@ const DOMAIN_STRINGS = { 'auth0.com': 'Auth0', }; -const PROVIDER_WITH_LOGO = ['GitLab', 'Google', 'Auth0']; +const PROVIDER_WITH_LOGO = ['GitHub', 'GitLab', 'Google', 'Okta', 'Auth0']; export { DOMAIN_STRINGS, PROVIDER_WITH_LOGO }; @@ -28,8 +28,8 @@ export default class RoleJwtModel extends Model { return DOMAIN_STRINGS[firstMatch] || null; } - get providerButtonComponent() { + get providerIcon() { const { providerName } = this; - return PROVIDER_WITH_LOGO.includes(providerName) ? `auth-button-${providerName.toLowerCase()}` : null; + return PROVIDER_WITH_LOGO.includes(providerName) ? providerName.toLowerCase() : null; } } diff --git a/ui/app/styles/components/auth-buttons.scss b/ui/app/styles/components/auth-buttons.scss deleted file mode 100644 index 84310f7c07..0000000000 --- a/ui/app/styles/components/auth-buttons.scss +++ /dev/null @@ -1,27 +0,0 @@ -/** - * Copyright (c) HashiCorp, Inc. - * SPDX-License-Identifier: BUSL-1.1 - */ - -.auth-button-tile { - height: 31px; - width: 31px; - background: $white; - border-radius: 1px; - box-shadow: 0 0 0 1px rgba(255, 255, 255, 0.4); -} -.auth-button-type-google { - position: relative; - top: -10px; - left: -1.05rem; -} - -.auth-button-type-auth0, -.auth-button-type-gitlab { - position: relative; - top: -6px; - left: -0.75rem; -} -[class*='auth-button-type'] .text { - padding-left: $spacing-m; -} diff --git a/ui/app/styles/components/calendar-widget.scss b/ui/app/styles/components/calendar-widget.scss index f7de7a1625..9fe4a848fe 100644 --- a/ui/app/styles/components/calendar-widget.scss +++ b/ui/app/styles/components/calendar-widget.scss @@ -23,22 +23,11 @@ $dark-gray: #535f73; .select-year { grid-area: select-year; - margin-left: 24px; - margin-top: 10px; + margin: 10px 24px; font-weight: $font-weight-bold; display: flex; justify-content: space-between; align-items: first baseline; - - // spacing of < year > icons when the tooltip is added or removed from DOM. - > .padding-right { - // if no tooltip - padding-right: 26px; - } - > .negative-margin { - // if tooltip - margin-right: -50px; - } } .calendar-widget { diff --git a/ui/app/styles/components/popup-menu.scss b/ui/app/styles/components/popup-menu.scss index 68db72abbd..325b138379 100644 --- a/ui/app/styles/components/popup-menu.scss +++ b/ui/app/styles/components/popup-menu.scss @@ -83,6 +83,10 @@ cursor: default; } } + &.loading-dropdown { + display: flex; + align-items: center; + } } .menu-label { diff --git a/ui/app/styles/core.scss b/ui/app/styles/core.scss index a062572629..1dca67e697 100644 --- a/ui/app/styles/core.scss +++ b/ui/app/styles/core.scss @@ -52,7 +52,6 @@ @import './helper-classes/typography'; // Component specific styling -@import './components/auth-buttons'; @import './components/auth-form'; @import './components/autocomplete-input'; @import './components/b64-toggle'; diff --git a/ui/app/templates/components/alphabet-edit.hbs b/ui/app/templates/components/alphabet-edit.hbs index 66b20c7e0c..f35121b10c 100644 --- a/ui/app/templates/components/alphabet-edit.hbs +++ b/ui/app/templates/components/alphabet-edit.hbs @@ -31,9 +31,13 @@ {{#if this.capabilities.canDelete}} - +
{{/if}} {{#if this.capabilities.canUpdate}} @@ -79,27 +83,30 @@ {{/each}}
-
- - - Cancel - -
+ data-test-alphabet-transform-create + /> + {{#if (eq this.mode "create")}} + + {{else}} + + {{/if}} +
{{else}} diff --git a/ui/app/templates/components/auth-button-auth0.hbs b/ui/app/templates/components/auth-button-auth0.hbs deleted file mode 100644 index 0a4e4154e8..0000000000 --- a/ui/app/templates/components/auth-button-auth0.hbs +++ /dev/null @@ -1,24 +0,0 @@ -{{! - Copyright (c) HashiCorp, Inc. - SPDX-License-Identifier: BUSL-1.1 -~}} - -
-
- {{! template-lint-disable no-forbidden-elements }} - - - - - - - - {{! template-lint-enable no-forbidden-elements }} -
-
- Sign in with Auth0 -
-
\ No newline at end of file diff --git a/ui/app/templates/components/auth-button-gitlab.hbs b/ui/app/templates/components/auth-button-gitlab.hbs deleted file mode 100644 index 16e48fe664..0000000000 --- a/ui/app/templates/components/auth-button-gitlab.hbs +++ /dev/null @@ -1,53 +0,0 @@ -{{! - Copyright (c) HashiCorp, Inc. - SPDX-License-Identifier: BUSL-1.1 -~}} - -
- {{! template-lint-disable no-forbidden-elements }} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - {{! template-lint-enable no-forbidden-elements }} -
- Sign in with GitLab -
-
\ No newline at end of file diff --git a/ui/app/templates/components/auth-button-google.hbs b/ui/app/templates/components/auth-button-google.hbs deleted file mode 100644 index c8c96ad817..0000000000 --- a/ui/app/templates/components/auth-button-google.hbs +++ /dev/null @@ -1,75 +0,0 @@ -{{! - Copyright (c) HashiCorp, Inc. - SPDX-License-Identifier: BUSL-1.1 -~}} - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- Sign in with Google -
-
\ No newline at end of file diff --git a/ui/app/templates/components/auth-config-form/config.hbs b/ui/app/templates/components/auth-config-form/config.hbs index e245a51e66..d0aa09c9e9 100644 --- a/ui/app/templates/components/auth-config-form/config.hbs +++ b/ui/app/templates/components/auth-config-form/config.hbs @@ -16,13 +16,12 @@ {{/if}}
- + />
\ No newline at end of file diff --git a/ui/app/templates/components/auth-config-form/options.hbs b/ui/app/templates/components/auth-config-form/options.hbs index 35e6f0909a..eaef6e030d 100644 --- a/ui/app/templates/components/auth-config-form/options.hbs +++ b/ui/app/templates/components/auth-config-form/options.hbs @@ -12,13 +12,12 @@ {{/each}}
- + />
\ No newline at end of file diff --git a/ui/app/templates/components/auth-form.hbs b/ui/app/templates/components/auth-form.hbs index cb56335804..35506c5cb3 100644 --- a/ui/app/templates/components/auth-form.hbs +++ b/ui/app/templates/components/auth-form.hbs @@ -181,15 +181,14 @@ @selectedAuthIsPath={{this.selectedAuthIsPath}} /> {{/if}} - + /> {{#if (and this.delayAuthMessageReminder.isIdle this.showLoading)}} {{yield}} - + + {{#if this.isOIDC}} + + {{else}} + + {{/if}} \ No newline at end of file diff --git a/ui/app/templates/components/auth-saml.hbs b/ui/app/templates/components/auth-saml.hbs index a3d0059268..37ebf14037 100644 --- a/ui/app/templates/components/auth-saml.hbs +++ b/ui/app/templates/components/auth-saml.hbs @@ -31,15 +31,14 @@
{{yield}}
- + /> {{else}} diff --git a/ui/app/templates/components/calendar-widget.hbs b/ui/app/templates/components/calendar-widget.hbs index 242cf6362f..3fbbf964b1 100644 --- a/ui/app/templates/components/calendar-widget.hbs +++ b/ui/app/templates/components/calendar-widget.hbs @@ -15,6 +15,7 @@
DATE OPTIONS
+ {{! TODO Hds::Dropdown swapout }}
  • + @color="secondary" + @text="previous year" + @icon="chevron-left" + @isIconOnly={{true}} + />

    {{this.displayYear}}

    - + @color="secondary" + @text="next year" + @icon="chevron-right" + @isIconOnly={{true}} + /> {{#if this.tooltipTarget}} {{! Component must be in curly bracket notation }} {{! template-lint-disable no-curly-component-invocation }} @@ -107,15 +103,15 @@
    {{#each this.widgetMonths as |month|}} - + /> {{/each}}
    diff --git a/ui/app/templates/components/clients/config.hbs b/ui/app/templates/components/clients/config.hbs index 088f68ea2b..6549488e84 100644 --- a/ui/app/templates/components/clients/config.hbs +++ b/ui/app/templates/components/clients/config.hbs @@ -37,9 +37,7 @@
    - + Cancel diff --git a/ui/app/templates/components/clients/dashboard.hbs b/ui/app/templates/components/clients/dashboard.hbs index 2c96204c9a..c8405df12c 100644 --- a/ui/app/templates/components/clients/dashboard.hbs +++ b/ui/app/templates/components/clients/dashboard.hbs @@ -16,9 +16,13 @@
    {{#if this.formattedStartDate}}

    {{this.formattedStartDate}}

    - + {{else}} {{/if}} @@ -113,7 +117,7 @@ or viewing the current month filtered down to auth method }}
    - +
    {{else}} @@ -151,9 +149,7 @@ {{/if}}
    - +
    {{/if}} \ No newline at end of file diff --git a/ui/app/templates/components/configure-ssh-secret.hbs b/ui/app/templates/components/configure-ssh-secret.hbs index 0d01a52381..38abccf77e 100644 --- a/ui/app/templates/components/configure-ssh-secret.hbs +++ b/ui/app/templates/components/configure-ssh-secret.hbs @@ -74,14 +74,13 @@
    - + />
    diff --git a/ui/app/templates/components/control-group-success.hbs b/ui/app/templates/components/control-group-success.hbs index ee98a1c769..311a852149 100644 --- a/ui/app/templates/components/control-group-success.hbs +++ b/ui/app/templates/components/control-group-success.hbs @@ -9,9 +9,7 @@ {{this.model.requestPath}}. Be careful, you can only access this data once. If you need access again in the future you will need to get authorized again.
    - +
    {{else}} @@ -63,9 +61,7 @@ />
    - +
    diff --git a/ui/app/templates/components/control-group.hbs b/ui/app/templates/components/control-group.hbs index d9a9d5db16..1baa0a6805 100644 --- a/ui/app/templates/components/control-group.hbs +++ b/ui/app/templates/components/control-group.hbs @@ -109,24 +109,20 @@ Back {{else}} - + /> {{/if}} {{else}} - + /> {{/if}} {{/unless}} diff --git a/ui/app/templates/components/dashboard/quick-actions-card.hbs b/ui/app/templates/components/dashboard/quick-actions-card.hbs index 4ad7985d72..57ba832405 100644 --- a/ui/app/templates/components/dashboard/quick-actions-card.hbs +++ b/ui/app/templates/components/dashboard/quick-actions-card.hbs @@ -54,15 +54,13 @@ />
    - + />
    {{/if}} {{else}} diff --git a/ui/app/templates/components/database-connection.hbs b/ui/app/templates/components/database-connection.hbs index d2f26bd79a..e32dbff959 100644 --- a/ui/app/templates/components/database-connection.hbs +++ b/ui/app/templates/components/database-connection.hbs @@ -25,14 +25,13 @@ {{#if @model.canDelete}} - + /> {{/if}} {{#if @model.canReset}}
    -
    - -
    -
    - - Cancel - -
    + + + +
    @@ -293,16 +291,15 @@
    -
    - -
    -
    - - Cancel - -
    + + + +
    diff --git a/ui/app/templates/components/database-role-edit.hbs b/ui/app/templates/components/database-role-edit.hbs index 65c97ddada..be4a6c00fd 100644 --- a/ui/app/templates/components/database-role-edit.hbs +++ b/ui/app/templates/components/database-role-edit.hbs @@ -37,9 +37,12 @@
    {{/if}} {{#if (and @model.canRotateRoleCredentials (eq @model.type "static"))}} - + {{/if}} {{#if (or @@ -47,14 +50,13 @@ (and (eq @model.type "dynamic") @model.canGenerateCredentials) ) }} - + /> {{/if}} {{#if @model.canEditRole}} -
    -
    - {{#if (is-empty-value this.warningMessages)}} - - {{else}} - - - - - -
    - You don't have permissions required to - {{if (eq @mode "create") "create" "update"}} - this role. See form for details. -
    -     -     - {{/if}} -
    -
    - - Cancel - -
    + + + + + {{#if (not (is-empty-value this.warningMessages))}} + + Warning + + You don't have permissions required to + {{if (eq @mode "create") "create" "update"}} + this role. See form for details. + + + {{/if}}
    diff --git a/ui/app/templates/components/date-dropdown.hbs b/ui/app/templates/components/date-dropdown.hbs index 272c15199a..4e87843a2a 100644 --- a/ui/app/templates/components/date-dropdown.hbs +++ b/ui/app/templates/components/date-dropdown.hbs @@ -4,7 +4,7 @@ ~}} - + {{#each this.dropdownMonths as |month|}} {{/each}} - + {{#each this.dropdownYears as |year|}} {{#if this.filename}} - + /> {{/if}} diff --git a/ui/app/templates/components/generate-credentials-database.hbs b/ui/app/templates/components/generate-credentials-database.hbs index cfb171a193..41662eab29 100644 --- a/ui/app/templates/components/generate-credentials-database.hbs +++ b/ui/app/templates/components/generate-credentials-database.hbs @@ -83,12 +83,5 @@ {{/if}}
    - +
    \ No newline at end of file diff --git a/ui/app/templates/components/generate-credentials.hbs b/ui/app/templates/components/generate-credentials.hbs index 1e69c4b796..21536b3071 100644 --- a/ui/app/templates/components/generate-credentials.hbs +++ b/ui/app/templates/components/generate-credentials.hbs @@ -110,9 +110,12 @@ Back {{else}} - + {{/if}} @@ -134,14 +137,13 @@
    - + />
    - + /> {{#if (eq this.mode "create")}} Cancel diff --git a/ui/app/templates/components/identity/edit-form.hbs b/ui/app/templates/components/identity/edit-form.hbs index 4d558ad5a7..7bce3b4067 100644 --- a/ui/app/templates/components/identity/edit-form.hbs +++ b/ui/app/templates/components/identity/edit-form.hbs @@ -62,34 +62,26 @@
    -
    - + /> {{#if (or (eq this.mode "merge") (eq this.mode "create"))}} - - Cancel - + {{else}} - - Cancel - + data-test-cancel-link + /> {{/if}} -
    +
    \ No newline at end of file diff --git a/ui/app/templates/components/identity/lookup-input.hbs b/ui/app/templates/components/identity/lookup-input.hbs index 3a136a4fe6..51670f694a 100644 --- a/ui/app/templates/components/identity/lookup-input.hbs +++ b/ui/app/templates/components/identity/lookup-input.hbs @@ -26,7 +26,7 @@
    - +
    \ No newline at end of file diff --git a/ui/app/templates/components/identity/popup-alias.hbs b/ui/app/templates/components/identity/popup-alias.hbs index c2908b8d77..78817fb173 100644 --- a/ui/app/templates/components/identity/popup-alias.hbs +++ b/ui/app/templates/components/identity/popup-alias.hbs @@ -18,9 +18,7 @@
    • {{#if item.updatePath.isPending}}
  • - +
    • {{else}} {{#if item.canEdit}} diff --git a/ui/app/templates/components/keymgmt/distribute.hbs b/ui/app/templates/components/keymgmt/distribute.hbs index ee8ed2b383..ec9fdbc063 100644 --- a/ui/app/templates/components/keymgmt/distribute.hbs +++ b/ui/app/templates/components/keymgmt/distribute.hbs @@ -167,9 +167,7 @@
    - +
    diff --git a/ui/app/templates/components/keymgmt/key-edit.hbs b/ui/app/templates/components/keymgmt/key-edit.hbs index 197969a240..40d9037d47 100644 --- a/ui/app/templates/components/keymgmt/key-edit.hbs +++ b/ui/app/templates/components/keymgmt/key-edit.hbs @@ -55,25 +55,23 @@ {{#unless @model.distribution}} - + /> {{/unless}} {{#if @model.canDelete}} - + /> {{/if}} {{#if @model.provider}} {{/each}}
    -
    - -
    -
    - + - Cancel - -
    + /> +
    {{/let}} @@ -208,10 +202,13 @@ data-test-keymgmt-dist-empty-state > {{#if @model.canListProviders}} - + {{/if}} {{else}} diff --git a/ui/app/templates/components/keymgmt/provider-edit.hbs b/ui/app/templates/components/keymgmt/provider-edit.hbs index c23c4c1234..b847f2d5b1 100644 --- a/ui/app/templates/components/keymgmt/provider-edit.hbs +++ b/ui/app/templates/components/keymgmt/provider-edit.hbs @@ -73,15 +73,15 @@
    {{/if}} {{#if (or @model.canListKeys @model.canCreateKeys)}} - + /> {{/if}} {{#if @model.canEdit}}
    -
    - -
    -
    - + - Cancel - -
    + /> +
    {{/if}} diff --git a/ui/app/templates/components/link-status.hbs b/ui/app/templates/components/link-status.hbs index 0e0f913d49..c09c9daf39 100644 --- a/ui/app/templates/components/link-status.hbs +++ b/ui/app/templates/components/link-status.hbs @@ -12,47 +12,15 @@ HCP. {{else}} - There was an error connecting to HCP. Click - - for more information. + Error connecting to HCP {{/if}} + {{#if this.error}} + + Since + {{this.timestamp}}, + {{this.error}}. Check the logs for more information. + + {{/if}} -{{/if}} - -{{#if this.showModal}} - - - HCP Link error - - -
    -

    Timestamp

    -

    - {{or this.timestamp "Not available"}} -

    -
    -
    -

    Error

    - {{#if this.error}} - - {{this.error}} - - {{else}} -

    - Not available -

    - {{/if}} -
    -
    -

    Additional information

    -

    Check the logs for more information

    -
    -     - - - -     {{/if}} \ No newline at end of file diff --git a/ui/app/templates/components/mfa/method-form.hbs b/ui/app/templates/components/mfa/method-form.hbs index 5f8fc8346b..23b826161d 100644 --- a/ui/app/templates/components/mfa/method-form.hbs +++ b/ui/app/templates/components/mfa/method-form.hbs @@ -10,21 +10,16 @@ {{#if @hasActions}}
    -
    - - -
    + data-test-mfa-save + /> + +
    {{/if}} diff --git a/ui/app/templates/components/mfa/mfa-form.hbs b/ui/app/templates/components/mfa/mfa-form.hbs index b23daf5609..5ec07b60a1 100644 --- a/ui/app/templates/components/mfa/mfa-form.hbs +++ b/ui/app/templates/components/mfa/mfa-form.hbs @@ -61,15 +61,14 @@ {{/if}} - + /> {{#if this.newCodeDelay.isRunning}} {{this.countdown}} diff --git a/ui/app/templates/components/mfa/mfa-login-enforcement-form.hbs b/ui/app/templates/components/mfa/mfa-login-enforcement-form.hbs index a827c33921..dd3a64cf6e 100644 --- a/ui/app/templates/components/mfa/mfa-login-enforcement-form.hbs +++ b/ui/app/templates/components/mfa/mfa-login-enforcement-form.hbs @@ -66,14 +66,14 @@ {{target.value}} {{/if}} - + /> {{/each}}
    @@ -118,15 +118,14 @@ /> {{/if}}
    - + /> {{#if this.errors.targets.errors}} @@ -135,24 +134,22 @@ {{#unless @isInline}}
    - - + + + +
    {{/unless}} \ No newline at end of file diff --git a/ui/app/templates/components/mfa/mfa-setup-step-one.hbs b/ui/app/templates/components/mfa/mfa-setup-step-one.hbs index ef2288d9c1..e1198ec0d9 100644 --- a/ui/app/templates/components/mfa/mfa-setup-step-one.hbs +++ b/ui/app/templates/components/mfa/mfa-setup-step-one.hbs @@ -30,13 +30,9 @@ /> -
    - - -
    + + + + \ No newline at end of file diff --git a/ui/app/templates/components/mfa/mfa-setup-step-two.hbs b/ui/app/templates/components/mfa/mfa-setup-step-two.hbs index 20008f8970..c570d99db8 100644 --- a/ui/app/templates/components/mfa/mfa-setup-step-two.hbs +++ b/ui/app/templates/components/mfa/mfa-setup-step-two.hbs @@ -46,18 +46,8 @@ {{/if}}
    - - + +
    \ No newline at end of file diff --git a/ui/app/templates/components/mount-backend-form.hbs b/ui/app/templates/components/mount-backend-form.hbs index 17cb45e7b5..62f22c1adb 100644 --- a/ui/app/templates/components/mount-backend-form.hbs +++ b/ui/app/templates/components/mount-backend-form.hbs @@ -39,23 +39,16 @@
    - + />
    - +
    {{#if this.invalidFormAlert}}
    diff --git a/ui/app/templates/components/namespace-picker.hbs b/ui/app/templates/components/namespace-picker.hbs index 440376abaf..9af86128eb 100644 --- a/ui/app/templates/components/namespace-picker.hbs +++ b/ui/app/templates/components/namespace-picker.hbs @@ -91,14 +91,14 @@ - + {{on "click" (action "refreshNamespaceList")}} + />
    diff --git a/ui/app/templates/components/oidc/assignment-form.hbs b/ui/app/templates/components/oidc/assignment-form.hbs index d2f8a06885..8ce86f2168 100644 --- a/ui/app/templates/components/oidc/assignment-form.hbs +++ b/ui/app/templates/components/oidc/assignment-form.hbs @@ -47,23 +47,21 @@ />
    - - + /> {{#if this.modelValidations.targets.errors}} {{/if}} diff --git a/ui/app/templates/components/oidc/client-form.hbs b/ui/app/templates/components/oidc/client-form.hbs index fb5fd92c62..e2c0a9def1 100644 --- a/ui/app/templates/components/oidc/client-form.hbs +++ b/ui/app/templates/components/oidc/client-form.hbs @@ -79,23 +79,21 @@
    - - + />
    {{#if this.invalidFormAlert}}
    diff --git a/ui/app/templates/components/oidc/key-form.hbs b/ui/app/templates/components/oidc/key-form.hbs index 7cf8daafa9..9ea41100b0 100644 --- a/ui/app/templates/components/oidc/key-form.hbs +++ b/ui/app/templates/components/oidc/key-form.hbs @@ -80,23 +80,21 @@
    - - + />
    {{#if this.invalidFormAlert}}
    diff --git a/ui/app/templates/components/oidc/provider-form.hbs b/ui/app/templates/components/oidc/provider-form.hbs index 505f6ad78f..b51e0d1e86 100644 --- a/ui/app/templates/components/oidc/provider-form.hbs +++ b/ui/app/templates/components/oidc/provider-form.hbs @@ -107,23 +107,21 @@
    - - + />
    {{#if this.invalidFormAlert}}
    diff --git a/ui/app/templates/components/oidc/scope-form.hbs b/ui/app/templates/components/oidc/scope-form.hbs index d55a292d40..76541045a8 100644 --- a/ui/app/templates/components/oidc/scope-form.hbs +++ b/ui/app/templates/components/oidc/scope-form.hbs @@ -55,23 +55,21 @@

    - - + />
    {{#if this.invalidFormAlert}}
    diff --git a/ui/app/templates/components/okta-number-challenge.hbs b/ui/app/templates/components/okta-number-challenge.hbs index 790833362f..8f08fbc571 100644 --- a/ui/app/templates/components/okta-number-challenge.hbs +++ b/ui/app/templates/components/okta-number-challenge.hbs @@ -11,12 +11,12 @@ {{#if @hasError}}
    - + />
    {{else if @correctAnswer}}
    diff --git a/ui/app/templates/components/pgp-file.hbs b/ui/app/templates/components/pgp-file.hbs index c77badd4df..69486ed2d3 100644 --- a/ui/app/templates/components/pgp-file.hbs +++ b/ui/app/templates/components/pgp-file.hbs @@ -70,9 +70,15 @@ {{/if}} {{#if this.key.filename}} - + {{/if}}
    diff --git a/ui/app/templates/components/raft-join.hbs b/ui/app/templates/components/raft-join.hbs index 2d10decf6b..a727955e9d 100644 --- a/ui/app/templates/components/raft-join.hbs +++ b/ui/app/templates/components/raft-join.hbs @@ -52,9 +52,7 @@
    - +
    {{/if}} \ No newline at end of file diff --git a/ui/app/templates/components/raft-storage-overview.hbs b/ui/app/templates/components/raft-storage-overview.hbs index e021a00a2e..011423ec68 100644 --- a/ui/app/templates/components/raft-storage-overview.hbs +++ b/ui/app/templates/components/raft-storage-overview.hbs @@ -34,13 +34,11 @@ Download {{else}} - + {{/if}}
  • diff --git a/ui/app/templates/components/raft-storage-restore.hbs b/ui/app/templates/components/raft-storage-restore.hbs index 814728fe82..826aeb9003 100644 --- a/ui/app/templates/components/raft-storage-restore.hbs +++ b/ui/app/templates/components/raft-storage-restore.hbs @@ -34,9 +34,7 @@
    • - +
    {{else}}
    diff --git a/ui/app/templates/components/role-aws-edit.hbs b/ui/app/templates/components/role-aws-edit.hbs index 2a00af373a..a713939c1d 100644 --- a/ui/app/templates/components/role-aws-edit.hbs +++ b/ui/app/templates/components/role-aws-edit.hbs @@ -72,18 +72,24 @@ {{/each}}
    -
    - - - Cancel - -
    + + + {{#if (eq this.mode "create")}} + + {{else}} + + {{/if}} +
    {{else}} diff --git a/ui/app/templates/components/role-ssh-edit.hbs b/ui/app/templates/components/role-ssh-edit.hbs index d202a7c9b4..96396bee69 100644 --- a/ui/app/templates/components/role-ssh-edit.hbs +++ b/ui/app/templates/components/role-ssh-edit.hbs @@ -67,18 +67,25 @@
    -
    - - - Cancel - -
    + + + {{#if (eq this.mode "create")}} + + {{else}} + + {{/if}} +
    {{else}} diff --git a/ui/app/templates/components/secret-create-or-update.hbs b/ui/app/templates/components/secret-create-or-update.hbs index c7371010db..4dc52bc88d 100644 --- a/ui/app/templates/components/secret-create-or-update.hbs +++ b/ui/app/templates/components/secret-create-or-update.hbs @@ -6,7 +6,7 @@ {{#if (eq @mode "create")}}
    @@ -59,8 +59,8 @@ {{else}} @@ -75,7 +75,7 @@ data-test-secret-key={{true}} @value={{secret.name}} placeholder="key" - {{on "change" (action "handleChange")}} + {{on "change" this.handleChange}} class="input" autocomplete="off" spellcheck="false" @@ -91,23 +91,15 @@
    {{#if (eq @secretData.length (inc index))}} - + {{else}} - + /> {{/if}}
    @@ -125,9 +117,7 @@
    - +
    @@ -140,7 +130,7 @@ {{#if (eq @mode "edit")}} @@ -166,8 +156,8 @@
    {{else}} @@ -182,7 +172,7 @@ data-test-secret-key={{true}} @value={{secret.name}} placeholder="key" - {{on "change" (action "handleChange")}} + {{on "change" this.handleChange}} class="input" autocomplete="off" spellcheck="false" @@ -198,23 +188,15 @@
    {{#if (eq @secretData.length (inc index))}} - + {{else}} - + {{/if}}
    @@ -225,14 +207,12 @@
    - + />
    diff --git a/ui/app/templates/components/secret-list/aws-role-item.hbs b/ui/app/templates/components/secret-list/aws-role-item.hbs index 486664f766..62ac42976f 100644 --- a/ui/app/templates/components/secret-list/aws-role-item.hbs +++ b/ui/app/templates/components/secret-list/aws-role-item.hbs @@ -29,9 +29,7 @@
      {{#if @item.generatePath.isPending}}
    • - +
      • {{else if @item.canGenerate}}
    • @@ -46,14 +44,10 @@ {{/if}} {{#if @item.updatePath.isPending}}
    • - +
    • - +
      • {{else}} {{#if @item.canRead}} diff --git a/ui/app/templates/components/secret-list/database-list-item.hbs b/ui/app/templates/components/secret-list/database-list-item.hbs index 46e2c8cf97..8211079889 100644 --- a/ui/app/templates/components/secret-list/database-list-item.hbs +++ b/ui/app/templates/components/secret-list/database-list-item.hbs @@ -31,7 +31,7 @@
        {{#if @item.canEdit}}
      • - + Edit connection
        • @@ -45,9 +45,12 @@ {{/if}} {{#if @item.canReset}}
      • - +
        • {{/if}} {{#if (and (eq @item.type "dynamic") @item.canGenerateCredentials)}} @@ -73,16 +76,22 @@ {{/if}} {{#if (and @item.canRotateRoleCredentials (eq this.keyTypeValue "static"))}}
      • - +
        • {{/if}} {{#if @item.canRotateRoot}}
      • - +
        • {{/if}}
      diff --git a/ui/app/templates/components/secret-list/item.hbs b/ui/app/templates/components/secret-list/item.hbs index a6bcb3d49f..548afa8963 100644 --- a/ui/app/templates/components/secret-list/item.hbs +++ b/ui/app/templates/components/secret-list/item.hbs @@ -41,9 +41,7 @@ {{else}} {{#if (or @item.versionPath.isLoading @item.secretPath.isLoading)}}
    • - +
      • {{else}} {{#if @item.canRead}} diff --git a/ui/app/templates/components/secret-list/transform-transformation-item.hbs b/ui/app/templates/components/secret-list/transform-transformation-item.hbs index 0254943a78..e070759aef 100644 --- a/ui/app/templates/components/secret-list/transform-transformation-item.hbs +++ b/ui/app/templates/components/secret-list/transform-transformation-item.hbs @@ -31,9 +31,7 @@
        {{#if (or @item.versionPath.isLoading @item.secretPath.isLoading)}}
      • - +
        • {{else}} {{#if @item.updatePath.canRead}} diff --git a/ui/app/templates/components/tool-hash.hbs b/ui/app/templates/components/tool-hash.hbs index 00efac15c9..db3e1521ff 100644 --- a/ui/app/templates/components/tool-hash.hbs +++ b/ui/app/templates/components/tool-hash.hbs @@ -25,9 +25,7 @@
    - +
    {{else}} @@ -77,9 +75,7 @@
    - +
    {{/if}} \ No newline at end of file diff --git a/ui/app/templates/components/tool-lookup.hbs b/ui/app/templates/components/tool-lookup.hbs index 977e3cea5e..d01e071d8b 100644 --- a/ui/app/templates/components/tool-lookup.hbs +++ b/ui/app/templates/components/tool-lookup.hbs @@ -23,9 +23,7 @@
    - +
    {{else}} @@ -44,9 +42,7 @@
    - +
    {{/if}} \ No newline at end of file diff --git a/ui/app/templates/components/tool-random.hbs b/ui/app/templates/components/tool-random.hbs index 9ac50289b5..e010c677df 100644 --- a/ui/app/templates/components/tool-random.hbs +++ b/ui/app/templates/components/tool-random.hbs @@ -21,9 +21,7 @@
    - +
    {{else}} @@ -60,9 +58,7 @@
    - +
    {{/if}} \ No newline at end of file diff --git a/ui/app/templates/components/tool-rewrap.hbs b/ui/app/templates/components/tool-rewrap.hbs index 909cac20fb..7a8679ab6c 100644 --- a/ui/app/templates/components/tool-rewrap.hbs +++ b/ui/app/templates/components/tool-rewrap.hbs @@ -32,9 +32,7 @@
    - +
    {{else}} @@ -53,9 +51,7 @@
    - +
    {{/if}} \ No newline at end of file diff --git a/ui/app/templates/components/tool-unwrap.hbs b/ui/app/templates/components/tool-unwrap.hbs index e021210ad8..91e1cdd633 100644 --- a/ui/app/templates/components/tool-unwrap.hbs +++ b/ui/app/templates/components/tool-unwrap.hbs @@ -44,7 +44,7 @@ - + {{else}}
    @@ -70,9 +70,7 @@
    - +
    {{/if}} \ No newline at end of file diff --git a/ui/app/templates/components/tool-wrap.hbs b/ui/app/templates/components/tool-wrap.hbs index 4596396980..b74cde52fa 100644 --- a/ui/app/templates/components/tool-wrap.hbs +++ b/ui/app/templates/components/tool-wrap.hbs @@ -32,9 +32,7 @@
    - +
    {{else}} @@ -62,9 +60,7 @@
    - +
    {{/if}} \ No newline at end of file diff --git a/ui/app/templates/components/transform-create-form.hbs b/ui/app/templates/components/transform-create-form.hbs index f591c29eb1..e6ff90067c 100644 --- a/ui/app/templates/components/transform-create-form.hbs +++ b/ui/app/templates/components/transform-create-form.hbs @@ -12,17 +12,14 @@ {{/each}}
    -
    - - - Cancel - -
    + + + +
    \ No newline at end of file diff --git a/ui/app/templates/components/transform-edit-form.hbs b/ui/app/templates/components/transform-edit-form.hbs index 65eb18a068..7bc2486e38 100644 --- a/ui/app/templates/components/transform-edit-form.hbs +++ b/ui/app/templates/components/transform-edit-form.hbs @@ -43,22 +43,14 @@ {{/each}}
    -
    - - - Cancel - -
    + + + +
    \ No newline at end of file diff --git a/ui/app/templates/components/transform-role-edit.hbs b/ui/app/templates/components/transform-role-edit.hbs index 32d8b5dc7d..e73724e466 100644 --- a/ui/app/templates/components/transform-role-edit.hbs +++ b/ui/app/templates/components/transform-role-edit.hbs @@ -71,29 +71,30 @@ {{/each}}
    -
    - + data-test-role-transform-create + /> {{#if (eq this.mode "create")}} - - Cancel - - {{else if (eq this.mode "edit")}} - - Cancel - + + {{else}} + {{/if}} -
    +
    {{else}} diff --git a/ui/app/templates/components/transform-template-edit.hbs b/ui/app/templates/components/transform-template-edit.hbs index 2ce3fa6782..32e0847bba 100644 --- a/ui/app/templates/components/transform-template-edit.hbs +++ b/ui/app/templates/components/transform-template-edit.hbs @@ -31,9 +31,13 @@ {{#if this.capabilities.canDelete}} - +
    {{/if}} {{#if this.capabilities.canUpdate}} @@ -82,27 +86,30 @@ {{/each}}
    -
    - - - Cancel - -
    + data-test-template-transform-create + /> + {{#if (eq this.mode "create")}} + + {{else}} + + {{/if}} +
    {{else}} diff --git a/ui/app/templates/components/transformation-edit.hbs b/ui/app/templates/components/transformation-edit.hbs index 0a26fc6536..c4d54157a1 100644 --- a/ui/app/templates/components/transformation-edit.hbs +++ b/ui/app/templates/components/transformation-edit.hbs @@ -34,9 +34,13 @@ {{#if (gt this.model.allowed_roles.length 0)}} - +
    @@ -45,9 +49,12 @@ {{else}} - + {{/if}}
    {{/if}} diff --git a/ui/app/templates/components/transit-form-create.hbs b/ui/app/templates/components/transit-form-create.hbs index 924e3bc532..0b6d403d8f 100644 --- a/ui/app/templates/components/transit-form-create.hbs +++ b/ui/app/templates/components/transit-form-create.hbs @@ -125,14 +125,13 @@
    - + />
    diff --git a/ui/app/templates/components/transit-form-edit.hbs b/ui/app/templates/components/transit-form-edit.hbs index b87eabf242..1681e9f5c0 100644 --- a/ui/app/templates/components/transit-form-edit.hbs +++ b/ui/app/templates/components/transit-form-edit.hbs @@ -91,9 +91,12 @@
    {{#if @capabilities.canUpdate}}
    - +
    {{/if}}
    diff --git a/ui/app/templates/components/transit-key-action/datakey.hbs b/ui/app/templates/components/transit-key-action/datakey.hbs index 24b8d8cbf2..4dd9a317ae 100644 --- a/ui/app/templates/components/transit-key-action/datakey.hbs +++ b/ui/app/templates/components/transit-key-action/datakey.hbs @@ -68,9 +68,7 @@
    - +
    diff --git a/ui/app/templates/components/transit-key-action/decrypt.hbs b/ui/app/templates/components/transit-key-action/decrypt.hbs index 84d8f90c7a..b0493679c1 100644 --- a/ui/app/templates/components/transit-key-action/decrypt.hbs +++ b/ui/app/templates/components/transit-key-action/decrypt.hbs @@ -49,9 +49,7 @@
    - +
    diff --git a/ui/app/templates/components/transit-key-action/encrypt.hbs b/ui/app/templates/components/transit-key-action/encrypt.hbs index 82483bc045..257ce66d9b 100644 --- a/ui/app/templates/components/transit-key-action/encrypt.hbs +++ b/ui/app/templates/components/transit-key-action/encrypt.hbs @@ -63,9 +63,7 @@
    - +
    diff --git a/ui/app/templates/components/transit-key-action/export.hbs b/ui/app/templates/components/transit-key-action/export.hbs index b14b2d67f8..beb949099e 100644 --- a/ui/app/templates/components/transit-key-action/export.hbs +++ b/ui/app/templates/components/transit-key-action/export.hbs @@ -59,9 +59,7 @@
    - +
    diff --git a/ui/app/templates/components/transit-key-action/hmac.hbs b/ui/app/templates/components/transit-key-action/hmac.hbs index 05c674a897..3dedf52cdf 100644 --- a/ui/app/templates/components/transit-key-action/hmac.hbs +++ b/ui/app/templates/components/transit-key-action/hmac.hbs @@ -45,9 +45,7 @@
    - +
    diff --git a/ui/app/templates/components/transit-key-action/rewrap.hbs b/ui/app/templates/components/transit-key-action/rewrap.hbs index 7d75bd2ce5..5a173dbfb6 100644 --- a/ui/app/templates/components/transit-key-action/rewrap.hbs +++ b/ui/app/templates/components/transit-key-action/rewrap.hbs @@ -57,9 +57,7 @@

    - +
    diff --git a/ui/app/templates/components/transit-key-action/sign.hbs b/ui/app/templates/components/transit-key-action/sign.hbs index b14eb7a26c..5c12139724 100644 --- a/ui/app/templates/components/transit-key-action/sign.hbs +++ b/ui/app/templates/components/transit-key-action/sign.hbs @@ -114,9 +114,7 @@
    - +
    diff --git a/ui/app/templates/components/transit-key-action/verify.hbs b/ui/app/templates/components/transit-key-action/verify.hbs index 2fdbd63a04..77a774c7b1 100644 --- a/ui/app/templates/components/transit-key-action/verify.hbs +++ b/ui/app/templates/components/transit-key-action/verify.hbs @@ -186,9 +186,7 @@
    - +
    diff --git a/ui/app/templates/components/wizard-content.hbs b/ui/app/templates/components/wizard-content.hbs index 2ebd051fae..6c4420468c 100644 --- a/ui/app/templates/components/wizard-content.hbs +++ b/ui/app/templates/components/wizard-content.hbs @@ -9,9 +9,7 @@ diff --git a/ui/app/templates/vault/cluster/access/identity/index.hbs b/ui/app/templates/vault/cluster/access/identity/index.hbs index 743a7a2479..d995acd240 100644 --- a/ui/app/templates/vault/cluster/access/identity/index.hbs +++ b/ui/app/templates/vault/cluster/access/identity/index.hbs @@ -43,9 +43,7 @@ {{#if (or item.isReloading item.updatePath.isPending item.aliasPath.isPending)}}
  • - +
    • {{else}} {{#if item.canAddAlias}} diff --git a/ui/app/templates/vault/cluster/policies/index.hbs b/ui/app/templates/vault/cluster/policies/index.hbs index d0fcf50949..0aa5c28faf 100644 --- a/ui/app/templates/vault/cluster/policies/index.hbs +++ b/ui/app/templates/vault/cluster/policies/index.hbs @@ -97,14 +97,10 @@
      {{#if item.updatePath.isPending}}
    • - +
    • - +
      • {{else}} {{#if item.canRead}} diff --git a/ui/lib/core/addon/components/menu-loader.hbs b/ui/lib/core/addon/components/menu-loader.hbs index 7a8687666d..32f65c3c81 100644 --- a/ui/lib/core/addon/components/menu-loader.hbs +++ b/ui/lib/core/addon/components/menu-loader.hbs @@ -5,9 +5,7 @@
    • {{#if @loadingParam}} - + {{else}} {{yield}} {{/if}} diff --git a/ui/scripts/codemods/hds/button.js b/ui/scripts/codemods/hds/button.js index ff5b2e8cec..2ddcc08418 100755 --- a/ui/scripts/codemods/hds/button.js +++ b/ui/scripts/codemods/hds/button.js @@ -171,6 +171,18 @@ class Transforms { }); } + filterModifiers() { + const params = [this.builders.string('click')]; + this.node.modifiers.forEach((modifier) => { + if (modifier.path === 'action') { + // Replaces {{action "blah"}} with {{on "click" (action "blah")}} + params.push(this.builders.sexpr(modifier.path, modifier.params)); + const onClickModifier = this.builders.elementModifier('on', params); + this.modifiers.push(onClickModifier); + } + }); + } + textToString(node) { // filter out escape charaters like \n and whitespace from TextNode and rebuild as StringLiteral const text = decodeURI(node.chars).trim(); @@ -249,6 +261,7 @@ class Transforms { } else if (this.hasIcon) { // if there was an icon node but no text we need to add the @isIconOnly arg this.addAttr('@isIconOnly', this.builders.mustache(this.builders.boolean(true))); + this.addAttr('@text', 'REPLACE_ME'); } } @@ -273,6 +286,7 @@ module.exports = (env) => { if (transforms.shouldTransform()) { transforms.childNodesToArgs(); transforms.filterAttributes(); + transforms.filterModifiers(); return transforms.buildElement(); } } catch (error) { diff --git a/ui/tests/acceptance/mfa-login-test.js b/ui/tests/acceptance/mfa-login-test.js index e05d5dfb70..7f5d4f45c7 100644 --- a/ui/tests/acceptance/mfa-login-test.js +++ b/ui/tests/acceptance/mfa-login-test.js @@ -84,8 +84,8 @@ module('Acceptance | mfa-login', function (hooks) { .hasText('Check device for push notification', 'Push notification instruction renders'); assert.dom('[data-test-mfa-validate]').isDisabled('Button is disabled while validating'); assert - .dom('[data-test-mfa-validate]') - .hasClass('is-loading', 'Loading class applied to button while validating'); + .dom('[data-test-mfa-validate] [data-test-icon="loading"]') + .exists('Loading icon shows while validating'); return validationHandler(schema, req); }); diff --git a/ui/tests/acceptance/mfa-method-test.js b/ui/tests/acceptance/mfa-method-test.js index dc87797ff9..b6f8ddc538 100644 --- a/ui/tests/acceptance/mfa-method-test.js +++ b/ui/tests/acceptance/mfa-method-test.js @@ -282,7 +282,7 @@ module('Acceptance | mfa-method', function (hooks) { const SHA1radioBtn = this.element.querySelectorAll('input[name=algorithm]')[0]; await click(SHA1radioBtn); await fillIn('[data-test-input="max_validation_attempts"]', 10); - await click('[data-test-mfa-method-save]'); + await click('[data-test-mfa-save]'); await fillIn('[data-test-confirmation-modal-input]', model.type); await click('[data-test-confirm-button]'); diff --git a/ui/tests/acceptance/secrets/backend/database/secret-test.js b/ui/tests/acceptance/secrets/backend/database/secret-test.js index b128aa377a..c622304c40 100644 --- a/ui/tests/acceptance/secrets/backend/database/secret-test.js +++ b/ui/tests/acceptance/secrets/backend/database/secret-test.js @@ -318,7 +318,11 @@ module('Acceptance | secrets/database/*', function (hooks) { 'Database connection is pre-selected on the form' ); await click('[data-test-database-role-cancel]'); - assert.strictEqual(currentURL(), `/vault/secrets/${backend}/list`, 'Cancel button links to list view'); + assert.strictEqual( + currentURL(), + `/vault/secrets/${backend}/list?tab=role`, + 'Cancel button links to role list view' + ); }); } test('database connection create and edit: vault-plugin-database-oracle', async function (assert) { diff --git a/ui/tests/integration/components/link-status-test.js b/ui/tests/integration/components/link-status-test.js index a0852cdd0b..04bd942b9b 100644 --- a/ui/tests/integration/components/link-status-test.js +++ b/ui/tests/integration/components/link-status-test.js @@ -5,7 +5,7 @@ import { module, test } from 'qunit'; import { setupRenderingTest } from 'ember-qunit'; -import { click, render } from '@ember/test-helpers'; +import { render } from '@ember/test-helpers'; import { hbs } from 'ember-cli-htmlbars'; import { setupMirage } from 'ember-cli-mirage/test-support'; import { statuses } from '../../../mirage/handlers/hcp-link'; @@ -69,37 +69,50 @@ module('Integration | Component | link-status', function (hooks) { assert.dom(SELECTORS.bannerWarning).exists('Warning banner renders for error state'); assert .dom('[data-test-link-status]') + .hasText('Error connecting to HCP', 'Banner title renders for error state'); + assert + .dom('[data-test-link-error]') .hasText( - 'There was an error connecting to HCP. Click here for more information.', - 'Banner copy renders for error state' + 'Since 2022-09-21T11:25:02.196835-07:00, unable to establish a connection with HCP. Check the logs for more information.', + 'Error renders for case 1' ); - await click(SELECTORS.modalOpen); + // unable to establish connection error + await render(hbs` + + `); assert - .dom('[data-test-link-status-timestamp]') - .hasText('2022-09-21T11:25:02.196835-07:00', 'Timestamp renders'); - assert - .dom('[data-test-link-status-error]') - .hasText('unable to establish a connection with HCP', 'Error renders'); + .dom('[data-test-link-error]') + .hasText( + 'Since 2022-09-21T11:25:02.196835-07:00, unable to establish a connection with HCP. Check the logs for more information.', + 'Error renders for case 2' + ); - await click(SELECTORS.modalClose); - // connecting error + // no permissions error await render(hbs` `); - await click(SELECTORS.modalOpen); assert - .dom('[data-test-link-status-error]') - .hasText('principal does not have the permission to register as a provider', 'Error renders'); - await click(SELECTORS.modalClose); + .dom('[data-test-link-error]') + .hasText( + 'Since 2022-09-21T11:25:02.196835-07:00, principal does not have the permission to register as a provider. Check the logs for more information.', + 'Error renders for case 3' + ); + + // could not obtain token error + await render(hbs` + + `); + assert + .dom('[data-test-link-error]') + .hasText( + 'Since 2022-09-21T11:25:02.196835-07:00, could not obtain a token with the supplied credentials. Check the logs for more information.', + 'Error renders for case 3' + ); - // this shouldn't happen but placeholders should render if disconnected/connecting status is returned without timestamp and/or error await render(hbs` `); - await click(SELECTORS.modalOpen); - - assert.dom('[data-test-link-status-timestamp]').hasText('Not available', 'Timestamp placeholder renders'); - assert.dom('[data-test-link-status-error]').hasText('Not available', 'Error placeholder renders'); + assert.dom('[data-test-link-error]').doesNotExist('No errors rendered when link is in connected state'); }); }); diff --git a/ui/tests/integration/components/mfa-form-test.js b/ui/tests/integration/components/mfa-form-test.js index f539ba704a..c5c65ed696 100644 --- a/ui/tests/integration/components/mfa-form-test.js +++ b/ui/tests/integration/components/mfa-form-test.js @@ -148,7 +148,9 @@ module('Integration | Component | mfa-form', function (hooks) { // override to avoid authSuccess method since it expects an auth payload async totpValidate(authData) { await waitUntil(() => - assert.dom('[data-test-mfa-validate]').hasClass('is-loading', 'Loading class applied to button') + assert + .dom('[data-test-mfa-validate] [data-test-icon="loading"]') + .exists('Loading icon shows on button') ); assert.dom('[data-test-mfa-validate]').isDisabled('Button is disabled while loading'); assert.deepEqual(authData, expectedAuthData, 'Mfa auth data passed to validate method'); diff --git a/ui/tests/unit/models/role-jwt-test.js b/ui/tests/unit/models/role-jwt-test.js index 9bb8f9a274..9fd47d59c8 100644 --- a/ui/tests/unit/models/role-jwt-test.js +++ b/ui/tests/unit/models/role-jwt-test.js @@ -15,7 +15,7 @@ module('Unit | Model | role-jwt', function (hooks) { const model = this.owner.lookup('service:store').createRecord('role-jwt'); assert.ok(!!model); assert.strictEqual(model.providerName, null, 'no providerName'); - assert.strictEqual(model.providerButtonComponent, null, 'no providerButtonComponent'); + assert.strictEqual(model.providerIcon, null, 'no providerIcon'); }); test('it computes providerName when known provider url match fails', function (assert) { @@ -24,7 +24,7 @@ module('Unit | Model | role-jwt', function (hooks) { }); assert.strictEqual(model.providerName, null, 'no providerName'); - assert.strictEqual(model.providerButtonComponent, null, 'no providerButtonComponent'); + assert.strictEqual(model.providerIcon, null, 'no providerIcon'); }); test('it provides a providerName for listed known providers', function (assert) { @@ -36,19 +36,11 @@ module('Unit | Model | role-jwt', function (hooks) { const expectedName = DOMAIN_STRINGS[domain]; assert.strictEqual(model.providerName, expectedName, `computes providerName: ${expectedName}`); + let expectedIcon = null; if (PROVIDER_WITH_LOGO.includes(expectedName)) { - assert.strictEqual( - model.providerButtonComponent, - `auth-button-${expectedName.toLowerCase()}`, - `computes providerButtonComponent: ${domain}` - ); - } else { - assert.strictEqual( - model.providerButtonComponent, - null, - `computes providerButtonComponent: ${domain}` - ); + expectedIcon = expectedName.toLowerCase(); } + assert.strictEqual(model.providerIcon, expectedIcon, `computes providerIcon: ${domain}`); }); }); @@ -58,6 +50,6 @@ module('Unit | Model | role-jwt', function (hooks) { authUrl: `http://custom-auth0-provider.com`, }); assert.strictEqual(model.providerName, null, `no providerName for custom URL`); - assert.strictEqual(model.providerButtonComponent, null, 'no providerButtonComponent for custom URL'); + assert.strictEqual(model.providerIcon, null, 'no providerIcon for custom URL'); }); });