From 2d152b4d5e72b87197ca9091e87046b3ac12e53d Mon Sep 17 00:00:00 2001 From: BrunoQuaresma Date: Mon, 6 Nov 2023 17:40:48 +0000 Subject: [PATCH] refactor(site): add version back to workspace header --- site/src/pages/WorkspacePage/Workspace.tsx | 1 - .../pages/WorkspacePage/WorkspaceStats.tsx | 53 ++++++------------- 2 files changed, 17 insertions(+), 37 deletions(-) diff --git a/site/src/pages/WorkspacePage/Workspace.tsx b/site/src/pages/WorkspacePage/Workspace.tsx index 0122e64cf115b..761592d32f25b 100644 --- a/site/src/pages/WorkspacePage/Workspace.tsx +++ b/site/src/pages/WorkspacePage/Workspace.tsx @@ -191,7 +191,6 @@ export const Workspace: FC> = ({ quotaBudget={quotaBudget} handleUpdate={handleUpdate} canUpdateWorkspace={canUpdateWorkspace} - canChangeVersions={canChangeVersions} maxDeadlineDecrease={scheduleProps.maxDeadlineDecrease} maxDeadlineIncrease={scheduleProps.maxDeadlineIncrease} onDeadlineMinus={scheduleProps.onDeadlineMinus} diff --git a/site/src/pages/WorkspacePage/WorkspaceStats.tsx b/site/src/pages/WorkspacePage/WorkspaceStats.tsx index 93650af02f85a..72c703ea63f54 100644 --- a/site/src/pages/WorkspacePage/WorkspaceStats.tsx +++ b/site/src/pages/WorkspacePage/WorkspaceStats.tsx @@ -7,11 +7,9 @@ import { Link as RouterLink } from "react-router-dom"; import { getDisplayWorkspaceTemplateName, isWorkspaceOn, - workspaceUpdatePolicy, } from "utils/workspace"; import type { Workspace } from "api/typesGenerated"; import { Stats, StatsItem } from "components/Stats/Stats"; -import upperFirst from "lodash/upperFirst"; import { autostartDisplay, autostopDisplay } from "utils/schedule"; import IconButton from "@mui/material/IconButton"; import RemoveIcon from "@mui/icons-material/RemoveOutlined"; @@ -26,12 +24,6 @@ import { PopoverTrigger, usePopover, } from "components/Popover/Popover"; -import { useTemplatePoliciesEnabled } from "components/Dashboard/DashboardProvider"; -import { - HelpTooltip, - HelpTooltipText, -} from "components/HelpTooltip/HelpTooltip"; -import { Stack } from "components/Stack/Stack"; const Language = { workspaceDetails: "Workspace Details", @@ -45,7 +37,6 @@ export interface WorkspaceStatsProps { maxDeadlineIncrease: number; maxDeadlineDecrease: number; canUpdateWorkspace: boolean; - canChangeVersions: boolean; quotaBudget?: number; onDeadlinePlus: (hours: number) => void; onDeadlineMinus: (hours: number) => void; @@ -58,7 +49,6 @@ export const WorkspaceStats: FC = ({ maxDeadlineDecrease, maxDeadlineIncrease, canUpdateWorkspace, - canChangeVersions, handleUpdate, onDeadlineMinus, onDeadlinePlus, @@ -66,7 +56,6 @@ export const WorkspaceStats: FC = ({ const displayTemplateName = getDisplayWorkspaceTemplateName(workspace); const deadlinePlusEnabled = maxDeadlineIncrease >= 1; const deadlineMinusEnabled = maxDeadlineDecrease >= 1; - const templatePoliciesEnabled = useTemplatePoliciesEnabled(); const paperStyles = css` padding: 24px; @@ -91,12 +80,25 @@ export const WorkspaceStats: FC = ({ css={styles.statsItem} label={Language.templateLabel} value={ -
+ + {displayTemplateName} + + } + /> + + - {displayTemplateName} + {workspace.latest_build.template_version_name} {workspace.outdated && ( @@ -107,7 +109,7 @@ export const WorkspaceStats: FC = ({ ariaLabel="update version" /> )} -
+ } /> @@ -187,27 +189,6 @@ export const WorkspaceStats: FC = ({ }`} /> )} - {templatePoliciesEnabled && ( - - - {workspace.automatic_updates === "never" && - workspace.template_require_active_version && - !canChangeVersions && ( - - - Your workspace has not opted in to automatic updates but - your template requires updating to the active version. - - - )} - - )} );