From b7bf44b997bd197923bf4140045a061277359a86 Mon Sep 17 00:00:00 2001
From: Carlos Alcaide Corvo <ccorvo@hashicorp.com>
Date: Tue, 9 Nov 2021 10:29:49 -0800
Subject: [PATCH 1/6] =?UTF-8?q?feat:=20=F0=9F=8E=B8=20Add=20managed=20grou?=
 =?UTF-8?q?ps=20read=20CRUD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Add managed groups Read CRUD operation
---
 addons/api/mirage/config.js                   |  1 +
 addons/core/translations/form/en-us.yaml      |  2 +
 addons/core/translations/resources/en-us.yaml |  3 ++
 .../components/form/managed-group/index.hbs   | 54 +++++++++++++++++++
 ui/admin/app/router.js                        |  8 ++-
 .../auth-method/managed-groups.js             | 15 ++++++
 .../auth-method/managed-groups/index.js       |  8 ++-
 .../managed-groups/managed-group.js           | 49 +++++++++++++++++
 .../managed-groups/managed-group/index.js     |  3 ++
 .../auth-method/managed-groups/index.hbs      | 11 +++-
 .../managed-groups/managed-group.hbs          |  2 +
 .../managed-groups/managed-group/-actions.hbs | 11 ++++
 .../managed-groups/managed-group/-header.hbs  | 12 +++++
 .../managed-group/-navigation.hbs             |  7 +++
 .../managed-groups/managed-group/index.hbs    |  1 +
 ui/admin/config/environment.js                |  1 +
 .../managed-groups/managed-group-test.js      | 16 ++++++
 .../managed-group/index-test.js               | 16 ++++++
 18 files changed, 217 insertions(+), 3 deletions(-)
 create mode 100644 ui/admin/app/components/form/managed-group/index.hbs
 create mode 100644 ui/admin/app/routes/scopes/scope/auth-methods/auth-method/managed-groups/managed-group.js
 create mode 100644 ui/admin/app/routes/scopes/scope/auth-methods/auth-method/managed-groups/managed-group/index.js
 create mode 100644 ui/admin/app/templates/scopes/scope/auth-methods/auth-method/managed-groups/managed-group.hbs
 create mode 100644 ui/admin/app/templates/scopes/scope/auth-methods/auth-method/managed-groups/managed-group/-actions.hbs
 create mode 100644 ui/admin/app/templates/scopes/scope/auth-methods/auth-method/managed-groups/managed-group/-header.hbs
 create mode 100644 ui/admin/app/templates/scopes/scope/auth-methods/auth-method/managed-groups/managed-group/-navigation.hbs
 create mode 100644 ui/admin/app/templates/scopes/scope/auth-methods/auth-method/managed-groups/managed-group/index.hbs
 create mode 100644 ui/admin/tests/unit/routes/scopes/scope/auth-methods/auth-method/managed-groups/managed-group-test.js
 create mode 100644 ui/admin/tests/unit/routes/scopes/scope/auth-methods/auth-method/managed-groups/managed-group/index-test.js

diff --git a/addons/api/mirage/config.js b/addons/api/mirage/config.js
index 89e2a82b5..8c62edd5e 100644
--- a/addons/api/mirage/config.js
+++ b/addons/api/mirage/config.js
@@ -521,6 +521,7 @@ export default function () {
       return managedGroups.where({ authMethodId });
     }
   );
