Fix second test

presleyp · presleyp · commit 0c4d52c60c71 · 2022-12-12T20:13:40.000Z
diff --git a/site/src/pages/WorkspaceSchedulePage/WorkspaceSchedulePage.test.tsx b/site/src/pages/WorkspaceSchedulePage/WorkspaceSchedulePage.test.tsx
@@ -11,7 +11,14 @@ import {
 } from "pages/WorkspaceSchedulePage/schedule"
 import { AutoStop, ttlMsToAutoStop } from "pages/WorkspaceSchedulePage/ttl"
 import * as TypesGen from "../../api/typesGenerated"
-import { WorkspaceScheduleFormValues } from "../../components/WorkspaceScheduleForm/WorkspaceScheduleForm"
+import {
+  WorkspaceScheduleFormValues,
+  Language as FormLanguage,
+} from "../../components/WorkspaceScheduleForm/WorkspaceScheduleForm"
+import {
+  WorkspaceSchedulePage,
+  Language as PageLanguage,
+} from "./WorkspaceSchedulePage"
 
 const validValues: WorkspaceScheduleFormValues = {
   autoStartEnabled: true,
@@ -262,6 +269,20 @@ describe("WorkspaceSchedulePage", () => {
       expect(dialog).toBeInTheDocument()
     })
 
-
+    it("doesn't show if autoStop is not changed", async () => {
+      renderWithAuth(<WorkspaceSchedulePage />, {
+        route: `/@${MockUser.username}/${MockWorkspace.name}/schedule`,
+        path: "/@:username/:workspace/schedule"
+      })
+      const user = userEvent.setup()
+      const autoStartToggle = await screen.findByLabelText(
+        FormLanguage.startSwitch,
+      )
+      await user.click(autoStartToggle)
+      const submitButton = await screen.findByRole("button", { name: /submit/i })
+      await user.click(submitButton)
+      const dialog = screen.queryByText(PageLanguage.dialogTitle)
+      expect(dialog).not.toBeInTheDocument()
+    })
   })
 })
diff --git a/site/src/pages/WorkspaceSchedulePage/WorkspaceSchedulePage.tsx b/site/src/pages/WorkspaceSchedulePage/WorkspaceSchedulePage.tsx
@@ -3,7 +3,7 @@ import { AlertBanner } from "components/AlertBanner/AlertBanner"
 import { ConfirmDialog } from "components/Dialogs/ConfirmDialog/ConfirmDialog"
 import { scheduleToAutoStart } from "pages/WorkspaceSchedulePage/schedule"
 import { ttlMsToAutoStop } from "pages/WorkspaceSchedulePage/ttl"
-import React, { useEffect, useState } from "react"
+import React, { useEffect } from "react"
 import { Navigate, useNavigate, useParams } from "react-router-dom"
 import { scheduleChanged } from "util/schedule"
 import * as TypesGen from "../../api/typesGenerated"
@@ -28,6 +28,11 @@ export const Language = {
   applyLater: "Apply update later",
 }
 
+const getAutoStart = (workspace?: TypesGen.Workspace) =>
+  scheduleToAutoStart(workspace?.autostart_schedule)
+const getAutoStop = (workspace?: TypesGen.Workspace) =>
+  ttlMsToAutoStop(workspace?.ttl_ms)
+
 export const WorkspaceSchedulePage: React.FC = () => {
   const { username: usernameQueryParam, workspace: workspaceQueryParam } =
     useParams()
@@ -52,19 +57,6 @@ export const WorkspaceSchedulePage: React.FC = () => {
       scheduleSend({ type: "GET_WORKSPACE", username, workspaceName })
   }, [username, workspaceName, scheduleSend])
 
-  const getAutoStart = (workspace?: TypesGen.Workspace) =>
-    scheduleToAutoStart(workspace?.autostart_schedule)
-  const getAutoStop = (workspace?: TypesGen.Workspace) =>
-    ttlMsToAutoStop(workspace?.ttl_ms)
-
-  const [autoStart, setAutoStart] = useState(getAutoStart(workspace))
-  const [autoStop, setAutoStop] = useState(getAutoStop(workspace))
-
-  useEffect(() => {
-    setAutoStart(getAutoStart(workspace))
-    setAutoStop(getAutoStop(workspace))
-  }, [workspace])
-
   if (!username || !workspaceName) {
     return <Navigate to="/workspaces" />
   }
@@ -108,7 +100,7 @@ export const WorkspaceSchedulePage: React.FC = () => {
     return (
       <WorkspaceScheduleForm
         submitScheduleError={submitScheduleError}
-        initialValues={{ ...autoStart, ...autoStop }}
+        initialValues={{ ...getAutoStart(workspace), ...getAutoStop(workspace) }}
         isLoading={scheduleState.tags.has("loading")}
         onCancel={() => {
           navigate(`/@${username}/${workspaceName}`)
@@ -118,8 +110,8 @@ export const WorkspaceSchedulePage: React.FC = () => {
             type: "SUBMIT_SCHEDULE",
             autoStart: formValuesToAutoStartRequest(values),
             ttl: formValuesToTTLRequest(values),
-            autoStartChanged: scheduleChanged(autoStart, values),
-            autoStopChanged: scheduleChanged(autoStop, values),
+            autoStartChanged: scheduleChanged(getAutoStart(workspace), values),
+            autoStopChanged: scheduleChanged(getAutoStop(workspace), values),
           })
         }}
       />
diff --git a/site/src/xServices/workspaceSchedule/workspaceScheduleXService.ts b/site/src/xServices/workspaceSchedule/workspaceScheduleXService.ts
@@ -214,6 +214,7 @@ export const workspaceSchedule =
           }
         },
         submitSchedule: async (context, event) => {
+          console.log(event)
           if (!context.workspace?.id) {
             // This state is theoretically impossible, but helps TS
             throw new Error("Failed to load workspace.")

Original file line number	Diff line number	Diff line change
`@@ -214,6 +214,7 @@ export const workspaceSchedule =`
`214`	`214`	`}`
`215`	`215`	`},`
`216`	`216`	`submitSchedule: async (context, event) => {`
	`217`	`+ console.log(event)`
`217`	`218`	`if (!context.workspace?.id) {`
`218`	`219`	`// This state is theoretically impossible, but helps TS`
`219`	`220`	`throw new Error("Failed to load workspace.")`