Fix errors in schedule xservice

coder · presleyp · Jul 28, 2022 · Jul 27, 2022 · Jul 27, 2022 · Jul 27, 2022
commit 82ee773c56a4ab3c003eeab0192f6faaf9edcca5
diff --git a/site/src/components/WorkspaceScheduleForm/WorkspaceScheduleForm.tsx b/site/src/components/WorkspaceScheduleForm/WorkspaceScheduleForm.tsx
@@ -16,8 +16,7 @@ import utc from "dayjs/plugin/utc"
 import { useFormik } from "formik"
 import { FC } from "react"
 import * as Yup from "yup"
-import { FieldErrors } from "../../api/errors"
-import { getFormHelpers } from "../../util/formUtils"
+import { getFormHelpersWithError } from "../../util/formUtils"
 import { FormFooter } from "../FormFooter/FormFooter"
 import { FullPageForm } from "../FullPageForm/FullPageForm"
 import { Stack } from "../Stack/Stack"
@@ -54,7 +53,7 @@ export const Language = {
 }
 
 export interface WorkspaceScheduleFormProps {
-  fieldErrors?: FieldErrors
+  submitScheduleError?: Error | unknown
   initialValues?: WorkspaceScheduleFormValues
   isLoading: boolean
   onCancel: () => void
@@ -178,7 +177,7 @@ export const defaultWorkspaceSchedule = (
 })
 
 export const WorkspaceScheduleForm: FC<WorkspaceScheduleFormProps> = ({
-  fieldErrors,
+  submitScheduleError,
   initialValues = defaultWorkspaceSchedule(),
   isLoading,
   onCancel,
@@ -191,7 +190,7 @@ export const WorkspaceScheduleForm: FC<WorkspaceScheduleFormProps> = ({
     onSubmit,
     validationSchema,
   })
-  const formHelpers = getFormHelpers<WorkspaceScheduleFormValues>(form, fieldErrors)
+  const formHelpers = getFormHelpersWithError<WorkspaceScheduleFormValues>(form, submitScheduleError)
 
   const checkboxes: Array<{ value: boolean; name: string; label: string }> = [
     { value: form.values.sunday, name: "sunday", label: Language.daySundayLabel },

diff --git a/site/src/pages/WorkspaceSchedulePage/WorkspaceSchedulePage.tsx b/site/src/pages/WorkspaceSchedulePage/WorkspaceSchedulePage.tsx
@@ -28,6 +28,8 @@ dayjs.extend(timezone)
 
 const Language = {
   forbiddenError: "You don't have permissions to update the schedule for this workspace.",
+  getWorkspaceError: "Failed to fetch workspace.",
+  checkPermissionsError: "Failed to fetch permissions."
 }
 
 export const formValuesToAutoStartRequest = (
@@ -156,7 +158,7 @@ export const WorkspaceSchedulePage: React.FC = () => {
       userId: me?.id,
     },
   })
-  const { checkPermissionsError, formErrors, getWorkspaceError, permissions, workspace } =
+  const { checkPermissionsError, submitScheduleError, getWorkspaceError, permissions, workspace } =
     scheduleState.context
 
   // Get workspace on mount and whenever the args for getting a workspace change.
@@ -183,6 +185,7 @@ export const WorkspaceSchedulePage: React.FC = () => {
     return (
       <ErrorSummary
         error={getWorkspaceError || checkPermissionsError}
+        defaultMessage={getWorkspaceError ? Language.getWorkspaceError : Language.checkPermissionsError}
         retry={() => scheduleSend({ type: "GET_WORKSPACE", username, workspaceName })}
       />
     )
@@ -195,7 +198,7 @@ export const WorkspaceSchedulePage: React.FC = () => {
   if (scheduleState.matches("presentForm") || scheduleState.matches("submittingSchedule")) {
     return (
       <WorkspaceScheduleForm
-        fieldErrors={formErrors}
+        submitScheduleError={submitScheduleError}
         initialValues={workspaceToInitialValues(workspace, dayjs.tz.guess())}
         isLoading={scheduleState.tags.has("loading")}
         onCancel={() => {

diff --git a/site/src/xServices/workspaceSchedule/workspaceScheduleXService.ts b/site/src/xServices/workspaceSchedule/workspaceScheduleXService.ts
@@ -4,20 +4,16 @@
  */
 import { assign, createMachine } from "xstate"
 import * as API from "../../api/api"
-import { ApiError, FieldErrors, mapApiErrorToFieldErrors } from "../../api/errors"
 import * as TypesGen from "../../api/typesGenerated"
-import { displayError, displaySuccess } from "../../components/GlobalSnackbar/utils"
+import { displaySuccess } from "../../components/GlobalSnackbar/utils"
 
 export const Language = {
-  errorSubmissionFailed: "Failed to update schedule",
-  errorWorkspaceFetch: "Failed to fetch workspace",
   successMessage: "Successfully updated workspace schedule.",
 }
 
 type Permissions = Record<keyof ReturnType<typeof permissionsToCheck>, boolean>
 
 export interface WorkspaceScheduleContext {
-  formErrors?: FieldErrors
   getWorkspaceError?: Error | unknown
   /**
    * Each workspace has their own schedule (start and ttl). For this reason, we
@@ -29,6 +25,7 @@ export interface WorkspaceScheduleContext {
   userId?: string
   permissions?: Permissions
   checkPermissionsError?: Error | unknown
+  submitScheduleError?: Error | unknown
 }
 
 export const checks = {
@@ -86,7 +83,7 @@ export const workspaceSchedule = createMachine(
           },
           onError: {
             target: "error",
-            actions: ["assignGetWorkspaceError", "displayWorkspaceError"],
+            actions: ["assignGetWorkspaceError"],
           },
         },
         tags: "loading",
@@ -125,7 +122,7 @@ export const workspaceSchedule = createMachine(
           },
           onError: {
             target: "presentForm",
-            actions: ["assignSubmissionError", "displaySubmissionError"],
+            actions: ["assignSubmissionError"],
           },
         },
         tags: "loading",
@@ -145,7 +142,7 @@ export const workspaceSchedule = createMachine(
   {
     actions: {
       assignSubmissionError: assign({
-        formErrors: (_, event) => mapApiErrorToFieldErrors((event.data as ApiError).response.data),
+        submitScheduleError: (_, event) => event.data
       }),
       assignWorkspace: assign({
         workspace: (_, event) => event.data,
@@ -170,12 +167,6 @@ export const workspaceSchedule = createMachine(
       clearGetWorkspaceError: (context) => {
         assign({ ...context, getWorkspaceError: undefined })
       },
-      displayWorkspaceError: () => {
-        displayError(Language.errorWorkspaceFetch)
-      },
-      displaySubmissionError: () => {
-        displayError(Language.errorSubmissionFailed)
-      },
       displaySuccess: () => {
         displaySuccess(Language.successMessage)
       },
@@ -197,7 +188,7 @@ export const workspaceSchedule = createMachine(
       submitSchedule: async (context, event) => {
         if (!context.workspace?.id) {
           // This state is theoretically impossible, but helps TS
-          throw new Error("failed to load workspace")
+          throw new Error("Failed to load workspace.")
         }
 
         // REMARK: These calls are purposefully synchronous because if one