From faafc7cadc2fb0fc9788761b09d68cca0590dc24 Mon Sep 17 00:00:00 2001
From: Bruno Quaresma <bruno@coder.com>
Date: Tue, 9 Jul 2024 14:55:46 -0300
Subject: [PATCH 1/3] fix(site): enable dormant workspace to be deleted
 (#13850)

(cherry picked from commit 01b30eaa324df69b82ad4c6570dc721f10751de6)
---
 .../WorkspaceActions/WorkspaceActions.stories.tsx   | 13 +++++++++++++
 .../WorkspacePage/WorkspaceActions/constants.ts     |  2 +-
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/site/src/pages/WorkspacePage/WorkspaceActions/WorkspaceActions.stories.tsx b/site/src/pages/WorkspacePage/WorkspaceActions/WorkspaceActions.stories.tsx
index ce03863b69c55..8499d04c16837 100644
--- a/site/src/pages/WorkspacePage/WorkspaceActions/WorkspaceActions.stories.tsx
+++ b/site/src/pages/WorkspacePage/WorkspaceActions/WorkspaceActions.stories.tsx
@@ -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",
@@ -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,
     };
   }
 

From a9acdb42ea0e81221a204446dad1e662ed23d662 Mon Sep 17 00:00:00 2001
From: Michael Smith <throwawayclover@gmail.com>
Date: Tue, 2 Jul 2024 12:00:16 -0400
Subject: [PATCH 2/3] chore: add SVG desktop icon (#13765)

* chore: add SVG desktop icon

* fix: add desktop icon to to icons.json

(cherry picked from commit 21a923a7a0a9cf18427468fc009db46fa2a4efda)
---
 site/src/theme/icons.json    | 1 +
 site/static/icon/desktop.svg | 7 +++++++
 2 files changed, 8 insertions(+)
 create mode 100644 site/static/icon/desktop.svg

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 @@
+<?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>

From 6f3f17d5ae2a35089d0ba91f71e42a6bee0c0f56 Mon Sep 17 00:00:00 2001
From: Parkreiner <throwawayclover@gmail.com>
Date: Wed, 17 Jul 2024 19:42:05 +0000
Subject: [PATCH 3/3] fix: update import order for Storybook

---
 .../WorkspacePage/WorkspaceActions/WorkspaceActions.stories.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/site/src/pages/WorkspacePage/WorkspaceActions/WorkspaceActions.stories.tsx b/site/src/pages/WorkspacePage/WorkspaceActions/WorkspaceActions.stories.tsx
index 8499d04c16837..0bdf6c1e36fab 100644
--- a/site/src/pages/WorkspacePage/WorkspaceActions/WorkspaceActions.stories.tsx
+++ b/site/src/pages/WorkspacePage/WorkspaceActions/WorkspaceActions.stories.tsx
@@ -1,7 +1,7 @@
 import type { Meta, StoryObj } from "@storybook/react";
+import { userEvent, within, expect } from "@storybook/test";
 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",