fix workflow context assignment

coder · AbhineetJain · Aug 5, 2022 · Aug 1, 2022 · Aug 1, 2022 · Aug 1, 2022
commit 66910aba4c33f268029e67116d4d4b1b20c8afee
diff --git a/site/src/components/Workspace/Workspace.stories.tsx b/site/src/components/Workspace/Workspace.stories.tsx
@@ -101,11 +101,6 @@ export const Canceled = Template.bind({})
 Canceled.args = {
   ...Started.args,
   workspace: Mocks.MockCanceledWorkspace,
-  workspaceErrors: {
-    [WorkspaceErrors.CANCELLATION_MESSAGE]: Mocks.makeMockApiError({
-      message: "Job has been marked as canceled...",
-    }),
-  },
 }
 
 export const Outdated = Template.bind({})
@@ -133,3 +128,13 @@ GetResourcesError.args = {
     }),
   },
 }
+
+export const CancellationError = Template.bind({})
+CancellationError.args = {
+  ...Error.args,
+  workspaceErrors: {
+    [WorkspaceErrors.CANCELLATION_ERROR]: Mocks.makeMockApiError({
+      message: "Job could not be canceled.",
+    }),
+  },
+}
diff --git a/site/src/components/Workspace/Workspace.tsx b/site/src/components/Workspace/Workspace.tsx
@@ -20,7 +20,7 @@ export enum WorkspaceErrors {
   GET_RESOURCES_ERROR = "getResourcesError",
   GET_BUILDS_ERROR = "getBuildsError",
   BUILD_ERROR = "buildError",
-  CANCELLATION_MESSAGE = "cancellationMessage",
+  CANCELLATION_ERROR = "cancellationError",
 }
 
 export interface WorkspaceProps {
@@ -70,8 +70,8 @@ export const Workspace: FC<WorkspaceProps> = ({
         {workspaceErrors[WorkspaceErrors.BUILD_ERROR] && (
           <ErrorSummary error={workspaceErrors[WorkspaceErrors.BUILD_ERROR]} dismissible />
         )}
-        {workspaceErrors[WorkspaceErrors.CANCELLATION_MESSAGE] && (
-          <ErrorSummary error={workspaceErrors[WorkspaceErrors.CANCELLATION_MESSAGE]} dismissible />
+        {workspaceErrors[WorkspaceErrors.CANCELLATION_ERROR] && (
+          <ErrorSummary error={workspaceErrors[WorkspaceErrors.CANCELLATION_ERROR]} dismissible />
         )}
       </Stack>
       <PageHeader

diff --git a/site/src/pages/WorkspacePage/WorkspacePage.tsx b/site/src/pages/WorkspacePage/WorkspacePage.tsx
@@ -42,7 +42,7 @@ export const WorkspacePage: React.FC = () => {
     permissions,
     checkPermissionsError,
     buildError,
-    cancellationMessage,
+    cancellationError,
   } = workspaceState.context
 
   const canUpdateWorkspace = !!permissions?.updateWorkspace
@@ -124,7 +124,7 @@ export const WorkspacePage: React.FC = () => {
             [WorkspaceErrors.GET_RESOURCES_ERROR]: getResourcesError,
             [WorkspaceErrors.GET_BUILDS_ERROR]: getBuildsError,
             [WorkspaceErrors.BUILD_ERROR]: buildError,
-            [WorkspaceErrors.CANCELLATION_MESSAGE]: cancellationMessage,
+            [WorkspaceErrors.CANCELLATION_ERROR]: cancellationError,
           }}
         />
         <DeleteWorkspaceDialog

diff --git a/site/src/xServices/workspace/workspaceXService.ts b/site/src/xServices/workspace/workspaceXService.ts
@@ -3,7 +3,7 @@ import { pure } from "xstate/lib/actions"
 import * as API from "../../api/api"
 import * as Types from "../../api/types"
 import * as TypesGen from "../../api/typesGenerated"
-import { displayError } from "../../components/GlobalSnackbar/utils"
+import { displayError, displaySuccess } from "../../components/GlobalSnackbar/utils"
 
 const latestBuild = (builds: TypesGen.WorkspaceBuild[]) => {
   // Cloning builds to not change the origin object with the sort()
@@ -35,7 +35,8 @@ export interface WorkspaceContext {
   builds?: TypesGen.WorkspaceBuild[]
   getBuildsError?: Error | unknown
   loadMoreBuildsError?: Error | unknown
-  cancellationMessage: Error | unknown
+  cancellationMessage?: Types.Message
+  cancellationError?: Error | unknown
   // permissions
   permissions?: Permissions
   checkPermissionsError?: Error | unknown
@@ -97,6 +98,9 @@ export const workspaceMachine = createMachine(
         stopWorkspace: {
           data: TypesGen.WorkspaceBuild
         }
+        deleteWorkspace: {
+          data: TypesGen.WorkspaceBuild
+        }
         cancelWorkspace: {
           data: Types.Message
         }
@@ -248,17 +252,17 @@ export const workspaceMachine = createMachine(
                 },
               },
               requestingCancel: {
-                entry: "clearCancellationMessage",
+                entry: ["clearCancellationMessage", "clearCancellationError"],
                 invoke: {
                   id: "cancelWorkspace",
                   src: "cancelWorkspace",
                   onDone: {
                     target: "idle",
-                    actions: ["assignCancellationMessage", "refreshTimeline"],
+                    actions: ["assignCancellationMessage", "displayCancellationMessage", "refreshTimeline"],
                   },
                   onError: {
                     target: "idle",
-                    actions: ["assignCancellationMessage"],
+                    actions: ["assignCancellationError"],
                   },
                 },
               },
@@ -387,57 +391,57 @@ export const workspaceMachine = createMachine(
       clearGetPermissionsError: assign({
         checkPermissionsError: (_) => undefined,
       }),
-      assignBuild: (_, event) =>
-        assign({
-          build: event.data,
-        }),
-      assignBuildError: (_, event) =>
-        assign({
-          buildError: event.data,
-        }),
-      clearBuildError: (_) =>
-        assign({
-          buildError: undefined,
-        }),
-      assignCancellationMessage: (_, event) =>
-        assign({
-          cancellationMessage: event.data,
-        }),
-      clearCancellationMessage: (_) =>
-        assign({
-          cancellationMessage: undefined,
-        }),
-      assignRefreshWorkspaceError: (_, event) =>
-        assign({
-          refreshWorkspaceError: event.data,
-        }),
-      clearRefreshWorkspaceError: (_) =>
-        assign({
-          refreshWorkspaceError: undefined,
-        }),
-      assignRefreshTemplateError: (_, event) =>
-        assign({
-          refreshTemplateError: event.data,
-        }),
+      assignBuild: assign({
+        build: (_, event) => event.data,
+      }),
+      assignBuildError: assign({
+        buildError: (_, event) => event.data,
+      }),
+      clearBuildError: assign({
+        buildError: (_) => undefined,
+      }),
+      assignCancellationMessage: assign({
+        cancellationMessage: (_, event) => event.data,
+      }),
+      clearCancellationMessage: assign({
+        cancellationMessage: (_) => undefined,
+      }),
+      displayCancellationMessage: (context) => {
+        if (context.cancellationMessage) {
+          displaySuccess(context.cancellationMessage.message)
+        }
+      },
+      assignCancellationError: assign({
+        cancellationError: (_, event) => event.data,
+      }),
+      clearCancellationError: assign({
+        cancellationError: (_) => undefined,
+      }),
+      assignRefreshWorkspaceError: assign({
+        refreshWorkspaceError: (_, event) => event.data,
+      }),
+      clearRefreshWorkspaceError: assign({
+        refreshWorkspaceError: (_) => undefined,
+      }),
+      assignRefreshTemplateError: assign({
+        refreshTemplateError: (_, event) => event.data,
+      }),
       displayRefreshTemplateError: () => {
         displayError(Language.refreshTemplateError)
       },
-      clearRefreshTemplateError: (_) =>
-        assign({
-          refreshTemplateError: undefined,
-        }),
+      clearRefreshTemplateError: assign({
+        refreshTemplateError: (_) => undefined,
+      }),
       // Resources
       assignResources: assign({
         resources: (_, event) => event.data,
       }),
-      assignGetResourcesError: (_, event) =>
-        assign({
-          getResourcesError: event.data,
-        }),
-      clearGetResourcesError: (_) =>
-        assign({
-          getResourcesError: undefined,
-        }),
+      assignGetResourcesError: assign({
+        getResourcesError: (_, event) => event.data,
+      }),
+      clearGetResourcesError: assign({
+        getResourcesError: (_) => undefined,
+      }),
       // Timeline
       assignBuilds: assign({
         builds: (_, event) => event.data,