From 885ce5ebf53305e0b467fcf5fe9c63011ff09cf1 Mon Sep 17 00:00:00 2001 From: Carlos Alcaide Date: Wed, 14 Jul 2021 07:59:15 -0700 Subject: [PATCH 1/8] =?UTF-8?q?feat:=20=F0=9F=8E=B8=20Adding=20credential?= =?UTF-8?q?=20store=20edit=20form?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Add credential-store mirage config. Add edit credential store form. Add credential store route. Add credential store template. --- addons/api/mirage/config.js | 3 ++ .../form/credential-store/index.hbs | 37 +++++++++++++++++++ ui/admin/app/router.js | 6 ++- .../routes/scopes/scope/credential-stores.js | 16 ++++++++ .../credential-stores/credential-store.js | 20 +++++++++- .../credential-stores/credential-store.hbs | 26 ++++++++++++- .../credential-store/-header.hbs | 3 ++ .../credential-store/-navigation.hbs | 5 +++ .../credential-store/index.hbs | 4 ++ 9 files changed, 116 insertions(+), 4 deletions(-) create mode 100644 ui/admin/app/components/form/credential-store/index.hbs create mode 100644 ui/admin/app/templates/scopes/scope/credential-stores/credential-store/-header.hbs create mode 100644 ui/admin/app/templates/scopes/scope/credential-stores/credential-store/-navigation.hbs create mode 100644 ui/admin/app/templates/scopes/scope/credential-stores/credential-store/index.hbs diff --git a/addons/api/mirage/config.js b/addons/api/mirage/config.js index 6e598b47d..4564352a6 100644 --- a/addons/api/mirage/config.js +++ b/addons/api/mirage/config.js @@ -464,6 +464,9 @@ export default function () { credentialStores.where({ scopeId }) ); + this.get('/credential-stores/:id'); + this.patch('/credential-stores/:id'); + // credential-libraries this.get( diff --git a/ui/admin/app/components/form/credential-store/index.hbs b/ui/admin/app/components/form/credential-store/index.hbs new file mode 100644 index 000000000..312dce672 --- /dev/null +++ b/ui/admin/app/components/form/credential-store/index.hbs @@ -0,0 +1,37 @@ + + + + + + + + + \ No newline at end of file diff --git a/ui/admin/app/router.js b/ui/admin/app/router.js index 4d723cab8..21a7859c7 100644 --- a/ui/admin/app/router.js +++ b/ui/admin/app/router.js @@ -87,7 +87,11 @@ Router.map(function () { }); }); this.route('credential-stores', function () { - this.route('credential-store', { path: ':credential_store_id' }); + this.route( + 'credential-store', + { path: ':credential_store_id' }, + function () {} + ); }); }); }); diff --git a/ui/admin/app/routes/scopes/scope/credential-stores.js b/ui/admin/app/routes/scopes/scope/credential-stores.js index 7f75dd4fa..d08a6402a 100644 --- a/ui/admin/app/routes/scopes/scope/credential-stores.js +++ b/ui/admin/app/routes/scopes/scope/credential-stores.js @@ -1,4 +1,7 @@ import Route from '@ember/routing/route'; +import { action } from '@ember/object'; +import loading from 'ember-loading/decorator'; +import { notifySuccess, notifyError } from 'core/decorators/notify'; export default class ScopesScopeCredentialStoresRoute extends Route { /** @@ -9,4 +12,17 @@ export default class ScopesScopeCredentialStoresRoute extends Route { const { id: scope_id } = this.modelFor('scopes.scope'); return this.store.query('credential-store', { scope_id }); } + + @action + @loading + @notifyError(({ message }) => message) + @notifySuccess('notifications.save-success') + async save(credentialStore) { + await credentialStore.save(); + await this.transitionTo( + 'scopes.scope.credential-stores.credential-store', + credentialStore + ); + 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 82fa9d62c..307c11079 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 @@ -6,6 +6,24 @@ export default class ScopesScopeCredentialStoresCredentialStoreRoute extends Rou * @return {Promise[CredentialStoreModel]} */ async model({ credential_store_id }) { - return this.route.findRecord('credential-store', credential_store_id); + return this.store.findRecord('credential-store', credential_store_id); + } + + /** + * Render credential store header and navigation page sections. + * @override + */ + renderTemplate() { + super.renderTemplate(...arguments); + + this.render('scopes/scope/credential-stores/credential-store/-header', { + into: 'scopes/scope/credential-stores/credential-store', + outlet: 'header', + }); + + this.render('scopes/scope/credential-stores/credential-store/-navigation', { + into: 'scopes/scope/credential-stores/credential-store', + outlet: 'navigation', + }); } } 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 637b45528..a6ecd7f81 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 @@ -1,2 +1,24 @@ -{{page-title 'CredentialStore'}} -{{outlet}} \ No newline at end of file +{{page-title @model.displayName}} + + + + + + + + + {{outlet 'header'}} + + + + {{outlet 'navigation'}} + + + + {{!-- {{outlet 'actions'}} --}} + + + + {{outlet}} + + \ No newline at end of file diff --git a/ui/admin/app/templates/scopes/scope/credential-stores/credential-store/-header.hbs b/ui/admin/app/templates/scopes/scope/credential-stores/credential-store/-header.hbs new file mode 100644 index 000000000..d9df667e2 --- /dev/null +++ b/ui/admin/app/templates/scopes/scope/credential-stores/credential-store/-header.hbs @@ -0,0 +1,3 @@ +

