Skip to content

feat: add frontend support for enabling automatic workspace updates #10375

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 11 commits into from
Oct 31, 2023
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
add update policy to workspace stats
  • Loading branch information
sreya committed Oct 21, 2023
commit 86b0cb70dc8c9e29f050ba3706179c5b13d441c4
8 changes: 8 additions & 0 deletions site/src/components/Dashboard/DashboardProvider.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -122,3 +122,11 @@ export const useIsWorkspaceActionsEnabled = (): boolean => {
const allowWorkspaceActions = experiments.includes("workspace_actions");
return allowWorkspaceActions && allowAdvancedScheduling;
};

export const useTemplatePoliciesEnabled = (): boolean => {
const { entitlements, experiments } = useDashboard();
return (
entitlements.features.access_control.enabled &&
experiments.includes("template_update_policies")
);
};
Original file line number Diff line number Diff line change
Expand Up @@ -10,18 +10,15 @@ import { useTemplateSettings } from "../TemplateSettingsLayout";
import { TemplateSettingsPageView } from "./TemplateSettingsPageView";
import { templateByNameKey } from "api/queries/templates";
import { useOrganizationId } from "hooks";
import { useDashboard } from "components/Dashboard/DashboardProvider";
import { useTemplatePoliciesEnabled } from "components/Dashboard/DashboardProvider";

export const TemplateSettingsPage: FC = () => {
const { template: templateName } = useParams() as { template: string };
const navigate = useNavigate();
const orgId = useOrganizationId();
const { template } = useTemplateSettings();
const queryClient = useQueryClient();
const { entitlements, experiments } = useDashboard();
const accessControlEnabled =
entitlements.features["advanced_template_scheduling"].enabled &&
experiments.includes("template_update_policies");
const accessControlEnabled = useTemplatePoliciesEnabled();

const {
mutate: updateTemplate,
Expand Down
1 change: 1 addition & 0 deletions site/src/pages/WorkspacePage/Workspace.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -191,6 +191,7 @@ export const Workspace: FC<React.PropsWithChildren<WorkspaceProps>> = ({
quotaBudget={quotaBudget}
handleUpdate={handleUpdate}
canUpdateWorkspace={canUpdateWorkspace}
canChangeVersions={canChangeVersions}
maxDeadlineDecrease={scheduleProps.maxDeadlineDecrease}
maxDeadlineIncrease={scheduleProps.maxDeadlineIncrease}
onDeadlineMinus={scheduleProps.onDeadlineMinus}
Expand Down
4 changes: 2 additions & 2 deletions site/src/pages/WorkspacePage/WorkspaceActions/constants.ts
Original file line number Diff line number Diff line change
Expand Up @@ -43,9 +43,9 @@ export const actionsByWorkspaceStatus = (
};
}
if (
workspace.template_require_active_version &&
workspace.outdated &&
!canChangeVersions
((workspace.template_require_active_version && !canChangeVersions) ||
workspace.automatic_updates === "always")
) {
if (status === "running") {
return {
Expand Down
35 changes: 35 additions & 0 deletions site/src/pages/WorkspacePage/WorkspaceStats.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,12 @@ 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",
Expand All @@ -37,13 +43,15 @@ const Language = {
upToDate: "Up to date",
byLabel: "Last built by",
costLabel: "Daily cost",
updatePolicy: "Update policy",
};

export interface WorkspaceStatsProps {
workspace: Workspace;
maxDeadlineIncrease: number;
maxDeadlineDecrease: number;
canUpdateWorkspace: boolean;
canChangeVersions: boolean;
quotaBudget?: number;
onDeadlinePlus: (hours: number) => void;
onDeadlineMinus: (hours: number) => void;
Expand All @@ -56,6 +64,7 @@ export const WorkspaceStats: FC<WorkspaceStatsProps> = ({
maxDeadlineDecrease,
maxDeadlineIncrease,
canUpdateWorkspace,
canChangeVersions,
handleUpdate,
onDeadlineMinus,
onDeadlinePlus,
Expand All @@ -67,6 +76,13 @@ export const WorkspaceStats: FC<WorkspaceStatsProps> = ({
const styles = useStyles();
const deadlinePlusEnabled = maxDeadlineIncrease >= 1;
const deadlineMinusEnabled = maxDeadlineDecrease >= 1;
const templatePoliciesEnabled = useTemplatePoliciesEnabled();
const workspaceUpdatePolicy = (): string => {
if (workspace.template_require_active_version && !canChangeVersions) {
return "Always";
}
return upperFirst(workspace.automatic_updates);
};

return (
<>
Expand Down Expand Up @@ -198,6 +214,25 @@ export const WorkspaceStats: FC<WorkspaceStatsProps> = ({
}`}
/>
)}
{templatePoliciesEnabled && (
<Stack direction="row" spacing={0.5}>
<StatsItem
className={styles.statsItem}
label={Language.updatePolicy}
value={workspaceUpdatePolicy()}
/>
{workspace.automatic_updates === "never" &&
workspace.template_require_active_version &&
!canChangeVersions && (
<HelpTooltip>
<HelpTooltipText>
Your workspace has not opted in to automatic updates but
your template requires updating to the active version.
</HelpTooltipText>
</HelpTooltip>
)}
</Stack>
)}
</Stats>
</>
);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ const WorkspaceSettingsPage = () => {

const mutation = useMutation({
mutationFn: async (formValues: WorkspaceSettingsFormValues) => {
console.log("in here", formValues.automatic_updates);
await patchWorkspace(workspace.id, { name: formValues.name });
await updateWorkspaceAutomaticUpdates(
workspace.id,
Expand Down