From ae8c67f1f637a057389770b06e6be4508ca94df2 Mon Sep 17 00:00:00 2001 From: BrunoQuaresma Date: Wed, 6 Dec 2023 23:42:16 +0000 Subject: [PATCH 1/2] Change a few names related to workspace actions --- .../WorkspaceActions/WorkspaceActions.tsx | 6 +++--- .../WorkspacePage/WorkspaceActions/constants.ts | 13 +++++-------- 2 files changed, 8 insertions(+), 11 deletions(-) diff --git a/site/src/pages/WorkspacePage/WorkspaceActions/WorkspaceActions.tsx b/site/src/pages/WorkspacePage/WorkspaceActions/WorkspaceActions.tsx index 181c3b4ba0803..9da528838608c 100644 --- a/site/src/pages/WorkspacePage/WorkspaceActions/WorkspaceActions.tsx +++ b/site/src/pages/WorkspacePage/WorkspaceActions/WorkspaceActions.tsx @@ -3,7 +3,7 @@ import { Workspace, WorkspaceBuildParameter } from "api/typesGenerated"; import { useWorkspaceDuplication } from "pages/CreateWorkspacePage/useWorkspaceDuplication"; import { workspaceUpdatePolicy } from "utils/workspace"; -import { type ButtonType, actionsByWorkspaceStatus } from "./constants"; +import { type ActionType, abilitiesByWorkspaceStatus } from "./constants"; import { ActionLoadingButton, @@ -72,7 +72,7 @@ export const WorkspaceActions: FC = ({ const { duplicateWorkspace, isDuplicationReady } = useWorkspaceDuplication(workspace); - const { actions, canCancel, canAcceptJobs } = actionsByWorkspaceStatus( + const { actions, canCancel, canAcceptJobs } = abilitiesByWorkspaceStatus( workspace, canRetryDebug, ); @@ -85,7 +85,7 @@ export const WorkspaceActions: FC = ({ const canBeUpdated = workspace.outdated && canAcceptJobs; // A mapping of button type to the corresponding React component - const buttonMapping: Record = { + const buttonMapping: Record = { update: , updating: , start: ( diff --git a/site/src/pages/WorkspacePage/WorkspaceActions/constants.ts b/site/src/pages/WorkspacePage/WorkspaceActions/constants.ts index 5d043cc300e5d..0dc3f02251a63 100644 --- a/site/src/pages/WorkspacePage/WorkspaceActions/constants.ts +++ b/site/src/pages/WorkspacePage/WorkspaceActions/constants.ts @@ -1,9 +1,9 @@ import { type Workspace, type WorkspaceStatus } from "api/typesGenerated"; /** - * An iterable of all button types supported by the workspace actions UI + * An iterable of all action types supported by the workspace UI */ -export const buttonTypes = [ +export const actionTypes = [ "start", "starting", "stop", @@ -28,18 +28,15 @@ export const buttonTypes = [ "pending", ] as const; -/** - * A button type supported by the workspace actions UI - */ -export type ButtonType = (typeof buttonTypes)[number]; +export type ActionType = (typeof actionTypes)[number]; type WorkspaceAbilities = { - actions: readonly ButtonType[]; + actions: readonly ActionType[]; canCancel: boolean; canAcceptJobs: boolean; }; -export const actionsByWorkspaceStatus = ( +export const abilitiesByWorkspaceStatus = ( workspace: Workspace, canRetryDebug: boolean, ): WorkspaceAbilities => { From 91697397371c10a3fc037bb7d2057c2a150ac2ae Mon Sep 17 00:00:00 2001 From: BrunoQuaresma Date: Fri, 8 Dec 2023 13:35:54 +0000 Subject: [PATCH 2/2] Improve ability name --- site/src/pages/WorkspacePage/WorkspaceActions/constants.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/site/src/pages/WorkspacePage/WorkspaceActions/constants.ts b/site/src/pages/WorkspacePage/WorkspaceActions/constants.ts index 0dc3f02251a63..ba966d81d5ece 100644 --- a/site/src/pages/WorkspacePage/WorkspaceActions/constants.ts +++ b/site/src/pages/WorkspacePage/WorkspaceActions/constants.ts @@ -51,15 +51,15 @@ export const abilitiesByWorkspaceStatus = ( const status = workspace.latest_build.status; if (status === "failed" && canRetryDebug) { return { - ...statusToActions.failed, + ...statusToAbility.failed, actions: ["retry", "retryDebug"], }; } - return statusToActions[status]; + return statusToAbility[status]; }; -const statusToActions: Record = { +const statusToAbility: Record = { starting: { actions: ["starting"], canCancel: true,