Skip to content

chore: patch 2.12.4 #13925

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 3 commits into from
Jul 18, 2024
Merged

chore: patch 2.12.4 #13925

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
faafc7c
fix(site): enable dormant workspace to be deleted (#13850)
BrunoQuaresma Jul 9, 2024
a9acdb4
chore: add SVG desktop icon (#13765)
Parkreiner Jul 2, 2024
6f3f17d
fix: update import order for Storybook
Parkreiner Jul 17, 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
Next Next commit
fix(site): enable dormant workspace to be deleted (#13850) 
(cherry picked from commit 01b30ea)
  • Loading branch information
@BrunoQuaresma
BrunoQuaresma committed Jul 17, 2024
commit faafc7cadc2fb0fc9788761b09d68cca0590dc24
13 changes: 13 additions & 0 deletions site/src/pages/WorkspacePage/WorkspaceActions/WorkspaceActions.stories.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import type { Meta, StoryObj } from "@storybook/react";
import * as Mocks from "testHelpers/entities";
import { WorkspaceActions } from "./WorkspaceActions";
import { userEvent, within, expect } from "@storybook/test";

const meta: Meta<typeof WorkspaceActions> = {
title: "pages/WorkspacePage/WorkspaceActions",
Expand Down Expand Up @@ -140,3 +141,15 @@ export const CancelHiddenForUser: Story = {
isOwner: false,
},
};

export const CanDeleteDormantWorkspace: Story = {
args: {
workspace: Mocks.MockDormantWorkspace,
},
play: async ({ canvasElement }) => {
const canvas = within(canvasElement);
await userEvent.click(canvas.getByRole("button", { name: "More options" }));
const deleteButton = canvas.getByText("Delete…");
await expect(deleteButton).toBeEnabled();
},
};
2 changes: 1 addition & 1 deletion site/src/pages/WorkspacePage/WorkspaceActions/constants.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ export const abilitiesByWorkspaceStatus = (
return {
actions: ["activate"],
canCancel: false,
canAcceptJobs: false,
canAcceptJobs: true,
};
}

Expand Down