Fixes

coder · deansheather · Dec 15, 2023 · Nov 28, 2023 · Dec 5, 2023 · Dec 8, 2023
commit b33ab522b83c60525261b99b0c43843d3275cdba
diff --git a/coderd/workspaces.go b/coderd/workspaces.go
@@ -431,7 +431,7 @@ func (api *API) postWorkspacesByOrganization(rw http.ResponseWriter, r *http.Req
 	}
 
 	maxTTL := templateSchedule.MaxTTL
-	if templateSchedule.UseMaxTTL {
+	if !templateSchedule.UseMaxTTL {
 		// If we're using autostop requirements, there isn't a max TTL.
 		maxTTL = 0
 	}
@@ -787,7 +787,7 @@ func (api *API) putWorkspaceTTL(rw http.ResponseWriter, r *http.Request) {
 		}
 
 		maxTTL := templateSchedule.MaxTTL
-		if templateSchedule.UseMaxTTL {
+		if !templateSchedule.UseMaxTTL {
 			// If we're using autostop requirements, there isn't a max TTL.
 			maxTTL = 0
 		}

diff --git a/enterprise/coderd/schedule/template.go b/enterprise/coderd/schedule/template.go
@@ -46,7 +46,7 @@ func (s *EnterpriseTemplateScheduleStore) now() time.Time {
 }
 
 // Get implements agpl.TemplateScheduleStore.
-func (s *EnterpriseTemplateScheduleStore) Get(ctx context.Context, db database.Store, templateID uuid.UUID) (agpl.TemplateScheduleOptions, error) {
+func (*EnterpriseTemplateScheduleStore) Get(ctx context.Context, db database.Store, templateID uuid.UUID) (agpl.TemplateScheduleOptions, error) {
 	ctx, span := tracing.StartSpan(ctx)
 	defer span.End()
 
@@ -181,7 +181,6 @@ func (s *EnterpriseTemplateScheduleStore) Set(ctx context.Context, db database.S
 			}
 		}
 
-		// TODO: update all workspace max_deadlines to be within new bounds
 		template, err = tx.GetTemplateByID(ctx, tpl.ID)
 		if err != nil {
 			return xerrors.Errorf("get updated template schedule: %w", err)

diff --git a/enterprise/coderd/users_test.go b/enterprise/coderd/users_test.go
@@ -24,8 +24,7 @@ func TestUserQuietHours(t *testing.T) {
 		adminClient, adminUser := coderdenttest.New(t, &coderdenttest.Options{
 			LicenseOptions: &coderdenttest.LicenseOptions{
 				Features: license.Features{
-					codersdk.FeatureAdvancedTemplateScheduling:  1,
-					codersdk.FeatureTemplateAutostopRequirement: 1,
+					codersdk.FeatureAdvancedTemplateScheduling: 1,
 				},
 			},
 		})
@@ -63,8 +62,7 @@ func TestUserQuietHours(t *testing.T) {
 			},
 			LicenseOptions: &coderdenttest.LicenseOptions{
 				Features: license.Features{
-					codersdk.FeatureAdvancedTemplateScheduling:  1,
-					codersdk.FeatureTemplateAutostopRequirement: 1,
+					codersdk.FeatureAdvancedTemplateScheduling: 1,
 				},
 			},
 		})
@@ -164,9 +162,8 @@ func TestUserQuietHours(t *testing.T) {
 			},
 			LicenseOptions: &coderdenttest.LicenseOptions{
 				Features: license.Features{
-					codersdk.FeatureAdvancedTemplateScheduling: 1,
 					// Not entitled.
-					// codersdk.FeatureTemplateAutostopRequirement: 1,
+					// codersdk.FeatureAdvancedTemplateScheduling: 1,
 				},
 			},
 		})

@@ -128,9 +128,9 @@ export const DeprecatedBadge: FC = () => {
       css={[
         styles.badge,
         {
-          border: `1px solid ${colors.red[600]}`,
-          backgroundColor: colors.red[950],
-          color: colors.red[50],
+          border: `1px solid ${colors.orange[600]}`,
+          backgroundColor: colors.orange[950],
+          color: colors.orange[50],
         },
       ]}
     >

@@ -422,29 +422,35 @@ export const TemplateScheduleForm: FC<TemplateScheduleForm> = ({
       >
         <Stack direction="column">
           <Stack direction="row" alignItems="center">
-            <Checkbox
-              id="use_max_ttl"
-              size="small"
-              disabled={isSubmitting || !allowAdvancedScheduling}
-              onChange={handleToggleUseMaxTTL}
-              name="use_max_ttl"
-              checked={form.values.use_max_ttl}
+            <FormControlLabel
+              control={
+                <Checkbox
+                  id="use_max_ttl"
+                  size="small"
+                  disabled={isSubmitting || !allowAdvancedScheduling}
+                  onChange={handleToggleUseMaxTTL}
+                  name="use_max_ttl"
+                  checked={form.values.use_max_ttl}
+                />
+              }
+              label={
+                <Stack spacing={0.5}>
+                  <strong>
+                    Use a max lifetime instead of a required autostop schedule.
+                  </strong>
+                  <span
+                    css={{
+                      fontSize: 12,
+                      color: theme.palette.text.secondary,
+                    }}
+                  >
+                    Use a maximum lifetime for workspaces created from this
+                    template instead of an autostop requirement as configured
+                    above.
+                  </span>
+                </Stack>
+              }
             />
-            <Stack spacing={0.5}>
-              <strong>
-                Use a max lifetime instead of a required autostop schedule.
-              </strong>
-              <span
-                css={{
-                  fontSize: 12,
-                  color: theme.palette.text.secondary,
-                }}
-              >
-                Use a maximum lifetime for workspaces created from this
-                template instead of an autostop requirement as configured
-                above.
-              </span>
-            </Stack>
           </Stack>
 
           <TextField

@@ -74,8 +74,12 @@ const fillAndSubmitForm = async ({
   }
 
   if (max_ttl_ms) {
+    const useMaxTtlCheckbox = screen.getByRole("checkbox", {
+      name: /Use a max lifetime/i,
+    });
     const maxTtlField = await screen.findByLabelText("Max lifetime (hours)");
 
+    await user.click(useMaxTtlCheckbox);
     await user.clear(maxTtlField);
     await user.type(maxTtlField, max_ttl_ms.toString());
   }