Skip to content

fix: check update permission to start workspace #11798

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.

Sign up for GitHub

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 2 commits into from
Jan 24, 2024
Merged

fix: check update permission to start workspace #11798

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c400685
fix: check update permission to start workspace
mtojek Jan 24, 2024
ff7b925
make fmt
mtojek Jan 24, 2024
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
7 changes: 2 additions & 5 deletions site/src/pages/WorkspacePage/WorkspaceActions/WorkspaceActions.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { type FC, type ReactNode, Fragment } from "react";
import { Workspace, WorkspaceBuildParameter } from "api/typesGenerated";
import { useWorkspaceDuplication } from "pages/CreateWorkspacePage/useWorkspaceDuplication";
import { workspaceUpdatePolicy } from "utils/workspace";
import { mustUpdateWorkspace } from "utils/workspace";
import { type ActionType, abilitiesByWorkspaceStatus } from "./constants";
import {
CancelButton,
Expand Down Expand Up @@ -79,10 +79,7 @@ export const WorkspaceActions: FC<WorkspaceActionsProps> = ({
canCancel &&
(workspace.template_allow_user_cancel_workspace_jobs || isOwner);

const mustUpdate =
workspaceUpdatePolicy(workspace, canChangeVersions) === "always" &&
workspace.outdated;

const mustUpdate = mustUpdateWorkspace(workspace, canChangeVersions);
const tooltipText = getTooltipText(workspace, mustUpdate, canChangeVersions);
const canBeUpdated = workspace.outdated && canAcceptJobs;

Expand Down
1 change: 1 addition & 0 deletions site/src/pages/WorkspacesPage/WorkspacesPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,7 @@ const WorkspacesPage: FC = () => {

<WorkspacesPageView
canCreateTemplate={permissions.createTemplates}
canChangeVersions={permissions.updateTemplates}
checkedWorkspaces={checkedWorkspaces}
onCheckChange={setCheckedWorkspaces}
canCheckWorkspaces={canCheckWorkspaces}
Expand Down
7 changes: 6 additions & 1 deletion site/src/pages/WorkspacesPage/WorkspacesPageView.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ import KeyboardArrowDownOutlined from "@mui/icons-material/KeyboardArrowDownOutl
import Divider from "@mui/material/Divider";
import LoadingButton from "@mui/lab/LoadingButton";
import { PaginationHeader } from "components/PaginationWidget/PaginationHeader";
import { mustUpdateWorkspace } from "utils/workspace";

export const Language = {
pageTitle: "Workspaces",
Expand Down Expand Up @@ -59,6 +60,7 @@ export interface WorkspacesPageViewProps {
templatesFetchStatus: TemplateQuery["status"];
templates: TemplateQuery["data"];
canCreateTemplate: boolean;
canChangeVersions: boolean;
}

export const WorkspacesPageView = ({
Expand All @@ -81,6 +83,7 @@ export const WorkspacesPageView = ({
templates,
templatesFetchStatus,
canCreateTemplate,
canChangeVersions,
}: WorkspacesPageViewProps) => {
return (
<Margins>
Expand Down Expand Up @@ -136,7 +139,9 @@ export const WorkspacesPageView = ({
onClick={onStartAll}
disabled={
!checkedWorkspaces?.every(
(w) => w.latest_build.status === "stopped",
(w) =>
w.latest_build.status === "stopped" &&
!mustUpdateWorkspace(w, canChangeVersions),
)
}
>
Expand Down
12 changes: 11 additions & 1 deletion site/src/utils/workspace.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -274,7 +274,17 @@ export const getMatchingAgentOrFirst = (
.filter((a) => a)[0];
};

export const workspaceUpdatePolicy = (
export const mustUpdateWorkspace = (
workspace: TypesGen.Workspace,
canChangeVersions: boolean,
): boolean => {
return (
workspaceUpdatePolicy(workspace, canChangeVersions) === "always" &&
workspace.outdated
);
};

const workspaceUpdatePolicy = (
workspace: TypesGen.Workspace,
canChangeVersions: boolean,
): TypesGen.AutomaticUpdates => {
Expand Down