+  this.get('/managed-groups/:id');
 
   /* Uncomment the following line and the Response import above
    * Then change the response code to simulate error responses.
diff --git a/addons/core/translations/form/en-us.yaml b/addons/core/translations/form/en-us.yaml
index cb7b69832..5960782e7 100644
--- a/addons/core/translations/form/en-us.yaml
+++ b/addons/core/translations/form/en-us.yaml
@@ -115,3 +115,5 @@ value:
 callback_url:
   label: Callback URL
   help: The URL to which the third-party provider sends the authentication response.  Paste this into the provider configuration.
+filter:
+  label: Filter
diff --git a/addons/core/translations/resources/en-us.yaml b/addons/core/translations/resources/en-us.yaml
index d7d07aee2..c52b88323 100644
--- a/addons/core/translations/resources/en-us.yaml
+++ b/addons/core/translations/resources/en-us.yaml
@@ -354,3 +354,6 @@ scope:
 managed-group:
   title: Managed Group
   title_plural: Managed Groups
+  description: A managed group is a resource that represents a collection of accounts.
+  actions:
+    delete: Delete Managed Group
diff --git a/ui/admin/app/components/form/managed-group/index.hbs b/ui/admin/app/components/form/managed-group/index.hbs
new file mode 100644
index 000000000..4f0f53c28
--- /dev/null
+++ b/ui/admin/app/components/form/managed-group/index.hbs
@@ -0,0 +1,54 @@
+<Rose::Form as |form|>
+  <form.input
+    @value={{@model.type}}
+    @label={{t 'form.type.label'}}
+    readonly={{true}}
+    @disabled={{true}}
+  />
+
+  <form.input
+    @name='name'
+    @type='name'
+    @value={{@model.name}}
+    @label={{t 'form.name.label'}}
+    @helperText={{t 'form.name.help'}}
+    @error={{@model.error.name}}
+    readonly={{false}}
+    as |field|
+  >
+    {{#if @model.errors.name}}
+      <field.errors as |errors|>
+        {{#each @model.errors.name as |error|}}
+          <errors.message>{{error.message}}</errors.message>
+        {{/each}}
+      </field.errors>
+    {{/if}}
+  </form.input>
+
+  <form.textarea
+    @name='description'
+    @type='description'
+    @value={{@model.description}}
+    @label={{t 'form.description.label'}}
+    @error={{@model.errors.description}}
+    @helperText={{t 'form.description.help'}}
+    disabled={{@model.isSaving}}
+    readonly={{false}}
+    as |field|
+  >
+    {{#if @model.errors.description}}
+      <field.errors as |errors|>
+        {{#each @model.errors.description as |error|}}
+          <errors.message>{{error.message}}</errors.message>
+        {{/each}}
+      </field.errors>
+    {{/if}}
+  </form.textarea>
+
+  <form.input
+    @value={{@model.attributes.filter}}
+    @label={{t 'form.filter.label'}}
+    readonly={{true}}
+    @disabled={{true}}
+  />
+</Rose::Form>
\ No newline at end of file
diff --git a/ui/admin/app/router.js b/ui/admin/app/router.js
index 17519a2a5..49a0c0756 100644
--- a/ui/admin/app/router.js
+++ b/ui/admin/app/router.js
@@ -55,7 +55,13 @@ Router.map(function () {
             });
             this.route('new');
           });
-          this.route('managed-groups', function () {});
+          this.route('managed-groups', function () {
+            this.route(
+              'managed-group',
+              { path: ':managed_group_id' },
+              function () {}
+            );
+          });
         });
         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 bde134d3f..f1c4acac5 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,4 +1,5 @@
 import Route from '@ember/routing/route';
+import { action } from '@ember/object';
 
 export default class ScopesScopeAuthMethodsAuthMethodManagedGroupsRoute extends Route {
   /**
@@ -10,4 +11,18 @@ export default class ScopesScopeAuthMethodsAuthMethodManagedGroupsRoute extends
     const { id: auth_method_id } = authMethod;
     return this.store.query('managed-group', { auth_method_id });
   }
+
+  // =actions
+  /**
+   * Rollback changes on a managed group.
+   * @param {ManagedGroupModel} managedGroup
+   */
+  @action
+  cancel(managedGroup) {
+    const { isNew } = managedGroup;
+    managedGroup.rollbackAttributes();
+    if (isNew) {
+      this.transitionTo('scopes.scope.auth-methods.auth-method.managed-groups');
+    }
+  }
 }
diff --git a/ui/admin/app/routes/scopes/scope/auth-methods/auth-method/managed-groups/index.js b/ui/admin/app/routes/scopes/scope/auth-methods/auth-method/managed-groups/index.js
index 24639a124..7cdc46a89 100644
--- a/ui/admin/app/routes/scopes/scope/auth-methods/auth-method/managed-groups/index.js
+++ b/ui/admin/app/routes/scopes/scope/auth-methods/auth-method/managed-groups/index.js
@@ -1,3 +1,9 @@
 import Route from '@ember/routing/route';
 
