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: fix workspace actions options#13572

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
aslilac merged 4 commits intomainfromfix-workspace-actions
Jun 17, 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
24 changes: 18 additions & 6 deletionssite/src/pages/WorkspacePage/WorkspaceActions/Buttons.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -99,6 +99,21 @@ export const StartButton: FC<ActionButtonPropsWithWorkspace> = ({
);
};

export const UpdateAndStartButton: FC<ActionButtonProps> = ({
handleAction,
}) => {
return (
<Tooltip title="This template requires automatic updates on workspace startup. Contact your administrator if you want to preserve the template version.">
<TopbarButton
startIcon={<PlayCircleOutlineIcon />}
onClick={() => handleAction()}
>
Update and start&hellip;
</TopbarButton>
</Tooltip>
);
};

export const StopButton: FC<ActionButtonProps> = ({
handleAction,
loading,
Expand DownExpand Up@@ -148,16 +163,13 @@ export const RestartButton: FC<ActionButtonPropsWithWorkspace> = ({
);
};

export constUpdateAndStartButton: FC<ActionButtonProps> = ({
export constUpdateAndRestartButton: FC<ActionButtonProps> = ({
handleAction,
}) => {
return (
<Tooltip title="This template requires automatic updates on workspace startup. Contact your administrator if you want to preserve the template version.">
<TopbarButton
startIcon={<PlayCircleOutlineIcon />}
onClick={() => handleAction()}
>
Update and start&hellip;
<TopbarButton startIcon={<ReplayIcon />} onClick={() => handleAction()}>
Update and restart&hellip;
</TopbarButton>
</Tooltip>
);
Expand Down
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -34,93 +34,128 @@ export const Running: Story = {
},
};

export const Stopping: Story = {
export const RunningUpdateAvailable: Story = {
name: "Running (Update available)",
args: {
workspace: Mocks.MockStoppingWorkspace,
workspace: {
...Mocks.MockWorkspace,
outdated: true,
},
},
};

export const Stopped: Story = {
export const RunningRequireActiveVersion: Story = {
name: "Running (No required update)",
args: {
workspace: Mocks.MockStoppedWorkspace,
workspace: {
...Mocks.MockWorkspace,
template_require_active_version: true,
},
},
};

export const Canceling: Story = {
export const RunningUpdateRequired: Story = {
name: "Running (Update Required)",
args: {
workspace: Mocks.MockCancelingWorkspace,
workspace: {
...Mocks.MockWorkspace,
template_require_active_version: true,
outdated: true,
},
},
};

export constCanceled: Story = {
export constStopping: Story = {
args: {
workspace: Mocks.MockCanceledWorkspace,
workspace: Mocks.MockStoppingWorkspace,
},
};

export constDeleting: Story = {
export constStopped: Story = {
args: {
workspace: Mocks.MockDeletingWorkspace,
workspace: Mocks.MockStoppedWorkspace,
},
};

export const Deleted: Story = {
export const StoppedUpdateAvailable: Story = {
name: "Stopped (Update available)",
args: {
workspace: Mocks.MockDeletedWorkspace,
workspace: {
...Mocks.MockStoppedWorkspace,
outdated: true,
},
},
};

export const Outdated: Story = {
export const StoppedRequireActiveVersion: Story = {
name: "Stopped (No required update)",
args: {
workspace: {
...Mocks.MockStoppedWorkspace,
template_require_active_version: true,
},
},
};

export const StoppedUpdateRequired: Story = {
name: "Stopped (Update Required)",
args: {
workspace: {
...Mocks.MockStoppedWorkspace,
template_require_active_version: true,
outdated: true,
},
},
};

export const Updating: Story = {
args: {
workspace: Mocks.MockOutdatedWorkspace,
isUpdating: true,
},
};

export constFailed: Story = {
export constRestarting: Story = {
args: {
workspace: Mocks.MockFailedWorkspace,
workspace: Mocks.MockStoppingWorkspace,
isRestarting: true,
},
};

export constFailedWithDebug: Story = {
export constCanceling: Story = {
args: {
workspace: Mocks.MockFailedWorkspace,
canDebug: true,
workspace: Mocks.MockCancelingWorkspace,
},
};

export constUpdating: Story = {
export constDeleting: Story = {
args: {
isUpdating: true,
workspace: Mocks.MockOutdatedWorkspace,
workspace: Mocks.MockDeletingWorkspace,
},
};

export constRequireActiveVersionStarted: Story = {
export constDeleted: Story = {
args: {
workspace: Mocks.MockOutdatedRunningWorkspaceRequireActiveVersion,
canChangeVersions: false,
workspace: Mocks.MockDeletedWorkspace,
},
};

export constRequireActiveVersionStopped: Story = {
export constOutdated: Story = {
args: {
workspace: Mocks.MockOutdatedStoppedWorkspaceRequireActiveVersion,
canChangeVersions: false,
workspace: Mocks.MockOutdatedWorkspace,
},
};

export constAlwaysUpdateStarted: Story = {
export constFailed: Story = {
args: {
workspace: Mocks.MockOutdatedRunningWorkspaceAlwaysUpdate,
canChangeVersions: true,
workspace: Mocks.MockFailedWorkspace,
},
};

export constAlwaysUpdateStopped: Story = {
export constFailedWithDebug: Story = {
args: {
workspace: Mocks.MockOutdatedStoppedWorkspaceAlwaysUpdate,
canChangeVersions: true,
workspace: Mocks.MockFailedWorkspace,
canDebug: true,
},
};

Expand All@@ -133,6 +168,7 @@ export const CancelShownForOwner: Story = {
isOwner: true,
},
};

export const CancelShownForUser: Story = {
args: {
workspace: Mocks.MockStartingWorkspace,
Expand Down
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -26,6 +26,7 @@ import {
ActivateButton,
FavoriteButton,
UpdateAndStartButton,
UpdateAndRestartButton,
} from "./Buttons";
import { type ActionType, abilitiesByWorkspaceStatus } from "./constants";
import { DebugButton } from "./DebugButton";
Expand DownExpand Up@@ -89,12 +90,12 @@ export const WorkspaceActions: FC<WorkspaceActionsProps> = ({

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

// A mapping of button type to the corresponding React component
const buttonMapping: Record<ActionType, ReactNode> = {
update: <UpdateButton handleAction={handleUpdate} />,
updateAndStart: <UpdateAndStartButton handleAction={handleUpdate} />,
updateAndRestart: <UpdateAndRestartButton handleAction={handleUpdate} />,
updating: <UpdateButton loading handleAction={handleUpdate} />,
start: (
<StartButton
Expand DownExpand Up@@ -152,44 +153,29 @@ export const WorkspaceActions: FC<WorkspaceActionsProps> = ({
enableBuildParameters={workspace.latest_build.transition === "start"}
/>
),
toggleFavorite: (
<FavoriteButton
workspaceID={workspace.id}
isFavorite={workspace.favorite}
onToggle={handleToggleFavorite}
/>
),
};

return (
<div
css={{ display: "flex", alignItems: "center", gap: 8 }}
data-testid="workspace-actions"
>
{canBeUpdated && (
<>
{isUpdating
? buttonMapping.updating
: workspace.template_require_active_version
? buttonMapping.updateAndStart
: buttonMapping.update}
</>
)}

{!canBeUpdated &&
!isUpdating &&
workspace.template_require_active_version &&
buttonMapping.start}

{isRestarting
? buttonMapping.restarting
: actions.map((action) => (
<Fragment key={action}>{buttonMapping[action]}</Fragment>
))}
{/* Restarting must be handled separately, because it otherwise would appear as stopping */}
{isUpdating
? buttonMapping.updating
: isRestarting
? buttonMapping.restarting
: actions.map((action) => (
<Fragment key={action}>{buttonMapping[action]}</Fragment>
))}

{showCancel && <CancelButton handleAction={handleCancel} />}

{buttonMapping.toggleFavorite}
<FavoriteButton
workspaceID={workspace.id}
isFavorite={workspace.favorite}
onToggle={handleToggleFavorite}
/>

<MoreMenu>
<MoreMenuTrigger>
Expand Down
Loading
Loading
[8]ページ先頭
©2009-2025 Movatter.jp