From be5f033712d4cb4af526e48c41a7f08ff0bb136b Mon Sep 17 00:00:00 2001
From: Susmitha Girumala <susmitha@hashicorp.com>
Date: Fri, 12 Nov 2021 11:22:16 -0500
Subject: [PATCH 01/10] feat: List accounts within a managed group

---
 addons/api/mirage/config.js                   | 13 +++-
 addons/api/mirage/factories/auth-method.js    | 12 +++-
 addons/core/translations/resources/en-us.yaml |  3 +
 ui/admin/app/router.js                        |  4 +-
 .../managed-groups/managed-group/accounts.js  | 26 +++++++
 .../managed-groups/managed-group.hbs          |  2 +-
 .../managed-group/-navigation.hbs             |  5 ++
 .../managed-groups/managed-group/accounts.hbs | 62 +++++++++++++++++
 .../acceptance/auth-methods/oidc-test.js      |  1 -
 .../managed-groups/accounts-test.js           | 69 +++++++++++++++++++
 .../managed-group/accounts-test.js            | 16 +++++
 11 files changed, 207 insertions(+), 6 deletions(-)
 create mode 100644 ui/admin/app/routes/scopes/scope/auth-methods/auth-method/managed-groups/managed-group/accounts.js
 create mode 100644 ui/admin/app/templates/scopes/scope/auth-methods/auth-method/managed-groups/managed-group/accounts.hbs
 create mode 100644 ui/admin/tests/acceptance/managed-groups/accounts-test.js
 create mode 100644 ui/admin/tests/unit/routes/scopes/scope/auth-methods/auth-method/managed-groups/managed-group/accounts-test.js

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..f91ea6c4c 100644
--- a/addons/core/translations/resources/en-us.yaml
+++ b/addons/core/translations/resources/en-us.yaml
@@ -362,3 +362,6 @@ managed-group:
     welcome:
       title: Welcome to Managed Groups
       description: Create and manage managed groups for an auth method.
+    accounts:
+      title: Welcome to Accounts
+      description: No accounts in this managed group.
diff --git a/ui/admin/app/router.js b/ui/admin/app/router.js
index edc70b62d..18a09b6c5 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('accounts');
+              }
             );
             this.route('new');
           });
