diff --git a/ui/admin/app/templates/scopes/scope/targets/target/injected-application-credential-sources.hbs b/ui/admin/app/templates/scopes/scope/targets/target/injected-application-credential-sources.hbs index 93b005ce5..d82248b48 100644 --- a/ui/admin/app/templates/scopes/scope/targets/target/injected-application-credential-sources.hbs +++ b/ui/admin/app/templates/scopes/scope/targets/target/injected-application-credential-sources.hbs @@ -28,94 +28,79 @@ {{#if @model.injectedApplicationCredentialSources}} - - - - {{t 'form.name.label'}} - {{t 'form.type.label'}} - {{t 'form.id.label'}} - {{t 'titles.actions'}} - - - - {{#each - @model.injectedApplicationCredentialSources - as |injectedApplicationCredentialSource| - }} - - - {{#if injectedApplicationCredentialSource.isUnknown}} - {{injectedApplicationCredentialSource.displayName}} - {{else}} - {{#if injectedApplicationCredentialSource.isStatic}} - - {{injectedApplicationCredentialSource.displayName}} - - {{else}} - - {{injectedApplicationCredentialSource.displayName}} - - {{/if}} - {{/if}} - -

{{injectedApplicationCredentialSource.description}}

-
- - - - - - {{injectedApplicationCredentialSource.id}} - - - - {{#if (can 'removeCredentialSources target' @model)}} - + <:body as |B|> + + + {{#if B.data.isUnknown}} + {{B.data.displayName}} + {{else}} + {{#if B.data.isStatic}} + - - {{t 'actions.remove'}} - - + {{B.data.displayName}} + + {{else}} + + {{B.data.displayName}} + {{/if}} - -
- {{/each}} -
-
+ {{/if}} + +

{{B.data.description}}

+ + + + + + + {{B.data.id}} + + + + {{#if (can 'removeCredentialSources target' @model)}} + + + + + {{/if}} + + + + {{else}} diff --git a/ui/admin/tests/acceptance/targets/injected-application-credential-sources-test.js b/ui/admin/tests/acceptance/targets/injected-application-credential-sources-test.js index 167975cff..3a96c9599 100644 --- a/ui/admin/tests/acceptance/targets/injected-application-credential-sources-test.js +++ b/ui/admin/tests/acceptance/targets/injected-application-credential-sources-test.js @@ -133,7 +133,7 @@ module( test('can navigate to a vault type credential library', async function (assert) { assert.expect(1); await visit(urls.injectedApplicationCredentialSources); - await click('main tbody .rose-table-header-cell:nth-child(1) a'); + await click('main tbody tr .hds-table__td:nth-child(1) a'); await a11yAudit(); assert.strictEqual(currentURL(), urls.credentialLibrary); }); @@ -146,7 +146,7 @@ module( ], }); await visit(urls.injectedApplicationCredentialSources); - await click('main tbody .rose-table-header-cell:nth-child(1) a'); + await click('main tbody tr .hds-table__td:nth-child(1) a'); await a11yAudit(); assert.strictEqual(currentURL(), urls.credential); }); @@ -346,7 +346,8 @@ module( const credentialLibraryCount = getCredentialLibraryCount(); await visit(urls.injectedApplicationCredentialSources); assert.strictEqual(findAll('tbody tr').length, credentialLibraryCount); - await click('tbody tr .rose-dropdown-button-danger'); + await click('.hds-dropdown-toggle-icon'); + await click('tbody tr .hds-dropdown-list-item button'); assert.strictEqual( findAll('tbody tr').length, credentialLibraryCount - 1 @@ -368,7 +369,8 @@ module( const credentialCount = getCredentialCount(); await visit(urls.injectedApplicationCredentialSources); assert.strictEqual(findAll('tbody tr').length, credentialCount); - await click('tbody tr .rose-dropdown-button-danger'); + await click('.hds-dropdown-toggle-icon'); + await click('tbody tr .hds-dropdown-list-item button'); assert.strictEqual(findAll('tbody tr').length, credentialCount - 1); await visit(urls.addInjectedApplicationCredentialSources); assert.strictEqual(findAll('tbody tr').length, credentialCount + 1); @@ -406,7 +408,8 @@ module( const count = getCredentialLibraryCount(); await visit(urls.injectedApplicationCredentialSources); assert.strictEqual(findAll('tbody tr').length, count); - await click('tbody tr .rose-dropdown-button-danger'); + await click('.hds-dropdown-toggle-icon'); + await click('tbody tr .hds-dropdown-list-item button'); assert.dom('[role="alert"]').isVisible(); }); @@ -432,7 +435,8 @@ module( const count = getCredentialCount(); await visit(urls.injectedApplicationCredentialSources); assert.strictEqual(findAll('tbody tr').length, count); - await click('tbody tr .rose-dropdown-button-danger'); + await click('.hds-dropdown-toggle-icon'); + await click('tbody tr .hds-dropdown-list-item button'); assert.dom('[role="alert"]').isVisible(); }); }