diff --git a/addons/api/mirage/config.js b/addons/api/mirage/config.js index 9036f6653..0fe8fb6b1 100644 --- a/addons/api/mirage/config.js +++ b/addons/api/mirage/config.js @@ -77,8 +77,17 @@ export default function () { // Auth Method Accounts this.get( '/accounts', - ({ accounts }, { queryParams: { auth_method_id: authMethodId } }) => { - return accounts.where({ authMethodId }); + ( + { accounts }, + { queryParams: { auth_method_id: authMethodId, filter } } + ) => { + let resultSet; + if (authMethodId) { + resultSet = accounts.where({ authMethodId }); + } else { + resultSet = accounts.all(); + } + return resultSet.filter(makeBooleanFilter(filter)); } ); this.post('/accounts'); diff --git a/addons/api/mirage/factories/auth-method.js b/addons/api/mirage/factories/auth-method.js index 865c10b3d..2196a13a3 100644 --- a/addons/api/mirage/factories/auth-method.js +++ b/addons/api/mirage/factories/auth-method.js @@ -36,7 +36,17 @@ export default factory.extend({ }); if (type === 'oidc') { - server.createList('managed-group', 2, { scope, authMethod }); + server + .createList('managed-group', 2, { scope, authMethod }) + .map((managedGroup) => { + const accounts = server.createList('account', 2, { + scope, + type, + authMethod, + }); + const accountIds = accounts.map((account) => account.id); + managedGroup.update({ memberIds: accountIds }); + }); } }, }), diff --git a/addons/core/translations/resources/en-us.yaml b/addons/core/translations/resources/en-us.yaml index 4d7f4842f..609f74266 100644 --- a/addons/core/translations/resources/en-us.yaml +++ b/addons/core/translations/resources/en-us.yaml @@ -362,3 +362,9 @@ managed-group: welcome: title: Welcome to Managed Groups description: Create and manage managed groups for an auth method. + member: + title: Member + title_plural: Members + messages: + title: Welcome to Members + description: No members in this managed group. diff --git a/ui/admin/app/controllers/scopes/scope/auth-methods/auth-method/managed-groups/managed-group/members.js b/ui/admin/app/controllers/scopes/scope/auth-methods/auth-method/managed-groups/managed-group/members.js new file mode 100644 index 000000000..dcef2e4a5 --- /dev/null +++ b/ui/admin/app/controllers/scopes/scope/auth-methods/auth-method/managed-groups/managed-group/members.js @@ -0,0 +1,17 @@ +import Controller from '@ember/controller'; +import { inject as service } from '@ember/service'; + +export default class ScopesScopeAuthMethodsAuthMethodManagedGroupsManagedGroupMembersController extends Controller { + // =services + + @service intl; + + // =attributes + /** + * Translated new managed group breadcrumb + * @type {string} + */ + get breadCrumb() { + return this.intl.t('resources.managed-group.member.title_plural'); + } +} diff --git a/ui/admin/app/controllers/scopes/scope/auth-methods/auth-method/managed-groups/new.js b/ui/admin/app/controllers/scopes/scope/auth-methods/auth-method/managed-groups/new.js index cf16a4e94..1beca0353 100644 --- a/ui/admin/app/controllers/scopes/scope/auth-methods/auth-method/managed-groups/new.js +++ b/ui/admin/app/controllers/scopes/scope/auth-methods/auth-method/managed-groups/new.js @@ -7,8 +7,9 @@ export default class ScopesScopeAuthMethodsAuthMethodManagedGroupsNewController @service intl; // =attributes + /** - * Translated new managed group breadcrumb + * Translated new account breadcrumb * @type {string} */ get breadCrumb() { diff --git a/ui/admin/app/router.js b/ui/admin/app/router.js index edc70b62d..ef557fbc8 100644 --- a/ui/admin/app/router.js +++ b/ui/admin/app/router.js @@ -59,7 +59,9 @@ Router.map(function () { this.route( 'managed-group', { path: ':managed_group_id' }, - function () {} + function () { + this.route('members'); + } ); this.route('new'); }); diff --git a/ui/admin/app/routes/scopes/scope/auth-methods/auth-method/managed-groups/managed-group/members.js b/ui/admin/app/routes/scopes/scope/auth-methods/auth-method/managed-groups/managed-group/members.js new file mode 100644 index 000000000..1c3dd319c --- /dev/null +++ b/ui/admin/app/routes/scopes/scope/auth-methods/auth-method/managed-groups/managed-group/members.js @@ -0,0 +1,26 @@ +import Route from '@ember/routing/route'; +import { inject as service } from '@ember/service'; + +export default class ScopesScopeAuthMethodsAuthMethodManagedGroupsManagedGroupMembersRoute extends Route { + // =services + + @service resourceFilterStore; + + // =methods + + /** + * Returns the previously loaded managed group instances memebrs. + * @return {Promise{[AccountModel]}} + */ + model() { + const { auth_method_id, member_ids } = this.modelFor( + 'scopes.scope.auth-methods.auth-method.managed-groups.managed-group' + ); + + return this.resourceFilterStore.queryBy( + 'account', + { id: member_ids }, + { auth_method_id } + ); + } +} diff --git a/ui/admin/app/templates/scopes/scope/auth-methods/auth-method/accounts.hbs b/ui/admin/app/templates/scopes/scope/auth-methods/auth-method/accounts.hbs deleted file mode 100644 index 29730ea21..000000000 --- a/ui/admin/app/templates/scopes/scope/auth-methods/auth-method/accounts.hbs +++ /dev/null @@ -1,3 +0,0 @@ -{{page-title (t 'resources.account.title_plural')}} - -{{outlet}} \ No newline at end of file diff --git a/ui/admin/app/templates/scopes/scope/auth-methods/auth-method/managed-groups/managed-group.hbs b/ui/admin/app/templates/scopes/scope/auth-methods/auth-method/managed-groups/managed-group.hbs index a6696c3b6..f6557cda4 100644 --- a/ui/admin/app/templates/scopes/scope/auth-methods/auth-method/managed-groups/managed-group.hbs +++ b/ui/admin/app/templates/scopes/scope/auth-methods/auth-method/managed-groups/managed-group.hbs @@ -1,2 +1,2 @@ -{{page-title 'ManagedGroup'}} +{{page-title @model.displayName}} {{outlet}} \ No newline at end of file diff --git a/ui/admin/app/templates/scopes/scope/auth-methods/auth-method/managed-groups/managed-group/-navigation.hbs b/ui/admin/app/templates/scopes/scope/auth-methods/auth-method/managed-groups/managed-group/-navigation.hbs index 3a2ce54b7..08500e254 100644 --- a/ui/admin/app/templates/scopes/scope/auth-methods/auth-method/managed-groups/managed-group/-navigation.hbs +++ b/ui/admin/app/templates/scopes/scope/auth-methods/auth-method/managed-groups/managed-group/-navigation.hbs @@ -4,4 +4,9 @@ > {{t 'titles.details'}} + + {{t 'resources.managed-group.member.title_plural'}} + \ No newline at end of file diff --git a/ui/admin/app/templates/scopes/scope/auth-methods/auth-method/managed-groups/managed-group/members.hbs b/ui/admin/app/templates/scopes/scope/auth-methods/auth-method/managed-groups/managed-group/members.hbs new file mode 100644 index 000000000..8f942d312 --- /dev/null +++ b/ui/admin/app/templates/scopes/scope/auth-methods/auth-method/managed-groups/managed-group/members.hbs @@ -0,0 +1,62 @@ +{{page-title (t 'resources.managed-group.member.title_plural')}} + +{{#if @model}} + + + + {{t 'form.name.label'}} + {{t 'form.issuer.label'}} + {{t 'form.subject.label'}} + {{t 'form.email.label'}} + {{t 'form.full_name.label'}} + {{t 'form.type.label'}} + {{t 'form.id.label'}} + + + + {{#each @model as |member|}} + + + {{member.accountName}} +

{{member.description}}

+ + + {{member.attributes.issuer}} + + + {{member.attributes.subject}} + + + {{member.attributes.email}} + + + {{member.attributes.full_name}} + + + {{member.type}} + + + + {{member.id}} + + + + {{/each}} + + +{{else}} + + + + {{t 'resources.managed-group.member.messages.description'}} + + + +{{/if}} \ No newline at end of file diff --git a/ui/admin/app/templates/scopes/scope/auth-methods/auth-method/members.hbs b/ui/admin/app/templates/scopes/scope/auth-methods/auth-method/members.hbs new file mode 100644 index 000000000..5dc94ed60 --- /dev/null +++ b/ui/admin/app/templates/scopes/scope/auth-methods/auth-method/members.hbs @@ -0,0 +1,3 @@ +{{page-title (t 'resources.managed-group.member.title_plural')}} + +{{outlet}} \ No newline at end of file diff --git a/ui/admin/tests/acceptance/auth-methods/oidc-test.js b/ui/admin/tests/acceptance/auth-methods/oidc-test.js index ab37b1d62..2ab3e56bd 100644 --- a/ui/admin/tests/acceptance/auth-methods/oidc-test.js +++ b/ui/admin/tests/acceptance/auth-methods/oidc-test.js @@ -123,7 +123,6 @@ module('Acceptance | auth methods | oidc', function (hooks) { await visit(urls.authMethod); await click('.rose-layout-page-actions .rose-dropdown-trigger'); await click(`.rose-dropdown[open] input[value="${newState}"]`); - // debugger; const authMethod = this.server.db.authMethods.find(instances.authMethod.id); assert.notEqual( newState, diff --git a/ui/admin/tests/acceptance/managed-groups/members-test.js b/ui/admin/tests/acceptance/managed-groups/members-test.js new file mode 100644 index 000000000..8b5427d2a --- /dev/null +++ b/ui/admin/tests/acceptance/managed-groups/members-test.js @@ -0,0 +1,69 @@ +import { module, test } from 'qunit'; +import { visit, currentURL, findAll } from '@ember/test-helpers'; +import { setupApplicationTest } from 'ember-qunit'; +import setupMirage from 'ember-cli-mirage/test-support/setup-mirage'; +import a11yAudit from 'ember-a11y-testing/test-support/audit'; +import { + authenticateSession, + // These are left here intentionally for future reference. + //currentSession, + //invalidateSession, +} from 'ember-simple-auth/test-support'; + +module('Acceptance | managed-groups | members', function (hooks) { + setupApplicationTest(hooks); + setupMirage(hooks); + + const instances = { + scopes: { + global: null, + org: null, + }, + authMethod: null, + managedGroup: null, + accounts: null, + }; + const urls = { + orgScope: null, + authMethods: null, + managedGroups: null, + managedGroup: null, + managedGroupMembers: null, + }; + + hooks.beforeEach(function () { + authenticateSession({}); + instances.scopes.global = this.server.create('scope', { id: 'global' }); + instances.scopes.org = this.server.create('scope', { + type: 'org', + scope: { id: 'global', type: 'global' }, + }); + instances.authMethod = this.server.create( + 'auth-method', + { + scope: instances.scopes.org, + type: 'oidc', + }, + 'withAccountsAndUsersAndManagedGroups' + ); + + instances.managedGroup = this.server.db.managedGroups[0]; + // Generate route URLs for resources + urls.orgScope = `/scopes/${instances.scopes.org.id}`; + urls.authMethods = `${urls.orgScope}/auth-methods`; + urls.authMethod = `${urls.authMethods}/${instances.authMethod.id}`; + urls.managedGroups = `${urls.authMethod}/managed-groups`; + urls.managedGroup = `${urls.managedGroups}/${instances.managedGroup.id}`; + urls.managedGroupMembers = `${urls.managedGroup}/members`; + }); + + test('User can navigate to index', async function (assert) { + assert.expect(3); + const membersCount = instances.managedGroup.memberIds.length; + await visit(urls.managedGroupMembers); + await a11yAudit(); + assert.equal(currentURL(), urls.managedGroupMembers); + assert.ok(membersCount); + assert.equal(findAll('tbody tr').length, membersCount); + }); +}); diff --git a/ui/admin/tests/unit/controllers/scopes/scope/auth-methods/auth-method/managed-groups/managed-group/members-test.js b/ui/admin/tests/unit/controllers/scopes/scope/auth-methods/auth-method/managed-groups/managed-group/members-test.js new file mode 100644 index 000000000..31aeaf043 --- /dev/null +++ b/ui/admin/tests/unit/controllers/scopes/scope/auth-methods/auth-method/managed-groups/managed-group/members-test.js @@ -0,0 +1,17 @@ +import { module, test } from 'qunit'; +import { setupTest } from 'ember-qunit'; + +module( + 'Unit | Controller | scopes/scope/auth-methods/auth-method/managed-groups/managed-group/members', + function (hooks) { + setupTest(hooks); + + // TODO: Replace this with your real tests. + test('it exists', function (assert) { + let controller = this.owner.lookup( + 'controller:scopes/scope/auth-methods/auth-method/managed-groups/managed-group/members' + ); + assert.ok(controller); + }); + } +); diff --git a/ui/admin/tests/unit/routes/scopes/scope/auth-methods/auth-method/managed-groups/managed-group/members-test.js b/ui/admin/tests/unit/routes/scopes/scope/auth-methods/auth-method/managed-groups/managed-group/members-test.js new file mode 100644 index 000000000..783592559 --- /dev/null +++ b/ui/admin/tests/unit/routes/scopes/scope/auth-methods/auth-method/managed-groups/managed-group/members-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/managed-group/members', + function (hooks) { + setupTest(hooks); + + test('it exists', function (assert) { + let route = this.owner.lookup( + 'route:scopes/scope/auth-methods/auth-method/managed-groups/managed-group/members' + ); + assert.ok(route); + }); + } +);