-export default class ScopesScopeAuthMethodsAuthMethodManagedGroupsIndexRoute extends Route {}
+export default class ScopesScopeAuthMethodsAuthMethodManagedGroupsIndexRoute extends Route {
+  setupController(controller) {
+    const authMethod = this.modelFor('scopes.scope.auth-methods.auth-method');
+    super.setupController(...arguments);
+    controller.setProperties({ authMethod });
+  }
+}
diff --git a/ui/admin/app/routes/scopes/scope/auth-methods/auth-method/managed-groups/managed-group.js b/ui/admin/app/routes/scopes/scope/auth-methods/auth-method/managed-groups/managed-group.js
new file mode 100644
index 000000000..816b537da
--- /dev/null
+++ b/ui/admin/app/routes/scopes/scope/auth-methods/auth-method/managed-groups/managed-group.js
@@ -0,0 +1,49 @@
+import Route from '@ember/routing/route';
+
+export default class ScopesScopeAuthMethodsAuthMethodManagedGroupsManagedGroupRoute extends Route {
+  // =methods
+
+  /**
+   * Load managed group by ID.
+   * @param {object} params
+   * @param {string} params.managed_group_id
+   * @returns {ManagedGroupModel}
+   */
+  model({ managed_group_id }) {
+    return this.store.findRecord('managed-group', managed_group_id, {
+      reload: true,
+    });
+  }
+
+  /**
+   * Render the route-set specific page sections
+   * @override
+   */
+  renderTemplate() {
+    super.renderTemplate(...arguments);
+
+    this.render(
+      'scopes/scope/auth-methods/auth-method/managed-groups/managed-group/-header',
+      {
+        into: 'scopes/scope/auth-methods/auth-method',
+        outlet: 'header',
+      }
+    );
+
+    this.render(
+      'scopes/scope/auth-methods/auth-method/managed-groups/managed-group/-actions',
+      {
+        into: 'scopes/scope/auth-methods/auth-method',
+        outlet: 'actions',
+      }
+    );
+
+    this.render(
+      'scopes/scope/auth-methods/auth-method/managed-groups/managed-group/-navigation',
+      {
+        into: 'scopes/scope/auth-methods/auth-method',
+        outlet: 'navigation',
+      }
+    );
+  }
+}
diff --git a/ui/admin/app/routes/scopes/scope/auth-methods/auth-method/managed-groups/managed-group/index.js b/ui/admin/app/routes/scopes/scope/auth-methods/auth-method/managed-groups/managed-group/index.js
new file mode 100644
index 000000000..0dbea955a
--- /dev/null
+++ b/ui/admin/app/routes/scopes/scope/auth-methods/auth-method/managed-groups/managed-group/index.js
@@ -0,0 +1,3 @@
+import Route from '@ember/routing/route';
+
+export default class ScopesScopeAuthMethodsAuthMethodManagedGroupsManagedGroupIndexRoute extends Route {}
diff --git a/ui/admin/app/templates/scopes/scope/auth-methods/auth-method/managed-groups/index.hbs b/ui/admin/app/templates/scopes/scope/auth-methods/auth-method/managed-groups/index.hbs
index 959c50afa..7483ea871 100644
--- a/ui/admin/app/templates/scopes/scope/auth-methods/auth-method/managed-groups/index.hbs
+++ b/ui/admin/app/templates/scopes/scope/auth-methods/auth-method/managed-groups/index.hbs
@@ -12,7 +12,16 @@
     <table.body as |body|>
       {{#each @model as |managed-group|}}
         <body.row as |row|>
-          <row.headerCell>{{managed-group.name}}</row.headerCell>
+          <row.headerCell>
+            {{#if (can 'read model' managed-group)}}
+              <LinkTo
+                @route='scopes.scope.auth-methods.auth-method.managed-groups.managed-group'
+                @model={{managed-group.id}}
+              >
+                {{managed-group.name}}
+              </LinkTo>
+            {{/if}}
+          </row.headerCell>
           <row.cell>{{managed-group.description}}</row.cell>
           <row.cell>
             <Rose::Badge>{{managed-group.type}}</Rose::Badge>
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
new file mode 100644
index 000000000..a6696c3b6
--- /dev/null
+++ b/ui/admin/app/templates/scopes/scope/auth-methods/auth-method/managed-groups/managed-group.hbs
@@ -0,0 +1,2 @@
+{{page-title 'ManagedGroup'}}
+{{outlet}}
\ No newline at end of file
diff --git a/ui/admin/app/templates/scopes/scope/auth-methods/auth-method/managed-groups/managed-group/-actions.hbs b/ui/admin/app/templates/scopes/scope/auth-methods/auth-method/managed-groups/managed-group/-actions.hbs
new file mode 100644
index 000000000..240e83e8e
--- /dev/null
+++ b/ui/admin/app/templates/scopes/scope/auth-methods/auth-method/managed-groups/managed-group/-actions.hbs
@@ -0,0 +1,11 @@
+{{#if (can 'delete model' @model)}}
+  <Rose::Dropdown
+    @text={{t 'actions.manage'}}
+    @dropdownRight={{true}}
+    as |dropdown|
+  >
+    <dropdown.button @style='danger' @disabled={{@model.canSave}}>
+      {{t 'resources.managed-group.actions.delete'}}
+    </dropdown.button>
+  </Rose::Dropdown>
+{{/if}}
\ No newline at end of file
diff --git a/ui/admin/app/templates/scopes/scope/auth-methods/auth-method/managed-groups/managed-group/-header.hbs b/ui/admin/app/templates/scopes/scope/auth-methods/auth-method/managed-groups/managed-group/-header.hbs
new file mode 100644
index 000000000..1e7ef1124
--- /dev/null
+++ b/ui/admin/app/templates/scopes/scope/auth-methods/auth-method/managed-groups/managed-group/-header.hbs
@@ -0,0 +1,12 @@
+<h2>
+  {{t 'resources.managed-group.title'}}
+  <DocLink @doc='managed-groups' @iconSize='large' />
+</h2>
+<p>{{t 'resources.managed-group.description'}}</p>
+<Copyable
+  @text={{@model.id}}
+  @buttonText={{t 'actions.copy-to-clipboard'}}
+  @acknowledgeText={{t 'states.copied'}}
+>
+  <code>{{@model.id}}</code>
+</Copyable>
\ 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
new file mode 100644
index 000000000..3a2ce54b7
--- /dev/null
+++ b/ui/admin/app/templates/scopes/scope/auth-methods/auth-method/managed-groups/managed-group/-navigation.hbs
@@ -0,0 +1,7 @@
+<Rose::Nav::Tabs as |nav|>
+  <nav.link
+    @route='scopes.scope.auth-methods.auth-method.managed-groups.managed-group.index'
+  >
+    {{t 'titles.details'}}
+  </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/index.hbs b/ui/admin/app/templates/scopes/scope/auth-methods/auth-method/managed-groups/managed-group/index.hbs
new file mode 100644
index 000000000..19ab29fcb
--- /dev/null
+++ b/ui/admin/app/templates/scopes/scope/auth-methods/auth-method/managed-groups/managed-group/index.hbs
@@ -0,0 +1 @@
+<Form::ManagedGroup @model={{@model}} />
\ No newline at end of file
diff --git a/ui/admin/config/environment.js b/ui/admin/config/environment.js
index 7e4c3ca78..613c6a3e8 100644
--- a/ui/admin/config/environment.js
+++ b/ui/admin/config/environment.js
@@ -48,6 +48,7 @@ module.exports = function (environment) {
         account: '/accounts',
         'account.new': '/accounts/new',
         'auth-method': '/auth-methods',
+        'managed-groups': '/managed-groups',
         group: '/groups',
         'group.add-members': '/groups/add-members',
         'host-catalog': '/host-catalogs',
diff --git a/ui/admin/tests/unit/routes/scopes/scope/auth-methods/auth-method/managed-groups/managed-group-test.js b/ui/admin/tests/unit/routes/scopes/scope/auth-methods/auth-method/managed-groups/managed-group-test.js
new file mode 100644
index 000000000..f323d5e2e
--- /dev/null
+++ b/ui/admin/tests/unit/routes/scopes/scope/auth-methods/auth-method/managed-groups/managed-group-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',
+  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'
+      );
+      assert.ok(route);
+    });
+  }
+);
diff --git a/ui/admin/tests/unit/routes/scopes/scope/auth-methods/auth-method/managed-groups/managed-group/index-test.js b/ui/admin/tests/unit/routes/scopes/scope/auth-methods/auth-method/managed-groups/managed-group/index-test.js
new file mode 100644
index 000000000..47aadd91a
--- /dev/null
+++ b/ui/admin/tests/unit/routes/scopes/scope/auth-methods/auth-method/managed-groups/managed-group/index-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/index',
+  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/index'
+      );
+      assert.ok(route);
+    });
+  }
+);

