From 620227a9ef623d5b99285ec80c2b6e5686a74e07 Mon Sep 17 00:00:00 2001 From: Parkreiner Date: Fri, 31 May 2024 03:18:50 +0000 Subject: [PATCH 1/4] fix: update typo --- site/src/api/api.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/site/src/api/api.ts b/site/src/api/api.ts index 8baa6a5edfc1c..a7550f44fdb90 100644 --- 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<{ From 6da4072687023d8dc572a2e917b564bea7334db5 Mon Sep 17 00:00:00 2001 From: Parkreiner Date: Fri, 31 May 2024 03:50:53 +0000 Subject: [PATCH 2/4] fix: update typo in call site --- site/src/pages/WorkspacePage/WorkspaceReadyPage.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/site/src/pages/WorkspacePage/WorkspaceReadyPage.tsx b/site/src/pages/WorkspacePage/WorkspaceReadyPage.tsx index f3750051823ff..f98edfc89409e 100644 --- a/site/src/pages/WorkspacePage/WorkspaceReadyPage.tsx +++ b/site/src/pages/WorkspacePage/WorkspaceReadyPage.tsx @@ -173,7 +173,7 @@ export const WorkspaceReadyPage: FC = ({ stopWorkspaceMutation.mutate({ logLevel }); break; case "delete": - deleteWorkspaceMutation.mutate({ logLevel }); + deleteWorkspaceMutation.mutate({ log_level: logLevel }); break; } }; From acc6631f29ede4854584c26a33c184642f7ed89c Mon Sep 17 00:00:00 2001 From: Parkreiner Date: Fri, 31 May 2024 03:58:48 +0000 Subject: [PATCH 3/4] fix: update type for deleteWorkspace mock --- site/src/pages/WorkspacePage/WorkspacePage.test.tsx | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/site/src/pages/WorkspacePage/WorkspacePage.test.tsx b/site/src/pages/WorkspacePage/WorkspacePage.test.tsx index 9766d76f692a3..f049c4a24bbef 100644 --- 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, }); From 46ca48cea6a8250b8170aeb9878146461e95d944 Mon Sep 17 00:00:00 2001 From: Parkreiner Date: Fri, 31 May 2024 04:06:29 +0000 Subject: [PATCH 4/4] fix: update one more type mismatch --- site/src/pages/WorkspacePage/WorkspacePage.test.tsx | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/site/src/pages/WorkspacePage/WorkspacePage.test.tsx b/site/src/pages/WorkspacePage/WorkspacePage.test.tsx index f049c4a24bbef..a6bf1e2ca0bc2 100644 --- a/site/src/pages/WorkspacePage/WorkspacePage.test.tsx +++ b/site/src/pages/WorkspacePage/WorkspacePage.test.tsx @@ -427,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", }); }); });