fixup! add back max_ttl and put restart_requirement behind feature flag

deansheather · deansheather · commit cb9428e53da0 · 2023-07-12T15:38:20.000Z
diff --git a/coderd/database/modelqueries.go b/coderd/database/modelqueries.go
@@ -71,6 +71,7 @@ func (q *sqlQuerier) GetAuthorizedTemplates(ctx context.Context, arg GetTemplate
 			&i.ActiveVersionID,
 			&i.Description,
 			&i.DefaultTTL,
+			&i.MaxTTL,
 			&i.CreatedBy,
 			&i.Icon,
 			&i.UserACL,
@@ -82,6 +83,8 @@ func (q *sqlQuerier) GetAuthorizedTemplates(ctx context.Context, arg GetTemplate
 			&i.FailureTTL,
 			&i.InactivityTTL,
 			&i.LockedTTL,
+			&i.RestartRequirementDaysOfWeek,
+			&i.RestartRequirementWeeks,
 		); err != nil {
 			return nil, xerrors.Errorf("scan: %w", err)
 		}
diff --git a/codersdk/templates.go b/codersdk/templates.go
@@ -30,7 +30,7 @@ type Template struct {
 	Icon             string                 `json:"icon"`
 	DefaultTTLMillis int64                  `json:"default_ttl_ms"`
 	// TODO(@dean): remove max_ttl once restart_requirement is matured
-	MaxTTLMillis int64 `json:"max_ttl_ms,omitempty"`
+	MaxTTLMillis int64 `json:"max_ttl_ms"`
 	// RestartRequirement is an enterprise feature. Its value is only used if
 	// your license is entitled to use the advanced template scheduling feature.
 	RestartRequirement TemplateRestartRequirement `json:"restart_requirement"`
diff --git a/site/src/api/typesGenerated.ts b/site/src/api/typesGenerated.ts
@@ -866,7 +866,7 @@ export interface Template {
   readonly description: string
   readonly icon: string
   readonly default_ttl_ms: number
-  readonly max_ttl_ms?: number
+  readonly max_ttl_ms: number
   readonly restart_requirement: TemplateRestartRequirement
   readonly created_by_id: string
   readonly created_by_name: string
diff --git a/site/src/pages/TemplateSettingsPage/TemplateGeneralSettingsPage/TemplateSettingsPage.test.tsx b/site/src/pages/TemplateSettingsPage/TemplateGeneralSettingsPage/TemplateSettingsPage.test.tsx
@@ -26,6 +26,10 @@ const validFormValues: FormValues = {
   allow_user_cancel_workspace_jobs: false,
   allow_user_autostart: false,
   allow_user_autostop: false,
+  restart_requirement: {
+    days_of_week: [],
+    weeks: 1,
+  },
   failure_ttl_ms: 0,
   inactivity_ttl_ms: 0,
   locked_ttl_ms: 0,
diff --git a/site/src/pages/TemplateSettingsPage/TemplateSchedulePage/TemplateScheduleForm/TemplateScheduleForm.tsx b/site/src/pages/TemplateSettingsPage/TemplateSchedulePage/TemplateScheduleForm/TemplateScheduleForm.tsx
@@ -70,6 +70,11 @@ export const TemplateScheduleForm: FC<TemplateScheduleForm> = ({
         ? template.locked_ttl_ms / MS_DAY_CONVERSION
         : 0,
 
+      restart_requirement: {
+        days_of_week: template.restart_requirement.days_of_week,
+        weeks: template.restart_requirement.weeks,
+      },
+
       allow_user_autostart: template.allow_user_autostart,
       allow_user_autostop: template.allow_user_autostop,
       failure_cleanup_enabled:
