fix: update DeleteWorkspaceOptions to pick properties correctly (#13423)

Parkreiner · web-flow · commit 19530c6b44c6 · 2024-05-31T10:23:59.000-04:00
* fix: update typo

* fix: update typo in call site

* fix: update type for deleteWorkspace mock

* fix: update one more type mismatch
diff --git a/site/src/api/api.ts b/site/src/api/api.ts
@@ -314,7 +314,7 @@ type RestartWorkspaceParameters = Readonly<{
 
 export type DeleteWorkspaceOptions = Pick<
   TypesGen.CreateWorkspaceBuildRequest,
-  "log_level" & "orphan"
+  "log_level" | "orphan"
 >;
 
 export type DeploymentConfig = Readonly<{
diff --git a/site/src/pages/WorkspacePage/WorkspacePage.test.tsx b/site/src/pages/WorkspacePage/WorkspacePage.test.tsx
@@ -161,7 +161,9 @@ describe("WorkspacePage", () => {
     });
     await user.click(confirmButton);
     // arguments are workspace.name, log level (undefined), and orphan
-    expect(deleteWorkspaceMock).toBeCalledWith(MockFailedWorkspace.id, {
+    expect(deleteWorkspaceMock).toBeCalledWith<
+      [string, apiModule.DeleteWorkspaceOptions]
+    >(MockFailedWorkspace.id, {
       log_level: undefined,
       orphan: true,
     });
@@ -425,8 +427,10 @@ describe("WorkspacePage", () => {
 
       test("Retry with debug logs", async () => {
         await testButton(failedDelete, retryDebugButtonRe, mockDelete);
-        expect(mockDelete).toBeCalledWith(failedDelete.id, {
-          logLevel: "debug",
+        expect(mockDelete).toBeCalledWith<
+          [string, apiModule.DeleteWorkspaceOptions]
+        >(failedDelete.id, {
+          log_level: "debug",
         });
       });
     });
diff --git a/site/src/pages/WorkspacePage/WorkspaceReadyPage.tsx b/site/src/pages/WorkspacePage/WorkspaceReadyPage.tsx
@@ -173,7 +173,7 @@ export const WorkspaceReadyPage: FC<WorkspaceReadyPageProps> = ({
         stopWorkspaceMutation.mutate({ logLevel });
         break;
       case "delete":
-        deleteWorkspaceMutation.mutate({ logLevel });
+        deleteWorkspaceMutation.mutate({ log_level: logLevel });
         break;
     }
   };

Original file line number	Diff line number	Diff line change
`@@ -173,7 +173,7 @@ export const WorkspaceReadyPage: FC<WorkspaceReadyPageProps> = ({`
`173`	`173`	`stopWorkspaceMutation.mutate({ logLevel });`
`174`	`174`	`break;`
`175`	`175`	`case "delete":`
`176`		`- deleteWorkspaceMutation.mutate({ logLevel });`
	`176`	`+ deleteWorkspaceMutation.mutate({ log_level: logLevel });`
`177`	`177`	`break;`
`178`	`178`	`}`
`179`	`179`	`};`