From f444ef9c97cbc8ea0d23265cc68c39a7179479a0 Mon Sep 17 00:00:00 2001
From: Danielle Maywood <danielle@themaywoods.com>
Date: Wed, 6 Aug 2025 10:37:33 +0000
Subject: [PATCH 1/4] fix(site): hide "Show parent apps" when no running or
 starting devcontainers

---
 site/src/modules/resources/AgentRow.tsx | 21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)

diff --git a/site/src/modules/resources/AgentRow.tsx b/site/src/modules/resources/AgentRow.tsx
index ab0e5884c48e9..3ed9af3eb5640 100644
--- a/site/src/modules/resources/AgentRow.tsx
+++ b/site/src/modules/resources/AgentRow.tsx
@@ -137,17 +137,16 @@ export const AgentRow: FC<AgentRowProps> = ({
 	// This is used to show the parent apps of the devcontainer.
 	const [showParentApps, setShowParentApps] = useState(false);
 
-	let shouldDisplayAppsSection = shouldDisplayAgentApps;
-	if (
-		devcontainers &&
-		devcontainers.find(
-			// We only want to hide the parent apps by default when there are dev
-			// containers that are either starting or running. If they are all in
-			// the stopped state, it doesn't make sense to hide the parent apps.
+	const anyRunningOrStartingDevcontainers =
+		devcontainers?.find(
 			(dc) => dc.status === "running" || dc.status === "starting",
-		) !== undefined &&
-		!showParentApps
-	) {
+		) !== undefined;
+
+	// We only want to hide the parent apps by default when there are dev
+	// containers that are either starting or running. If they are all in
+	// the stopped state, it doesn't make sense to hide the parent apps.
+	let shouldDisplayAppsSection = shouldDisplayAgentApps;
+	if (devcontainers && anyRunningOrStartingDevcontainers && !showParentApps) {
 		shouldDisplayAppsSection = false;
 	}
 
@@ -187,7 +186,7 @@ export const AgentRow: FC<AgentRowProps> = ({
 				</div>
 
 				<div className="flex items-center gap-2">
-					{devcontainers && devcontainers.length > 0 && (
+					{anyRunningOrStartingDevcontainers && (
 						<Button
 							variant="outline"
 							size="sm"

From 40b071e72e8eef264d2321473a1d812a54e64134 Mon Sep 17 00:00:00 2001
From: Danielle Maywood <danielle@themaywoods.com>
Date: Wed, 6 Aug 2025 11:35:40 +0000
Subject: [PATCH 2/4] chore: simplification

---
 site/src/modules/resources/AgentRow.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/site/src/modules/resources/AgentRow.tsx b/site/src/modules/resources/AgentRow.tsx
index 3ed9af3eb5640..3cf757a15c2ab 100644
--- a/site/src/modules/resources/AgentRow.tsx
+++ b/site/src/modules/resources/AgentRow.tsx
@@ -146,7 +146,7 @@ export const AgentRow: FC<AgentRowProps> = ({
 	// containers that are either starting or running. If they are all in
 	// the stopped state, it doesn't make sense to hide the parent apps.
 	let shouldDisplayAppsSection = shouldDisplayAgentApps;
-	if (devcontainers && anyRunningOrStartingDevcontainers && !showParentApps) {
+	if (anyRunningOrStartingDevcontainers && !showParentApps) {
 		shouldDisplayAppsSection = false;
 	}
 

From bf87a475f1d08d05c0b7ce23a5c4fd826df1b906 Mon Sep 17 00:00:00 2001
From: Danielle Maywood <danielle@themaywoods.com>
Date: Wed, 6 Aug 2025 11:35:51 +0000
Subject: [PATCH 3/4] test: add story

---
 .../modules/resources/AgentRow.stories.tsx    | 21 +++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/site/src/modules/resources/AgentRow.stories.tsx b/site/src/modules/resources/AgentRow.stories.tsx
index a5ad16ae9f97b..2a3b5dba46d25 100644
--- a/site/src/modules/resources/AgentRow.stories.tsx
+++ b/site/src/modules/resources/AgentRow.stories.tsx
@@ -293,3 +293,24 @@ export const Devcontainer: Story = {
 		});
 	},
 };
+
+export const FoundDevcontainer: Story = {
+	args: {
+		agent: {
+			...M.MockWorkspaceAgentReady,
+		},
+	},
+	beforeEach: () => {
+		spyOn(API, "getAgentContainers").mockResolvedValue({
+			devcontainers: [
+				{
+					...M.MockWorkspaceAgentDevcontainer,
+					status: "stopped",
+					container: undefined,
+					agent: undefined,
+				},
+			],
+			containers: [],
+		});
+	},
+};

From 97432c9e2488d463c121f73291447999efc0227d Mon Sep 17 00:00:00 2001
From: Danielle Maywood <danielle@themaywoods.com>
Date: Wed, 6 Aug 2025 17:10:05 +0000
Subject: [PATCH 4/4] test: fix stories

---
 .../modules/resources/AgentRow.stories.tsx    | 44 ++++++++++++-------
 1 file changed, 28 insertions(+), 16 deletions(-)

diff --git a/site/src/modules/resources/AgentRow.stories.tsx b/site/src/modules/resources/AgentRow.stories.tsx
index 2a3b5dba46d25..c1bc40e98eb1d 100644
--- a/site/src/modules/resources/AgentRow.stories.tsx
+++ b/site/src/modules/resources/AgentRow.stories.tsx
@@ -286,11 +286,17 @@ export const GroupApp: Story = {
 };
 
 export const Devcontainer: Story = {
-	beforeEach: () => {
-		spyOn(API, "getAgentContainers").mockResolvedValue({
-			devcontainers: [M.MockWorkspaceAgentDevcontainer],
-			containers: [M.MockWorkspaceAgentContainer],
-		});
+	parameters: {
+		queries: [
+			{
+				key: ["agents", M.MockWorkspaceAgent.id, "containers"],
+				data: {
+					devcontainers: [M.MockWorkspaceAgentDevcontainer],
+					containers: [M.MockWorkspaceAgentContainer],
+				},
+			},
+		],
+		webSocket: [],
 	},
 };
 
@@ -300,17 +306,23 @@ export const FoundDevcontainer: Story = {
 			...M.MockWorkspaceAgentReady,
 		},
 	},
-	beforeEach: () => {
-		spyOn(API, "getAgentContainers").mockResolvedValue({
-			devcontainers: [
-				{
-					...M.MockWorkspaceAgentDevcontainer,
-					status: "stopped",
-					container: undefined,
-					agent: undefined,
+	parameters: {
+		queries: [
+			{
+				key: ["agents", M.MockWorkspaceAgentReady.id, "containers"],
+				data: {
+					devcontainers: [
+						{
+							...M.MockWorkspaceAgentDevcontainer,
+							status: "stopped",
+							container: undefined,
+							agent: undefined,
+						},
+					],
+					containers: [],
 				},
-			],
-			containers: [],
-		});
+			},
+		],
+		webSocket: [],
 	},
 };