From b4a46db73d67b168851a9f92dd2bdfd4403de994 Mon Sep 17 00:00:00 2001 From: Sas Swart Date: Wed, 11 Dec 2024 20:32:07 +0000 Subject: [PATCH 1/2] Don't show provisioner warnings for running workspaces --- site/src/pages/WorkspacePage/Workspace.stories.tsx | 11 ++++++++++- site/src/pages/WorkspacePage/Workspace.tsx | 2 +- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/site/src/pages/WorkspacePage/Workspace.stories.tsx b/site/src/pages/WorkspacePage/Workspace.stories.tsx index 3dd05a398cf2e..6efbeef76ee25 100644 --- a/site/src/pages/WorkspacePage/Workspace.stories.tsx +++ b/site/src/pages/WorkspacePage/Workspace.stories.tsx @@ -63,7 +63,16 @@ type Story = StoryObj; export const Running: Story = { args: { - workspace: Mocks.MockWorkspace, + workspace: { + ...Mocks.MockWorkspace, + latest_build: { + ...Mocks.MockWorkspace.latest_build, + matched_provisioners: { + count: 0, + available: 0, + }, + }, + }, handleStart: action("start"), handleStop: action("stop"), buildInfo: Mocks.MockBuildInfo, diff --git a/site/src/pages/WorkspacePage/Workspace.tsx b/site/src/pages/WorkspacePage/Workspace.tsx index 1d89e63d8914a..93706d262499d 100644 --- a/site/src/pages/WorkspacePage/Workspace.tsx +++ b/site/src/pages/WorkspacePage/Workspace.tsx @@ -116,7 +116,7 @@ export const Workspace: FC = ({ const provisionersHealthy = (workspace.latest_build.matched_provisioners?.available ?? 0) > 0; const shouldShowProvisionerAlert = - !provisionersHealthy && (!buildLogs || buildLogs.length === 0); + !shouldDisplayBuildLogs && !provisionersHealthy; return (
Date: Thu, 12 Dec 2024 09:47:25 +0000 Subject: [PATCH 2/2] fix warnings on the workspace page --- site/src/pages/WorkspacePage/Workspace.tsx | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/site/src/pages/WorkspacePage/Workspace.tsx b/site/src/pages/WorkspacePage/Workspace.tsx index 93706d262499d..af4883e73740a 100644 --- a/site/src/pages/WorkspacePage/Workspace.tsx +++ b/site/src/pages/WorkspacePage/Workspace.tsx @@ -110,13 +110,13 @@ export const Workspace: FC = ({ (r) => resourceOptionValue(r) === resourcesNav.value, ); - const shouldDisplayBuildLogs = - (buildLogs ?? []).length > 0 && workspace.latest_build.status !== "running"; - + const workspaceRunning = workspace.latest_build.status === "running"; + const haveBuildLogs = (buildLogs ?? []).length > 0; const provisionersHealthy = (workspace.latest_build.matched_provisioners?.available ?? 0) > 0; + const shouldDisplayBuildLogs = haveBuildLogs && !workspaceRunning; const shouldShowProvisionerAlert = - !shouldDisplayBuildLogs && !provisionersHealthy; + !workspaceRunning && !haveBuildLogs && !provisionersHealthy; return (
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy