Movatterモバイル変換


[0]ホーム

URL:


Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Sign up
Appearance settings

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.

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

Already on GitHub?Sign in to your account

Merged
mtojek merged 2 commits intomainfrom11595-part-3a
Jan 24, 2024
Merged
Show file tree
Hide file tree
Changes fromall commits
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
View file
Open in desktop
Original file line numberDiff line numberDiff 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 DownExpand 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 deletionssite/src/pages/WorkspacesPage/WorkspacesPage.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff 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 deletionsite/src/pages/WorkspacesPage/WorkspacesPageView.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff 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 DownExpand 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 DownExpand 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 deletionsite/src/utils/workspace.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff 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

[8]ページ先頭

©2009-2025 Movatter.jp