From f8bb37e5af82b44ea4f1c55e9e3123375c1a7f90 Mon Sep 17 00:00:00 2001
From: Carlos Alcaide Corvo <ccorvo@hashicorp.com>
Date: Tue, 9 Nov 2021 11:16:21 -0800
Subject: [PATCH 2/6] Add managed groups to auth method JUST if is type oidc.
 Within auth method, show the managed groups tabs JUST if type is oidc

---
 addons/api/mirage/factories/auth-method.js             |  4 +++-
 addons/api/mirage/scenarios/default.js                 |  2 +-
 .../scope/auth-methods/auth-method/-navigation.hbs     | 10 ++++++----
 .../scopes/scope/auth-methods/auth-method/index.hbs    |  3 ++-
 4 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/addons/api/mirage/factories/auth-method.js b/addons/api/mirage/factories/auth-method.js
index 051ea096f..755154b09 100644
--- a/addons/api/mirage/factories/auth-method.js
+++ b/addons/api/mirage/factories/auth-method.js
@@ -34,7 +34,9 @@ export default factory.extend({
         user.update({ accountIds: [id] });
       });
 
-      server.createList('managed-group', 2, { scope, authMethod });
+      if (type === 'oidc') {
+        server.createList('managed-group', 2, { scope, authMethod });
+      }
     },
   }),
 });