{{@model.displayName}}

+

{{@model.description}}

+{{@model.id}} \ No newline at end of file diff --git a/ui/admin/app/templates/scopes/scope/credential-stores/credential-store/-navigation.hbs b/ui/admin/app/templates/scopes/scope/credential-stores/credential-store/-navigation.hbs new file mode 100644 index 000000000..86b9cf585 --- /dev/null +++ b/ui/admin/app/templates/scopes/scope/credential-stores/credential-store/-navigation.hbs @@ -0,0 +1,5 @@ + + + {{t 'titles.details'}} + + \ No newline at end of file diff --git a/ui/admin/app/templates/scopes/scope/credential-stores/credential-store/index.hbs b/ui/admin/app/templates/scopes/scope/credential-stores/credential-store/index.hbs new file mode 100644 index 000000000..860476547 --- /dev/null +++ b/ui/admin/app/templates/scopes/scope/credential-stores/credential-store/index.hbs @@ -0,0 +1,4 @@ + \ No newline at end of file From b9c5ed0de3599cf798881656d68ab981c1e25760 Mon Sep 17 00:00:00 2001 From: Carlos Alcaide Date: Wed, 14 Jul 2021 10:15:21 -0700 Subject: [PATCH 2/8] Add cancel action when editing a credential-store. Add breadcrumb feature on the credential store controller. --- .../components/form/credential-store/index.hbs | 1 + .../scope/credential-stores/credential-store.js | 13 +++++++++++++ .../routes/scopes/scope/credential-stores.js | 11 +++++++++++ .../credential-store/-header.hbs | 8 +++++++- .../credential-store/index.hbs | 1 + .../credential-stores/credential-store-test.js | 17 +++++++++++++++++ 6 files changed, 50 insertions(+), 1 deletion(-) create mode 100644 ui/admin/app/controllers/scopes/scope/credential-stores/credential-store.js create mode 100644 ui/admin/tests/unit/controllers/scopes/scope/credential-stores/credential-store-test.js diff --git a/ui/admin/app/components/form/credential-store/index.hbs b/ui/admin/app/components/form/credential-store/index.hbs index 312dce672..f972854c1 100644 --- a/ui/admin/app/components/form/credential-store/index.hbs +++ b/ui/admin/app/components/form/credential-store/index.hbs @@ -1,5 +1,6 @@ message) @@ -25,4 +29,11 @@ export default class ScopesScopeCredentialStoresRoute extends Route { ); this.refresh(); } + + @action + cancel(credentialStore) { + const { isNew } = credentialStore; + credentialStore.rollbackAttributes(); + if (isNew) this.transitionTo('scopes.scope.credential-stores'); + } } diff --git a/ui/admin/app/templates/scopes/scope/credential-stores/credential-store/-header.hbs b/ui/admin/app/templates/scopes/scope/credential-stores/credential-store/-header.hbs index d9df667e2..9bdf844ae 100644 --- a/ui/admin/app/templates/scopes/scope/credential-stores/credential-store/-header.hbs +++ b/ui/admin/app/templates/scopes/scope/credential-stores/credential-store/-header.hbs @@ -1,3 +1,9 @@

{{@model.displayName}}

{{@model.description}}

