🧹🧹🧹 I'm done now I swear

aslilac · aslilac · commit 22366e406c38 · 2023-09-14T19:46:11.000Z
diff --git a/site/src/pages/UserSettingsPage/SchedulePage/ScheduleForm.tsx b/site/src/pages/UserSettingsPage/SchedulePage/ScheduleForm.tsx
@@ -17,12 +17,12 @@ import { Alert } from "components/Alert/Alert";
 import { timeToCron, quietHoursDisplay } from "utils/schedule";
 
 export interface ScheduleFormValues {
-  startTime: string;
+  time: string;
   timezone: string;
 }
 
 const validationSchema = Yup.object({
-  startTime: Yup.string()
+  time: Yup.string()
     .ensure()
     .test("is-time-string", "Time must be in HH:mm format.", (value) => {
       if (value === "") {
@@ -64,17 +64,11 @@ export const ScheduleForm: FC<React.PropsWithChildren<ScheduleFormProps>> = ({
     };
   }, []);
 
-  const preferredTimezone = getPreferredTimezone();
-
   // If the user has a custom schedule, use that as the initial values.
-  // Otherwise, use midnight in their preferred timezone.
-  const formInitialValues = {
-    startTime: "00:00",
-    timezone: preferredTimezone,
-  };
-  if (initialValues.user_set) {
-    formInitialValues.startTime = initialValues.time;
-    formInitialValues.timezone = initialValues.timezone;
+  // Otherwise, use the default time, with their local timezone.
+  const formInitialValues = { ...initialValues };
+  if (!initialValues.user_set) {
+    formInitialValues.timezone = getPreferredTimezone();
   }
 
   const form: FormikContextType<ScheduleFormValues> =
@@ -83,7 +77,7 @@ export const ScheduleForm: FC<React.PropsWithChildren<ScheduleFormProps>> = ({
       validationSchema,
       onSubmit: async (values) => {
         onSubmit({
-          schedule: timeToCron(values.startTime, values.timezone),
+          schedule: timeToCron(values.time, values.timezone),
         });
       },
     });
@@ -107,7 +101,7 @@ export const ScheduleForm: FC<React.PropsWithChildren<ScheduleFormProps>> = ({
 
         <Stack direction="row">
           <TextField
-            {...getFieldHelpers("startTime")}
+            {...getFieldHelpers("time")}
             disabled={isLoading}
             label="Start time"
             type="time"
@@ -132,18 +126,14 @@ export const ScheduleForm: FC<React.PropsWithChildren<ScheduleFormProps>> = ({
           disabled
           fullWidth
           label="Cron schedule"
-          value={timeToCron(form.values.startTime, form.values.timezone)}
+          value={timeToCron(form.values.time, form.values.timezone)}
         />
 
         <TextField
           disabled
           fullWidth
           label="Next occurrence"
-          value={quietHoursDisplay(
-            form.values.startTime,
-            form.values.timezone,
-            now,
-          )}
+          value={quietHoursDisplay(form.values.time, form.values.timezone, now)}
         />
 
         <div>
diff --git a/site/src/pages/WorkspaceSettingsPage/WorkspaceSchedulePage/WorkspaceSchedulePage.test.tsx b/site/src/pages/WorkspaceSettingsPage/WorkspaceSchedulePage/WorkspaceSchedulePage.test.tsx
@@ -1,20 +1,20 @@
 import { renderWithWorkspaceSettingsLayout } from "testHelpers/renderHelpers";
 import userEvent from "@testing-library/user-event";
 import { screen } from "@testing-library/react";
+import { rest } from "msw";
+import { server } from "testHelpers/server";
+import { MockUser, MockWorkspace } from "testHelpers/entities";
 import {
   formValuesToAutostartRequest,
   formValuesToTTLRequest,
-} from "pages/WorkspaceSettingsPage/WorkspaceSchedulePage/formToRequest";
-import { scheduleToAutostart } from "pages/WorkspaceSettingsPage/WorkspaceSchedulePage/schedule";
-import { ttlMsToAutostop } from "pages/WorkspaceSettingsPage/WorkspaceSchedulePage/ttl";
+} from "./formToRequest";
+import { scheduleToAutostart } from "./schedule";
+import { ttlMsToAutostop } from "./ttl";
 import {
   WorkspaceScheduleFormValues,
   Language as FormLanguage,
 } from "./WorkspaceScheduleForm";
 import { WorkspaceSchedulePage } from "./WorkspaceSchedulePage";
-import { server } from "testHelpers/server";
-import { rest } from "msw";
-import { MockUser, MockWorkspace } from "testHelpers/entities";
 
 const validValues: WorkspaceScheduleFormValues = {
   autostartEnabled: true,
