added restart hook

coder · Kira-Pilot · Apr 28, 2023 · Apr 14, 2023 · Apr 25, 2023 · Apr 26, 2023
commit a6cbf3486f571b7e64f8e3b4cc50b34903cbc048
diff --git a/site/src/components/Workspace/Workspace.tsx b/site/src/components/Workspace/Workspace.tsx
@@ -41,7 +41,7 @@ export interface WorkspaceProps {
   }
   handleStart: () => void
   handleStop: () => void
-  handleRestart: () => void
+  handleRestart: any
   handleDelete: () => void
   handleUpdate: () => void
   handleCancel: () => void

diff --git a/site/src/components/WorkspaceActions/Buttons.tsx b/site/src/components/WorkspaceActions/Buttons.tsx
@@ -8,6 +8,8 @@ import { LoadingButton } from "components/LoadingButton/LoadingButton"
 import { FC, PropsWithChildren } from "react"
 import { useTranslation } from "react-i18next"
 import { makeStyles } from "@material-ui/core/styles"
+// import { UseMutateFunction } from "@tanstack/react-query"
+// import { WorkspaceBuild } from "api/typesGenerated"
 
 interface WorkspaceAction {
   handleAction: () => void
@@ -67,9 +69,7 @@ export const StopButton: FC<PropsWithChildren<WorkspaceAction>> = ({
   )
 }
 
-export const RestartButton: FC<PropsWithChildren<WorkspaceAction>> = ({
-  handleAction,
-}) => {
+export const RestartButton: FC<PropsWithChildren<any>> = ({ handleAction }) => {
   const { t } = useTranslation("workspacePage")
   const styles = useStyles()
 

diff --git a/site/src/components/WorkspaceActions/WorkspaceActions.tsx b/site/src/components/WorkspaceActions/WorkspaceActions.tsx
@@ -5,7 +5,7 @@ import { makeStyles } from "@material-ui/core/styles"
 import MoreVertOutlined from "@material-ui/icons/MoreVertOutlined"
 import { FC, ReactNode, useRef, useState } from "react"
 import { useTranslation } from "react-i18next"
-import { WorkspaceStatus } from "../../api/typesGenerated"
+import { WorkspaceStatus } from "api/typesGenerated"
 import {
   ActionLoadingButton,
   CancelButton,
@@ -29,7 +29,7 @@ export interface WorkspaceActionsProps {
   isOutdated: boolean
   handleStart: () => void
   handleStop: () => void
-  handleRestart: () => void
+  handleRestart: any
   handleDelete: () => void
   handleUpdate: () => void
   handleCancel: () => void
@@ -133,7 +133,9 @@ export const WorkspaceActions: FC<WorkspaceActionsProps> = ({
         (isUpdating
           ? buttonMapping[ButtonTypesEnum.updating]
           : buttonMapping[ButtonTypesEnum.update])}
-      {actionsByStatus.map((action) => buttonMapping[action])}
+      {actionsByStatus.map((action) => (
+        <span key={action}>{buttonMapping[action]}</span>
+      ))}
       {canCancel && <CancelButton handleAction={handleCancel} />}
       <div>
         <Button

diff --git a/site/src/pages/WorkspacePage/WorkspaceReadyPage.tsx b/site/src/pages/WorkspacePage/WorkspaceReadyPage.tsx
@@ -30,6 +30,7 @@ import { UpdateBuildParametersDialog } from "./UpdateBuildParametersDialog"
 import { ChangeVersionDialog } from "./ChangeVersionDialog"
 import { useQuery } from "@tanstack/react-query"
 import { getTemplateVersions } from "api/api"
+import { useRestartWorkspace } from "./hooks"
 
 interface WorkspaceReadyPageProps {
   workspaceState: StateFrom<typeof workspaceMachine>
@@ -77,6 +78,12 @@ export const WorkspaceReadyPage = ({
     enabled: changeVersionDialogOpen,
   })
 
+  const [restartBuildError, setRestartBuildError] = useState<
+    Error | unknown | undefined
+  >(undefined)
+
+  const { mutate: restartWorkspace } = useRestartWorkspace(setRestartBuildError)
+
   // keep banner machine in sync with workspace
   useEffect(() => {
     bannerSend({ type: "REFRESH_WORKSPACE", workspace })
@@ -123,7 +130,7 @@ export const WorkspaceReadyPage = ({
         workspace={workspace}
         handleStart={() => workspaceSend({ type: "START" })}
         handleStop={() => workspaceSend({ type: "STOP" })}
-        handleRestart={() => workspaceSend({ type: "START" })}
+        handleRestart={() => restartWorkspace(workspace.id)}
         handleDelete={() => workspaceSend({ type: "ASK_DELETE" })}
         handleUpdate={() => workspaceSend({ type: "UPDATE" })}
         handleCancel={() => workspaceSend({ type: "CANCEL" })}
@@ -141,7 +148,7 @@ export const WorkspaceReadyPage = ({
         hideVSCodeDesktopButton={featureVisibility["browser_only"]}
         workspaceErrors={{
           [WorkspaceErrors.GET_BUILDS_ERROR]: getBuildsError,
-          [WorkspaceErrors.BUILD_ERROR]: buildError,
+          [WorkspaceErrors.BUILD_ERROR]: buildError ?? restartBuildError,
           [WorkspaceErrors.CANCELLATION_ERROR]: cancellationError,
         }}
         buildInfo={buildInfo}

diff --git a/site/src/pages/WorkspacePage/hooks.ts b/site/src/pages/WorkspacePage/hooks.ts
@@ -0,0 +1,64 @@
+import { useMutation } from "@tanstack/react-query"
+import {
+  stopWorkspace,
+  getWorkspaceBuildByNumber,
+  startWorkspace,
+} from "api/api"
+import { delay } from "utils/delay"
+import { ProvisionerJob, WorkspaceBuild } from "api/typesGenerated"
+
+function waitForStop(
+  username: string,
+  workspaceName: string,
+  buildNumber: string,
+) {
+  return new Promise((res, reject) => {
+    void (async () => {
+      let latestJobInfo: ProvisionerJob | undefined = undefined
+
+      while (latestJobInfo?.status !== "succeeded") {
+        const { job } = await getWorkspaceBuildByNumber(
+          username,
+          workspaceName,
+          buildNumber,
+        )
+        latestJobInfo = job
+
+        if (
+          ["failed", "canceled"].some((status) =>
+            latestJobInfo?.status.includes(status),
+          )
+        ) {
+          return reject(latestJobInfo)
+        }
+
+        await delay(1000)
+      }
+
+      return res(latestJobInfo)
+    })()
+  })
+}
+
+export const useRestartWorkspace = (
+  setRestartBuildError: (arg: Error | unknown | undefined) => void,
+) => {
+  return useMutation({
+    mutationFn: stopWorkspace,
+    onSuccess: async (data) => {
+      try {
+        await waitForStop(
+          data.workspace_owner_name,
+          data.workspace_name,
+          String(data.build_number),
+        )
+        await startWorkspace(data.workspace_id, data.template_version_id)
+      } catch (error) {
+        if ((error as WorkspaceBuild).status === "canceled") {
+          return
+        }
+        setRestartBuildError(error)
+      }
+    },
+  })
+}