From fce79d46d710a4eba70162e8ff3843de7d30cf9f Mon Sep 17 00:00:00 2001 From: Carlos Alcaide Date: Tue, 20 Jul 2021 14:55:00 -0700 Subject: [PATCH 1/6] =?UTF-8?q?feat:=20=F0=9F=8E=B8=20Add=20credential=20s?= =?UTF-8?q?tore=20delete=20CRUD=20operation?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- addons/api/mirage/config.js | 1 + addons/core/translations/resources/en-us.yaml | 2 +- .../routes/scopes/scope/credential-stores.js | 16 ++++++++++++++++ .../scope/credential-stores/credential-store.js | 5 +++++ .../credential-stores/credential-store.hbs | 2 +- .../credential-store/-actions.hbs | 17 +++++++++++++++++ 6 files changed, 41 insertions(+), 2 deletions(-) create mode 100644 ui/admin/app/templates/scopes/scope/credential-stores/credential-store/-actions.hbs diff --git a/addons/api/mirage/config.js b/addons/api/mirage/config.js index 1fd364182..c796d099c 100644 --- a/addons/api/mirage/config.js +++ b/addons/api/mirage/config.js @@ -467,6 +467,7 @@ export default function () { this.get('/credential-stores/:id'); this.post('/credential-stores'); this.patch('/credential-stores/:id'); + this.del('/credential-stores/:id'); // credential-libraries diff --git a/addons/core/translations/resources/en-us.yaml b/addons/core/translations/resources/en-us.yaml index cc9fed978..56baf2d3d 100644 --- a/addons/core/translations/resources/en-us.yaml +++ b/addons/core/translations/resources/en-us.yaml @@ -278,4 +278,4 @@ credential-library: messages: none: title: No Credential Libraries Available - description: No Credential Libraries available in this credential store. \ No newline at end of file + description: No Credential Libraries available in this credential store. diff --git a/ui/admin/app/routes/scopes/scope/credential-stores.js b/ui/admin/app/routes/scopes/scope/credential-stores.js index 4bac020b1..8bfce1b1d 100644 --- a/ui/admin/app/routes/scopes/scope/credential-stores.js +++ b/ui/admin/app/routes/scopes/scope/credential-stores.js @@ -1,6 +1,7 @@ import Route from '@ember/routing/route'; import { action } from '@ember/object'; import loading from 'ember-loading/decorator'; +import { confirm } from 'core/decorators/confirm'; import { notifySuccess, notifyError } from 'core/decorators/notify'; export default class ScopesScopeCredentialStoresRoute extends Route { @@ -44,4 +45,19 @@ export default class ScopesScopeCredentialStoresRoute extends Route { credentialStore.rollbackAttributes(); if (isNew) this.transitionTo('scopes.scope.credential-stores'); } + + /** + * Deletes the credential store and redirects to index + * @param {CredentialStoreModel} credentialStore + */ + @action + @loading + @confirm('questions.delete-confirm') + @notifyError(({ message }) => message, { catch: true }) + @notifySuccess('notifications.delete-success') + async delete(credentialStore) { + await credentialStore.destroyRecord(); + await this.replaceWith('scopes.scope.credential-stores'); + this.refresh(); + } } diff --git a/ui/admin/app/routes/scopes/scope/credential-stores/credential-store.js b/ui/admin/app/routes/scopes/scope/credential-stores/credential-store.js index 307c11079..d217736fc 100644 --- a/ui/admin/app/routes/scopes/scope/credential-stores/credential-store.js +++ b/ui/admin/app/routes/scopes/scope/credential-stores/credential-store.js @@ -25,5 +25,10 @@ export default class ScopesScopeCredentialStoresCredentialStoreRoute extends Rou into: 'scopes/scope/credential-stores/credential-store', outlet: 'navigation', }); + + this.render('scopes/scope/credential-stores/credential-store/-actions', { + into: 'scopes/scope/credential-stores/credential-store', + outlet: 'actions', + }); } } diff --git a/ui/admin/app/templates/scopes/scope/credential-stores/credential-store.hbs b/ui/admin/app/templates/scopes/scope/credential-stores/credential-store.hbs index a6ecd7f81..efc46641a 100644 --- a/ui/admin/app/templates/scopes/scope/credential-stores/credential-store.hbs +++ b/ui/admin/app/templates/scopes/scope/credential-stores/credential-store.hbs @@ -15,7 +15,7 @@ - {{!-- {{outlet 'actions'}} --}} + {{outlet 'actions'}} diff --git a/ui/admin/app/templates/scopes/scope/credential-stores/credential-store/-actions.hbs b/ui/admin/app/templates/scopes/scope/credential-stores/credential-store/-actions.hbs new file mode 100644 index 000000000..165b709ca --- /dev/null +++ b/ui/admin/app/templates/scopes/scope/credential-stores/credential-store/-actions.hbs @@ -0,0 +1,17 @@ + + + {{t 'resources.credential-store.actions.create'}} + + + + {{t 'resources.credential-store.actions.delete'}} + + \ No newline at end of file From c5af15f4c14e3771dac7199252e9bf18342ae843 Mon Sep 17 00:00:00 2001 From: Carlos Alcaide Date: Wed, 21 Jul 2021 10:30:44 -0700 Subject: [PATCH 2/6] Add missing translation after rebase --- addons/core/translations/resources/en-us.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/addons/core/translations/resources/en-us.yaml b/addons/core/translations/resources/en-us.yaml index 56baf2d3d..fcc631b72 100644 --- a/addons/core/translations/resources/en-us.yaml +++ b/addons/core/translations/resources/en-us.yaml @@ -271,6 +271,9 @@ credential-store: title: Credential Store title_plural: Credential Stores description: A credential stores is a collection of credentials and credential libraries. + actions: + create: New Credential Library + delete: Delete Credential Store credential-library: title: Credential Library title_plural: Credential Libraries From 2eb7084643ef0ae01430e70a57d68dd7e8ee07a8 Mon Sep 17 00:00:00 2001 From: Carlos Alcaide Date: Wed, 21 Jul 2021 13:31:48 -0700 Subject: [PATCH 3/6] =?UTF-8?q?test:=20=F0=9F=92=8D=20Adding=20acceptance?= =?UTF-8?q?=20test=20for=20delete=20CRUD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Add acceptance test for delete CRUD operation in credential stores --- .../acceptance/credential-stores-test.js | 52 +++++++++++++++++++ 1 file changed, 52 insertions(+) diff --git a/ui/admin/tests/acceptance/credential-stores-test.js b/ui/admin/tests/acceptance/credential-stores-test.js index f41d31a12..53c98d274 100644 --- a/ui/admin/tests/acceptance/credential-stores-test.js +++ b/ui/admin/tests/acceptance/credential-stores-test.js @@ -5,6 +5,8 @@ import setupMirage from 'ember-cli-mirage/test-support/setup-mirage'; import a11yAudit from 'ember-a11y-testing/test-support/audit'; import { authenticateSession } from 'ember-simple-auth/test-support'; import { Response } from 'miragejs'; +import { resolve, reject } from 'rsvp'; +import sinon from 'sinon'; module('Acceptance | credential-stores', function (hooks) { setupApplicationTest(hooks); @@ -236,4 +238,54 @@ module('Acceptance | credential-stores', function (hooks) { ); } }); + + test('can delete credential store', async function (assert) { + assert.expect(1); + const count = getCredentialStoresCount(); + await visit(urls.credentialStore); + await click('.rose-layout-page-actions .rose-dropdown-button-danger'); + assert.equal(getCredentialStoresCount(), count - 1); + }); + + test('can accept delete credential store via dialog', async function (assert) { + assert.expect(2); + const confirmService = this.owner.lookup('service:confirm'); + confirmService.enabled = true; + confirmService.confirm = sinon.fake.returns(resolve()); + const count = getCredentialStoresCount(); + await visit(urls.credentialStore); + await click('.rose-layout-page-actions .rose-dropdown-button-danger'); + assert.equal(getCredentialStoresCount(), count - 1); + assert.ok(confirmService.confirm.calledOnce); + }); + + test('cannot cancel delete credential store via dialog', async function (assert) { + assert.expect(2); + const confirmService = this.owner.lookup('service:confirm'); + confirmService.enabled = true; + confirmService.confirm = sinon.fake.returns(reject()); + const count = getCredentialStoresCount(); + await visit(urls.credentialStore); + await click('.rose-layout-page-actions .rose-dropdown-button-danger'); + assert.equal(getCredentialStoresCount(), count); + assert.ok(confirmService.confirm.calledOnce); + }); + + test('deleting a host catalog which errors displays error messages', async function (assert) { + assert.expect(1); + this.server.del('/credential-stores/:id', () => { + return new Response( + 490, + {}, + { + status: 490, + code: 'error', + message: 'Oops.', + } + ); + }); + await visit(urls.credentialStore); + await click('.rose-layout-page-actions .rose-dropdown-button-danger'); + assert.ok(find('[role="alert"]').textContent.trim(), 'Oops.'); + }); }); From 74fa0876fb1fcf560e03f82e3db9036d23caa23e Mon Sep 17 00:00:00 2001 From: Carlos Alcaide Date: Wed, 21 Jul 2021 14:01:57 -0700 Subject: [PATCH 4/6] =?UTF-8?q?fix:=20=F0=9F=90=9B=20Fix=20translation=20m?= =?UTF-8?q?isplacement?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- addons/core/translations/resources/en-us.yaml | 3 ++- .../routes/scopes/scope/credential-stores/credential-store.js | 2 +- .../scope/credential-stores/credential-store/-actions.hbs | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/addons/core/translations/resources/en-us.yaml b/addons/core/translations/resources/en-us.yaml index fcc631b72..9d8564288 100644 --- a/addons/core/translations/resources/en-us.yaml +++ b/addons/core/translations/resources/en-us.yaml @@ -272,7 +272,6 @@ credential-store: title_plural: Credential Stores description: A credential stores is a collection of credentials and credential libraries. actions: - create: New Credential Library delete: Delete Credential Store credential-library: title: Credential Library @@ -282,3 +281,5 @@ credential-library: none: title: No Credential Libraries Available description: No Credential Libraries available in this credential store. + actions: + create: New Credential Library diff --git a/ui/admin/app/routes/scopes/scope/credential-stores/credential-store.js b/ui/admin/app/routes/scopes/scope/credential-stores/credential-store.js index d217736fc..046b8a01c 100644 --- a/ui/admin/app/routes/scopes/scope/credential-stores/credential-store.js +++ b/ui/admin/app/routes/scopes/scope/credential-stores/credential-store.js @@ -10,7 +10,7 @@ export default class ScopesScopeCredentialStoresCredentialStoreRoute extends Rou } /** - * Render credential store header and navigation page sections. + * Render credential store header, navigation and actions page sections. * @override */ renderTemplate() { diff --git a/ui/admin/app/templates/scopes/scope/credential-stores/credential-store/-actions.hbs b/ui/admin/app/templates/scopes/scope/credential-stores/credential-store/-actions.hbs index 165b709ca..9364d89f5 100644 --- a/ui/admin/app/templates/scopes/scope/credential-stores/credential-store/-actions.hbs +++ b/ui/admin/app/templates/scopes/scope/credential-stores/credential-store/-actions.hbs @@ -4,7 +4,7 @@ as |dropdown| > - {{t 'resources.credential-store.actions.create'}} + {{t 'resources.credential-library.actions.create'}} Date: Wed, 21 Jul 2021 14:31:10 -0700 Subject: [PATCH 5/6] Comment dropdown option to create a new library store until that route is available --- .../scope/credential-stores/credential-store/-actions.hbs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ui/admin/app/templates/scopes/scope/credential-stores/credential-store/-actions.hbs b/ui/admin/app/templates/scopes/scope/credential-stores/credential-store/-actions.hbs index 9364d89f5..e19af1ada 100644 --- a/ui/admin/app/templates/scopes/scope/credential-stores/credential-store/-actions.hbs +++ b/ui/admin/app/templates/scopes/scope/credential-stores/credential-store/-actions.hbs @@ -3,10 +3,10 @@ @dropdownRight={{true}} as |dropdown| > - + {{!-- {{t 'resources.credential-library.actions.create'}} - + --}} Date: Wed, 21 Jul 2021 15:09:21 -0700 Subject: [PATCH 6/6] Fix typo --- ui/admin/tests/acceptance/credential-stores-test.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui/admin/tests/acceptance/credential-stores-test.js b/ui/admin/tests/acceptance/credential-stores-test.js index 53c98d274..3979f664e 100644 --- a/ui/admin/tests/acceptance/credential-stores-test.js +++ b/ui/admin/tests/acceptance/credential-stores-test.js @@ -271,7 +271,7 @@ module('Acceptance | credential-stores', function (hooks) { assert.ok(confirmService.confirm.calledOnce); }); - test('deleting a host catalog which errors displays error messages', async function (assert) { + test('deleting a credential store which errors displays error messages', async function (assert) { assert.expect(1); this.server.del('/credential-stores/:id', () => { return new Response(