diff --git a/addons/api/mirage/scenarios/default.js b/addons/api/mirage/scenarios/default.js
index 9291f8a3e..965234b5d 100644
--- a/addons/api/mirage/scenarios/default.js
+++ b/addons/api/mirage/scenarios/default.js
@@ -22,7 +22,7 @@ export default function (server) {
   // Auth
   const globalAuthMethods = server.createList(
     'auth-method',
-    1,
+    4,
     { scope: globalScope },
     'withAccountsAndUsersAndManagedGroups'
   );
diff --git a/ui/admin/app/templates/scopes/scope/auth-methods/auth-method/-navigation.hbs b/ui/admin/app/templates/scopes/scope/auth-methods/auth-method/-navigation.hbs
index d13958255..40b38d901 100644
--- a/ui/admin/app/templates/scopes/scope/auth-methods/auth-method/-navigation.hbs
+++ b/ui/admin/app/templates/scopes/scope/auth-methods/auth-method/-navigation.hbs
@@ -10,8 +10,10 @@
   {{/if}}
 
   {{#if (feature-flag 'managed-groups')}}
-    <nav.link @route='scopes.scope.auth-methods.auth-method.managed-groups'>
-      {{t 'resources.managed-group.title_plural'}}
-    </nav.link>
+    {{#if @model.isOIDC}}
+      <nav.link @route='scopes.scope.auth-methods.auth-method.managed-groups'>
+        {{t 'resources.managed-group.title_plural'}}
+      </nav.link>
+    {{/if}}
   {{/if}}
-</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/index.hbs b/ui/admin/app/templates/scopes/scope/auth-methods/auth-method/index.hbs
index e3302df0b..52639ddc0 100644
--- a/ui/admin/app/templates/scopes/scope/auth-methods/auth-method/index.hbs
+++ b/ui/admin/app/templates/scopes/scope/auth-methods/auth-method/index.hbs
@@ -1,3 +1,4 @@
+<h2>{{@model.type}}</h2>
 <Form::AuthMethod
   @model={{@model}}
   @submit={{route-action 'save' @model}}
@@ -5,4 +6,4 @@
   @removeItemByIndex={{route-action 'removeItemByIndex' @model}}
   @addStringItem={{route-action 'addStringItem' @model}}
   @addAccountClaimMapItem={{route-action 'addAccountClaimMapItem' @model}}
-/>
\ No newline at end of file
+/>

From 9541d2ed5c687a2e52db7802f4a7a1bc352b77fb Mon Sep 17 00:00:00 2001
From: Carlos Alcaide Corvo <ccorvo@hashicorp.com>
Date: Tue, 9 Nov 2021 11:26:19 -0800
Subject: [PATCH 3/6] Add helper text for filter field

---
 addons/core/translations/form/en-us.yaml             | 1 +
 ui/admin/app/components/form/managed-group/index.hbs | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/addons/core/translations/form/en-us.yaml b/addons/core/translations/form/en-us.yaml
index 5960782e7..05105fbac 100644
--- a/addons/core/translations/form/en-us.yaml
+++ b/addons/core/translations/form/en-us.yaml
@@ -117,3 +117,4 @@ callback_url:
   help: The URL to which the third-party provider sends the authentication response.  Paste this into the provider configuration.
 filter:
   label: Filter
+  help: A boolean expression defining a filter run against the provided information.
diff --git a/ui/admin/app/components/form/managed-group/index.hbs b/ui/admin/app/components/form/managed-group/index.hbs
index 4f0f53c28..726e6c456 100644
--- a/ui/admin/app/components/form/managed-group/index.hbs
+++ b/ui/admin/app/components/form/managed-group/index.hbs
@@ -47,8 +47,9 @@
 
   <form.input
     @value={{@model.attributes.filter}}
+    @helperText={{t 'form.filter.help'}}
     @label={{t 'form.filter.label'}}
     readonly={{true}}
     @disabled={{true}}
   />
-</Rose::Form>
\ No newline at end of file
+</Rose::Form>

From 259840808c67184b9078966a4c374c13dfc0e06d Mon Sep 17 00:00:00 2001
From: Carlos Alcaide Corvo <ccorvo@hashicorp.com>
Date: Tue, 9 Nov 2021 11:28:37 -0800
Subject: [PATCH 4/6] Fix linting errors

---
 ui/admin/app/components/form/managed-group/index.hbs            | 2 +-
 .../scopes/scope/auth-methods/auth-method/-navigation.hbs       | 2 +-
 .../templates/scopes/scope/auth-methods/auth-method/index.hbs   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/ui/admin/app/components/form/managed-group/index.hbs b/ui/admin/app/components/form/managed-group/index.hbs
index 726e6c456..1ccd49e57 100644
--- a/ui/admin/app/components/form/managed-group/index.hbs
+++ b/ui/admin/app/components/form/managed-group/index.hbs
@@ -52,4 +52,4 @@
     readonly={{true}}
     @disabled={{true}}
   />
-</Rose::Form>
+</Rose::Form>
\ No newline at end of file
diff --git a/ui/admin/app/templates/scopes/scope/auth-methods/auth-method/-navigation.hbs b/ui/admin/app/templates/scopes/scope/auth-methods/auth-method/-navigation.hbs
index 40b38d901..6c5d6bd70 100644
--- a/ui/admin/app/templates/scopes/scope/auth-methods/auth-method/-navigation.hbs
+++ b/ui/admin/app/templates/scopes/scope/auth-methods/auth-method/-navigation.hbs
@@ -16,4 +16,4 @@
       </nav.link>
     {{/if}}
   {{/if}}
-</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/index.hbs b/ui/admin/app/templates/scopes/scope/auth-methods/auth-method/index.hbs
index 52639ddc0..494c7fb67 100644
--- a/ui/admin/app/templates/scopes/scope/auth-methods/auth-method/index.hbs
+++ b/ui/admin/app/templates/scopes/scope/auth-methods/auth-method/index.hbs
@@ -6,4 +6,4 @@
   @removeItemByIndex={{route-action 'removeItemByIndex' @model}}
   @addStringItem={{route-action 'addStringItem' @model}}
   @addAccountClaimMapItem={{route-action 'addAccountClaimMapItem' @model}}
-/>
+/>
\ No newline at end of file

From f3d8db6aaf8614e2353e7fa68edd6f3e3e3e4c96 Mon Sep 17 00:00:00 2001
From: Carlos Alcaide Corvo <ccorvo@hashicorp.com>
Date: Wed, 10 Nov 2021 07:47:06 -0800
Subject: [PATCH 5/6] Fix typo

---
 .../templates/scopes/scope/auth-methods/auth-method/index.hbs    | 1 -
 1 file changed, 1 deletion(-)

diff --git a/ui/admin/app/templates/scopes/scope/auth-methods/auth-method/index.hbs b/ui/admin/app/templates/scopes/scope/auth-methods/auth-method/index.hbs
index 494c7fb67..e3302df0b 100644
--- a/ui/admin/app/templates/scopes/scope/auth-methods/auth-method/index.hbs
+++ b/ui/admin/app/templates/scopes/scope/auth-methods/auth-method/index.hbs
@@ -1,4 +1,3 @@
-<h2>{{@model.type}}</h2>
 <Form::AuthMethod
   @model={{@model}}
   @submit={{route-action 'save' @model}}

From 07aaa8fcde18bae38f3b30d5a9ff4d5a9a247cd6 Mon Sep 17 00:00:00 2001
From: Carlos Alcaide Corvo <ccorvo@hashicorp.com>
Date: Wed, 10 Nov 2021 14:40:16 -0800
Subject: [PATCH 6/6] Fix typo on description

---
 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 c52b88323..df2366fe5 100644
--- a/addons/core/translations/resources/en-us.yaml
+++ b/addons/core/translations/resources/en-us.yaml
@@ -354,6 +354,6 @@ scope:
 managed-group:
   title: Managed Group
   title_plural: Managed Groups
-  description: A managed group is a resource that represents a collection of accounts.
+  description: A managed group represents a collection of accounts.
   actions:
     delete: Delete Managed Group