From 7c762c1050b2fb331ea55f2729f7033ccf885c66 Mon Sep 17 00:00:00 2001
From: Susmitha Girumala <susmitha@hashicorp.com>
Date: Wed, 10 Nov 2021 16:12:42 -0500
Subject: [PATCH] fix: Mirage post issue for managed-groups

---
 addons/api/addon/models/managed-group.js      |  8 ++++++++
 addons/api/mirage/factories/managed-group.js  |  9 ++++-----
 .../{managed-groups.js => managed-group.js}   |  0
 .../components/form/managed-group/index.hbs   | 19 +++++++++++++++----
 .../auth-method/managed-groups.js             |  4 +---
 .../auth-method/managed-groups/index.hbs      |  4 +++-
 6 files changed, 31 insertions(+), 13 deletions(-)
 rename addons/api/mirage/serializers/{managed-groups.js => managed-group.js} (100%)

diff --git a/addons/api/addon/models/managed-group.js b/addons/api/addon/models/managed-group.js
index 426807de2..5843bb0e5 100644
--- a/addons/api/addon/models/managed-group.js
+++ b/addons/api/addon/models/managed-group.js
@@ -5,6 +5,14 @@ import { A } from '@ember/array';
 
 export default class ManagedGroupModel extends GeneratedManagedGroupModel {
   // =attributes
+
+  // =error attributes
+  // These attributes exist solely to capture errors on nested fields.
+  // See the application adapter's error normalization method for
+  // more information.
+
+  @attr('string', { readOnly: true }) attributes_filter;
+
   /**
    * Members is read-only under normal circumstances.  But members can
    * be persisted via calls to `addMembers()` or `removeMembers()`.
diff --git a/addons/api/mirage/factories/managed-group.js b/addons/api/mirage/factories/managed-group.js
index 7378f84d6..9460f847f 100644
--- a/addons/api/mirage/factories/managed-group.js
+++ b/addons/api/mirage/factories/managed-group.js
@@ -2,8 +2,11 @@ import factory from '../generated/factories/managed-group';
 import { random } from 'faker';
 import permissions from '../helpers/permissions';
 
+const types = ['oidc'];
+
 export default factory.extend({
   id: (i) => `managed-groups-id-${i}`,
+  type: (i) => types[i % types.length],
 
   authorized_actions: () =>
     permissions.authorizedActionsFor('managed-group') || [
@@ -17,11 +20,7 @@ export default factory.extend({
     switch (this.type) {
       case 'oidc':
         return {
-          filter: random.word(),
-        };
-      default:
-        return {
-          filter: '',
+          filter: random.words(),
         };
     }
   },
diff --git a/addons/api/mirage/serializers/managed-groups.js b/addons/api/mirage/serializers/managed-group.js
similarity index 100%
rename from addons/api/mirage/serializers/managed-groups.js
rename to addons/api/mirage/serializers/managed-group.js
diff --git a/ui/admin/app/components/form/managed-group/index.hbs b/ui/admin/app/components/form/managed-group/index.hbs
index 6ebc5f284..7918dd146 100644
--- a/ui/admin/app/components/form/managed-group/index.hbs
+++ b/ui/admin/app/components/form/managed-group/index.hbs
@@ -53,12 +53,23 @@
   </form.textarea>
 
   <form.input
+    @name='filter'
+    @type='text'
     @value={{@model.attributes.filter}}
-    @helperText={{t 'form.filter.help'}}
     @label={{t 'form.filter.label'}}
-    readonly={{true}}
-    @disabled={{true}}
-  />
+    @error={{@model.errors.attributes_filter}}
+    @helperText={{t 'form.filter.help'}}
+    as |field|
+  >
+    {{#if @model.errors.filter}}
+      <field.errors as |errors|>
+        {{#each @model.errors.filter as |error|}}
+          <errors.message>{{error.message}}</errors.message>
+        {{/each}}
+      </field.errors>
+    {{/if}}
+  </form.input>
+
   <form.actions
     @disabled={{if @model.cannotSave @model.cannotSave}}
     @enableEditText={{t 'actions.edit-form'}}
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 dd9b88f5b..cef4017d2 100644
--- a/ui/admin/app/routes/scopes/scope/auth-methods/auth-method/managed-groups.js
+++ b/ui/admin/app/routes/scopes/scope/auth-methods/auth-method/managed-groups.js
@@ -49,11 +49,9 @@ export default class ScopesScopeAuthMethodsAuthMethodManagedGroupsRoute extends
     isNew ? 'notifications.create-success' : 'notifications.save-success'
   )
   async save(managedGroup) {
-    debugger;
     await managedGroup.save();
     await this.transitionTo(
-      'scopes.scope.auth-methods.auth-method.managed-groups',
-      managedGroup
+      'scopes.scope.auth-methods.auth-method.managed-groups'
     );
     this.refresh();
   }
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 7483ea871..8165f109d 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
@@ -18,8 +18,10 @@
                 @route='scopes.scope.auth-methods.auth-method.managed-groups.managed-group'
                 @model={{managed-group.id}}
               >
-                {{managed-group.name}}
+                {{managed-group.displayName}}
               </LinkTo>
+            {{else}}
+              {{managed-group.displayName}}
             {{/if}}
           </row.headerCell>
           <row.cell>{{managed-group.description}}</row.cell>