finalize machine

coder · greyscaled · May 26, 2022 · May 24, 2022 · May 24, 2022 · May 24, 2022
commit 7a050dbae1d636b5f5a266e832fa656b614813f9
diff --git a/site/src/pages/WorkspaceSchedulePage/WorkspaceSchedulePage.tsx b/site/src/pages/WorkspaceSchedulePage/WorkspaceSchedulePage.tsx
@@ -94,11 +94,11 @@ export const WorkspaceSchedulePage: React.FC = () => {
   if (!workspaceId) {
     navigate("/workspaces")
     return null
+  } else if (scheduleState.matches("idle") || scheduleState.matches("gettingWorkspace") || !workspace) {
+    return <FullScreenLoader />
   } else if (scheduleState.matches("error")) {
     return <ErrorSummary error={getWorkspaceError} retry={() => scheduleSend({ type: "GET_WORKSPACE", workspaceId })} />
-  } else if (!workspace) {
-    return <FullScreenLoader />
-  } else {
+  } else if (scheduleState.matches("presentForm") || scheduleState.matches("submittingSchedule")) {
     return (
       <WorkspaceScheduleForm
         fieldErrors={formErrors}
@@ -112,9 +112,16 @@ export const WorkspaceSchedulePage: React.FC = () => {
             autoStart: formValuesToAutoStartRequest(values),
             ttl: formValuesToTTLRequest(values),
           })
-          // TODO(Grey): navigation logic
         }}
       />
     )
+  } else if (scheduleState.matches("submitSuccess")) {
+    navigate(`/workspaces/${workspaceId}`)
+    return <FullScreenLoader />
+  } else {
+    // Theoretically impossible - log and bail
+    console.error("WorkspaceSchedulePage: unknown state :: ", scheduleState)
+    navigate("/")
+    return null
   }
 }
diff --git a/site/src/xServices/workspaceSchedule/workspaceScheduleXService.ts b/site/src/xServices/workspaceSchedule/workspaceScheduleXService.ts
@@ -80,7 +80,7 @@ export const workspaceSchedule = createMachine(
           src: "submitSchedule",
           id: "submitSchedule",
           onDone: {
-            target: "idle",
+            target: "submitSuccess",
             actions: "displaySuccess",
           },
           onError: {
@@ -90,6 +90,11 @@ export const workspaceSchedule = createMachine(
         },
         tags: "loading",
       },
+      submitSuccess: {
+        on: {
+          SUBMIT_SCHEDULE: "submittingSchedule",
+        },
+      },
       error: {
         on: {
           GET_WORKSPACE: "gettingWorkspace",