diff --git a/ui/admin/app/routes/scopes/scope/auth-methods/auth-method/managed-groups/managed-group/accounts.js b/ui/admin/app/routes/scopes/scope/auth-methods/auth-method/managed-groups/managed-group/accounts.js
new file mode 100644
index 000000000..e3bdc5a91
--- /dev/null
+++ b/ui/admin/app/routes/scopes/scope/auth-methods/auth-method/managed-groups/managed-group/accounts.js
@@ -0,0 +1,26 @@
+import Route from '@ember/routing/route';
+import { inject as service } from '@ember/service';
+
+export default class ScopesScopeAuthMethodsAuthMethodManagedGroupsManagedGroupAccountsRoute extends Route {
+  // =services
+
+  @service resourceFilterStore;
+
+  // =methods
+
+  /**
+   * Returns the previously loaded managed group instances accounts.
+   * @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/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..18ece151c 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'}}
   </nav.link>
+  <nav.link
+    @route='scopes.scope.auth-methods.auth-method.managed-groups.managed-group.accounts'
+  >
+    {{t 'resources.account.title_plural'}}
+  </nav.link>
 </Rose::Nav::Tabs>
\ No newline at end of file
diff --git a/ui/admin/app/templates/scopes/scope/auth-methods/auth-method/managed-groups/managed-group/accounts.hbs b/ui/admin/app/templates/scopes/scope/auth-methods/auth-method/managed-groups/managed-group/accounts.hbs
new file mode 100644
index 000000000..2a1b1f286
--- /dev/null
+++ b/ui/admin/app/templates/scopes/scope/auth-methods/auth-method/managed-groups/managed-group/accounts.hbs
@@ -0,0 +1,62 @@
+{{page-title (t 'resources.account.title_plural')}}
+
+{{#if @model}}
+  <Rose::Table as |table|>
+    <table.header as |header|>
+      <header.row as |row|>
+        <row.headerCell>{{t 'form.name.label'}}</row.headerCell>
+        <row.headerCell>{{t 'form.issuer.label'}}</row.headerCell>
+        <row.headerCell>{{t 'form.subject.label'}}</row.headerCell>
+        <row.headerCell>{{t 'form.email.label'}}</row.headerCell>
+        <row.headerCell>{{t 'form.full_name.label'}}</row.headerCell>
+        <row.headerCell>{{t 'form.type.label'}}</row.headerCell>
+        <row.headerCell>{{t 'form.id.label'}}</row.headerCell>
+      </header.row>
+    </table.header>
+    <table.body as |body|>
+      {{#each @model as |account|}}
+        <body.row as |row|>
+          <row.headerCell scope='row'>
+            {{account.accountName}}
+            <p>{{account.description}}</p>
+          </row.headerCell>
+          <row.cell>
+            <code>{{account.attributes.issuer}}</code>
+          </row.cell>
+          <row.cell>
+            <code>{{account.attributes.subject}}</code>
+          </row.cell>
+          <row.cell>
+            <code>{{account.attributes.email}}</code>
+          </row.cell>
+          <row.cell>
+            {{account.attributes.full_name}}
+          </row.cell>
+          <row.cell>
+            <Rose::Badge>{{account.type}}</Rose::Badge>
+          </row.cell>
+          <row.cell>
+            <Copyable
+              @text={{account.id}}
+              @buttonText={{t 'actions.copy-to-clipboard'}}
+              @acknowledgeText={{t 'states.copied'}}
+            >
+              <code>{{account.id}}</code>
+            </Copyable>
+          </row.cell>
+        </body.row>
+      {{/each}}
+    </table.body>
+  </Rose::Table>
+{{else}}
+  <Rose::Layout::Centered>
+    <Rose::Message
+      @title={{t 'resources.managed-group.messages.accounts.title'}}
+      as |message|
+    >
+      <message.description>
+        {{t 'resources.managed-group.messages.accounts.description'}}
+      </message.description>
+    </Rose::Message>
+  </Rose::Layout::Centered>
+{{/if}}
\ 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/accounts-test.js b/ui/admin/tests/acceptance/managed-groups/accounts-test.js
new file mode 100644
index 000000000..3a1691d4a
--- /dev/null
+++ b/ui/admin/tests/acceptance/managed-groups/accounts-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 | accounts', 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,
+    managedGroupAccounts: 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.managedGroupAccounts = `${urls.managedGroup}/accounts`;
+  });
+
+  test('User can navigate to index', async function (assert) {
+    assert.expect(3);
+    const accountsCount = instances.managedGroup.memberIds.length;
+    await visit(urls.managedGroupAccounts);
+    await a11yAudit();
+    assert.equal(currentURL(), urls.managedGroupAccounts);
+    assert.ok(accountsCount);
+    assert.equal(findAll('tbody tr').length, accountsCount);
+  });
+});
diff --git a/ui/admin/tests/unit/routes/scopes/scope/auth-methods/auth-method/managed-groups/managed-group/accounts-test.js b/ui/admin/tests/unit/routes/scopes/scope/auth-methods/auth-method/managed-groups/managed-group/accounts-test.js
new file mode 100644
index 000000000..5713dd02c
--- /dev/null
+++ b/ui/admin/tests/unit/routes/scopes/scope/auth-methods/auth-method/managed-groups/managed-group/accounts-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/accounts',
+  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/accounts'
+      );
+      assert.ok(route);
+    });
+  }
+);

From 23c461fd3e385da7047d2c4982a6698753145f83 Mon Sep 17 00:00:00 2001
From: Carlos Alcaide Corvo <ccorvo@hashicorp.com>
Date: Fri, 12 Nov 2021 10:24:46 -0800
Subject: [PATCH 02/10] Create members route

---
 addons/core/translations/resources/en-us.yaml |  5 +-
 ui/admin/app/router.js                        |  1 +
 .../managed-groups/managed-group/members.js   | 26 ++++++++
 .../managed-group/-navigation.hbs             |  6 +-
 .../managed-groups/managed-group/members.hbs  | 62 +++++++++++++++++++
 .../managed-group/members-test.js             | 16 +++++
 6 files changed, 112 insertions(+), 4 deletions(-)
 create mode 100644 ui/admin/app/routes/scopes/scope/auth-methods/auth-method/managed-groups/managed-group/members.js
 create mode 100644 ui/admin/app/templates/scopes/scope/auth-methods/auth-method/managed-groups/managed-group/members.hbs
 create mode 100644 ui/admin/tests/unit/routes/scopes/scope/auth-methods/auth-method/managed-groups/managed-group/members-test.js

diff --git a/addons/core/translations/resources/en-us.yaml b/addons/core/translations/resources/en-us.yaml
index f91ea6c4c..a4b09dfad 100644
--- a/addons/core/translations/resources/en-us.yaml
+++ b/addons/core/translations/resources/en-us.yaml
@@ -362,6 +362,9 @@ managed-group:
     welcome:
       title: Welcome to Managed Groups
       description: Create and manage managed groups for an auth method.
-    accounts:
+    member:
       title: Welcome to Accounts
       description: No accounts in this managed group.
+member:
+  title: Member
+  title_plural: Members
diff --git a/ui/admin/app/router.js b/ui/admin/app/router.js
index 18a09b6c5..3ac54a0ea 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('accounts');
+                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/managed-groups/managed-group/-navigation.hbs b/ui/admin/app/templates/scopes/scope/auth-methods/auth-method/managed-groups/managed-group/-navigation.hbs
index 18ece151c..2ba91a922 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
@@ -5,8 +5,8 @@
     {{t 'titles.details'}}
   </nav.link>
   <nav.link
-    @route='scopes.scope.auth-methods.auth-method.managed-groups.managed-group.accounts'
+    @route='scopes.scope.auth-methods.auth-method.managed-groups.managed-group.members'
   >
-    {{t 'resources.account.title_plural'}}
+    {{t 'resources.member.title_plural'}}
   </nav.link>
-</Rose::Nav::Tabs>
\ No newline at end of file
+</Rose::Nav::Tabs>
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..315a905d8
--- /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.member.title_plural')}}
+
+{{#if @model}}
+  <Rose::Table as |table|>
+    <table.header as |header|>
+      <header.row as |row|>
+        <row.headerCell>{{t 'form.name.label'}}</row.headerCell>
+        <row.headerCell>{{t 'form.issuer.label'}}</row.headerCell>
+        <row.headerCell>{{t 'form.subject.label'}}</row.headerCell>
+        <row.headerCell>{{t 'form.email.label'}}</row.headerCell>
+        <row.headerCell>{{t 'form.full_name.label'}}</row.headerCell>
+        <row.headerCell>{{t 'form.type.label'}}</row.headerCell>
+        <row.headerCell>{{t 'form.id.label'}}</row.headerCell>
+      </header.row>
+    </table.header>
+    <table.body as |body|>
+      {{#each @model as |member|}}
+        <body.row as |row|>
+          <row.headerCell scope='row'>
+            {{member.accountName}}
+            <p>{{member.description}}</p>
+          </row.headerCell>
+          <row.cell>
+            <code>{{member.attributes.issuer}}</code>
+          </row.cell>
+          <row.cell>
+            <code>{{member.attributes.subject}}</code>
+          </row.cell>
+          <row.cell>
+            <code>{{member.attributes.email}}</code>
+          </row.cell>
+          <row.cell>
+            {{member.attributes.full_name}}
+          </row.cell>
+          <row.cell>
+            <Rose::Badge>{{member.type}}</Rose::Badge>
+          </row.cell>
+          <row.cell>
+            <Copyable
+              @text={{member.id}}
+              @buttonText={{t 'actions.copy-to-clipboard'}}
+              @acknowledgeText={{t 'states.copied'}}
+            >
+              <code>{{member.id}}</code>
+            </Copyable>
+          </row.cell>
+        </body.row>
+      {{/each}}
+    </table.body>
+  </Rose::Table>
+{{else}}
+  <Rose::Layout::Centered>
+    <Rose::Message
+      @title={{t 'resources.managed-group.messages.members.title'}}
+      as |message|
+    >
+      <message.description>
+        {{t 'resources.managed-group.messages.members.description'}}
+      </message.description>
+    </Rose::Message>
+  </Rose::Layout::Centered>
+{{/if}}
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);
+    });
+  }
+);

From 9e005a73bbbd8791eb903ac15565893388eb41e9 Mon Sep 17 00:00:00 2001
From: Carlos Alcaide Corvo <ccorvo@hashicorp.com>
Date: Fri, 12 Nov 2021 10:31:13 -0800
Subject: [PATCH 03/10] Remove accounts route in favour of members

---
 ui/admin/app/router.js                        |  1 -
 .../managed-groups/managed-group/accounts.js  | 26 --------
 .../managed-groups/managed-group/accounts.hbs | 62 -------------------
 .../managed-group/accounts-test.js            | 16 -----
 4 files changed, 105 deletions(-)
 delete mode 100644 ui/admin/app/routes/scopes/scope/auth-methods/auth-method/managed-groups/managed-group/accounts.js
 delete mode 100644 ui/admin/app/templates/scopes/scope/auth-methods/auth-method/managed-groups/managed-group/accounts.hbs
 delete mode 100644 ui/admin/tests/unit/routes/scopes/scope/auth-methods/auth-method/managed-groups/managed-group/accounts-test.js

diff --git a/ui/admin/app/router.js b/ui/admin/app/router.js
index 3ac54a0ea..ef557fbc8 100644
--- a/ui/admin/app/router.js
+++ b/ui/admin/app/router.js
@@ -60,7 +60,6 @@ Router.map(function () {
               'managed-group',
               { path: ':managed_group_id' },
               function () {
-                this.route('accounts');
                 this.route('members');
               }
             );
diff --git a/ui/admin/app/routes/scopes/scope/auth-methods/auth-method/managed-groups/managed-group/accounts.js b/ui/admin/app/routes/scopes/scope/auth-methods/auth-method/managed-groups/managed-group/accounts.js
deleted file mode 100644
index e3bdc5a91..000000000
--- a/ui/admin/app/routes/scopes/scope/auth-methods/auth-method/managed-groups/managed-group/accounts.js
+++ /dev/null
@@ -1,26 +0,0 @@
-import Route from '@ember/routing/route';
-import { inject as service } from '@ember/service';
-
-export default class ScopesScopeAuthMethodsAuthMethodManagedGroupsManagedGroupAccountsRoute extends Route {
-  // =services
-
-  @service resourceFilterStore;
-
-  // =methods
-
-  /**
-   * Returns the previously loaded managed group instances accounts.
-   * @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/managed-groups/managed-group/accounts.hbs b/ui/admin/app/templates/scopes/scope/auth-methods/auth-method/managed-groups/managed-group/accounts.hbs
deleted file mode 100644
index 2a1b1f286..000000000
--- a/ui/admin/app/templates/scopes/scope/auth-methods/auth-method/managed-groups/managed-group/accounts.hbs
+++ /dev/null
@@ -1,62 +0,0 @@
-{{page-title (t 'resources.account.title_plural')}}
-
-{{#if @model}}
-  <Rose::Table as |table|>
-    <table.header as |header|>
-      <header.row as |row|>
-        <row.headerCell>{{t 'form.name.label'}}</row.headerCell>
-        <row.headerCell>{{t 'form.issuer.label'}}</row.headerCell>
-        <row.headerCell>{{t 'form.subject.label'}}</row.headerCell>
-        <row.headerCell>{{t 'form.email.label'}}</row.headerCell>
-        <row.headerCell>{{t 'form.full_name.label'}}</row.headerCell>
-        <row.headerCell>{{t 'form.type.label'}}</row.headerCell>
-        <row.headerCell>{{t 'form.id.label'}}</row.headerCell>
-      </header.row>
-    </table.header>
-    <table.body as |body|>
-      {{#each @model as |account|}}
-        <body.row as |row|>
-          <row.headerCell scope='row'>
-            {{account.accountName}}
-            <p>{{account.description}}</p>
-          </row.headerCell>
-          <row.cell>
-            <code>{{account.attributes.issuer}}</code>
-          </row.cell>
-          <row.cell>
-            <code>{{account.attributes.subject}}</code>
-          </row.cell>
-          <row.cell>
-            <code>{{account.attributes.email}}</code>
-          </row.cell>
-          <row.cell>
-            {{account.attributes.full_name}}
-          </row.cell>
-          <row.cell>
-            <Rose::Badge>{{account.type}}</Rose::Badge>
-          </row.cell>
-          <row.cell>
-            <Copyable
-              @text={{account.id}}
-              @buttonText={{t 'actions.copy-to-clipboard'}}
-              @acknowledgeText={{t 'states.copied'}}
-            >
-              <code>{{account.id}}</code>
-            </Copyable>
-          </row.cell>
-        </body.row>
-      {{/each}}
-    </table.body>
-  </Rose::Table>
-{{else}}
-  <Rose::Layout::Centered>
-    <Rose::Message
-      @title={{t 'resources.managed-group.messages.accounts.title'}}
-      as |message|
-    >
-      <message.description>
-        {{t 'resources.managed-group.messages.accounts.description'}}
-      </message.description>
-    </Rose::Message>
-  </Rose::Layout::Centered>
-{{/if}}
\ No newline at end of file
diff --git a/ui/admin/tests/unit/routes/scopes/scope/auth-methods/auth-method/managed-groups/managed-group/accounts-test.js b/ui/admin/tests/unit/routes/scopes/scope/auth-methods/auth-method/managed-groups/managed-group/accounts-test.js
deleted file mode 100644
index 5713dd02c..000000000
--- a/ui/admin/tests/unit/routes/scopes/scope/auth-methods/auth-method/managed-groups/managed-group/accounts-test.js
+++ /dev/null
@@ -1,16 +0,0 @@
-import { module, test } from 'qunit';
-import { setupTest } from 'ember-qunit';
-
-module(
-  'Unit | Route | scopes/scope/auth-methods/auth-method/managed-groups/managed-group/accounts',
-  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/accounts'
-      );
-      assert.ok(route);
-    });
-  }
-);

From 21a70217f4580bedeaed1036cc4b2a6b79596314 Mon Sep 17 00:00:00 2001
From: Carlos Alcaide Corvo <ccorvo@hashicorp.com>
Date: Fri, 12 Nov 2021 11:18:03 -0800
Subject: [PATCH 04/10] =?UTF-8?q?refactor:=20=F0=9F=92=A1=20Refactor=20acc?=
 =?UTF-8?q?ounts=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'}}
   </nav.link>
-</Rose::Nav::Tabs>
+</Rose::Nav::Tabs>
\ 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 @@
       </message.description>
     </Rose::Message>
   </Rose::Layout::Centered>
-{{/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);
     });

From 27d25808f0ca3a3fc6970e26b128dee294fbc175 Mon Sep 17 00:00:00 2001
From: Carlos Alcaide Corvo <ccorvo@hashicorp.com>
Date: Fri, 12 Nov 2021 12:57:26 -0800
Subject: [PATCH 05/10] Update addons/core/translations/resources/en-us.yaml

Co-authored-by: Susmitha Girumala <susmitha@hashicorp.com>
---
 addons/core/translations/resources/en-us.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/core/translations/resources/en-us.yaml b/addons/core/translations/resources/en-us.yaml
index a4b09dfad..8692fddbd 100644
--- a/addons/core/translations/resources/en-us.yaml
+++ b/addons/core/translations/resources/en-us.yaml
@@ -363,7 +363,7 @@ managed-group:
       title: Welcome to Managed Groups
       description: Create and manage managed groups for an auth method.
     member:
-      title: Welcome to Accounts
+      title: Welcome to Members
       description: No accounts in this managed group.
 member:
   title: Member

From c22a4c08f5025bfedd65cd503104622a07fe512f Mon Sep 17 00:00:00 2001
From: Carlos Alcaide Corvo <ccorvo@hashicorp.com>
Date: Fri, 12 Nov 2021 12:57:33 -0800
Subject: [PATCH 06/10] Update addons/core/translations/resources/en-us.yaml

Co-authored-by: Susmitha Girumala <susmitha@hashicorp.com>
---
 addons/core/translations/resources/en-us.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/core/translations/resources/en-us.yaml b/addons/core/translations/resources/en-us.yaml
index 8692fddbd..2622101b2 100644
--- a/addons/core/translations/resources/en-us.yaml
+++ b/addons/core/translations/resources/en-us.yaml
@@ -364,7 +364,7 @@ managed-group:
       description: Create and manage managed groups for an auth method.
     member:
       title: Welcome to Members
-      description: No accounts in this managed group.
+      description: No members in this managed group.
 member:
   title: Member
   title_plural: Members

From 7700603735bcaad9d41f2368acbd1b728be39225 Mon Sep 17 00:00:00 2001
From: Carlos Alcaide Corvo <ccorvo@hashicorp.com>
Date: Fri, 12 Nov 2021 13:17:57 -0800
Subject: [PATCH 07/10] Refactor translation files

---
 addons/core/translations/resources/en-us.yaml      | 14 ++++++++++----
 .../auth-method/managed-groups/members.js          |  2 +-
 .../managed-groups/managed-group/-navigation.hbs   |  4 ++--
 .../managed-groups/managed-group/members.hbs       |  8 ++++----
 .../scope/auth-methods/auth-method/members.hbs     |  4 ++--
 5 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/addons/core/translations/resources/en-us.yaml b/addons/core/translations/resources/en-us.yaml
index 2622101b2..0eb0bd90a 100644
--- a/addons/core/translations/resources/en-us.yaml
+++ b/addons/core/translations/resources/en-us.yaml
@@ -362,9 +362,15 @@ managed-group:
     welcome:
       title: Welcome to Managed Groups
       description: Create and manage managed groups for an auth method.
-    member:
+  member:
+    title: Member
+    title_plural: Members
+    messages:
       title: Welcome to Members
       description: No members in this managed group.
-member:
-  title: Member
-  title_plural: Members
+    # member:
+    #   title: Welcome to Members
+    #   description: No members in this managed group.
+# member:
+#   title: Member
+#   title_plural: Members
diff --git a/ui/admin/app/controllers/scopes/scope/auth-methods/auth-method/managed-groups/members.js b/ui/admin/app/controllers/scopes/scope/auth-methods/auth-method/managed-groups/members.js
index 18f422fb1..3fccd5222 100644
--- a/ui/admin/app/controllers/scopes/scope/auth-methods/auth-method/managed-groups/members.js
+++ b/ui/admin/app/controllers/scopes/scope/auth-methods/auth-method/managed-groups/members.js
@@ -12,6 +12,6 @@ export default class ScopesScopeAuthMethodsAuthMethodManagedGroupsMembersControl
    * @type {string}
    */
   get breadCrumb() {
-    return this.intl.t('resources.member.title_plural');
+    return this.intl.t('resources.managed-group.member.title_plural');
   }
 }
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 d366bc99e..d6edf6047 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
@@ -7,6 +7,6 @@
   <nav.link
     @route='scopes.scope.auth-methods.auth-method.managed-groups.managed-group.members'
   >
