Handle canceling

presleyp · presleyp · commit 87fee0668a27 · 2022-05-13T14:12:07.000Z
diff --git a/site/src/components/Workspace/Workspace.stories.tsx b/site/src/components/Workspace/Workspace.stories.tsx
@@ -35,6 +35,18 @@ Stopping.args = { ...Started.args, workspaceStatus: "stopping" }
 export const Error = Template.bind({})
 Error.args = { ...Started.args, workspaceStatus: "error" }
 
+export const BuildLoading = Template.bind({})
+BuildLoading.args = {...Started.args, workspaceStatus: "loading" }
+
+export const Deleting = Template.bind({})
+Deleting.args = {...Started.args, workspaceStatus: "deleting"}
+
+export const Deleted = Template.bind({})
+Deleted.args = {...Started.args, workspaceStatus: "deleted"}
+
+export const Canceling = Template.bind({})
+Canceling.args = {...Started.args, workspaceStatus: "canceling"}
+
 export const NoBreadcrumb = Template.bind({})
 NoBreadcrumb.args = { ...Started.args, template: undefined }
 
diff --git a/site/src/components/WorkspaceStatusBar/WorkspaceStatusBar.tsx b/site/src/components/WorkspaceStatusBar/WorkspaceStatusBar.tsx
@@ -24,7 +24,10 @@ const Language = {
   error: "Build Failed",
   loading: "Loading Status",
   deleting: "Deleting", 
-  deleted: "Deleted"
+  deleted: "Deleted",
+  // "Canceling" would be misleading because it refers to a build, not the workspace. 
+  // So just stall. When it is canceled it will appear as the error workspaceStatus.
+  canceling: "Loading Status"
 }
 
 export interface WorkspaceStatusBarProps {
@@ -102,7 +105,7 @@ export const WorkspaceStatusBar: React.FC<WorkspaceStatusBarProps> = ({
             )}
 
             {/* Workspace will not update while another job is in progress so hide the button until it's usable */}
-            {workspace.outdated && ["started", "stopped", "error"].includes(workspaceStatus) && (
+            {workspace.outdated && ["started", "stopped", "deleted", "error"].includes(workspaceStatus) && (
               <Button onClick={handleUpdate} color="primary">
                 {Language.update}
               </Button>
diff --git a/site/src/pages/WorkspacePage/WorkspacePage.tsx b/site/src/pages/WorkspacePage/WorkspacePage.tsx
@@ -10,7 +10,7 @@ import { firstOrItem } from "../../util/array"
 import { XServiceContext } from "../../xServices/StateContext"
 import { selectWorkspaceStatus } from "../../xServices/workspace/workspaceSelectors"
 
-export type WorkspaceStatus = "started" | "starting" | "stopped" | "stopping" | "error" | "loading" | "deleting" | "deleted"
+export type WorkspaceStatus = "started" | "starting" | "stopped" | "stopping" | "error" | "loading" | "deleting" | "deleted" | "canceling"
 
 export const WorkspacePage: React.FC = () => {
   const { workspace: workspaceQueryParam } = useParams()
diff --git a/site/src/xServices/workspace/workspaceSelectors.ts b/site/src/xServices/workspace/workspaceSelectors.ts
@@ -23,8 +23,8 @@ export const selectWorkspaceStatus = (state: State<WorkspaceContext, WorkspaceEv
     case "succeeded": return succeededToStatus[transition]
     case "pending": return inProgressToStatus[transition]
     case "running": return inProgressToStatus[transition]
+    case "canceling": return "canceling"
     case "canceled": return "error"
-    case "canceling": return "error"
     case "failed": return "error"
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -23,8 +23,8 @@ export const selectWorkspaceStatus = (state: State<WorkspaceContext, WorkspaceEv`
`23`	`23`	`case "succeeded": return succeededToStatus[transition]`
`24`	`24`	`case "pending": return inProgressToStatus[transition]`
`25`	`25`	`case "running": return inProgressToStatus[transition]`
	`26`	`+ case "canceling": return "canceling"`
`26`	`27`	`case "canceled": return "error"`
`27`		`- case "canceling": return "error"`
`28`	`28`	`case "failed": return "error"`
`29`	`29`	`}`
`30`	`30`	`}`