revert restrictive behavior

sreya · sreya · commit ce25bba16e22 · 2023-10-21T22:39:08.000Z
diff --git a/scripts/develop.sh b/scripts/develop.sh
@@ -136,7 +136,7 @@ fatal() {
 	trap 'fatal "Script encountered an error"' ERR
 
 	cdroot
-	start_cmd API "" "${CODER_DEV_SHIM}" server --http-address 0.0.0.0:3000 --swagger-enable --access-url "${CODER_DEV_ACCESS_URL}" --experiments="template_update_policies" --dangerous-allow-cors-requests=true "$@"
+	start_cmd API "" "${CODER_DEV_SHIM}" server --http-address 0.0.0.0:3000 --swagger-enable --access-url "${CODER_DEV_ACCESS_URL}" --dangerous-allow-cors-requests=true "$@"
 
 	echo '== Waiting for Coder to become ready'
 	# Start the timeout in the background so interrupting this script
diff --git a/site/src/pages/WorkspacePage/WorkspaceActions/constants.ts b/site/src/pages/WorkspacePage/WorkspaceActions/constants.ts
@@ -1,5 +1,6 @@
 import { Workspace, WorkspaceStatus } from "api/typesGenerated";
 import { ReactNode } from "react";
+import { workspaceUpdatePolicy } from "utils/workspace";
 
 // the button types we have
 export enum ButtonTypesEnum {
@@ -44,8 +45,8 @@ export const actionsByWorkspaceStatus = (
   }
   if (
     workspace.outdated &&
-    ((workspace.template_require_active_version && !canChangeVersions) ||
-      workspace.automatic_updates === "always")
+    workspace.template_require_active_version &&
+    !canChangeVersions
   ) {
     if (status === "running") {
       return {
diff --git a/site/src/pages/WorkspacePage/WorkspaceStats.tsx b/site/src/pages/WorkspacePage/WorkspaceStats.tsx
@@ -7,6 +7,7 @@ import {
   getDisplayWorkspaceBuildInitiatedBy,
   getDisplayWorkspaceTemplateName,
   isWorkspaceOn,
+  workspaceUpdatePolicy,
 } from "utils/workspace";
 import { Workspace } from "api/typesGenerated";
 import { Stats, StatsItem } from "components/Stats/Stats";
@@ -77,12 +78,6 @@ export const WorkspaceStats: FC<WorkspaceStatsProps> = ({
   const deadlinePlusEnabled = maxDeadlineIncrease >= 1;
   const deadlineMinusEnabled = maxDeadlineDecrease >= 1;
   const templatePoliciesEnabled = useTemplatePoliciesEnabled();
-  const workspaceUpdatePolicy = (): string => {
-    if (workspace.template_require_active_version && !canChangeVersions) {
-      return "Always";
-    }
-    return upperFirst(workspace.automatic_updates);
-  };
 
   return (
     <>
@@ -219,7 +214,9 @@ export const WorkspaceStats: FC<WorkspaceStatsProps> = ({
             <StatsItem
               className={styles.statsItem}
               label={Language.updatePolicy}
-              value={workspaceUpdatePolicy()}
+              value={upperFirst(
+                workspaceUpdatePolicy(workspace, canChangeVersions),
+              )}
             />
             {workspace.automatic_updates === "never" &&
               workspace.template_require_active_version &&
diff --git a/site/src/utils/workspace.tsx b/site/src/utils/workspace.tsx
@@ -303,3 +303,16 @@ export const getMatchingAgentOrFirst = (
     })
     .filter((a) => a)[0];
 };
+
+export const workspaceUpdatePolicy = (
+  workspace: TypesGen.Workspace,
+  canChangeVersions: boolean,
+): TypesGen.AutomaticUpdates => {
+  // If a template requires the active version and you cannot change versions
+  // (restricted to template admins), then your policy must be "Always".
+  if (workspace.template_require_active_version && !canChangeVersions) {
+    return "always";
+  }
+  // Else prefer the workspace-level setting.
+  return workspace.automatic_updates;
+};
