Skip to content

feat: add orphan option to workspace delete in UI #10654

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 7 commits into from
Nov 14, 2023
Merged

feat: add orphan option to workspace delete in UI #10654

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
19e7341
added workspace delete dialog
Kira-Pilot Nov 13, 2023
16271f1
added stories and tests
Kira-Pilot Nov 13, 2023
3cea330
Merge remote-tracking branch 'origin/main' into delete-orphan-ui/kira…
Kira-Pilot Nov 13, 2023
fd4fabc
Merge remote-tracking branch 'origin/main' into delete-orphan-ui/kira…
Kira-Pilot Nov 13, 2023
e94d7ae
PR review
Kira-Pilot Nov 13, 2023
03c5082
fix flake
Kira-Pilot Nov 13, 2023
176125a
fixed stories
Kira-Pilot Nov 14, 2023
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
PR review
  • Loading branch information
@Kira-Pilot
Kira-Pilot committed Nov 13, 2023
commit e94d7ae2e1ddeafce7915417bb7d2d2dbbf812eb
6 changes: 2 additions & 4 deletions site/src/api/api.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -545,13 +545,11 @@ export const stopWorkspace = (

export const deleteWorkspace = (
workspaceId: string,
logLevel?: TypesGen.CreateWorkspaceBuildRequest["log_level"],
orphan?: TypesGen.CreateWorkspaceBuildRequest["orphan"],
options?: Pick<TypesGen.CreateWorkspaceBuildRequest, "log_level" & "orphan">,
) =>
postWorkspaceBuild(workspaceId, {
transition: "delete",
log_level: logLevel,
orphan,
...options,
});

export const cancelWorkspaceBuild = async (
Expand Down
3 changes: 2 additions & 1 deletion site/src/pages/WorkspacePage/WorkspaceDeleteDialog/WorkspaceDeleteDialog.stories.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import { type ComponentProps } from "react";
import { Meta, StoryObj } from "@storybook/react";
import { WorkspaceDeleteDialog } from "./WorkspaceDeleteDialog";
import { MockWorkspace } from "testHelpers/entities";
Expand All @@ -10,7 +11,7 @@ const meta: Meta<typeof WorkspaceDeleteDialog> = {
export default meta;
type Story = StoryObj<typeof WorkspaceDeleteDialog>;

const args = {
const args: ComponentProps<typeof WorkspaceDeleteDialog> = {
workspace: MockWorkspace,
canUpdateTemplate: false,
isOpen: true,
Expand Down
6 changes: 3 additions & 3 deletions site/src/pages/WorkspacePage/WorkspaceDeleteDialog/WorkspaceDeleteDialog.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,11 +102,11 @@ export const WorkspaceDeleteDialog = (props: WorkspaceDeleteDialogProps) => {
description={
<>
<div css={styles.workspaceInfo}>
<div css={{ flexDirection: "column" }}>
<div>
<p className="name">{workspace.name}</p>
<p className="label">workspace</p>
</div>
<div css={{ flexDirection: "column" }}>
<div>
<p className="info">{dayjs(workspace.created_at).fromNow()}</p>
<p className="label">created</p>
</div>
Expand Down Expand Up @@ -150,7 +150,7 @@ export const WorkspaceDeleteDialog = (props: WorkspaceDeleteDialogProps) => {
id="orphan_resources"
size="small"
color="warning"
onChange={async () => {
onChange={() => {
setOrphanWorkspace(!orphanWorkspace);
}}
className="option"
Expand Down
6 changes: 4 additions & 2 deletions site/src/xServices/workspace/workspaceXService.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -599,8 +599,10 @@ export const workspaceMachine = createMachine(
if (context.workspace) {
const deleteWorkspacePromise = await API.deleteWorkspace(
context.workspace.id,
context.createBuildLogLevel,
data.orphan,
{
log_level: context.createBuildLogLevel,
orphan: data.orphan,
},
);
send({ type: "REFRESH_TIMELINE" });
return deleteWorkspacePromise;
Expand Down