From 6ad1dfe7bf23fd4e4169ad342d0a0ccee277759e Mon Sep 17 00:00:00 2001 From: McKayla Washburn Date: Tue, 25 Jun 2024 21:31:49 +0000 Subject: [PATCH 1/3] fix: disable agent app buttons until startup script is completes when set to blocking --- site/src/modules/resources/AppLink/AppLink.tsx | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/site/src/modules/resources/AppLink/AppLink.tsx b/site/src/modules/resources/AppLink/AppLink.tsx index 7042c879385d0..ac13629e88a2f 100644 --- a/site/src/modules/resources/AppLink/AppLink.tsx +++ b/site/src/modules/resources/AppLink/AppLink.tsx @@ -16,7 +16,7 @@ import { ShareIcon } from "./ShareIcon"; export const DisplayAppNameMap: Record = { port_forwarding_helper: "Ports", ssh_helper: "SSH", - vscode: "VS Code Desktop", + vscode: "VS Code", vscode_insiders: "VS Code Insiders", web_terminal: "Terminal", }; @@ -94,19 +94,19 @@ export const AppLink: FC = ({ app, workspace, agent }) => { } if (!appsHost && app.subdomain) { canClick = false; - icon = ( - - ); + icon = ; primaryTooltip = "Your admin has not configured subdomain application access"; } if (fetchingSessionToken) { canClick = false; } + if ( + agent.lifecycle_state === "starting" && + agent.startup_script_behavior === "blocking" + ) { + canClick = false; + } const isPrivateApp = app.sharing_level === "owner"; From 4096570d2af50d4d0cdffb56c9bb7933b64cb7d1 Mon Sep 17 00:00:00 2001 From: McKayla Washburn Date: Wed, 26 Jun 2024 20:28:39 +0000 Subject: [PATCH 2/3] =?UTF-8?q?=F0=9F=A7=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/resources/AppLink/AppLink.stories.tsx | 12 ++++++++++++ site/src/modules/resources/AppLink/AppLink.tsx | 4 ++-- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/site/src/modules/resources/AppLink/AppLink.stories.tsx b/site/src/modules/resources/AppLink/AppLink.stories.tsx index 2dbc377a0d591..744f2b4529c2c 100644 --- a/site/src/modules/resources/AppLink/AppLink.stories.tsx +++ b/site/src/modules/resources/AppLink/AppLink.stories.tsx @@ -151,3 +151,15 @@ export const InternalApp: Story = { agent: MockWorkspaceAgent, }, }; + +export const BlockingStartupScriptRunning: Story = { + args: { + workspace: MockWorkspace, + app: MockWorkspaceApp, + agent: { + ...MockWorkspaceAgent, + lifecycle_state: "starting", + startup_script_behavior: "blocking", + }, + }, +}; diff --git a/site/src/modules/resources/AppLink/AppLink.tsx b/site/src/modules/resources/AppLink/AppLink.tsx index ac13629e88a2f..f2f2dd7144386 100644 --- a/site/src/modules/resources/AppLink/AppLink.tsx +++ b/site/src/modules/resources/AppLink/AppLink.tsx @@ -16,8 +16,8 @@ import { ShareIcon } from "./ShareIcon"; export const DisplayAppNameMap: Record = { port_forwarding_helper: "Ports", ssh_helper: "SSH", - vscode: "VS Code", - vscode_insiders: "VS Code Insiders", + vscode: "VS Code (Remote)", + vscode_insiders: "VS Code Insiders (Remote)", web_terminal: "Terminal", }; From 09e52eac77c59e653e99b72cd1ece4035b03195a Mon Sep 17 00:00:00 2001 From: McKayla Washburn Date: Wed, 26 Jun 2024 20:40:38 +0000 Subject: [PATCH 3/3] cry --- site/src/modules/resources/AppLink/AppLink.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/site/src/modules/resources/AppLink/AppLink.tsx b/site/src/modules/resources/AppLink/AppLink.tsx index f2f2dd7144386..4e823bdc9acb4 100644 --- a/site/src/modules/resources/AppLink/AppLink.tsx +++ b/site/src/modules/resources/AppLink/AppLink.tsx @@ -16,8 +16,8 @@ import { ShareIcon } from "./ShareIcon"; export const DisplayAppNameMap: Record = { port_forwarding_helper: "Ports", ssh_helper: "SSH", - vscode: "VS Code (Remote)", - vscode_insiders: "VS Code Insiders (Remote)", + vscode: "VS Code Desktop", + vscode_insiders: "VS Code Insiders", web_terminal: "Terminal", }; 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