From 21a70217f4580bedeaed1036cc4b2a6b79596314 Mon Sep 17 00:00:00 2001 From: Carlos Alcaide Corvo Date: Fri, 12 Nov 2021 11:18:03 -0800 Subject: [PATCH] =?UTF-8?q?refactor:=20=F0=9F=92=A1=20Refactor=20accounts?= =?UTF-8?q?=20to=20members?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../managed-groups/{new.js => members.js} | 4 ++-- .../scope/auth-methods/auth-method/accounts.hbs | 3 --- .../managed-groups/managed-group/-navigation.hbs | 2 +- .../managed-groups/managed-group/members.hbs | 2 +- .../scope/auth-methods/auth-method/members.hbs | 3 +++ .../{accounts-test.js => members-test.js} | 16 ++++++++-------- .../{new-test.js => members-test.js} | 4 ++-- 7 files changed, 17 insertions(+), 17 deletions(-) rename ui/admin/app/controllers/scopes/scope/auth-methods/auth-method/managed-groups/{new.js => members.js} (76%) delete mode 100644 ui/admin/app/templates/scopes/scope/auth-methods/auth-method/accounts.hbs create mode 100644 ui/admin/app/templates/scopes/scope/auth-methods/auth-method/members.hbs rename ui/admin/tests/acceptance/managed-groups/{accounts-test.js => members-test.js} (80%) rename ui/admin/tests/unit/controllers/scopes/scope/auth-methods/auth-method/managed-groups/{new-test.js => members-test.js} (91%) 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/members.js similarity index 76% rename from ui/admin/app/controllers/scopes/scope/auth-methods/auth-method/managed-groups/new.js rename to ui/admin/app/controllers/scopes/scope/auth-methods/auth-method/managed-groups/members.js index cf16a4e94..18f422fb1 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/members.js @@ -1,7 +1,7 @@ import Controller from '@ember/controller'; import { inject as service } from '@ember/service'; -export default class ScopesScopeAuthMethodsAuthMethodManagedGroupsNewController extends Controller { +export default class ScopesScopeAuthMethodsAuthMethodManagedGroupsMembersController extends Controller { // =services @service intl; @@ -12,6 +12,6 @@ export default class ScopesScopeAuthMethodsAuthMethodManagedGroupsNewController * @type {string} */ get breadCrumb() { - return this.intl.t('titles.new'); + return this.intl.t('resources.member.title_plural'); } } 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/-navigation.hbs b/ui/admin/app/templates/scopes/scope/auth-methods/auth-method/managed-groups/managed-group/-navigation.hbs index 2ba91a922..d366bc99e 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 @@ -9,4 +9,4 @@ > {{t 'resources.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 index 315a905d8..5048a063a 100644 --- 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 @@ -59,4 +59,4 @@ -{{/if}} +{{/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..4f816394c --- /dev/null +++ b/ui/admin/app/templates/scopes/scope/auth-methods/auth-method/members.hbs @@ -0,0 +1,3 @@ +{{page-title (t 'resources.member.title_plural')}} + +{{outlet}} \ No newline at end of file diff --git a/ui/admin/tests/acceptance/managed-groups/accounts-test.js b/ui/admin/tests/acceptance/managed-groups/members-test.js similarity index 80% rename from ui/admin/tests/acceptance/managed-groups/accounts-test.js rename to ui/admin/tests/acceptance/managed-groups/members-test.js index 3a1691d4a..8b5427d2a 100644 --- a/ui/admin/tests/acceptance/managed-groups/accounts-test.js +++ b/ui/admin/tests/acceptance/managed-groups/members-test.js @@ -10,7 +10,7 @@ import { //invalidateSession, } from 'ember-simple-auth/test-support'; -module('Acceptance | managed-groups | accounts', function (hooks) { +module('Acceptance | managed-groups | members', function (hooks) { setupApplicationTest(hooks); setupMirage(hooks); @@ -28,7 +28,7 @@ module('Acceptance | managed-groups | accounts', function (hooks) { authMethods: null, managedGroups: null, managedGroup: null, - managedGroupAccounts: null, + managedGroupMembers: null, }; hooks.beforeEach(function () { @@ -54,16 +54,16 @@ module('Acceptance | managed-groups | accounts', function (hooks) { urls.authMethod = `${urls.authMethods}/${instances.authMethod.id}`; urls.managedGroups = `${urls.authMethod}/managed-groups`; urls.managedGroup = `${urls.managedGroups}/${instances.managedGroup.id}`; - urls.managedGroupAccounts = `${urls.managedGroup}/accounts`; + urls.managedGroupMembers = `${urls.managedGroup}/members`; }); test('User can navigate to index', async function (assert) { assert.expect(3); - const accountsCount = instances.managedGroup.memberIds.length; - await visit(urls.managedGroupAccounts); + const membersCount = instances.managedGroup.memberIds.length; + await visit(urls.managedGroupMembers); await a11yAudit(); - assert.equal(currentURL(), urls.managedGroupAccounts); - assert.ok(accountsCount); - assert.equal(findAll('tbody tr').length, accountsCount); + 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/new-test.js b/ui/admin/tests/unit/controllers/scopes/scope/auth-methods/auth-method/managed-groups/members-test.js similarity index 91% rename from ui/admin/tests/unit/controllers/scopes/scope/auth-methods/auth-method/managed-groups/new-test.js rename to ui/admin/tests/unit/controllers/scopes/scope/auth-methods/auth-method/managed-groups/members-test.js index 699d52e58..d1510bb92 100644 --- a/ui/admin/tests/unit/controllers/scopes/scope/auth-methods/auth-method/managed-groups/new-test.js +++ b/ui/admin/tests/unit/controllers/scopes/scope/auth-methods/auth-method/managed-groups/members-test.js @@ -2,14 +2,14 @@ import { module, test } from 'qunit'; import { setupTest } from 'ember-qunit'; module( - 'Unit | Controller | scopes/scope/auth-methods/auth-method/managed-groups/new', + 'Unit | Controller | scopes/scope/auth-methods/auth-method/managed-groups/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/new' + 'controller:scopes/scope/auth-methods/auth-method/managed-groups/members' ); assert.ok(controller); });