From 9ac44aa74f87010b01b4d8daaf87bd68fdc7940f Mon Sep 17 00:00:00 2001 From: Jon Ayers Date: Wed, 15 Nov 2023 16:58:55 -0600 Subject: [PATCH] fix: disable autoupdate workspace setting when template setting enabled (#10662) --- .../TemplateSettingsForm.tsx | 4 ++-- .../WorkspaceSettingsForm.tsx | 14 ++++++++++++-- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/site/src/pages/TemplateSettingsPage/TemplateGeneralSettingsPage/TemplateSettingsForm.tsx b/site/src/pages/TemplateSettingsPage/TemplateGeneralSettingsPage/TemplateSettingsForm.tsx index a44c0ac4f5..80a1b82355 100644 --- a/site/src/pages/TemplateSettingsPage/TemplateGeneralSettingsPage/TemplateSettingsForm.tsx +++ b/site/src/pages/TemplateSettingsPage/TemplateGeneralSettingsPage/TemplateSettingsForm.tsx @@ -187,7 +187,7 @@ export const TemplateSettingsForm: FC = ({ spacing={0.5} css={styles.optionText} > - Require the active template version for workspace builds. + Require workspaces automatically update when started. This setting is not enforced for template admins. @@ -196,7 +196,7 @@ export const TemplateSettingsForm: FC = ({ Workspaces that are manually started or auto-started will - use the promoted template version. + use the active template version. diff --git a/site/src/pages/WorkspaceSettingsPage/WorkspaceSettingsForm.tsx b/site/src/pages/WorkspaceSettingsPage/WorkspaceSettingsForm.tsx index 605fbd406c..b94eabee07 100644 --- a/site/src/pages/WorkspaceSettingsPage/WorkspaceSettingsForm.tsx +++ b/site/src/pages/WorkspaceSettingsPage/WorkspaceSettingsForm.tsx @@ -83,9 +83,19 @@ export const WorkspaceSettingsForm: FC<{ {...getFieldHelpers("automatic_updates")} id="automatic_updates" label="Update Policy" - value={form.values.automatic_updates} + value={ + workspace.template_require_active_version + ? "always" + : form.values.automatic_updates + } select - disabled={form.isSubmitting} + disabled={ + form.isSubmitting || workspace.template_require_active_version + } + helperText={ + workspace.template_require_active_version && + "The template for this workspace requires automatic updates." + } > {AutomaticUpdateses.map((value) => (