cleanup

mafredri · mafredri · commit 79e1844d25c9 · 2025-06-13T20:08:31.000Z
diff --git a/site/src/modules/resources/AgentDevcontainerCard.stories.tsx b/site/src/modules/resources/AgentDevcontainerCard.stories.tsx
@@ -1,5 +1,4 @@
 import type { Meta, StoryObj } from "@storybook/react";
-import type { WorkspaceAgentDevcontainer } from "api/typesGenerated";
 import { getPreferredProxy } from "contexts/ProxyContext";
 import { chromatic } from "testHelpers/chromatic";
 import {
@@ -10,6 +9,7 @@ import {
 	MockWorkspaceAgent,
 	MockWorkspaceAgentContainer,
 	MockWorkspaceAgentContainerPorts,
+	MockWorkspaceAgentDevcontainer,
 	MockWorkspaceApp,
 	MockWorkspaceProxies,
 	MockWorkspaceSubAgent,
@@ -20,21 +20,6 @@ import {
 } from "testHelpers/storybook";
 import { AgentDevcontainerCard } from "./AgentDevcontainerCard";
 
-const MockWorkspaceAgentDevcontainer: WorkspaceAgentDevcontainer = {
-	id: "test-devcontainer-id",
-	name: "test-devcontainer",
-	workspace_folder: "/workspace/test",
-	config_path: "/workspace/test/.devcontainer/devcontainer.json",
-	status: "running",
-	dirty: false,
-	container: MockWorkspaceAgentContainer,
-	agent: {
-		id: MockWorkspaceSubAgent.id,
-		name: MockWorkspaceSubAgent.name,
-		directory: MockWorkspaceSubAgent?.directory ?? "/workspace/test",
-	},
-};
-
 const meta: Meta<typeof AgentDevcontainerCard> = {
 	title: "modules/resources/AgentDevcontainerCard",
 	component: AgentDevcontainerCard,
@@ -80,10 +65,6 @@ export const Dirty: Story = {
 		devcontainer: {
 			...MockWorkspaceAgentDevcontainer,
 			dirty: true,
-			container: {
-				...MockWorkspaceAgentContainer,
-				ports: MockWorkspaceAgentContainerPorts,
-			},
 		},
 	},
 };
@@ -94,10 +75,7 @@ export const Recreating: Story = {
 			...MockWorkspaceAgentDevcontainer,
 			dirty: true,
 			status: "starting",
-			container: {
-				...MockWorkspaceAgentContainer,
-				ports: MockWorkspaceAgentContainerPorts,
-			},
+			container: undefined,
 		},
 		subAgents: [],
 	},
@@ -115,12 +93,6 @@ export const NoSubAgent: Story = {
 
 export const SubAgentConnecting: Story = {
 	args: {
-		devcontainer: {
-			...MockWorkspaceAgentDevcontainer,
-			container: {
-				...MockWorkspaceAgentContainer,
-			},
-		},
 		subAgents: [
 			{
 				...MockWorkspaceSubAgent,
@@ -148,7 +120,7 @@ export const WithAppsAndPorts: Story = {
 	},
 };
 
-export const ShowingPortForward: Story = {
+export const WithPortForwarding: Story = {
 	decorators: [
 		withProxyProvider({
 			proxy: getPreferredProxy(MockWorkspaceProxies, MockPrimaryWorkspaceProxy),
diff --git a/site/src/modules/resources/AgentRow.stories.tsx b/site/src/modules/resources/AgentRow.stories.tsx
@@ -288,17 +288,7 @@ export const GroupApp: Story = {
 export const Devcontainer: Story = {
 	beforeEach: () => {
 		spyOn(API, "getAgentContainers").mockResolvedValue({
-			devcontainers: [
-				{
-					id: "test-devcontainer-id",
-					name: "test-devcontainer",
-					workspace_folder: "/workspace/test",
-					config_path: "/workspace/test/.devcontainer/devcontainer.json",
-					status: "running",
-					dirty: false,
-					container: M.MockWorkspaceAgentContainer,
-				},
-			],
+			devcontainers: [M.MockWorkspaceAgentDevcontainer],
 			containers: [M.MockWorkspaceAgentContainer],
 		});
 	},
diff --git a/site/src/testHelpers/entities.ts b/site/src/testHelpers/entities.ts
@@ -4369,6 +4369,22 @@ export const MockWorkspaceAgentContainer: TypesGen.WorkspaceAgentContainer = {
 	},
 };
 
+export const MockWorkspaceAgentDevcontainer: TypesGen.WorkspaceAgentDevcontainer =
+	{
+		id: "test-devcontainer-id",
+		name: "test-devcontainer",
+		workspace_folder: "/workspace/test",
+		config_path: "/workspace/test/.devcontainer/devcontainer.json",
+		status: "running",
+		dirty: false,
+		container: MockWorkspaceAgentContainer,
+		agent: {
+			id: MockWorkspaceSubAgent.id,
+			name: MockWorkspaceSubAgent.name,
+			directory: MockWorkspaceSubAgent?.directory ?? "/workspace/test",
+		},
+	};
+
 export const MockWorkspaceAppStatuses: TypesGen.WorkspaceAppStatus[] = [
 	{
 		// This is the latest status chronologically (15:04:38)