-{{@model.id}} \ No newline at end of file + + {{@model.id}} + \ No newline at end of file diff --git a/ui/admin/app/templates/scopes/scope/credential-stores/credential-store/index.hbs b/ui/admin/app/templates/scopes/scope/credential-stores/credential-store/index.hbs index 860476547..aaa14a18c 100644 --- a/ui/admin/app/templates/scopes/scope/credential-stores/credential-store/index.hbs +++ b/ui/admin/app/templates/scopes/scope/credential-stores/credential-store/index.hbs @@ -1,4 +1,5 @@ \ No newline at end of file diff --git a/ui/admin/tests/unit/controllers/scopes/scope/credential-stores/credential-store-test.js b/ui/admin/tests/unit/controllers/scopes/scope/credential-stores/credential-store-test.js new file mode 100644 index 000000000..5736858ff --- /dev/null +++ b/ui/admin/tests/unit/controllers/scopes/scope/credential-stores/credential-store-test.js @@ -0,0 +1,17 @@ +import { module, test } from 'qunit'; +import { setupTest } from 'ember-qunit'; + +module( + 'Unit | Controller | scopes/scope/credential-stores/credential-store', + function (hooks) { + setupTest(hooks); + + // TODO: Replace this with your real tests. + test('it exists', function (assert) { + let controller = this.owner.lookup( + 'controller:scopes/scope/credential-stores/credential-store' + ); + assert.ok(controller); + }); + } +); From c82a8be1ed6f4f66d1ced1cc8128a0994e083692 Mon Sep 17 00:00:00 2001 From: Carlos Alcaide Date: Wed, 14 Jul 2021 11:29:45 -0700 Subject: [PATCH 3/8] =?UTF-8?q?feat:=20=F0=9F=8E=B8=20Stop=20using=20model?= =?UTF-8?q?=20on=20template?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Stop using model on template, so no more updating template while editing the form. Add link to documentation --- .../.watchman-cookie-ccorvo-C02FJ2P9Q05P-810-234 | 0 .../credential-stores/credential-store/index.js | 3 +++ .../credential-store/-header.hbs | 4 ++-- .../scopes/scope/credential-stores/index.hbs | 5 ++++- ui/admin/config/environment.js | 1 + .../credential-store/index-test.js | 16 ++++++++++++++++ 6 files changed, 26 insertions(+), 3 deletions(-) create mode 100755 addons/rose/.watchman-cookie-ccorvo-C02FJ2P9Q05P-810-234 create mode 100644 ui/admin/app/routes/scopes/scope/credential-stores/credential-store/index.js create mode 100644 ui/admin/tests/unit/routes/scopes/scope/credential-stores/credential-store/index-test.js diff --git a/addons/rose/.watchman-cookie-ccorvo-C02FJ2P9Q05P-810-234 b/addons/rose/.watchman-cookie-ccorvo-C02FJ2P9Q05P-810-234 new file mode 100755 index 000000000..e69de29bb diff --git a/ui/admin/app/routes/scopes/scope/credential-stores/credential-store/index.js b/ui/admin/app/routes/scopes/scope/credential-stores/credential-store/index.js new file mode 100644 index 000000000..7e61beb34 --- /dev/null +++ b/ui/admin/app/routes/scopes/scope/credential-stores/credential-store/index.js @@ -0,0 +1,3 @@ +import Route from '@ember/routing/route'; + +export default class ScopesScopeCredentialStoresCredentialStoreIndexRoute extends Route {} diff --git a/ui/admin/app/templates/scopes/scope/credential-stores/credential-store/-header.hbs b/ui/admin/app/templates/scopes/scope/credential-stores/credential-store/-header.hbs index 9bdf844ae..0ff5c81bc 100644 --- a/ui/admin/app/templates/scopes/scope/credential-stores/credential-store/-header.hbs +++ b/ui/admin/app/templates/scopes/scope/credential-stores/credential-store/-header.hbs @@ -1,5 +1,5 @@ -

{{@model.displayName}}

-

{{@model.description}}

+

{{t 'resources.credential-store.title'}}

+

{{t 'resources.credential-store.description'}}

{{t 'resources.credential-store.title_plural'}} +

- {{t 'resources.credential-store.description'}} + {{#if @model}} +

{{t 'resources.credential-store.description'}}

+ {{/if}} {{!-- diff --git a/ui/admin/config/environment.js b/ui/admin/config/environment.js index 7464ea022..fca0dab92 100644 --- a/ui/admin/config/environment.js +++ b/ui/admin/config/environment.js @@ -55,6 +55,7 @@ module.exports = function (environment) { 'host-set': '/host-sets', 'host-set.new': '/host-sets/new', 'host-set.add-hosts': '/host-sets/add-hosts', + 'credential-stores': '/credential-stores', host: '/hosts', 'host.new': '/hosts/new', role: '/roles', diff --git a/ui/admin/tests/unit/routes/scopes/scope/credential-stores/credential-store/index-test.js b/ui/admin/tests/unit/routes/scopes/scope/credential-stores/credential-store/index-test.js new file mode 100644 index 000000000..a08a9fff6 --- /dev/null +++ b/ui/admin/tests/unit/routes/scopes/scope/credential-stores/credential-store/index-test.js @@ -0,0 +1,16 @@ +import { module, test } from 'qunit'; +import { setupTest } from 'ember-qunit'; + +module( + 'Unit | Route | scopes/scope/credential-stores/credential-store/index', + function (hooks) { + setupTest(hooks); + + test('it exists', function (assert) { + let route = this.owner.lookup( + 'route:scopes/scope/credential-stores/credential-store/index' + ); + assert.ok(route); + }); + } +); From cf377ad3dc07ad493b6e085946247cd4cb923c68 Mon Sep 17 00:00:00 2001 From: Carlos Alcaide Date: Fri, 16 Jul 2021 08:36:57 -0700 Subject: [PATCH 4/8] Delete model check --- .../app/templates/scopes/scope/credential-stores/index.hbs | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/ui/admin/app/templates/scopes/scope/credential-stores/index.hbs b/ui/admin/app/templates/scopes/scope/credential-stores/index.hbs index 765371017..0e2177ff1 100644 --- a/ui/admin/app/templates/scopes/scope/credential-stores/index.hbs +++ b/ui/admin/app/templates/scopes/scope/credential-stores/index.hbs @@ -8,9 +8,7 @@ {{t 'resources.credential-store.title_plural'}} - {{#if @model}} -

{{t 'resources.credential-store.description'}}

- {{/if}} +

{{t 'resources.credential-store.description'}}

{{!-- From 1a46a6b183204fe26544a823efe4845808f6d2c1 Mon Sep 17 00:00:00 2001 From: Carlos Alcaide Date: Fri, 16 Jul 2021 08:52:18 -0700 Subject: [PATCH 5/8] Add .watchman-cookie to gitignore --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 80cb94003..f8f2ec1c2 100644 --- a/.gitignore +++ b/.gitignore @@ -22,6 +22,7 @@ testem.log yarn-error.log storybook-static **/.storybook/*.html +addons/rose/.watchman-cookie* # ember-try .node_modules.ember-try From e4a0150ee79fed9fb9579a73ff81be04ba1c590a Mon Sep 17 00:00:00 2001 From: Carlos Alcaide Date: Fri, 16 Jul 2021 08:53:37 -0700 Subject: [PATCH 6/8] Delete watchman cookie file --- addons/rose/.watchman-cookie-ccorvo-C02FJ2P9Q05P-810-234 | 0 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100755 addons/rose/.watchman-cookie-ccorvo-C02FJ2P9Q05P-810-234 diff --git a/addons/rose/.watchman-cookie-ccorvo-C02FJ2P9Q05P-810-234 b/addons/rose/.watchman-cookie-ccorvo-C02FJ2P9Q05P-810-234 deleted file mode 100755 index e69de29bb..000000000 From cf72af400404ca6b708ee5168b50e7e204b8f780 Mon Sep 17 00:00:00 2001 From: Carlos Alcaide Date: Fri, 16 Jul 2021 09:05:36 -0700 Subject: [PATCH 7/8] Add comments to route functions --- .gitignore | 2 +- ui/admin/app/routes/scopes/scope/credential-stores.js | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index f8f2ec1c2..95852e8ad 100644 --- a/.gitignore +++ b/.gitignore @@ -22,7 +22,7 @@ testem.log yarn-error.log storybook-static **/.storybook/*.html -addons/rose/.watchman-cookie* +.watchman-cookie* # ember-try .node_modules.ember-try diff --git a/ui/admin/app/routes/scopes/scope/credential-stores.js b/ui/admin/app/routes/scopes/scope/credential-stores.js index 6dc7128e5..4bac020b1 100644 --- a/ui/admin/app/routes/scopes/scope/credential-stores.js +++ b/ui/admin/app/routes/scopes/scope/credential-stores.js @@ -17,6 +17,10 @@ export default class ScopesScopeCredentialStoresRoute extends Route { // =actions + /** + * Handle save + * @param {CredentialStoreModel} credentialStore + */ @action @loading @notifyError(({ message }) => message) @@ -30,6 +34,10 @@ export default class ScopesScopeCredentialStoresRoute extends Route { this.refresh(); } + /** + * Rollback changes on credential stores. + * @param {CredentialStoreModel} credentialStore + */ @action cancel(credentialStore) { const { isNew } = credentialStore; From 03187e2e2e1aa66d6444afa7e5094f4a639ea80d Mon Sep 17 00:00:00 2001 From: Carlos Alcaide Date: Fri, 16 Jul 2021 09:07:53 -0700 Subject: [PATCH 8/8] Fix typo in comment --- .../scopes/scope/credential-stores/credential-store.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui/admin/app/controllers/scopes/scope/credential-stores/credential-store.js b/ui/admin/app/controllers/scopes/scope/credential-stores/credential-store.js index 2b799746b..67b0b2c33 100644 --- a/ui/admin/app/controllers/scopes/scope/credential-stores/credential-store.js +++ b/ui/admin/app/controllers/scopes/scope/credential-stores/credential-store.js @@ -4,7 +4,7 @@ export default class ScopesScopeCredentialStoresCredentialStoreController extend // =attributes /** - * A role breadcrumb + * A credential store breadcrumb * @type {string} */ get breadCrumb() {