From deb9847617d53675f27b4923fc8d535488b5c76f Mon Sep 17 00:00:00 2001 From: Carlos Alcaide Corvo Date: Wed, 10 Nov 2021 07:32:40 -0800 Subject: [PATCH 1/4] =?UTF-8?q?feat:=20=F0=9F=8E=B8=20Add=20managed=20grou?= =?UTF-8?q?ps=20create=20CRUD=20operation?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- addons/api/mirage/config.js | 13 +++++++ addons/core/translations/resources/en-us.yaml | 1 + .../components/form/managed-group/index.hbs | 15 +++++++- ui/admin/app/router.js | 1 + .../auth-method/managed-groups.js | 19 ++++++++-- .../auth-method/managed-groups/new.js | 36 +++++++++++++++++++ .../auth-methods/auth-method/-actions.hbs | 12 +++++++ .../auth-method/managed-groups/new.hbs | 5 +++ .../managed-groups/new/-header.hbs | 5 +++ .../auth-method/managed-groups/new-test.js | 16 +++++++++ 10 files changed, 120 insertions(+), 3 deletions(-) create mode 100644 ui/admin/app/routes/scopes/scope/auth-methods/auth-method/managed-groups/new.js create mode 100644 ui/admin/app/templates/scopes/scope/auth-methods/auth-method/managed-groups/new.hbs create mode 100644 ui/admin/app/templates/scopes/scope/auth-methods/auth-method/managed-groups/new/-header.hbs create mode 100644 ui/admin/tests/unit/routes/scopes/scope/auth-methods/auth-method/managed-groups/new-test.js diff --git a/addons/api/mirage/config.js b/addons/api/mirage/config.js index f71eba2cc..152b68513 100644 --- a/addons/api/mirage/config.js +++ b/addons/api/mirage/config.js @@ -523,6 +523,19 @@ export default function () { ); this.get('/managed-groups/:id'); this.del('/managed-groups/:id'); + this.post( + '/managed-groups/:idMethod', + function ({ managedGroups }, { params: { idMethod } }) { + const attrs = this.normalizedRequestAttrs(); + const id = idMethod.split(':')[0]; + const managedGroup = managedGroups.find(id); + const updatedAttrs = { + version: attrs.version, + attributes: managedGroup.attributes, + }; + return managedGroup.update(updatedAttrs); + } + ); /* Uncomment the following line and the Response import above * Then change the response code to simulate error responses. diff --git a/addons/core/translations/resources/en-us.yaml b/addons/core/translations/resources/en-us.yaml index c52b88323..ba97605d8 100644 --- a/addons/core/translations/resources/en-us.yaml +++ b/addons/core/translations/resources/en-us.yaml @@ -357,3 +357,4 @@ managed-group: description: A managed group is a resource that represents a collection of accounts. actions: delete: Delete Managed Group + create: Create Managed Group diff --git a/ui/admin/app/components/form/managed-group/index.hbs b/ui/admin/app/components/form/managed-group/index.hbs index 1ccd49e57..6ebc5f284 100644 --- a/ui/admin/app/components/form/managed-group/index.hbs +++ b/ui/admin/app/components/form/managed-group/index.hbs @@ -1,4 +1,11 @@ - + + \ No newline at end of file diff --git a/ui/admin/app/router.js b/ui/admin/app/router.js index 49a0c0756..edc70b62d 100644 --- a/ui/admin/app/router.js +++ b/ui/admin/app/router.js @@ -61,6 +61,7 @@ Router.map(function () { { path: ':managed_group_id' }, function () {} ); + this.route('new'); }); }); this.route('new'); diff --git a/ui/admin/app/routes/scopes/scope/auth-methods/auth-method/managed-groups.js b/ui/admin/app/routes/scopes/scope/auth-methods/auth-method/managed-groups.js index e1f0d9435..e8b3e0747 100644 --- a/ui/admin/app/routes/scopes/scope/auth-methods/auth-method/managed-groups.js +++ b/ui/admin/app/routes/scopes/scope/auth-methods/auth-method/managed-groups.js @@ -1,8 +1,8 @@ import Route from '@ember/routing/route'; -import { inject as service } from '@ember/service'; import { action } from '@ember/object'; -import { confirm } from 'core/decorators/confirm'; +import { inject as service } from '@ember/service'; import loading from 'ember-loading/decorator'; +import { confirm } from 'core/decorators/confirm'; import { notifySuccess, notifyError } from 'core/decorators/notify'; export default class ScopesScopeAuthMethodsAuthMethodManagedGroupsRoute extends Route { @@ -33,6 +33,21 @@ export default class ScopesScopeAuthMethodsAuthMethodManagedGroupsRoute extends } } + @action + @loading + @notifyError(({ message }) => message) + @notifySuccess(({ isNew }) => + isNew ? 'notifications.create-success' : 'notifications.save-success' + ) + async save(managedGroup) { + await managedGroup.save(); + await this.transitionTo( + 'scopes.scope.auth-methods.auth-method.managed-groups.managed-group', + managedGroup + ); + this.refresh(); + } + /** * Delete a managed group in current scope and redirect to index * @param {ManagedGroupModel} managed group diff --git a/ui/admin/app/routes/scopes/scope/auth-methods/auth-method/managed-groups/new.js b/ui/admin/app/routes/scopes/scope/auth-methods/auth-method/managed-groups/new.js new file mode 100644 index 000000000..ca2b1473c --- /dev/null +++ b/ui/admin/app/routes/scopes/scope/auth-methods/auth-method/managed-groups/new.js @@ -0,0 +1,36 @@ +import Route from '@ember/routing/route'; + +export default class ScopesScopeAuthMethodsAuthMethodManagedGroupsNewRoute extends Route { + // =methods + model() { + const { id: auth_method_id, type } = this.modelFor( + 'scopes.scope.auth-methods.auth-method' + ); + return this.store.createRecord('managed-group', { + type, + auth_method_id, + }); + } + + renderTemplate() { + super.renderTemplate(...arguments); + + this.render( + 'scopes/scope/auth-methods/auth-method/managed-groups/new/-header', + { + into: 'scopes/scope/auth-methods/auth-method', + outlet: 'header', + } + ); + + this.render('_empty', { + into: 'scopes/scope/auth-methods/auth-method', + outlet: 'actions', + }); + + this.render('_empty', { + into: 'scopes/scope/auth-methods/auth-method', + outlet: 'navigation', + }); + } +} diff --git a/ui/admin/app/templates/scopes/scope/auth-methods/auth-method/-actions.hbs b/ui/admin/app/templates/scopes/scope/auth-methods/auth-method/-actions.hbs index a33cfdb42..865bdfeec 100644 --- a/ui/admin/app/templates/scopes/scope/auth-methods/auth-method/-actions.hbs +++ b/ui/admin/app/templates/scopes/scope/auth-methods/auth-method/-actions.hbs @@ -67,6 +67,18 @@ {{/if}} + {{#if (feature-flag 'managed-groups')}} + {{! TODO: Add capabilities }} + {{#if @model.isOIDC}} + + {{t 'resources.managed-group.actions.create'}} + + {{/if}} + {{/if}} + {{#if (can 'delete model' @model)}} \ No newline at end of file diff --git a/ui/admin/app/templates/scopes/scope/auth-methods/auth-method/managed-groups/new/-header.hbs b/ui/admin/app/templates/scopes/scope/auth-methods/auth-method/managed-groups/new/-header.hbs new file mode 100644 index 000000000..b6e89205e --- /dev/null +++ b/ui/admin/app/templates/scopes/scope/auth-methods/auth-method/managed-groups/new/-header.hbs @@ -0,0 +1,5 @@ +

+ {{t 'titles.new'}} + {{! TODO: change the icon link }} + +

\ No newline at end of file diff --git a/ui/admin/tests/unit/routes/scopes/scope/auth-methods/auth-method/managed-groups/new-test.js b/ui/admin/tests/unit/routes/scopes/scope/auth-methods/auth-method/managed-groups/new-test.js new file mode 100644 index 000000000..3ea26ad63 --- /dev/null +++ b/ui/admin/tests/unit/routes/scopes/scope/auth-methods/auth-method/managed-groups/new-test.js @@ -0,0 +1,16 @@ +import { module, test } from 'qunit'; +import { setupTest } from 'ember-qunit'; + +module( + 'Unit | Route | scopes/scope/auth-methods/auth-method/managed-groups/new', + function (hooks) { + setupTest(hooks); + + test('it exists', function (assert) { + let route = this.owner.lookup( + 'route:scopes/scope/auth-methods/auth-method/managed-groups/new' + ); + assert.ok(route); + }); + } +); From 4e41ac531d6e17b401f2f61f03882d119724f3c5 Mon Sep 17 00:00:00 2001 From: Carlos Alcaide Corvo Date: Wed, 10 Nov 2021 09:07:17 -0800 Subject: [PATCH 2/4] WIP fixing creation mirage model error --- addons/api/mirage/config.js | 27 ++++++++++--------- addons/api/mirage/factories/managed-group.js | 14 ++++++++++ .../generated/factories/managed-group.js | 11 -------- .../auth-method/managed-groups.js | 12 ++++++++- 4 files changed, 39 insertions(+), 25 deletions(-) diff --git a/addons/api/mirage/config.js b/addons/api/mirage/config.js index 152b68513..74c6ad61e 100644 --- a/addons/api/mirage/config.js +++ b/addons/api/mirage/config.js @@ -523,19 +523,20 @@ export default function () { ); this.get('/managed-groups/:id'); this.del('/managed-groups/:id'); - this.post( - '/managed-groups/:idMethod', - function ({ managedGroups }, { params: { idMethod } }) { - const attrs = this.normalizedRequestAttrs(); - const id = idMethod.split(':')[0]; - const managedGroup = managedGroups.find(id); - const updatedAttrs = { - version: attrs.version, - attributes: managedGroup.attributes, - }; - return managedGroup.update(updatedAttrs); - } - ); + this.post('/managed-groups'); + // this.post( + // '/managed-groups/:idMethod', + // function ({ managedGroups }, { params: { idMethod } }) { + // const attrs = this.normalizedRequestAttrs(); + // const id = idMethod.split(':')[0]; + // const managedGroup = managedGroups.find(id); + // const updatedAttrs = { + // version: attrs.version, + // attributes: managedGroup.attributes, + // }; + // return managedGroup.update(updatedAttrs); + // } + // ); /* Uncomment the following line and the Response import above * Then change the response code to simulate error responses. diff --git a/addons/api/mirage/factories/managed-group.js b/addons/api/mirage/factories/managed-group.js index c65e62334..7378f84d6 100644 --- a/addons/api/mirage/factories/managed-group.js +++ b/addons/api/mirage/factories/managed-group.js @@ -1,4 +1,5 @@ import factory from '../generated/factories/managed-group'; +import { random } from 'faker'; import permissions from '../helpers/permissions'; export default factory.extend({ @@ -11,4 +12,17 @@ export default factory.extend({ 'update', 'delete', ], + + attributes() { + switch (this.type) { + case 'oidc': + return { + filter: random.word(), + }; + default: + return { + filter: '', + }; + } + }, }); diff --git a/addons/api/mirage/generated/factories/managed-group.js b/addons/api/mirage/generated/factories/managed-group.js index 17bb7d6c6..a041c0f50 100644 --- a/addons/api/mirage/generated/factories/managed-group.js +++ b/addons/api/mirage/generated/factories/managed-group.js @@ -11,15 +11,4 @@ export default Factory.extend({ created_time: () => date.recent(), updated_time: () => date.recent(), version: () => datatype.number(), - type: 'oidc', - attributes: function () { - switch (this.type) { - case 'oidc': - return { - filter: random.words(), - }; - default: - return; - } - }, }); diff --git a/ui/admin/app/routes/scopes/scope/auth-methods/auth-method/managed-groups.js b/ui/admin/app/routes/scopes/scope/auth-methods/auth-method/managed-groups.js index e8b3e0747..dd9b88f5b 100644 --- a/ui/admin/app/routes/scopes/scope/auth-methods/auth-method/managed-groups.js +++ b/ui/admin/app/routes/scopes/scope/auth-methods/auth-method/managed-groups.js @@ -8,7 +8,12 @@ import { notifySuccess, notifyError } from 'core/decorators/notify'; export default class ScopesScopeAuthMethodsAuthMethodManagedGroupsRoute extends Route { // =services + @service intl; @service notify; + @service can; + + //=methods + /** * * @returns {Promise{[ManagedGroupsModel]}} @@ -33,6 +38,10 @@ export default class ScopesScopeAuthMethodsAuthMethodManagedGroupsRoute extends } } + /** + * Save a managed group in current scope. + * @param {ManagedGroupModel} managedGroup + */ @action @loading @notifyError(({ message }) => message) @@ -40,9 +49,10 @@ export default class ScopesScopeAuthMethodsAuthMethodManagedGroupsRoute extends isNew ? 'notifications.create-success' : 'notifications.save-success' ) async save(managedGroup) { + debugger; await managedGroup.save(); await this.transitionTo( - 'scopes.scope.auth-methods.auth-method.managed-groups.managed-group', + 'scopes.scope.auth-methods.auth-method.managed-groups', managedGroup ); this.refresh(); From 7c762c1050b2fb331ea55f2729f7033ccf885c66 Mon Sep 17 00:00:00 2001 From: Susmitha Girumala Date: Wed, 10 Nov 2021 16:12:42 -0500 Subject: [PATCH 3/4] fix: Mirage post issue for managed-groups --- addons/api/addon/models/managed-group.js | 8 ++++++++ addons/api/mirage/factories/managed-group.js | 9 ++++----- .../{managed-groups.js => managed-group.js} | 0 .../components/form/managed-group/index.hbs | 19 +++++++++++++++---- .../auth-method/managed-groups.js | 4 +--- .../auth-method/managed-groups/index.hbs | 4 +++- 6 files changed, 31 insertions(+), 13 deletions(-) rename addons/api/mirage/serializers/{managed-groups.js => managed-group.js} (100%) diff --git a/addons/api/addon/models/managed-group.js b/addons/api/addon/models/managed-group.js index 426807de2..5843bb0e5 100644 --- a/addons/api/addon/models/managed-group.js +++ b/addons/api/addon/models/managed-group.js @@ -5,6 +5,14 @@ import { A } from '@ember/array'; export default class ManagedGroupModel extends GeneratedManagedGroupModel { // =attributes + + // =error attributes + // These attributes exist solely to capture errors on nested fields. + // See the application adapter's error normalization method for + // more information. + + @attr('string', { readOnly: true }) attributes_filter; + /** * Members is read-only under normal circumstances. But members can * be persisted via calls to `addMembers()` or `removeMembers()`. diff --git a/addons/api/mirage/factories/managed-group.js b/addons/api/mirage/factories/managed-group.js index 7378f84d6..9460f847f 100644 --- a/addons/api/mirage/factories/managed-group.js +++ b/addons/api/mirage/factories/managed-group.js @@ -2,8 +2,11 @@ import factory from '../generated/factories/managed-group'; import { random } from 'faker'; import permissions from '../helpers/permissions'; +const types = ['oidc']; + export default factory.extend({ id: (i) => `managed-groups-id-${i}`, + type: (i) => types[i % types.length], authorized_actions: () => permissions.authorizedActionsFor('managed-group') || [ @@ -17,11 +20,7 @@ export default factory.extend({ switch (this.type) { case 'oidc': return { - filter: random.word(), - }; - default: - return { - filter: '', + filter: random.words(), }; } }, diff --git a/addons/api/mirage/serializers/managed-groups.js b/addons/api/mirage/serializers/managed-group.js similarity index 100% rename from addons/api/mirage/serializers/managed-groups.js rename to addons/api/mirage/serializers/managed-group.js diff --git a/ui/admin/app/components/form/managed-group/index.hbs b/ui/admin/app/components/form/managed-group/index.hbs index 6ebc5f284..7918dd146 100644 --- a/ui/admin/app/components/form/managed-group/index.hbs +++ b/ui/admin/app/components/form/managed-group/index.hbs @@ -53,12 +53,23 @@ + @error={{@model.errors.attributes_filter}} + @helperText={{t 'form.filter.help'}} + as |field| + > + {{#if @model.errors.filter}} + + {{#each @model.errors.filter as |error|}} + {{error.message}} + {{/each}} + + {{/if}} + + - {{managed-group.name}} + {{managed-group.displayName}} + {{else}} + {{managed-group.displayName}} {{/if}} {{managed-group.description}} From 05cf14e8b4bd1482ade7d577cf1bfa62104a1a10 Mon Sep 17 00:00:00 2001 From: Susmitha Girumala Date: Thu, 11 Nov 2021 10:05:04 -0500 Subject: [PATCH 4/4] style: Remove commented mirage config for managed groups --- addons/api/mirage/config.js | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/addons/api/mirage/config.js b/addons/api/mirage/config.js index 74c6ad61e..9036f6653 100644 --- a/addons/api/mirage/config.js +++ b/addons/api/mirage/config.js @@ -524,19 +524,6 @@ export default function () { this.get('/managed-groups/:id'); this.del('/managed-groups/:id'); this.post('/managed-groups'); - // this.post( - // '/managed-groups/:idMethod', - // function ({ managedGroups }, { params: { idMethod } }) { - // const attrs = this.normalizedRequestAttrs(); - // const id = idMethod.split(':')[0]; - // const managedGroup = managedGroups.find(id); - // const updatedAttrs = { - // version: attrs.version, - // attributes: managedGroup.attributes, - // }; - // return managedGroup.update(updatedAttrs); - // } - // ); /* Uncomment the following line and the Response import above * Then change the response code to simulate error responses.