Skip to content

Commit 14925e7

Browse files
refactor(site): add version back to workspace header (coder#10552)
1 parent a9797fa commit 14925e7

File tree

2 files changed

+17
-37
lines changed

2 files changed

+17
-37
lines changed

site/src/pages/WorkspacePage/Workspace.tsx

-1
Original file line numberDiff line numberDiff line change
@@ -191,7 +191,6 @@ export const Workspace: FC<React.PropsWithChildren<WorkspaceProps>> = ({
191191
quotaBudget={quotaBudget}
192192
handleUpdate={handleUpdate}
193193
canUpdateWorkspace={canUpdateWorkspace}
194-
canChangeVersions={canChangeVersions}
195194
maxDeadlineDecrease={scheduleProps.maxDeadlineDecrease}
196195
maxDeadlineIncrease={scheduleProps.maxDeadlineIncrease}
197196
onDeadlineMinus={scheduleProps.onDeadlineMinus}

site/src/pages/WorkspacePage/WorkspaceStats.tsx

+17-36
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,9 @@ import { Link as RouterLink } from "react-router-dom";
77
import {
88
getDisplayWorkspaceTemplateName,
99
isWorkspaceOn,
10-
workspaceUpdatePolicy,
1110
} from "utils/workspace";
1211
import type { Workspace } from "api/typesGenerated";
1312
import { Stats, StatsItem } from "components/Stats/Stats";
14-
import upperFirst from "lodash/upperFirst";
1513
import { autostartDisplay, autostopDisplay } from "utils/schedule";
1614
import IconButton from "@mui/material/IconButton";
1715
import RemoveIcon from "@mui/icons-material/RemoveOutlined";
@@ -26,12 +24,6 @@ import {
2624
PopoverTrigger,
2725
usePopover,
2826
} from "components/Popover/Popover";
29-
import { useTemplatePoliciesEnabled } from "components/Dashboard/DashboardProvider";
30-
import {
31-
HelpTooltip,
32-
HelpTooltipText,
33-
} from "components/HelpTooltip/HelpTooltip";
34-
import { Stack } from "components/Stack/Stack";
3527

3628
const Language = {
3729
workspaceDetails: "Workspace Details",
@@ -45,7 +37,6 @@ export interface WorkspaceStatsProps {
4537
maxDeadlineIncrease: number;
4638
maxDeadlineDecrease: number;
4739
canUpdateWorkspace: boolean;
48-
canChangeVersions: boolean;
4940
quotaBudget?: number;
5041
onDeadlinePlus: (hours: number) => void;
5142
onDeadlineMinus: (hours: number) => void;
@@ -58,15 +49,13 @@ export const WorkspaceStats: FC<WorkspaceStatsProps> = ({
5849
maxDeadlineDecrease,
5950
maxDeadlineIncrease,
6051
canUpdateWorkspace,
61-
canChangeVersions,
6252
handleUpdate,
6353
onDeadlineMinus,
6454
onDeadlinePlus,
6555
}) => {
6656
const displayTemplateName = getDisplayWorkspaceTemplateName(workspace);
6757
const deadlinePlusEnabled = maxDeadlineIncrease >= 1;
6858
const deadlineMinusEnabled = maxDeadlineDecrease >= 1;
69-
const templatePoliciesEnabled = useTemplatePoliciesEnabled();
7059

7160
const paperStyles = css`
7261
padding: 24px;
@@ -91,12 +80,25 @@ export const WorkspaceStats: FC<WorkspaceStatsProps> = ({
9180
css={styles.statsItem}
9281
label={Language.templateLabel}
9382
value={
94-
<div css={{ display: "flex", alignItems: "center", gap: 2 }}>
83+
<Link
84+
component={RouterLink}
85+
to={`/templates/${workspace.template_name}`}
86+
>
87+
{displayTemplateName}
88+
</Link>
89+
}
90+
/>
91+
92+
<StatsItem
93+
css={styles.statsItem}
94+
label="Version"
95+
value={
96+
<>
9597
<Link
9698
component={RouterLink}
97-
to={`/templates/${workspace.template_name}`}
99+
to={`/templates/${workspace.template_name}/versions/${workspace.latest_build.template_version_name}`}
98100
>
99-
{displayTemplateName}
101+
{workspace.latest_build.template_version_name}
100102
</Link>
101103

102104
{workspace.outdated && (
@@ -107,7 +109,7 @@ export const WorkspaceStats: FC<WorkspaceStatsProps> = ({
107109
ariaLabel="update version"
108110
/>
109111
)}
110-
</div>
112+
</>
111113
}
112114
/>
113115

@@ -187,27 +189,6 @@ export const WorkspaceStats: FC<WorkspaceStatsProps> = ({
187189
}`}
188190
/>
189191
)}
190-
{templatePoliciesEnabled && (
191-
<Stack direction="row" spacing={0.5}>
192-
<StatsItem
193-
css={styles.statsItem}
194-
label={Language.updatePolicy}
195-
value={upperFirst(
196-
workspaceUpdatePolicy(workspace, canChangeVersions),
197-
)}
198-
/>
199-
{workspace.automatic_updates === "never" &&
200-
workspace.template_require_active_version &&
201-
!canChangeVersions && (
202-
<HelpTooltip>
203-
<HelpTooltipText>
204-
Your workspace has not opted in to automatic updates but
205-
your template requires updating to the active version.
206-
</HelpTooltipText>
207-
</HelpTooltip>
208-
)}
209-
</Stack>
210-
)}
211192
</Stats>
212193
</>
213194
);

0 commit comments

Comments
 (0)