Refactor edit group

coder · BrunoQuaresma · May 4, 2023 · May 3, 2023 · May 3, 2023 · May 4, 2023
commit 7ea15a3d57a6625a3c3937b7a07d5a9df552a822
diff --git a/site/src/pages/GroupsPage/SettingsGroupPage.tsx b/site/src/pages/GroupsPage/SettingsGroupPage.tsx
@@ -26,7 +26,7 @@ export const SettingsGroupPage: FC = () => {
       onUpdate: navigateToGroup,
     },
   })
-  const { updateGroupFormErrors, group } = editState.context
+  const { error, group } = editState.context
 
   return (
     <>
@@ -40,7 +40,7 @@ export const SettingsGroupPage: FC = () => {
           sendEditEvent({ type: "UPDATE", data })
         }}
         group={group}
-        formErrors={updateGroupFormErrors}
+        formErrors={error}
         isLoading={editState.matches("loading")}
         isUpdating={editState.matches("updating")}
       />

diff --git a/site/src/xServices/groups/editGroupXService.ts b/site/src/xServices/groups/editGroupXService.ts
@@ -1,11 +1,5 @@
 import { getGroup, patchGroup } from "api/api"
-import {
-  ApiError,
-  getErrorMessage,
-  hasApiFieldErrors,
-  isApiError,
-  mapApiErrorToFieldErrors,
-} from "api/errors"
+import { getErrorMessage } from "api/errors"
 import { Group } from "api/typesGenerated"
 import { displayError } from "components/GlobalSnackbar/utils"
 import { assign, createMachine } from "xstate"
@@ -17,7 +11,7 @@ export const editGroupMachine = createMachine(
       context: {} as {
         groupId: string
         group?: Group
-        updateGroupFormErrors?: unknown
+        error?: unknown
       },
       services: {} as {
         loadGroup: {
@@ -61,26 +55,15 @@ export const editGroupMachine = createMachine(
           onDone: {
             actions: ["onUpdate"],
           },
-          onError: [
-            {
-              target: "idle",
-              cond: "hasFieldErrors",
-              actions: ["assignUpdateGroupFormErrors"],
-            },
-            {
-              target: "idle",
-              actions: ["displayUpdateGroupError"],
-            },
-          ],
+          onError: {
+            target: "idle",
+            actions: ["assignError"],
+          },
         },
       },
     },
   },
   {
-    guards: {
-      hasFieldErrors: (_, event) =>
-        isApiError(event.data) && hasApiFieldErrors(event.data),
-    },
     services: {
       loadGroup: ({ groupId }) => getGroup(groupId),
 
@@ -104,12 +87,7 @@ export const editGroupMachine = createMachine(
         const message = getErrorMessage(data, "Failed to the group.")
         displayError(message)
       },
-      displayUpdateGroupError: (_, { data }) => {
-        const message = getErrorMessage(data, "Failed to update the group.")
-        displayError(message)
-      },
-      assignUpdateGroupFormErrors: (_, event) =>
-        mapApiErrorToFieldErrors((event.data as ApiError).response.data),
+      assignError: (_, event) => event.data,
     },
   },
 )