-    {{t 'resources.member.title_plural'}}
+    {{t 'resources.managed-group.member.title_plural'}}
   </nav.link>
-</Rose::Nav::Tabs>
\ No newline at end of file
+</Rose::Nav::Tabs>
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 5048a063a..e96ea46bb 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
@@ -1,4 +1,4 @@
-{{page-title (t 'resources.member.title_plural')}}
+{{page-title (t 'resources.managed-group.member.title_plural')}}
 
 {{#if @model}}
   <Rose::Table as |table|>
@@ -51,12 +51,12 @@
 {{else}}
   <Rose::Layout::Centered>
     <Rose::Message
-      @title={{t 'resources.managed-group.messages.members.title'}}
+      @title={{t 'resources.managed-group.member.messages.title'}}
       as |message|
     >
       <message.description>
-        {{t 'resources.managed-group.messages.members.description'}}
+        {{t 'resources.managed-group.member.messages.description'}}
       </message.description>
     </Rose::Message>
   </Rose::Layout::Centered>
-{{/if}}
\ No newline at end of file
+{{/if}}
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
index 4f816394c..a890cac51 100644
--- 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
@@ -1,3 +1,3 @@
-{{page-title (t 'resources.member.title_plural')}}
+{{page-title (t 'resources.managed-group.member.title_plural')}}
 
-{{outlet}}
\ No newline at end of file
+{{outlet}}

From b3809b20515648034d714cd516865335c519f05f Mon Sep 17 00:00:00 2001
From: Carlos Alcaide Corvo <ccorvo@hashicorp.com>
Date: Fri, 12 Nov 2021 13:21:46 -0800
Subject: [PATCH 08/10] Refactor members controller location

---
 .../auth-method/managed-groups/{ => managed-group}/members.js | 2 +-
 .../auth-method/managed-groups/managed-group/-navigation.hbs  | 2 +-
 .../auth-method/managed-groups/managed-group/members.hbs      | 2 +-
 .../scopes/scope/auth-methods/auth-method/members.hbs         | 2 +-
 .../managed-groups/{ => managed-group}/members-test.js        | 4 ++--
 5 files changed, 6 insertions(+), 6 deletions(-)
 rename ui/admin/app/controllers/scopes/scope/auth-methods/auth-method/managed-groups/{ => managed-group}/members.js (87%)
 rename ui/admin/tests/unit/controllers/scopes/scope/auth-methods/auth-method/managed-groups/{ => managed-group}/members-test.js (86%)

diff --git a/ui/admin/app/controllers/scopes/scope/auth-methods/auth-method/managed-groups/members.js b/ui/admin/app/controllers/scopes/scope/auth-methods/auth-method/managed-groups/managed-group/members.js
similarity index 87%
rename from ui/admin/app/controllers/scopes/scope/auth-methods/auth-method/managed-groups/members.js
rename to ui/admin/app/controllers/scopes/scope/auth-methods/auth-method/managed-groups/managed-group/members.js
index 3fccd5222..dcef2e4a5 100644
--- a/ui/admin/app/controllers/scopes/scope/auth-methods/auth-method/managed-groups/members.js
+++ b/ui/admin/app/controllers/scopes/scope/auth-methods/auth-method/managed-groups/managed-group/members.js
@@ -1,7 +1,7 @@
 import Controller from '@ember/controller';
 import { inject as service } from '@ember/service';
 
-export default class ScopesScopeAuthMethodsAuthMethodManagedGroupsMembersController extends Controller {
+export default class ScopesScopeAuthMethodsAuthMethodManagedGroupsManagedGroupMembersController extends Controller {
   // =services
 
   @service intl;
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 d6edf6047..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
@@ -9,4 +9,4 @@
   >
     {{t 'resources.managed-group.member.title_plural'}}
   </nav.link>
-</Rose::Nav::Tabs>
+</Rose::Nav::Tabs>
\ 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 e96ea46bb..8f942d312 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 @@
       </message.description>
     </Rose::Message>
   </Rose::Layout::Centered>
-{{/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
index a890cac51..5dc94ed60 100644
--- 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
@@ -1,3 +1,3 @@
 {{page-title (t 'resources.managed-group.member.title_plural')}}
 
-{{outlet}}
+{{outlet}}
\ No newline at end of file
diff --git a/ui/admin/tests/unit/controllers/scopes/scope/auth-methods/auth-method/managed-groups/members-test.js b/ui/admin/tests/unit/controllers/scopes/scope/auth-methods/auth-method/managed-groups/managed-group/members-test.js
similarity index 86%
rename from ui/admin/tests/unit/controllers/scopes/scope/auth-methods/auth-method/managed-groups/members-test.js
rename to ui/admin/tests/unit/controllers/scopes/scope/auth-methods/auth-method/managed-groups/managed-group/members-test.js
index d1510bb92..31aeaf043 100644
--- a/ui/admin/tests/unit/controllers/scopes/scope/auth-methods/auth-method/managed-groups/members-test.js
+++ b/ui/admin/tests/unit/controllers/scopes/scope/auth-methods/auth-method/managed-groups/managed-group/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/members',
+  '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/members'
+        'controller:scopes/scope/auth-methods/auth-method/managed-groups/managed-group/members'
       );
       assert.ok(controller);
     });

From 16daed592d640ed30077c1e5081c3a396f887b6d Mon Sep 17 00:00:00 2001
From: Carlos Alcaide Corvo <ccorvo@hashicorp.com>
Date: Fri, 12 Nov 2021 13:24:31 -0800
Subject: [PATCH 09/10] Delete commented code

---
 addons/core/translations/resources/en-us.yaml | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/addons/core/translations/resources/en-us.yaml b/addons/core/translations/resources/en-us.yaml
index 0eb0bd90a..609f74266 100644
--- a/addons/core/translations/resources/en-us.yaml
+++ b/addons/core/translations/resources/en-us.yaml
@@ -368,9 +368,3 @@ managed-group:
     messages:
       title: Welcome to Members
       description: No members in this managed group.
-    # member:
-    #   title: Welcome to Members
-    #   description: No members in this managed group.
-# member:
-#   title: Member
-#   title_plural: Members

From ba048922bb10a1a5675af31c73d95a4da7024301 Mon Sep 17 00:00:00 2001
From: Carlos Alcaide Corvo <ccorvo@hashicorp.com>
Date: Fri, 12 Nov 2021 13:37:44 -0800
Subject: [PATCH 10/10] Get back a deleted file

---
 .../auth-method/managed-groups/new.js          | 18 ++++++++++++++++++
 .../auth-method/managed-groups/new-test.js     | 17 +++++++++++++++++
 2 files changed, 35 insertions(+)
 create mode 100644 ui/admin/app/controllers/scopes/scope/auth-methods/auth-method/managed-groups/new.js
 create mode 100644 ui/admin/tests/unit/controllers/scopes/scope/auth-methods/auth-method/managed-groups/new-test.js

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
new file mode 100644
index 000000000..1beca0353
--- /dev/null
+++ b/ui/admin/app/controllers/scopes/scope/auth-methods/auth-method/managed-groups/new.js
@@ -0,0 +1,18 @@
+import Controller from '@ember/controller';
+import { inject as service } from '@ember/service';
+
+export default class ScopesScopeAuthMethodsAuthMethodManagedGroupsNewController extends Controller {
+  // =services
+
+  @service intl;
+
+  // =attributes
+
+  /**
+   * Translated new account breadcrumb
+   * @type {string}
+   */
+  get breadCrumb() {
+    return this.intl.t('titles.new');
+  }
+}
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/new-test.js
new file mode 100644
index 000000000..699d52e58
--- /dev/null
+++ b/ui/admin/tests/unit/controllers/scopes/scope/auth-methods/auth-method/managed-groups/new-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/new',
+  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'
+      );
+      assert.ok(controller);
+    });
+  }
+);