From 1585c1893f62f45b77542af1bbb324a5f36b4474 Mon Sep 17 00:00:00 2001
From: Jon Ayers <jon@coder.com>
Date: Mon, 13 Nov 2023 23:59:10 +0000
Subject: [PATCH 1/2] fix: disable autoupdate workspace setting when template
 setting enabled

- Updates the wording for both settings to be consistent.
---
 .../TemplateGeneralSettingsPage/TemplateSettingsForm.tsx  | 4 ++--
 .../pages/WorkspaceSettingsPage/WorkspaceSettingsForm.tsx | 8 +++++++-
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/site/src/pages/TemplateSettingsPage/TemplateGeneralSettingsPage/TemplateSettingsForm.tsx b/site/src/pages/TemplateSettingsPage/TemplateGeneralSettingsPage/TemplateSettingsForm.tsx
index a44c0ac4f5324..80a1b82355985 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<TemplateSettingsForm> = ({
                     spacing={0.5}
                     css={styles.optionText}
                   >
-                    Require the active template version for workspace builds.
+                    Require workspaces automatically update when started.
                     <HelpTooltip>
                       <HelpTooltipText>
                         This setting is not enforced for template admins.
@@ -196,7 +196,7 @@ export const TemplateSettingsForm: FC<TemplateSettingsForm> = ({
                   </Stack>
                   <span css={styles.optionHelperText}>
                     Workspaces that are manually started or auto-started will
-                    use the promoted template version.
+                    use the active template version.
                   </span>
                 </Stack>
               </Stack>
diff --git a/site/src/pages/WorkspaceSettingsPage/WorkspaceSettingsForm.tsx b/site/src/pages/WorkspaceSettingsPage/WorkspaceSettingsForm.tsx
index 605fbd406c2d7..d6865872bd7e6 100644
--- a/site/src/pages/WorkspaceSettingsPage/WorkspaceSettingsForm.tsx
+++ b/site/src/pages/WorkspaceSettingsPage/WorkspaceSettingsForm.tsx
@@ -85,7 +85,13 @@ export const WorkspaceSettingsForm: FC<{
               label="Update Policy"
               value={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) => (
                 <MenuItem value={value} key={value}>

From 6029723e5998db4614933c37050c665c7dce6034 Mon Sep 17 00:00:00 2001
From: Jon Ayers <jon@coder.com>
Date: Tue, 14 Nov 2023 01:12:25 +0000
Subject: [PATCH 2/2] update disabled value

---
 .../pages/WorkspaceSettingsPage/WorkspaceSettingsForm.tsx   | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/site/src/pages/WorkspaceSettingsPage/WorkspaceSettingsForm.tsx b/site/src/pages/WorkspaceSettingsPage/WorkspaceSettingsForm.tsx
index d6865872bd7e6..b94eabee07fb4 100644
--- a/site/src/pages/WorkspaceSettingsPage/WorkspaceSettingsForm.tsx
+++ b/site/src/pages/WorkspaceSettingsPage/WorkspaceSettingsForm.tsx
@@ -83,7 +83,11 @@ 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 || workspace.template_require_active_version