chore: patch 2.12.4 (#13925)

stirby · BrunoQuaresma · Parkreiner · web-flow · commit 82ed9e4dc7c4 · 2024-07-17T20:36:52.000-04:00
* fix(site): enable dormant workspace to be deleted (#13850) (cherry picked from commit 01b30ea) * chore: add SVG desktop icon (#13765) * chore: add SVG desktop icon * fix: add desktop icon to to icons.json (cherry picked from commit 21a923a) * fix: update import order for Storybook --------- Co-authored-by: Bruno Quaresma <bruno@coder.com> Co-authored-by: Michael Smith <throwawayclover@gmail.com>
diff --git 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
@@ -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
@@ -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
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
+  <path d="M31 6V22C31 23.65 29.65 25 28 25H4C2.35 25 1 23.65 1 22V6C1 4.35 2.35 3 4 3H28C29.65 3 31 4.35 31 6Z" fill="#2197F3"/>
+  <path d="M21 27H17V24C17 23.4478 16.5522 23 16 23C15.4478 23 15 23.4478 15 24V27H11C10.4478 27 10 27.4478 10 28C10 28.5522 10.4478 29 11 29H21C21.5522 29 22 28.5522 22 28C22 27.4478 21.5522 27 21 27Z" fill="#FFC10A"/>
+  <path d="M31 17V22C31 23.65 29.65 25 28 25H4C2.35 25 1 23.65 1 22V17H31Z" fill="#3F51B5"/>
+</svg>

Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@ export const abilitiesByWorkspaceStatus = (`
`49`	`49`	`return {`
`50`	`50`	`actions: ["activate"],`
`51`	`51`	`canCancel: false,`
`52`		`- canAcceptJobs: false,`
	`52`	`+ canAcceptJobs: true,`
`53`	`53`	`};`
`54`	`54`	`}`
`55`	`55`