CyberCoveLLC/threshold-ui
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Icu 14663 update manage dropdown for credential stores form (#2454)

Browse Source 
* refactor: 💡 Update Manage dropdown in credential-store

✅ Closes: https://hashicorp.atlassian.net/browse/ICU-14663

* refactor: 💡 Adjusted tests

✅ Closes: https://hashicorp.atlassian.net/browse/ICU-14663

* refactor: 💡 Refactored tests and naming conventions

✅ Closes: https://hashicorp.atlassian.net/browse/ICU-14663

* refactor: 💡 Removed @model from delete

✅ Closes: https://hashicorp.atlassian.net/browse/ICU-14663

* test: 💍 add clicks to correct tests assertions

✅ Closes: https://hashicorp.atlassian.net/browse/ICU-14663

---------

Co-authored-by: Cameron Perera <cameron.perera@hashicorp.com>
This commit is contained in:
WadiandCameron Perera authored and GitHub committed 2024-08-26 14:58:14 -05:00
1 parent c38ba294cc
commit a9cfc43404
3 files changed
+48 -42
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

ui/admin/app/components/credential-stores/credential-store/actions/index.hbs
+14 -25
View File
@@ -2,37 +2,26 @@
Copyright (c) HashiCorp, Inc.
SPDX-License-Identifier: BUSL-1.1
}}
<Rose::Dropdown
@text={{t 'actions.manage'}}
@dropdownRight={{true}}
as |dropdown|
>
<Hds::Dropdown data-test-manage-credential-stores-dropdown as |dd|>
<dd.ToggleButton @text={{t 'actions.manage'}} @color='secondary' />
{{#if (can 'create model' @model collection='credential-libraries')}}
<dropdown.link
<dd.Interactive
@route='scopes.scope.credential-stores.credential-store.credential-libraries.new'
@model={{@model}}
>
{{t 'resources.credential-library.actions.create'}}
</dropdown.link>
@text={{t 'resources.credential-library.actions.create'}}
/>
{{/if}}
{{#if (can 'create model' @model collection='credentials')}}
<dropdown.link
<dd.Interactive
@route='scopes.scope.credential-stores.credential-store.credentials.new'
@model={{@model}}
>
{{t 'resources.credential.actions.create'}}
</dropdown.link>
@text={{t 'resources.credential.actions.create'}}
/>
{{/if}}
{{#if (can 'delete model' @model)}}
<dropdown.separator />
<dropdown.button
@style='danger'
@disabled={{@model.canSave}}
<dd.Separator />
<dd.Interactive
@text={{t 'resources.credential-store.actions.delete'}}
@color='critical'
{{on 'click' @delete}}
>
{{t 'resources.credential-store.actions.delete'}}
</dropdown.button>
/>
{{/if}}
</Rose::Dropdown>
</Hds::Dropdown>
ui/admin/tests/acceptance/credential-store/credentials/list-test.js
+8 -3
View File
@@ -13,6 +13,12 @@ module('Acceptance | credential-stores | credentials | list', function (hooks) {
setupApplicationTest(hooks);
setupMirage(hooks);
const MANAGE_DROPDOWN_SELECTOR =
'[data-test-manage-credential-stores-dropdown] div:first-child button';
const ADD_CREDENTIALS_SELECTOR =
'[data-test-manage-credential-stores-dropdown] div ul li a';
const instances = {
scopes: {
org: null,
@@ -107,8 +113,7 @@ module('Acceptance | credential-stores | credentials | list', function (hooks) {
['create'];
await visit(urls.staticCredentialStore);
assert.dom(`[href="${urls.credentials}"]`).isVisible();
assert
.dom(`.rose-layout-page-actions [href="${urls.newCredential}"]`)
.isVisible();
await click(MANAGE_DROPDOWN_SELECTOR);
assert.dom(ADD_CREDENTIALS_SELECTOR).isVisible();
});
});
ui/admin/tests/acceptance/credential-store/delete-test.js
+26 -14
View File
@@ -20,6 +20,10 @@ 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';
const DELETE_ACTION_SELECTOR =
'[data-test-manage-credential-stores-dropdown] ul li button';
const instances = {
scopes: {
@@ -79,14 +83,16 @@ module('Acceptance | credential-stores | delete', function (hooks) {
test('can delete credential store of type vault', async function (assert) {
const count = getVaultCredentialStoresCount();
await visit(urls.vaultCredentialStore);
await click('.rose-layout-page-actions .rose-dropdown-button-danger');
await click(MANAGE_DROPDOWN_SELECTOR);
await click(DELETE_ACTION_SELECTOR);
assert.strictEqual(getVaultCredentialStoresCount(), count - 1);
});
test('can delete credential store of type static', async function (assert) {
const count = getStaticCredentialStoresCount();
await visit(urls.staticCredentialStore);
await click('.rose-layout-page-actions .rose-dropdown-button-danger');
await click(MANAGE_DROPDOWN_SELECTOR);
await click(DELETE_ACTION_SELECTOR);
assert.strictEqual(getStaticCredentialStoresCount(), count - 1);
});
@@ -96,9 +102,9 @@ module('Acceptance | credential-stores | delete', function (hooks) {
(item) => item !== 'delete',
);
await visit(urls.vaultCredentialStore);
assert.notOk(
find('.rose-layout-page-actions .rose-dropdown-button-danger'),
);
await click(MANAGE_DROPDOWN_SELECTOR);
assert.dom(DELETE_ACTION_SELECTOR).doesNotExist();
});
test('cannot delete a static credential store without proper authorization', async function (assert) {
@@ -107,9 +113,9 @@ module('Acceptance | credential-stores | delete', function (hooks) {
(item) => item !== 'delete',
);
await visit(urls.staticCredentialStore);
assert.notOk(
find('.rose-layout-page-actions .rose-dropdown-button-danger'),
);
await click(MANAGE_DROPDOWN_SELECTOR);
assert.dom(DELETE_ACTION_SELECTOR).doesNotExist();
});
test('can accept delete static credential store via dialog', async function (assert) {
@@ -118,7 +124,8 @@ module('Acceptance | credential-stores | delete', function (hooks) {
confirmService.confirm = sinon.fake.returns(resolve());
const count = getStaticCredentialStoresCount();
await visit(urls.staticCredentialStore);
await click('.rose-layout-page-actions .rose-dropdown-button-danger');
await click(MANAGE_DROPDOWN_SELECTOR);
await click(DELETE_ACTION_SELECTOR);
assert.strictEqual(getStaticCredentialStoresCount(), count - 1);
assert.ok(confirmService.confirm.calledOnce);
});
@@ -129,7 +136,8 @@ module('Acceptance | credential-stores | delete', function (hooks) {
confirmService.confirm = sinon.fake.returns(resolve());
const count = getVaultCredentialStoresCount();
await visit(urls.vaultCredentialStore);
await click('.rose-layout-page-actions .rose-dropdown-button-danger');
await click(MANAGE_DROPDOWN_SELECTOR);
await click(DELETE_ACTION_SELECTOR);
assert.strictEqual(getVaultCredentialStoresCount(), count - 1);
assert.ok(confirmService.confirm.calledOnce);
});
@@ -140,7 +148,8 @@ module('Acceptance | credential-stores | delete', function (hooks) {
confirmService.confirm = sinon.fake.returns(reject());
const count = getStaticCredentialStoresCount();
await visit(urls.staticCredentialStore);
await click('.rose-layout-page-actions .rose-dropdown-button-danger');
await click(MANAGE_DROPDOWN_SELECTOR);
await click(DELETE_ACTION_SELECTOR);
assert.strictEqual(getStaticCredentialStoresCount(), count);
assert.ok(confirmService.confirm.calledOnce);
});
@@ -151,7 +160,8 @@ module('Acceptance | credential-stores | delete', function (hooks) {
confirmService.confirm = sinon.fake.returns(reject());
const count = getVaultCredentialStoresCount();
await visit(urls.vaultCredentialStore);
await click('.rose-layout-page-actions .rose-dropdown-button-danger');
await click(MANAGE_DROPDOWN_SELECTOR);
await click(DELETE_ACTION_SELECTOR);
assert.strictEqual(getVaultCredentialStoresCount(), count);
assert.ok(confirmService.confirm.calledOnce);
});
@@ -169,7 +179,8 @@ module('Acceptance | credential-stores | delete', function (hooks) {
);
});
await visit(urls.staticCredentialStore);
await click('.rose-layout-page-actions .rose-dropdown-button-danger');
await click(MANAGE_DROPDOWN_SELECTOR);
await click(DELETE_ACTION_SELECTOR);
assert.ok(find('[role="alert"]').textContent.trim(), 'Oops.');
});
@@ -186,7 +197,8 @@ module('Acceptance | credential-stores | delete', function (hooks) {
);
});
await visit(urls.vaultCredentialStore);
await click('.rose-layout-page-actions .rose-dropdown-button-danger');
await click(MANAGE_DROPDOWN_SELECTOR);
await click(DELETE_ACTION_SELECTOR);
assert.ok(find('[role="alert"]').textContent.trim(), 'Oops.');
});
});