From 82ed9e4dc7c4efd7c0efffef2709c5e2eee3cf6d Mon Sep 17 00:00:00 2001 From: Stephen Kirby <58410745+stirby@users.noreply.github.com> Date: Wed, 17 Jul 2024 19:36:52 -0500 Subject: [PATCH] chore: patch 2.12.4 (#13925) * fix(site): enable dormant workspace to be deleted (#13850) (cherry picked from commit 01b30eaa324df69b82ad4c6570dc721f10751de6) * chore: add SVG desktop icon (#13765) * chore: add SVG desktop icon * fix: add desktop icon to to icons.json (cherry picked from commit 21a923a7a0a9cf18427468fc009db46fa2a4efda) * fix: update import order for Storybook --------- Co-authored-by: Bruno Quaresma Co-authored-by: Michael Smith --- .../WorkspaceActions/WorkspaceActions.stories.tsx | 13 +++++++++++++ .../WorkspacePage/WorkspaceActions/constants.ts | 2 +- site/src/theme/icons.json | 1 + site/static/icon/desktop.svg | 7 +++++++ 4 files changed, 22 insertions(+), 1 deletion(-) create mode 100644 site/static/icon/desktop.svg diff --git a/site/src/pages/WorkspacePage/WorkspaceActions/WorkspaceActions.stories.tsx b/site/src/pages/WorkspacePage/WorkspaceActions/WorkspaceActions.stories.tsx index ce03863b69c55..0bdf6c1e36fab 100644 --- a/site/src/pages/WorkspacePage/WorkspaceActions/WorkspaceActions.stories.tsx +++ b/site/src/pages/WorkspacePage/WorkspaceActions/WorkspaceActions.stories.tsx @@ -1,4 +1,5 @@ import type { Meta, StoryObj } from "@storybook/react"; +import { userEvent, within, expect } from "@storybook/test"; import * as Mocks from "testHelpers/entities"; import { WorkspaceActions } from "./WorkspaceActions"; @@ -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(); + }, +}; diff --git a/site/src/pages/WorkspacePage/WorkspaceActions/constants.ts b/site/src/pages/WorkspacePage/WorkspaceActions/constants.ts index c2a85da8cb121..c8f564d4fe99a 100644 --- a/site/src/pages/WorkspacePage/WorkspaceActions/constants.ts +++ b/site/src/pages/WorkspacePage/WorkspaceActions/constants.ts @@ -49,7 +49,7 @@ export const abilitiesByWorkspaceStatus = ( return { actions: ["activate"], canCancel: false, - canAcceptJobs: false, + canAcceptJobs: true, }; } diff --git a/site/src/theme/icons.json b/site/src/theme/icons.json index c1455be5d4033..9d1e852ca4540 100644 --- a/site/src/theme/icons.json +++ b/site/src/theme/icons.json @@ -25,6 +25,7 @@ "datagrip.svg", "dataspell.svg", "debian.svg", + "desktop.svg", "discord.svg", "do.png", "docker-white.svg", diff --git a/site/static/icon/desktop.svg b/site/static/icon/desktop.svg new file mode 100644 index 0000000000000..34b51fa65e303 --- /dev/null +++ b/site/static/icon/desktop.svg @@ -0,0 +1,7 @@ + + + + + + +