Fix polling

coder · presleyp · May 16, 2022 · May 5, 2022 · May 5, 2022 · May 5, 2022
commit 9786f6c8211d46da833a6bd25ccc33a34ff5408c
diff --git a/site/src/xServices/workspace/workspaceXService.ts b/site/src/xServices/workspace/workspaceXService.ts
@@ -178,79 +178,50 @@ export const workspaceMachine = createMachine(
                 tags: ["buildLoading", "stopping"],
               },
               buildingStart: {
-                invoke: {
-                  id: "building",
-                  src: "pollBuild",
-                },
                 initial: "refreshingWorkspace",
                 states: {
                   refreshingWorkspace: {
+                    entry: "clearRefreshWorkspaceError",
                     invoke: {
                       id: "refreshWorkspace",
                       src: "refreshWorkspace",
                       onDone: [
-                        {
-                          cond: "jobSucceeded",
-                          target: "#workspaceState.ready.build.started",
-                          actions: ["clearBuildError", "assignWorkspace"],
-                        },
-                        {
-                          cond: "jobPendingOrRunning",
-                          target: "waiting",
-                          actions: "assignWorkspace"
-                        },
-                        {
-                          // if job is canceling, cancelled, or failed, the user needs to retry
-                          target: "#workspaceState.ready.build.error",
-                          actions: ["assignBuildError", "assignWorkspace"],
-                        },
+                        { cond: "jobSucceeded", target: "#workspaceState.ready.build.started", actions: ["clearBuildError", "assignWorkspace"]},
+                        { cond: "jobPendingOrRunning", target: "waiting", actions: "assignWorkspace" },
+                        { target: "#workspaceState.ready.build.error", actions: ["assignWorkspace", "assignBuildError"] }
                       ],
-                      onError: "waiting",
-                    },
+                      onError: { target: "waiting", actions: "assignRefreshWorkspaceError"}
+                    }
                   },
                   waiting: {
-                    on: {
-                      REFRESH_WORKSPACE: "refreshingWorkspace",
-                    },
-                  },
+                    after: {
+                      1000: "refreshingWorkspace"
+                    }
+                  }
                 },
                 tags: ["buildLoading", "starting"],
               },
               buildingStop: {
-                invoke: {
-                  id: "building",
-                  src: "pollBuild",
-                },
                 initial: "refreshingWorkspace",
                 states: {
                   refreshingWorkspace: {
+                    entry: "clearRefreshWorkspaceError",
                     invoke: {
                       id: "refreshWorkspace",
                       src: "refreshWorkspace",
                       onDone: [
-                        {
-                          cond: "jobSucceeded",
-                          target: "#workspaceState.ready.build.stopped",
-                          actions: "clearBuildError",
-                        },
-                        {
-                          cond: "jobPendingOrRunning",
-                          target: "waiting",
-                        },
-                        {
-                          // if job is canceling, cancelled, or failed, the user needs to retry
-                          target: "#workspaceState.ready.build.error",
-                          actions: "assignBuildError",
-                        },
+                        { cond: "jobSucceeded", target: "#workspaceState.ready.build.stopped", actions: ["clearBuildError", "assignWorkspace"]},
+                        { cond: "jobPendingOrRunning", target: "waiting", actions: "assignWorkspace" },
+                        { target: "#workspaceState.ready.build.error", actions: ["assignWorkspace", "assignBuildError"] }
                       ],
-                      onError: "waiting",
-                    },
+                      onError: { target: "waiting", actions: "assignRefreshWorkspaceError"}
+                    }
                   },
                   waiting: {
-                    on: {
-                      REFRESH_WORKSPACE: "refreshingWorkspace",
-                    },
-                  },
+                    after: {
+                      1000: "refreshingWorkspace"
+                    }
+                  }
                 },
                 tags: ["buildLoading", "stopping"],
               },
@@ -318,6 +289,12 @@ export const workspaceMachine = createMachine(
         assign({
           buildError: undefined,
         }),
+      assignRefreshWorkspaceError: (_, event) => assign({
+        refreshWorkspaceError: event.data
+      }),
+      clearRefreshWorkspaceError: (_) => assign({
+        refreshWorkspaceError: undefined
+      })
     },
     guards: {
       workspaceIsStarted: (context) =>
@@ -371,15 +348,6 @@ export const workspaceMachine = createMachine(
           throw Error("Cannot stop workspace without workspace id")
         }
       },
-      pollBuild: async (context) => (send) => {
-        if (context.workspace) {
-          const workspaceId = context.workspace.id
-          const intervalId = setInterval(() => send({ type: "GET_WORKSPACE", workspaceId }), 1000)
-          return () => clearInterval(intervalId)
-        } else {
-          throw Error("Cannot fetch workspace without id")
-        }
-      },
       refreshWorkspace: async (context) => {
         if (context.workspace) {
           return await API.getWorkspace(context.workspace.id)