From 13ce457d6ed9ccf6760339419ee36cb9b1cf7c4c Mon Sep 17 00:00:00 2001 From: Jon Ayers Date: Thu, 6 Jun 2024 02:38:31 +0000 Subject: [PATCH 1/2] fix: only render tooltip when require_active_version enabled --- .../pages/WorkspacePage/WorkspaceActions/WorkspaceActions.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/site/src/pages/WorkspacePage/WorkspaceActions/WorkspaceActions.tsx b/site/src/pages/WorkspacePage/WorkspaceActions/WorkspaceActions.tsx index 7e41b7662b20a..83306a74e5303 100644 --- a/site/src/pages/WorkspacePage/WorkspaceActions/WorkspaceActions.tsx +++ b/site/src/pages/WorkspacePage/WorkspaceActions/WorkspaceActions.tsx @@ -244,7 +244,7 @@ function getTooltipText( return ""; } - if (!mustUpdate && canChangeVersions) { + if (!mustUpdate && canChangeVersions && workspace.template_require_active_version) { return "This template requires automatic updates on workspace startup, but template administrators can ignore this policy."; } From 7d02321418a128f1718c022c9d24c3e3476bd290 Mon Sep 17 00:00:00 2001 From: Jon Ayers Date: Thu, 6 Jun 2024 02:42:55 +0000 Subject: [PATCH 2/2] fmt --- .../WorkspacePage/WorkspaceActions/WorkspaceActions.tsx | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/site/src/pages/WorkspacePage/WorkspaceActions/WorkspaceActions.tsx b/site/src/pages/WorkspacePage/WorkspaceActions/WorkspaceActions.tsx index 83306a74e5303..beab34de37633 100644 --- a/site/src/pages/WorkspacePage/WorkspaceActions/WorkspaceActions.tsx +++ b/site/src/pages/WorkspacePage/WorkspaceActions/WorkspaceActions.tsx @@ -244,7 +244,11 @@ function getTooltipText( return ""; } - if (!mustUpdate && canChangeVersions && workspace.template_require_active_version) { + if ( + !mustUpdate && + canChangeVersions && + workspace.template_require_active_version + ) { return "This template requires automatic updates on workspace startup, but template administrators can ignore this policy."; }