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/config.js b/addons/api/mirage/config.js index f71eba2cc..9036f6653 100644 --- a/addons/api/mirage/config.js +++ b/addons/api/mirage/config.js @@ -523,6 +523,7 @@ export default function () { ); this.get('/managed-groups/:id'); this.del('/managed-groups/:id'); + this.post('/managed-groups'); /* 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..9460f847f 100644 --- a/addons/api/mirage/factories/managed-group.js +++ b/addons/api/mirage/factories/managed-group.js @@ -1,8 +1,12 @@ 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') || [ @@ -11,4 +15,13 @@ export default factory.extend({ 'update', 'delete', ], + + attributes() { + switch (this.type) { + case 'oidc': + return { + filter: random.words(), + }; + } + }, }); 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/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/addons/core/translations/resources/en-us.yaml b/addons/core/translations/resources/en-us.yaml index df2366fe5..7b9d1e4fe 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 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..7918dd146 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 @@ - + + {{#if @model.errors.filter}} + + {{#each @model.errors.filter as |error|}} + {{error.message}} + {{/each}} + + {{/if}} + + + \ 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..cef4017d2 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,14 +1,19 @@ 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 { // =services + @service intl; @service notify; + @service can; + + //=methods + /** * * @returns {Promise{[ManagedGroupsModel]}} @@ -33,6 +38,24 @@ export default class ScopesScopeAuthMethodsAuthMethodManagedGroupsRoute extends } } + /** + * Save a managed group in current scope. + * @param {ManagedGroupModel} managedGroup + */ + @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' + ); + 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)}} - {{managed-group.name}} + {{managed-group.displayName}} + {{else}} + {{managed-group.displayName}} {{/if}} {{managed-group.description}} diff --git a/ui/admin/app/templates/scopes/scope/auth-methods/auth-method/managed-groups/new.hbs b/ui/admin/app/templates/scopes/scope/auth-methods/auth-method/managed-groups/new.hbs new file mode 100644 index 000000000..bcaa893ac --- /dev/null +++ b/ui/admin/app/templates/scopes/scope/auth-methods/auth-method/managed-groups/new.hbs @@ -0,0 +1,5 @@ + \ 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); + }); + } +);