x state pass

coder · Kira-Pilot · Jun 9, 2022 · Jun 7, 2022 · Jun 7, 2022 · Jun 8, 2022
commit 2931b60bf0625907e25df8fa94790d9f579b3cd1
diff --git a/site/src/api/api.ts b/site/src/api/api.ts
@@ -108,8 +108,11 @@ export const getTemplateVersionResources = async (versionId: string): Promise<Ty
   return response.data
 }
 
-export const getWorkspace = async (workspaceId: string, params?: any): Promise<TypesGen.Workspace> => {
-  console.log("in here", params)
+export const getWorkspace = async (
+  workspaceId: string,
+  params?: TypesGen.WorkspaceOptions,
+): Promise<TypesGen.Workspace> => {
+  console.log("in get Workspace API method", params)
   const response = await axios.get<TypesGen.Workspace>(`/api/v2/workspaces/${workspaceId}`, { params })
   return response.data
 }

diff --git a/site/src/components/Workspace/Workspace.tsx b/site/src/components/Workspace/Workspace.tsx
@@ -46,9 +46,7 @@ export const Workspace: FC<WorkspaceProps> = ({
   builds,
 }) => {
   const styles = useStyles()
-  console.log("workspace", workspace)
   const isDeleted = getWorkspaceStatus(workspace.latest_build) === succeededToStatus["delete"]
-  console.log("isDeleted", isDeleted)
   return (
     <Margins>
       <PageHeader

diff --git a/site/src/components/WorkspaceScheduleBanner/WorkspaceScheduleBanner.tsx b/site/src/components/WorkspaceScheduleBanner/WorkspaceScheduleBanner.tsx
@@ -26,7 +26,7 @@ export const shouldDisplay = (workspace: TypesGen.Workspace): boolean => {
   if (!isWorkspaceOn(workspace)) {
     return false
   } else {
-    // a mannual shutdown has a deadline of '"0001-01-01T00:00:00Z"'
+    // a manual shutdown has a deadline of '"0001-01-01T00:00:00Z"'
     // SEE: #1834
     const deadline = dayjs(workspace.latest_build.deadline).utc()
     const hasDeadline = deadline.year() > 1

diff --git a/site/src/pages/WorkspacePage/WorkspacePage.tsx b/site/src/pages/WorkspacePage/WorkspacePage.tsx
@@ -1,7 +1,7 @@
 import { useMachine } from "@xstate/react"
 import React, { useEffect } from "react"
 import { Helmet } from "react-helmet"
-import { useNavigate, useParams } from "react-router-dom"
+import { useParams } from "react-router-dom"
 import { DeleteWorkspaceDialog } from "../../components/DeleteWorkspaceDialog/DeleteWorkspaceDialog"
 import { ErrorSummary } from "../../components/ErrorSummary/ErrorSummary"
 import { FullScreenLoader } from "../../components/Loader/FullScreenLoader"
@@ -13,7 +13,6 @@ import { workspaceScheduleBannerMachine } from "../../xServices/workspaceSchedul
 
 export const WorkspacePage: React.FC = () => {
   const { username: usernameQueryParam, workspace: workspaceQueryParam } = useParams()
-  const navigate = useNavigate()
   const username = firstOrItem(usernameQueryParam, null)
   const workspaceName = firstOrItem(workspaceQueryParam, null)
 
@@ -63,7 +62,6 @@ export const WorkspacePage: React.FC = () => {
           handleCancel={() => workspaceSend("CANCEL_DELETE")}
           handleConfirm={() => {
             workspaceSend("DELETE")
-            navigate("/workspaces")
           }}
         />
       </>

diff --git a/site/src/xServices/workspace/workspaceXService.ts b/site/src/xServices/workspace/workspaceXService.ts
@@ -58,6 +58,9 @@ export const workspaceMachine = createMachine(
         getWorkspace: {
           data: TypesGen.Workspace
         }
+        getDeletedWorkspace: {
+          data: TypesGen.Workspace
+        }
         getTemplate: {
           data: TypesGen.Template
         }
@@ -93,6 +96,9 @@ export const workspaceMachine = createMachine(
       idle: {
         tags: "loading",
       },
+      deleted: {
+        tags: "deleted",
+      },
       gettingWorkspace: {
         entry: ["clearGetWorkspaceError", "clearContext"],
         invoke: {
@@ -183,10 +189,10 @@ export const workspaceMachine = createMachine(
               requestingDelete: {
                 entry: "clearBuildError",
                 invoke: {
-                  id: "deleteWorkspace",
+                  id: "deleteWorkspace", // delete the workspace
                   src: "deleteWorkspace",
                   onDone: {
-                    target: "idle",
+                    target: "gettingDeletedWorkspace",
                     actions: ["assignBuild", "refreshTimeline"],
                   },
                   onError: {
@@ -195,6 +201,21 @@ export const workspaceMachine = createMachine(
                   },
                 },
               },
+              gettingDeletedWorkspace: {
+                entry: ["clearGetWorkspaceError", "clearContext"],
+                invoke: {
+                  id: "getDeletedWorkspace", // request deleted workspace
+                  src: "getDeletedWorkspace",
+                  onDone: {
+                    target: "idle",
+                    actions: ["assignBuild", "refreshTimeline"],
+                  },
+                  onError: {
+                    target: "idle", // error
+                    actions: ["assignBuildError", "displayBuildError"],
+                  },
+                },
+              },
               requestingCancel: {
                 entry: "clearCancellationMessage",
                 invoke: {
@@ -433,6 +454,13 @@ export const workspaceMachine = createMachine(
       getWorkspace: async (_, event) => {
         return await API.getWorkspaceByOwnerAndName(event.username, event.workspaceName)
       },
+      getDeletedWorkspace: async (context) => {
+        if (context.workspace) {
+          return await API.getWorkspace(context.workspace.id, { deleted: true })
+        } else {
          throw Error("Cannot get workspace without id")
+        }
+      },
       getTemplate: async (context) => {
         if (context.workspace) {
           return await API.getTemplate(context.workspace.template_id)