diff --git a/addons/core/tests/integration/components/session-status-test.js b/addons/core/tests/integration/components/session-status-test.js index f05dc1cec..bac9c52ac 100644 --- a/addons/core/tests/integration/components/session-status-test.js +++ b/addons/core/tests/integration/components/session-status-test.js @@ -15,7 +15,7 @@ module('Integration | Component | session-status', function (hooks) { const store = this.owner.lookup('service:store'); this.model = store.createRecord('session', { status: 'active' }); await render(hbs``); - assert.ok(find('.flight-icon-check')); + assert.ok(find('.hds-icon-check')); assert.ok(find('.hds-badge--color-success')); assert.ok(find('.hds-badge--type-filled')); }); @@ -24,7 +24,7 @@ module('Integration | Component | session-status', function (hooks) { const store = this.owner.lookup('service:store'); this.model = store.createRecord('session', { status: 'canceling' }); await render(hbs``); - assert.ok(find('.flight-icon-alert-triangle')); + assert.ok(find('.hds-icon-alert-triangle')); assert.ok(find('.hds-badge--color-warning')); assert.ok(find('.hds-badge--type-filled')); }); @@ -33,7 +33,7 @@ module('Integration | Component | session-status', function (hooks) { const store = this.owner.lookup('service:store'); this.model = store.createRecord('session', { status: 'terminated' }); await render(hbs``); - assert.ok(find('.flight-icon-x')); + assert.ok(find('.hds-icon-x')); assert.ok(find('.hds-badge--color-critical')); assert.ok(find('.hds-badge--type-filled')); }); @@ -42,7 +42,7 @@ module('Integration | Component | session-status', function (hooks) { const store = this.owner.lookup('service:store'); this.model = store.createRecord('session', { status: 'pending' }); await render(hbs``); - assert.ok(find('.flight-icon-delay')); + assert.ok(find('.hds-icon-delay')); assert.ok(find('.hds-badge--color-neutral')); assert.ok(find('.hds-badge--type-filled')); }); @@ -51,7 +51,7 @@ module('Integration | Component | session-status', function (hooks) { const store = this.owner.lookup('service:store'); this.model = store.createRecord('session', { status: 'any string' }); await render(hbs``); - assert.notOk(find('.flight-icon')); + assert.notOk(find('.hds-icon')); assert.ok(find('.hds-badge--color-neutral')); assert.ok(find('.hds-badge--type-outlined')); }); diff --git a/addons/rose/addon/components/rose/metadata-list/item/index.hbs b/addons/rose/addon/components/rose/metadata-list/item/index.hbs index 3419fcdb4..1355f8951 100644 --- a/addons/rose/addon/components/rose/metadata-list/item/index.hbs +++ b/addons/rose/addon/components/rose/metadata-list/item/index.hbs @@ -5,7 +5,7 @@
  • {{#if @icon}} - + {{/if}} {{yield}}
    • \ No newline at end of file diff --git a/addons/rose/index.js b/addons/rose/index.js index e1b4f1afb..81db8a446 100644 --- a/addons/rose/index.js +++ b/addons/rose/index.js @@ -27,12 +27,11 @@ module.exports = { /** * Due to a limitation in how ember treats nested addons (see https://github.com/ember-cli/ember-cli/issues/4475) - * this is neeeded to reach down into @hashicorp/ember-flight-icons' contentFor hook to run the logic + * this is neeeded to reach down into @hashicorp/design-system-components' contentFor hook to run the logic * that injects the sprite into the DOM */ contentFor(type, config) { return this.findOwnAddonByName('@hashicorp/design-system-components') - .findOwnAddonByName('@hashicorp/ember-flight-icons') .contentFor(type, config); }, @@ -45,8 +44,6 @@ module.exports = { '../../node_modules/@hashicorp/design-system-tokens/dist/products/css'; const hdsPath = '../../node_modules/@hashicorp/design-system-components/dist/styles'; - const iconsPath = - '../../node_modules/@hashicorp/ember-flight-icons/dist/styles'; // Setup default sassOptions on the running application app.options.sassOptions = app.options.sassOptions || {}; @@ -56,7 +53,6 @@ module.exports = { // Include the addon styles app.options.sassOptions.includePaths.push(tokensPath); app.options.sassOptions.includePaths.push(hdsPath); - app.options.sassOptions.includePaths.push(iconsPath); }, /** diff --git a/addons/rose/package.json b/addons/rose/package.json index a167abc6a..017495a32 100644 --- a/addons/rose/package.json +++ b/addons/rose/package.json @@ -30,7 +30,7 @@ }, "dependencies": { "@embroider/test-setup": "^2.1.1", - "@hashicorp/design-system-components": "^4.4.1", + "@hashicorp/design-system-components": "^4.13.0", "codemirror": "5.65.7", "ember-auto-import": "^2.8.1", "ember-cli-babel": "^8.2.0", diff --git a/addons/rose/tests/integration/components/rose/metadata-list/index-test.js b/addons/rose/tests/integration/components/rose/metadata-list/index-test.js index 853b88539..8ade482d6 100644 --- a/addons/rose/tests/integration/components/rose/metadata-list/index-test.js +++ b/addons/rose/tests/integration/components/rose/metadata-list/index-test.js @@ -60,7 +60,7 @@ module('Integration | Component | rose/metadata-list', function (hooks) { `); - assert.dom('.flight-icon').isNotVisible(); + assert.dom('.hds-icon').isNotVisible(); assert.dom('li.rose-metadata-list-item').hasText('Sample text 3'); }); }); diff --git a/ui/admin/app/components/info-field/index.hbs b/ui/admin/app/components/info-field/index.hbs index 1648bf540..55dd3e860 100644 --- a/ui/admin/app/components/info-field/index.hbs +++ b/ui/admin/app/components/info-field/index.hbs @@ -5,7 +5,7 @@
    {{#if @icon}} - + {{/if}}
    - + {{else}} @@ -33,7 +33,7 @@ - + {{/if}} {{else}} diff --git a/ui/admin/app/components/ordered-series-diagram/group/index.hbs b/ui/admin/app/components/ordered-series-diagram/group/index.hbs index 5c5d0b43e..bae00db54 100644 --- a/ui/admin/app/components/ordered-series-diagram/group/index.hbs +++ b/ui/admin/app/components/ordered-series-diagram/group/index.hbs @@ -24,7 +24,7 @@ {{! Separator icon is not configurable, but potentially could be. }} - + \ No newline at end of file diff --git a/ui/admin/app/components/ordered-series-diagram/item/index.hbs b/ui/admin/app/components/ordered-series-diagram/item/index.hbs index 6fb955584..d85d3c4f9 100644 --- a/ui/admin/app/components/ordered-series-diagram/item/index.hbs +++ b/ui/admin/app/components/ordered-series-diagram/item/index.hbs @@ -16,7 +16,7 @@ {{! Separator icon is not configurable, but potentially could be. }} - + \ No newline at end of file diff --git a/ui/admin/app/styles/app.scss b/ui/admin/app/styles/app.scss index 494f15aa2..13fbd6fad 100644 --- a/ui/admin/app/styles/app.scss +++ b/ui/admin/app/styles/app.scss @@ -368,7 +368,7 @@ } &.has-icon { - .flight-icon { + .hds-icon { position: absolute; transform: translateY(sizing.rems(xl) - sizing.rems(xs)); } @@ -663,7 +663,7 @@ margin-bottom: 0.25rem; } - .flight-icon-arrow-right { + .hds-icon-arrow-right { color: var(--token-color-foreground-faint); } } @@ -913,7 +913,7 @@ .session-recording-status-badge { /* stylelint-disable selector-class-pattern */ div.hds-badge__icon { - svg.flight-icon-circle-dot { + svg.hds-icon-circle-dot { color: var(--token-color-palette-red-200); } } diff --git a/ui/admin/app/templates/onboarding/success.hbs b/ui/admin/app/templates/onboarding/success.hbs index 3742b6718..01e8d8915 100644 --- a/ui/admin/app/templates/onboarding/success.hbs +++ b/ui/admin/app/templates/onboarding/success.hbs @@ -13,10 +13,11 @@ {{! We have created }}
    -

    {{t 'onboarding.success.titles.creation-success'}}

     @@ -26,7 +27,7 @@ {{! Download Desktop client }}
    - +

    {{t 'onboarding.success.titles.desktop'}}

    {{t 'onboarding.success.descriptions.download'}}

    diff --git a/ui/admin/app/templates/scopes/scope/aliases/index.hbs b/ui/admin/app/templates/scopes/scope/aliases/index.hbs index 0517da88a..2631db80d 100644 --- a/ui/admin/app/templates/scopes/scope/aliases/index.hbs +++ b/ui/admin/app/templates/scopes/scope/aliases/index.hbs @@ -75,7 +75,7 @@ {{#if B.data.target.displayName}}
    - + {{B.data.target.displayName}}
    {{else}} diff --git a/ui/admin/app/templates/scopes/scope/session-recordings/index.hbs b/ui/admin/app/templates/scopes/scope/session-recordings/index.hbs index 56c1c6513..15a17007d 100644 --- a/ui/admin/app/templates/scopes/scope/session-recordings/index.hbs +++ b/ui/admin/app/templates/scopes/scope/session-recordings/index.hbs @@ -76,7 +76,7 @@ as |orgId items| }} - + {{this.orgName orgId}} {{#each items as |project|}} @@ -155,7 +155,7 @@
    - + {{B.data.userDisplayName}}
    @@ -165,7 +165,7 @@ class='session-recording-list-cell-item target-column hds-font-weight-semibold' > - + {{B.data.create_time_values.target.name}} @@ -182,7 +182,7 @@
    - + {{format-time-duration B.data.duration}} diff --git a/ui/admin/app/templates/scopes/scope/session-recordings/session-recording/channels-by-connection/channel/loading.hbs b/ui/admin/app/templates/scopes/scope/session-recordings/session-recording/channels-by-connection/channel/loading.hbs index 4b00f4004..4b87d386c 100644 --- a/ui/admin/app/templates/scopes/scope/session-recordings/session-recording/channels-by-connection/channel/loading.hbs +++ b/ui/admin/app/templates/scopes/scope/session-recordings/session-recording/channels-by-connection/channel/loading.hbs @@ -8,7 +8,7 @@ @model={{@model.sessionRecording.id}} >
    - + {{t 'resources.session-recording.channel.player.loading'}}
    \ No newline at end of file diff --git a/ui/admin/tests/acceptance/auth-methods/create-test.js b/ui/admin/tests/acceptance/auth-methods/create-test.js index 20686e066..e40381bab 100644 --- a/ui/admin/tests/acceptance/auth-methods/create-test.js +++ b/ui/admin/tests/acceptance/auth-methods/create-test.js @@ -48,7 +48,7 @@ module('Acceptance | auth-methods | create', function (hooks) { const TOGGLE_SELECTOR = '[name="prompts"]'; const MANAGE_DROPDOWN_SELECTOR = - '[data-test-manage-auth-method] div:first-child button'; + '[data-test-manage-auth-method] button:first-child'; const MAKE_PRIMARY_SELECTOR = '[data-test-manage-auth-method] ul li:first-child button'; diff --git a/ui/admin/tests/acceptance/auth-methods/delete-test.js b/ui/admin/tests/acceptance/auth-methods/delete-test.js index cafbcc977..19bb4b0f6 100644 --- a/ui/admin/tests/acceptance/auth-methods/delete-test.js +++ b/ui/admin/tests/acceptance/auth-methods/delete-test.js @@ -31,7 +31,7 @@ module('Acceptance | auth-methods | delete', function (hooks) { const ERROR_MSG_SELECTOR = '.rose-notification-body'; const MANAGE_DROPDOWN_SELECTOR = - '[data-test-manage-auth-method] div:first-child button'; + '[data-test-manage-auth-method] button:first-child'; const DELETE_ACTION_SELECTOR = '[data-test-manage-auth-method] ul li:last-child button'; diff --git a/ui/admin/tests/acceptance/credential-library/delete-test.js b/ui/admin/tests/acceptance/credential-library/delete-test.js index bd6a91d8b..32325c5b8 100644 --- a/ui/admin/tests/acceptance/credential-library/delete-test.js +++ b/ui/admin/tests/acceptance/credential-library/delete-test.js @@ -18,7 +18,7 @@ module('Acceptance | credential-libraries | delete', function (hooks) { let getCredentialLibraryCount; const MANAGE_DROPDOWN_SELECTOR = - '[data-test-manage-credential-library-dropdown] div:first-child button'; + '[data-test-manage-credential-library-dropdown] button:first-child'; const DELETE_ACTION_SELECTOR = '[data-test-manage-credential-library-dropdown] ul li button'; diff --git a/ui/admin/tests/acceptance/credential-store/credentials/delete-test.js b/ui/admin/tests/acceptance/credential-store/credentials/delete-test.js index 95a0679d9..87ee7d642 100644 --- a/ui/admin/tests/acceptance/credential-store/credentials/delete-test.js +++ b/ui/admin/tests/acceptance/credential-store/credentials/delete-test.js @@ -21,7 +21,7 @@ module( let getJSONCredentialCount; const MANAGE_DROPDOWN_SELECTOR = - '[data-test-manage-credentials-dropdown] div:first-child button'; + '[data-test-manage-credentials-dropdown] button:first-child'; const DELETE_ACTION_SELECTOR = '[data-test-manage-credentials-dropdown] ul li button'; diff --git a/ui/admin/tests/acceptance/credential-store/credentials/list-test.js b/ui/admin/tests/acceptance/credential-store/credentials/list-test.js index 8e187bb0d..072b24d9f 100644 --- a/ui/admin/tests/acceptance/credential-store/credentials/list-test.js +++ b/ui/admin/tests/acceptance/credential-store/credentials/list-test.js @@ -14,7 +14,7 @@ module('Acceptance | credential-stores | credentials | list', function (hooks) { setupMirage(hooks); const MANAGE_DROPDOWN_SELECTOR = - '[data-test-manage-credential-stores-dropdown] div:first-child button'; + '[data-test-manage-credential-stores-dropdown] button:first-child'; const ADD_CREDENTIALS_SELECTOR = '[data-test-manage-credential-stores-dropdown] div ul li a'; diff --git a/ui/admin/tests/acceptance/credential-store/delete-test.js b/ui/admin/tests/acceptance/credential-store/delete-test.js index 132dda39f..7a5229b3f 100644 --- a/ui/admin/tests/acceptance/credential-store/delete-test.js +++ b/ui/admin/tests/acceptance/credential-store/delete-test.js @@ -21,7 +21,7 @@ module('Acceptance | credential-stores | delete', function (hooks) { let getStaticCredentialStoresCount; let getVaultCredentialStoresCount; const MANAGE_DROPDOWN_SELECTOR = - '[data-test-manage-credential-stores-dropdown] div:first-child button'; + '[data-test-manage-credential-stores-dropdown] button:first-child'; const DELETE_ACTION_SELECTOR = '[data-test-manage-credential-stores-dropdown] ul li button'; diff --git a/ui/admin/tests/acceptance/groups/delete-test.js b/ui/admin/tests/acceptance/groups/delete-test.js index a457c4f91..fcd9cccda 100644 --- a/ui/admin/tests/acceptance/groups/delete-test.js +++ b/ui/admin/tests/acceptance/groups/delete-test.js @@ -19,10 +19,8 @@ module('Acceptance | groups | delete', function (hooks) { setupApplicationTest(hooks); setupMirage(hooks); - const MANAGE_DROPDOWN_SELECTOR = - '[data-test-manage-group-dropdown] div:first-child button'; - const DELETE_ACTION_SELECTOR = - '[data-test-manage-group-dropdown] ul li button'; + const MANAGE_DROPDOWN_SELECTOR = "[data-test-manage-group-dropdown] button:first-child" + const DELETE_ACTION_SELECTOR = "[data-test-manage-group-dropdown] ul li button" const instances = { scopes: { diff --git a/ui/admin/tests/acceptance/groups/members-test.js b/ui/admin/tests/acceptance/groups/members-test.js index 3c3269de0..eb87ee8b6 100644 --- a/ui/admin/tests/acceptance/groups/members-test.js +++ b/ui/admin/tests/acceptance/groups/members-test.js @@ -38,7 +38,7 @@ module('Acceptance | groups | members', function (hooks) { }; let membersCount; const MANAGE_DROPDOWN_SELECTOR = - '[data-test-manage-group-dropdown] div:first-child button'; + '[data-test-manage-group-dropdown] button:first-child'; const ADD_MEMBERS_ACTION_SELECTOR = '[data-test-manage-group-dropdown] ul li a'; diff --git a/ui/admin/tests/acceptance/host-catalogs/delete-test.js b/ui/admin/tests/acceptance/host-catalogs/delete-test.js index 83c5776e7..50faffa47 100644 --- a/ui/admin/tests/acceptance/host-catalogs/delete-test.js +++ b/ui/admin/tests/acceptance/host-catalogs/delete-test.js @@ -23,7 +23,7 @@ module('Acceptance | host-catalogs | delete', function (hooks) { let getHostCatalogCount; const MANAGE_DROPDOWN_SELECTOR = - '[data-test-manage-host-catalogs-dropdown] div:first-child button'; + '[data-test-manage-host-catalogs-dropdown] button:first-child'; const DELETE_ACTION_SELECTOR = '[data-test-manage-host-catalogs-dropdown] ul li button'; diff --git a/ui/admin/tests/acceptance/host-catalogs/host-sets/delete-test.js b/ui/admin/tests/acceptance/host-catalogs/host-sets/delete-test.js index ca62e615a..d255b3ee3 100644 --- a/ui/admin/tests/acceptance/host-catalogs/host-sets/delete-test.js +++ b/ui/admin/tests/acceptance/host-catalogs/host-sets/delete-test.js @@ -23,7 +23,7 @@ module('Acceptance | host-catalogs | host sets | delete', function (hooks) { let getHostSetCount; const MANAGE_DROPDOWN_SELECTOR = - '[data-test-manage-dropdown-host-sets] div:first-child button'; + '[data-test-manage-dropdown-host-sets] button:first-child'; const DELETE_ACTION_SELECTOR = '[data-test-manage-dropdown-host-sets] ul li button'; diff --git a/ui/admin/tests/acceptance/host-catalogs/host-sets/hosts-test.js b/ui/admin/tests/acceptance/host-catalogs/host-sets/hosts-test.js index d84119976..a61df86bf 100644 --- a/ui/admin/tests/acceptance/host-catalogs/host-sets/hosts-test.js +++ b/ui/admin/tests/acceptance/host-catalogs/host-sets/hosts-test.js @@ -29,7 +29,7 @@ module('Acceptance | host-catalogs | host-sets | hosts', function (hooks) { let getHostSetHostCount; const MANAGE_DROPDOWN_SELECTOR = - '[data-test-manage-dropdown-host-sets] div:first-child button'; + '[data-test-manage-dropdown-host-sets] button:first-child'; const CREATE_AND_ADD_HOSTS_SELECTOR = '[data-test-manage-dropdown-host-sets] div ul li:first-child a'; const ADD_EXISTING_HOSTS_SELECTOR = diff --git a/ui/admin/tests/acceptance/host-catalogs/host-sets/list-test.js b/ui/admin/tests/acceptance/host-catalogs/host-sets/list-test.js index 76471da4d..24a5f2d87 100644 --- a/ui/admin/tests/acceptance/host-catalogs/host-sets/list-test.js +++ b/ui/admin/tests/acceptance/host-catalogs/host-sets/list-test.js @@ -19,7 +19,7 @@ module('Acceptance | host-catalogs | host sets | list', function (hooks) { setupMirage(hooks); const MANAGE_DROPDOWN_SELECTOR = - '[data-test-manage-host-catalogs-dropdown] div:first-child button'; + '[data-test-manage-host-catalogs-dropdown] button:first-child'; const instances = { scopes: { diff --git a/ui/admin/tests/acceptance/host-catalogs/hosts/delete-test.js b/ui/admin/tests/acceptance/host-catalogs/hosts/delete-test.js index 891cf0fc2..2897a6cac 100644 --- a/ui/admin/tests/acceptance/host-catalogs/hosts/delete-test.js +++ b/ui/admin/tests/acceptance/host-catalogs/hosts/delete-test.js @@ -23,7 +23,7 @@ module('Acceptance | host-catalogs | hosts | delete', function (hooks) { let getHostCount; const MANAGE_DROPDOWN_SELECTOR = - '[data-test-manage-hosts-dropdown] div:first-child button'; + '[data-test-manage-hosts-dropdown] button:first-child'; const DELETE_ACTION_SELECTOR = '[data-test-manage-hosts-dropdown] ul li button'; diff --git a/ui/admin/tests/acceptance/host-catalogs/hosts/list-test.js b/ui/admin/tests/acceptance/host-catalogs/hosts/list-test.js index 1b3e64bb7..ae7a135fd 100644 --- a/ui/admin/tests/acceptance/host-catalogs/hosts/list-test.js +++ b/ui/admin/tests/acceptance/host-catalogs/hosts/list-test.js @@ -19,7 +19,7 @@ module('Acceptance | host-catalogs | hosts | list', function (hooks) { setupMirage(hooks); const MANAGE_DROPDOWN_SELECTOR = - '[data-test-manage-host-catalogs-dropdown] div:first-child button'; + '[data-test-manage-host-catalogs-dropdown] button:first-child'; const NEW_HOST_SELECTOR = '[data-test-manage-host-catalogs-dropdown] div ul li a'; diff --git a/ui/admin/tests/acceptance/host-catalogs/hosts/selectors.js b/ui/admin/tests/acceptance/host-catalogs/hosts/selectors.js index d1f353fcc..1a144c948 100644 --- a/ui/admin/tests/acceptance/host-catalogs/hosts/selectors.js +++ b/ui/admin/tests/acceptance/host-catalogs/hosts/selectors.js @@ -4,7 +4,7 @@ */ export const MANAGE_DROPDOWN = - '[data-test-manage-host-catalogs-dropdown] div:first-child button'; + '[data-test-manage-host-catalogs-dropdown] button:first-child'; export const FIELD_ADDRESS = '[name=address]'; export const FIELD_ADDRESS_VALUE = 'New address'; diff --git a/ui/admin/tests/acceptance/managed-groups/create-test.js b/ui/admin/tests/acceptance/managed-groups/create-test.js index e14bb8980..ebd1e7f3a 100644 --- a/ui/admin/tests/acceptance/managed-groups/create-test.js +++ b/ui/admin/tests/acceptance/managed-groups/create-test.js @@ -30,7 +30,7 @@ module('Acceptance | managed-groups | create', function (hooks) { const DESC_INPUT_SELECTOR = '[name="description"]'; const ERROR_MSG_SELECTOR = '.rose-notification-body'; const FIELD_ERROR_TEXT_SELECTOR = '.hds-form-error__message'; - const MANAGE_DROPDOWN_SELECTOR = '[data-test-manage-auth-method] div button'; + const MANAGE_DROPDOWN_SELECTOR = '[data-test-manage-auth-method] button:first-child'; const instances = { scopes: { diff --git a/ui/admin/tests/acceptance/managed-groups/delete-test.js b/ui/admin/tests/acceptance/managed-groups/delete-test.js index 90297340d..c2a8d8fb4 100644 --- a/ui/admin/tests/acceptance/managed-groups/delete-test.js +++ b/ui/admin/tests/acceptance/managed-groups/delete-test.js @@ -22,7 +22,7 @@ module('Acceptance | managed-groups | delete', function (hooks) { let getManagedGroupCount; const MANAGE_DROPDOWN_SELECTOR = - '[data-test-managed-group-dropdown] div:first-child button'; + '[data-test-managed-group-dropdown] button:first-child'; const DELETE_ACTION_SELECTOR = '[data-test-managed-group-dropdown] ul li button'; const ERROR_MSG_SELECTOR = '.rose-notification-body'; diff --git a/ui/admin/tests/acceptance/managed-groups/list-test.js b/ui/admin/tests/acceptance/managed-groups/list-test.js index 9c1139ecb..21e9faccd 100644 --- a/ui/admin/tests/acceptance/managed-groups/list-test.js +++ b/ui/admin/tests/acceptance/managed-groups/list-test.js @@ -20,7 +20,7 @@ module('Acceptance | managed-groups | list', function (hooks) { setupIndexedDb(hooks); let featuresService; - const MANAGE_DROPDOWN_SELECTOR = '[data-test-manage-auth-method] div button'; + const MANAGE_DROPDOWN_SELECTOR = '[data-test-manage-auth-method] button:first-child'; const instances = { scopes: { diff --git a/ui/admin/tests/acceptance/scopes/delete-test.js b/ui/admin/tests/acceptance/scopes/delete-test.js index 66fc3ac2a..cb7da729a 100644 --- a/ui/admin/tests/acceptance/scopes/delete-test.js +++ b/ui/admin/tests/acceptance/scopes/delete-test.js @@ -23,7 +23,7 @@ module('Acceptance | scopes | delete', function (hooks) { let getScopeCount; const MANAGE_DROPDOWN_SELECTOR = - '[data-test-manage-projects-dropdown] div:first-child button'; + '[data-test-manage-projects-dropdown] button:first-child'; const DELETE_ACTION_SELECTOR = '[data-test-manage-projects-dropdown] ul li button'; diff --git a/ui/admin/tests/acceptance/scopes/read-test.js b/ui/admin/tests/acceptance/scopes/read-test.js index ced060735..b14e06ad7 100644 --- a/ui/admin/tests/acceptance/scopes/read-test.js +++ b/ui/admin/tests/acceptance/scopes/read-test.js @@ -26,7 +26,7 @@ module('Acceptance | scopes | read', function (hooks) { const FORM_SELECTOR = 'main .rose-form'; const MANAGE_DROPDOWN_SELECTOR = - '[data-test-manage-projects-dropdown] div:first-child button'; + '[data-test-manage-projects-dropdown] button:first-child'; const DELETE_ACTION_SELECTOR = '[data-test-manage-projects-dropdown] ul li button'; const STORAGE_POLICY_SIDEBAR = '.policy-sidebar'; diff --git a/ui/admin/tests/acceptance/targets/delete-test.js b/ui/admin/tests/acceptance/targets/delete-test.js index 776b96374..adfc6a65e 100644 --- a/ui/admin/tests/acceptance/targets/delete-test.js +++ b/ui/admin/tests/acceptance/targets/delete-test.js @@ -23,7 +23,7 @@ module('Acceptance | targets | delete', function (hooks) { let getTargetCount; const MANAGE_DROPDOWN_SELECTOR = - '[data-test-manage-targets-dropdown] div:first-child button'; + '[data-test-manage-targets-dropdown] button:first-child'; const DELETE_ACTION_SELECTOR = '[data-test-manage-targets-dropdown] ul li button'; diff --git a/ui/admin/tests/acceptance/targets/host-sources-test.js b/ui/admin/tests/acceptance/targets/host-sources-test.js index 8e739b92b..8e15af113 100644 --- a/ui/admin/tests/acceptance/targets/host-sources-test.js +++ b/ui/admin/tests/acceptance/targets/host-sources-test.js @@ -22,7 +22,7 @@ module('Acceptance | targets | host-sources', function (hooks) { let getTargetHostSetCount; const MANAGE_DROPDOWN_SELECTOR = - '[data-test-manage-targets-dropdown] div:first-child button'; + '[data-test-manage-targets-dropdown] button:first-child'; const ADD_HOSTSOURCE_SELECTOR = '[data-test-manage-targets-dropdown] ul li a'; const instances = { diff --git a/ui/admin/tests/acceptance/users/accounts-test.js b/ui/admin/tests/acceptance/users/accounts-test.js index fa08dc8f9..3c9944fb6 100644 --- a/ui/admin/tests/acceptance/users/accounts-test.js +++ b/ui/admin/tests/acceptance/users/accounts-test.js @@ -28,7 +28,7 @@ module('Acceptance | users | accounts', function (hooks) { const ADD_ACCOUNTS_ACTION_SELECTOR = '[data-test-manage-user-dropdown] ul li:first-child a'; const MANAGE_DROPDOWN_SELECTOR = - '[data-test-manage-user-dropdown] div:first-child button'; + '[data-test-manage-user-dropdown] button:first-child'; const ERROR_MSG_SELECTOR = '[role="alert"]'; const TABLE_ROWS_SELECTOR = 'tbody tr'; const CHECKBOX_SELECTOR = 'tbody label'; diff --git a/ui/admin/tests/acceptance/users/delete-test.js b/ui/admin/tests/acceptance/users/delete-test.js index cb8ff5d5b..83ffbf539 100644 --- a/ui/admin/tests/acceptance/users/delete-test.js +++ b/ui/admin/tests/acceptance/users/delete-test.js @@ -20,10 +20,8 @@ module('Acceptance | users | delete', function (hooks) { setupApplicationTest(hooks); setupMirage(hooks); setupIndexedDb(hooks); - const DELETE_ACTION_SELECTOR = - '[data-test-manage-user-dropdown] ul li button'; - const MANAGE_DROPDOWN_SELECTOR = - '[data-test-manage-user-dropdown] div:first-child button'; + const DELETE_ACTION_SELECTOR = "[data-test-manage-user-dropdown] ul li button" + const MANAGE_DROPDOWN_SELECTOR = "[data-test-manage-user-dropdown] button:first-child" const instances = { scopes: { global: null, diff --git a/ui/admin/tests/acceptance/workers/create-tags-test.js b/ui/admin/tests/acceptance/workers/create-tags-test.js index dfc58ed9f..49d787f21 100644 --- a/ui/admin/tests/acceptance/workers/create-tags-test.js +++ b/ui/admin/tests/acceptance/workers/create-tags-test.js @@ -17,9 +17,9 @@ module('Acceptance | workers | worker | create-tags', function (hooks) { const SAVE_BUTTON_SELECTOR = '[type="submit"]'; const CANCEL_BUTTON_SELECTOR = '.rose-form-actions [type="button"]'; const MANAGE_DROPDOWN_TOGGLE = - '[data-test-manage-worker-dropdown] div button'; + '[data-test-manage-worker-dropdown] button:first-child'; const CREATE_TAGS_BUTTON_SELECTOR = - '[data-test-manage-worker-dropdown] div:first-child a'; + '[data-test-manage-worker-dropdown] ul a:first-child'; const KEY_INPUT_SELECTOR = '[name="api_tags"] tr td:first-child input'; const VALUE_INPUT_SELECTOR = '[name="api_tags"] tr td:nth-child(2) input'; const ADD_INPUT_SELECTOR = '[name="api_tags"] tr td:last-child button'; diff --git a/ui/admin/tests/acceptance/workers/delete-test.js b/ui/admin/tests/acceptance/workers/delete-test.js index 9350c1e79..4365c7f10 100644 --- a/ui/admin/tests/acceptance/workers/delete-test.js +++ b/ui/admin/tests/acceptance/workers/delete-test.js @@ -22,7 +22,7 @@ module('Acceptance | workers | delete', function (hooks) { setupMirage(hooks); const MANAGE_DROPDOWN_TOGGLE = - '[data-test-manage-worker-dropdown] div button'; + '[data-test-manage-worker-dropdown] button:first-child'; const REMOVE_WORKER_BUTTON = '[data-test-manage-worker-dropdown] div:nth-child(2) button'; let getWorkerCount; diff --git a/ui/desktop/app/components/target/host-modal/index.hbs b/ui/desktop/app/components/target/host-modal/index.hbs index 82644ab2b..0305c307a 100644 --- a/ui/desktop/app/components/target/host-modal/index.hbs +++ b/ui/desktop/app/components/target/host-modal/index.hbs @@ -53,7 +53,11 @@ {{/if}}
    - + {{/each}} diff --git a/ui/desktop/app/styles/app.scss b/ui/desktop/app/styles/app.scss index f052b25ae..72d182984 100644 --- a/ui/desktop/app/styles/app.scss +++ b/ui/desktop/app/styles/app.scss @@ -503,7 +503,7 @@ $chevron-down: url("data:image/svg+xml;utf-8, - + {{org.key.displayName}} {{#each org.items as |project|}} diff --git a/ui/desktop/app/templates/scopes/scope/projects/targets/index.hbs b/ui/desktop/app/templates/scopes/scope/projects/targets/index.hbs index 1e489a397..fc49e2786 100644 --- a/ui/desktop/app/templates/scopes/scope/projects/targets/index.hbs +++ b/ui/desktop/app/templates/scopes/scope/projects/targets/index.hbs @@ -44,7 +44,7 @@ {{#let (group-by itemOptions 'scopeModel') as |orgs|}} {{#each orgs as |org|}} - + {{org.key.displayName}} {{#each org.items as |project|}} diff --git a/yarn.lock b/yarn.lock index ffb96f400..3cbc71e4e 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4144,39 +4144,38 @@ resolved "https://registry.yarnpkg.com/@handlebars/parser/-/parser-2.0.0.tgz#5e8b7298f31ff8f7b260e6b7363c7e9ceed7d9c5" integrity sha512-EP9uEDZv/L5Qh9IWuMUGJRfwhXJ4h1dqKTT4/3+tY0eu7sPis7xh23j61SYUnNF4vqCQvvUXpDo9Bh/+q1zASA== -"@hashicorp/design-system-components@^4.4.1": - version "4.4.1" - resolved "https://registry.yarnpkg.com/@hashicorp/design-system-components/-/design-system-components-4.4.1.tgz#22c6dbc3b7a808b5e6f20c275963da0eca2f9a20" - integrity sha512-y80hPnJJYFu4qKd6Hjb8WBV+uxuLVMxWQdrJlwo7Hl2LtOlBr8VQCCRelvPGI2VrF5VTehQinA+lLTzfMMe09w== +"@hashicorp/design-system-components@^4.13.0": + version "4.13.1" + resolved "https://registry.yarnpkg.com/@hashicorp/design-system-components/-/design-system-components-4.13.1.tgz#18a12eb23e52a7676613f6bf39e4defdfd73182a" + integrity sha512-yEiQJxAs0zgt/dxM6ZYPcVJT0a3C2wrO+8iOxUd623jyDXlbyjD/vZSp7qOCvkomQkHvWgD/7clVdl75a5i3rQ== dependencies: "@ember/render-modifiers" "^2.0.5" "@ember/string" "^3.1.1" "@ember/test-waiters" "^3.1.0" "@embroider/addon-shim" "^1.8.7" "@floating-ui/dom" "^1.6.3" - "@hashicorp/design-system-tokens" "^2.1.0" - "@hashicorp/ember-flight-icons" "^5.0.3" - "@oddbird/popover-polyfill" "^0.4.3" + "@hashicorp/design-system-tokens" "^2.2.1" + "@hashicorp/flight-icons" "^3.7.0" decorator-transforms "^1.1.0" - ember-a11y-refocus "^3.0.2" + ember-a11y-refocus "^4.1.3" ember-cli-sass "^11.0.1" ember-composable-helpers "^5.0.0" ember-element-helper "^0.8.5" ember-focus-trap "^1.1.0" - ember-keyboard "^8.2.1" + ember-get-config "^2.1.1" ember-modifier "^4.1.0" ember-power-select "^8.2.0" ember-stargate "^0.4.3" - ember-style-modifier "^3.0.1" + ember-style-modifier "^4.4.0" ember-truth-helpers "^4.0.3" prismjs "^1.29.0" sass "^1.69.5" tippy.js "^6.3.7" -"@hashicorp/design-system-tokens@^2.1.0": - version "2.1.0" - resolved "https://registry.yarnpkg.com/@hashicorp/design-system-tokens/-/design-system-tokens-2.1.0.tgz#e72284f375631f624ff2f3198dc6d2ee03e0d422" - integrity sha512-8SFUmRsX9v9pCc1Oq+zZGAmZGLxdZ6WnVEvwOzPAswlUTxBPa5zdoKdKEOPw8Xr3j142Mie6WVk2SMTV9EjQIQ== +"@hashicorp/design-system-tokens@^2.2.1": + version "2.2.1" + resolved "https://registry.yarnpkg.com/@hashicorp/design-system-tokens/-/design-system-tokens-2.2.1.tgz#9112c4cf9099ef1706a6b4f83be400960b473e91" + integrity sha512-Pnbnk5jbOXmW82W0wimP0PdOWYAi7dYsC3TE88JbR+jHzpwUdyVGsqcYF7ClOl/C/KDbK60N0FEJbFdaFj6ZXQ== "@hashicorp/ember-asciinema-player@https://github.com/hashicorp/ember-asciinema-player.git#e047a096039cff70234c232efe75dcad74c6358a": version "0.0.0" @@ -4187,19 +4186,10 @@ ember-cli-babel "^7.26.11" ember-cli-htmlbars "^6.1.1" -"@hashicorp/ember-flight-icons@^5.0.3": - version "5.0.3" - resolved "https://registry.yarnpkg.com/@hashicorp/ember-flight-icons/-/ember-flight-icons-5.0.3.tgz#34b9ccd5edf8671729ac59452748f03cd71603ab" - integrity sha512-tMBp+W+uyP8ElhOdWxAbQ+BF//wnOOwnQEXnMQlAlRlrW2oZQdS9VSatXoOv5rsbCyNCF8vjfEaCq5UDaZxg1w== - dependencies: - "@embroider/addon-shim" "^1.8.7" - "@hashicorp/flight-icons" "^3.3.0" - ember-get-config "^2.1.1" - -"@hashicorp/flight-icons@^3.3.0": - version "3.3.0" - resolved "https://registry.yarnpkg.com/@hashicorp/flight-icons/-/flight-icons-3.3.0.tgz#9a804eec1a846e3bfec3f27904fa9c9594fe24c7" - integrity sha512-pkBq6mpNVwf9664NT2tg7r6e0whQbpcAtpaU9etbSa4d+7uxRtdNM4v9rUtcHtI+2EL9VEY0VTUKCr4u1BgyAg== +"@hashicorp/flight-icons@^3.7.0": + version "3.7.0" + resolved "https://registry.yarnpkg.com/@hashicorp/flight-icons/-/flight-icons-3.7.0.tgz#cc8e4fb7cc8ac585a4841f6d724217a054cfe959" + integrity sha512-oSnIjGqzXciibyQjgc45u4GUHBrIgyFSBCjxP4t0WXbJ578J3/DB6eyvWoMJ4r4GSf0MxUgOg0A/fJV/V4yEdA== "@humanwhocodes/config-array@^0.11.13": version "0.11.13" @@ -4664,11 +4654,6 @@ mkdirp "^1.0.4" rimraf "^3.0.2" -"@oddbird/popover-polyfill@^0.4.3": - version "0.4.3" - resolved "https://registry.yarnpkg.com/@oddbird/popover-polyfill/-/popover-polyfill-0.4.3.tgz#310d61c8fc7ee12d8dba05cdfa8bd7e5d5a281a3" - integrity sha512-kBS0ZAwH8kZqFl0mV89KPK4cLYl2ZoKSfYngK4dz1eLAhKzTK0yu4LrvLdMeM7JhjWK6GxBtiY+cl1s6vR2pUg== - "@playwright/test@^1.43.0": version "1.43.1" resolved "https://registry.yarnpkg.com/@playwright/test/-/test-1.43.1.tgz#16728a59eb8ce0f60472f98d8886d6cab0fa3e42" @@ -5734,6 +5719,11 @@ babel-import-util@^2.0.1: resolved "https://registry.yarnpkg.com/babel-import-util/-/babel-import-util-2.1.1.tgz#0f4905fe899abfb8cd835dd52f3df1966d1ffbb0" integrity sha512-3qBQWRjzP9NreSH/YrOEU1Lj5F60+pWSLP0kIdCWxjFHH7pX2YPHIxQ67el4gnMNfYoDxSDGcT0zpVlZ+gVtQA== +babel-import-util@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/babel-import-util/-/babel-import-util-3.0.0.tgz#5814c6a58e7b80e64156b48fdfd34d48e6e0b1df" + integrity sha512-4YNPkuVsxAW5lnSTa6cn4Wk49RX6GAB6vX+M6LqEtN0YePqoFczv1/x0EyLK/o+4E1j9jEuYj5Su7IEPab5JHQ== + babel-jest@^29.7.0: version "29.7.0" resolved "https://registry.yarnpkg.com/babel-jest/-/babel-jest-29.7.0.tgz#f4369919225b684c56085998ac63dbd05be020d5" @@ -7736,6 +7726,11 @@ csstype@^3.1.0: resolved "https://registry.yarnpkg.com/csstype/-/csstype-3.1.2.tgz#1d4bf9d572f11c14031f0436e1c10bc1f571f50b" integrity sha512-I7K1Uu0MBPzaFKg4nI5Q7Vs2t+3gWWW648spaF+Rg7pI9ds18Ugn+lvg4SHczUdKlHI5LWBXyqfS8+DufyBsgQ== +csstype@^3.1.3: + version "3.1.3" + resolved "https://registry.yarnpkg.com/csstype/-/csstype-3.1.3.tgz#d80ff294d114fb0e6ac500fbf85b60137d7eff81" + integrity sha512-M1uQkMl8rQK/szD0LNhtqxIPLpimGm8sOBwU7lLnCpSbTyY3yeU1Vc7l4KT5zT4s/yOxHH5O7tIuuLOCnLADRw== + cycle@1.0.x: version "1.0.3" resolved "https://registry.yarnpkg.com/cycle/-/cycle-1.0.3.tgz#21e80b2be8580f98b468f379430662b046c34ad2" @@ -7855,6 +7850,14 @@ decorator-transforms@^1.1.0: "@babel/plugin-syntax-decorators" "^7.23.3" babel-import-util "^2.0.1" +decorator-transforms@^2.0.0: + version "2.2.2" + resolved "https://registry.yarnpkg.com/decorator-transforms/-/decorator-transforms-2.2.2.tgz#c163e86815c78152528a8c1549e95d8f3403e61b" + integrity sha512-NHCSJXOUQ29YFli1QzstXWo72EyASpoVx+s0YdkMwswpovf/iAJP580nD1tB0Ph9exvtbfWdVrSAloXrWVo1Xg== + dependencies: + "@babel/plugin-syntax-decorators" "^7.23.3" + babel-import-util "^3.0.0" + dedent@0.7.0: version "0.7.0" resolved "https://registry.yarnpkg.com/dedent/-/dedent-0.7.0.tgz#2495ddbaf6eb874abb0e1be9df22d2e5a544326c" @@ -8170,10 +8173,10 @@ electron-to-chromium@^1.5.28: resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.5.30.tgz#5b264b489cfe0c3dd71097c164d795444834e7c7" integrity sha512-sXI35EBN4lYxzc/pIGorlymYNzDBOqkSlVRe6MkgBsW/hW1tpC/HDJ2fjG7XnjakzfLEuvdmux0Mjs6jHq4UOA== -ember-a11y-refocus@^3.0.2: - version "3.0.2" - resolved "https://registry.yarnpkg.com/ember-a11y-refocus/-/ember-a11y-refocus-3.0.2.tgz#e648c491d3a8d84cb594679bafc8430cd22b2ed4" - integrity sha512-5T9kAvl0RUBF6SSeaaWpVS2WC8MTktgqiGdLAbxVjT2f2NGrDDPmv7riDVNMsuL5sHRwSKm0EHCIzZ4M3aFMow== +ember-a11y-refocus@^4.1.3: + version "4.1.4" + resolved "https://registry.yarnpkg.com/ember-a11y-refocus/-/ember-a11y-refocus-4.1.4.tgz#ffcabbc91503379cd2c0124cb5f0bc93178098b5" + integrity sha512-51tGk30bskObL1LsGZRxzqIxgZhIE8ZvvDYcT1OWphxZlq00+Arz57aMLS4Vz4qhSE40BfeN2qFYP/gXtp9qDA== dependencies: ember-cli-babel "^7.26.11" ember-cli-htmlbars "^6.0.1" @@ -8996,7 +8999,7 @@ ember-data@~4.12.0: ember-cli-babel "^7.26.11" ember-inflector "^4.0.2" -ember-destroyable-polyfill@^2.0.1, ember-destroyable-polyfill@^2.0.2, ember-destroyable-polyfill@^2.0.3: +ember-destroyable-polyfill@^2.0.1, ember-destroyable-polyfill@^2.0.2: version "2.0.3" resolved "https://registry.yarnpkg.com/ember-destroyable-polyfill/-/ember-destroyable-polyfill-2.0.3.tgz#1673ed66609a82268ef270a7d917ebd3647f11e1" integrity sha512-TovtNqCumzyAiW0/OisSkkVK93xnVF4NRU6+FN0ubpfwEOpRrmM2RqDwXI6YAChCgSHON1cz0DfQStpA1Gjuuw== @@ -9162,16 +9165,6 @@ ember-intl@^7.0.5: js-yaml "^4.1.0" json-stable-stringify "^1.1.1" -ember-keyboard@^8.2.1: - version "8.2.1" - resolved "https://registry.yarnpkg.com/ember-keyboard/-/ember-keyboard-8.2.1.tgz#945a8a71068d81c06ad26851008ef81061db2a59" - integrity sha512-wT9xpt3GKsiodGZoifKU4OyeRjXWlmKV9ZHHsp6wJBwMFpl4wWPjTNdINxivk2qg/WFNIh8nUiwuG4+soWXPdw== - dependencies: - "@embroider/addon-shim" "^1.8.4" - ember-destroyable-polyfill "^2.0.3" - ember-modifier "^2.1.2 || ^3.1.0 || ^4.0.0" - ember-modifier-manager-polyfill "^1.2.0" - ember-lifeline@^7.0.0: version "7.0.0" resolved "https://registry.yarnpkg.com/ember-lifeline/-/ember-lifeline-7.0.0.tgz#46780c8f832b6c784ee4681b938a1e1437bfa676" @@ -9218,7 +9211,7 @@ ember-modifier-manager-polyfill@^1.2.0: ember-cli-version-checker "^2.1.2" ember-compatibility-helpers "^1.2.0" -"ember-modifier@^2.1.2 || ^3.1.0 || ^4.0.0", ember-modifier@^3.2.7: +ember-modifier@^3.2.7: version "3.2.7" resolved "https://registry.yarnpkg.com/ember-modifier/-/ember-modifier-3.2.7.tgz#f2d35b7c867cbfc549e1acd8d8903c5ecd02ea4b" integrity sha512-ezcPQhH8jUfcJQbbHji4/ZG/h0yyj1jRDknfYue/ypQS8fM8LrGcCMo0rjDZLzL1Vd11InjNs3BD7BdxFlzGoA== @@ -9384,13 +9377,14 @@ ember-stargate@^0.4.3, ember-stargate@^0.6.0: ember-resources "^7.0.1" tracked-maps-and-sets "^3.0.2" -ember-style-modifier@^3.0.1: - version "3.0.1" - resolved "https://registry.yarnpkg.com/ember-style-modifier/-/ember-style-modifier-3.0.1.tgz#96aaaa2b713108725b81d8b934ec445ece6b89c3" - integrity sha512-WHRVIiqY/dpwDtVWlnHW0P4Z+Jha8QEwfaQdIF2ckJL77ZKdjbV2j1XZymS0Nzj61EGx5BM+YEsGL16r3hLv2A== +ember-style-modifier@^4.4.0: + version "4.4.0" + resolved "https://registry.yarnpkg.com/ember-style-modifier/-/ember-style-modifier-4.4.0.tgz#2d1fa6a35d41d88612277d7d149f1e569acaf8d3" + integrity sha512-gT1ckbhl1KSj5sWTo/8UChj98eZeE+mUmYoXw8VjwJgWP0wiTCibGZjVbC0WlIUd7umxuG61OQ/ivfF+sAiOEQ== dependencies: - ember-auto-import "^2.5.0" - ember-cli-babel "^7.26.11" + "@embroider/addon-shim" "^1.8.7" + csstype "^3.1.3" + decorator-transforms "^2.0.0" ember-modifier "^3.2.7 || ^4.0.0" ember-template-imports@^3.4.2: