From 9d8578e0e305746c3f1946114b74fa8e533805b6 Mon Sep 17 00:00:00 2001 From: Bruno Quaresma Date: Fri, 8 Dec 2023 11:46:18 -0300 Subject: [PATCH] refactor(site): apply minor naming improvements (#11080) Minor naming and logic improvements to improve readability --- .../pages/WorkspacePage/WorkspaceStats.tsx | 26 +++++++++++-------- 1 file changed, 15 insertions(+), 11 deletions(-) diff --git a/site/src/pages/WorkspacePage/WorkspaceStats.tsx b/site/src/pages/WorkspacePage/WorkspaceStats.tsx index d02bc78ef3..923f9aa44f 100644 --- a/site/src/pages/WorkspacePage/WorkspaceStats.tsx +++ b/site/src/pages/WorkspacePage/WorkspaceStats.tsx @@ -110,7 +110,7 @@ export const WorkspaceStats: FC = ({ {shouldDisplayScheduleLabel(workspace) && ( {isWorkspaceOn(workspace) ? ( @@ -335,21 +335,25 @@ const ScheduleSettingsLink = forwardRef( }, ); -export const canEditDeadline = (workspace: Workspace): boolean => { - return isWorkspaceOn(workspace) && Boolean(workspace.latest_build.deadline); +const hasDeadline = (workspace: Workspace): boolean => { + return Boolean(workspace.latest_build.deadline); }; -export const shouldDisplayScheduleLabel = (workspace: Workspace): boolean => { - if (canEditDeadline(workspace)) { - return true; - } - if (isWorkspaceOn(workspace)) { - return false; - } +const hasAutoStart = (workspace: Workspace): boolean => { return Boolean(workspace.autostart_schedule); }; -const getScheduleLabel = (workspace: Workspace) => { +export const canEditDeadline = (workspace: Workspace): boolean => { + return isWorkspaceOn(workspace) && hasDeadline(workspace); +}; + +export const shouldDisplayScheduleLabel = (workspace: Workspace): boolean => { + const willAutoStop = isWorkspaceOn(workspace) && hasDeadline(workspace); + const willAutoStart = !isWorkspaceOn(workspace) && hasAutoStart(workspace); + return willAutoStop || willAutoStart; +}; + +const scheduleLabel = (workspace: Workspace) => { return isWorkspaceOn(workspace) ? "Stops" : "Starts at"; };