Apply improvements from PR review

BrunoQuaresma · BrunoQuaresma · commit b70e28f0745e · 2025-05-06T14:10:57.000Z
diff --git a/site/src/modules/workspaces/WorkspaceUpdateDialogs.tsx b/site/src/modules/workspaces/WorkspaceUpdateDialogs.tsx
@@ -20,10 +20,7 @@ type UseWorkspaceUpdateOptions = {
 };
 
 type UseWorkspaceUpdateResult = {
-	update: (
-		hasConfirmed?: boolean,
-		buildParameters?: WorkspaceBuildParameter[],
-	) => void;
+	update: () => void;
 	isUpdating: boolean;
 	dialogs: {
 		updateConfirmation: UpdateConfirmationDialogProps;
@@ -50,15 +47,11 @@ export const useWorkspaceUpdate = ({
 		onError,
 	});
 
-	const update = (
-		hasConfirmed = false,
-		buildParameters: WorkspaceBuildParameter[] = [],
-	) => {
-		if (!hasConfirmed) {
-			setIsConfirmingUpdate(true);
-			return;
-		}
+	const update = () => {
+		setIsConfirmingUpdate(true);
+	};
 
+	const confirmUpdate = (buildParameters: WorkspaceBuildParameter[] = []) => {
 		updateWorkspaceMutation.mutate(buildParameters);
 		setIsConfirmingUpdate(false);
 	};
@@ -70,7 +63,7 @@ export const useWorkspaceUpdate = ({
 			updateConfirmation: {
 				open: isConfirmingUpdate,
 				onClose: () => setIsConfirmingUpdate(false),
-				onConfirm: () => update(true),
+				onConfirm: () => confirmUpdate(),
 				latestVersion,
 			},
 			missingBuildParameters: {
@@ -80,7 +73,7 @@ export const useWorkspaceUpdate = ({
 				},
 				onUpdate: (buildParameters: WorkspaceBuildParameter[]) => {
 					if (updateWorkspaceMutation.error instanceof MissingBuildParameters) {
-						update(true, buildParameters);
+						confirmUpdate(buildParameters);
 					}
 				},
 			},
diff --git a/site/src/modules/workspaces/actions.ts b/site/src/modules/workspaces/actions.ts
@@ -66,7 +66,7 @@ export const abilitiesByWorkspaceStatus = (
 		case "starting": {
 			return {
 				actions: ["starting"],
-				canCancel: true && hasPermissionToCancel,
+				canCancel: hasPermissionToCancel,
 				canAcceptJobs: false,
 			};
 		}
@@ -91,7 +91,7 @@ export const abilitiesByWorkspaceStatus = (
 		case "stopping": {
 			return {
 				actions: ["stopping"],
-				canCancel: true && hasPermissionToCancel,
+				canCancel: hasPermissionToCancel,
 				canAcceptJobs: false,
 			};
 		}
diff --git a/site/src/pages/WorkspacePage/WorkspaceReadyPage.tsx b/site/src/pages/WorkspacePage/WorkspaceReadyPage.tsx
@@ -26,7 +26,7 @@ import { useFeatureVisibility } from "modules/dashboard/useFeatureVisibility";
 import {
 	WorkspaceUpdateDialogs,
 	useWorkspaceUpdate,
-} from "modules/workspaces/useWorkspaceUpdate";
+} from "modules/workspaces/WorkspaceUpdateDialogs";
 import { type FC, useEffect, useState } from "react";
 import { Helmet } from "react-helmet-async";
 import { useMutation, useQuery, useQueryClient } from "react-query";
diff --git a/site/src/pages/WorkspacesPage/WorkspacesTable.tsx b/site/src/pages/WorkspacesPage/WorkspacesTable.tsx
@@ -54,11 +54,11 @@ import { useDashboard } from "modules/dashboard/useDashboard";
 import { WorkspaceAppStatus } from "modules/workspaces/WorkspaceAppStatus/WorkspaceAppStatus";
 import { WorkspaceDormantBadge } from "modules/workspaces/WorkspaceDormantBadge/WorkspaceDormantBadge";
 import { WorkspaceOutdatedTooltip } from "modules/workspaces/WorkspaceOutdatedTooltip/WorkspaceOutdatedTooltip";
-import { abilitiesByWorkspaceStatus } from "modules/workspaces/actions";
 import {
 	WorkspaceUpdateDialogs,
 	useWorkspaceUpdate,
-} from "modules/workspaces/useWorkspaceUpdate";
+} from "modules/workspaces/WorkspaceUpdateDialogs";
+import { abilitiesByWorkspaceStatus } from "modules/workspaces/actions";
 import {
 	type FC,
 	type PropsWithChildren,
