🧹

aslilac · aslilac · commit 75ed4f707957 · 2024-02-26T19:47:15.000Z
diff --git a/site/src/pages/WorkspacePage/WorkspaceScheduleControls.test.tsx b/site/src/pages/WorkspacePage/WorkspaceScheduleControls.test.tsx
@@ -94,7 +94,7 @@ test("add 3 hours to deadline", async () => {
   );
 });
 
-test("remove 3 hours to deadline", async () => {
+test("remove 2 hours to deadline", async () => {
   const user = userEvent.setup();
   const updateDeadlineSpy = jest
     .spyOn(API, "putWorkspaceExtension")
diff --git a/site/src/pages/WorkspacePage/WorkspaceScheduleControls.tsx b/site/src/pages/WorkspacePage/WorkspaceScheduleControls.tsx
@@ -52,9 +52,12 @@ export const WorkspaceScheduleContainer: FC<
     <TopbarData>
       <Tooltip title="Schedule">
         {onClickIcon ? (
-          <span
+          <button
+            data-testid="schedule-icon-button"
             onClick={onClickIcon}
             css={{
+              display: "flex",
+              alignItems: "center",
               background: "transparent",
               border: 0,
               padding: 0,
@@ -63,7 +66,7 @@ export const WorkspaceScheduleContainer: FC<
             }}
           >
             {icon}
-          </span>
+          </button>
         ) : (
           icon
         )}
diff --git a/site/src/pages/WorkspacePage/WorkspaceTopbar.stories.tsx b/site/src/pages/WorkspacePage/WorkspaceTopbar.stories.tsx
@@ -50,34 +50,12 @@ export const Outdated: Story = {
   },
 };
 
-export const Ready: Story = {
-  args: {
-    workspace: {
-      ...baseWorkspace,
-      get last_used_at() {
-        return new Date().toISOString();
-      },
-      latest_build: {
-        ...baseWorkspace.latest_build,
-        get created_at() {
-          return new Date().toISOString();
-        },
-      },
-    },
-  },
-};
 export const ReadyWithDeadline: Story = {
   args: {
     workspace: {
       ...MockWorkspace,
-      get last_used_at() {
-        return new Date().toISOString();
-      },
       latest_build: {
         ...MockWorkspace.latest_build,
-        get created_at() {
-          return new Date().toISOString();
-        },
         get deadline() {
           return addHours(new Date(), 8).toISOString();
         },
@@ -111,6 +89,24 @@ export const ConnectedWithDeadline: Story = {
       },
     },
   },
+  play: async ({ canvasElement, step }) => {
+    const screen = within(canvasElement);
+    const autostopText = "Stop in 8 hours";
+
+    await step("show controls", async () => {
+      await userEvent.click(screen.getByTestId("schedule-icon-button"));
+      await waitFor(() =>
+        expect(screen.getByText(autostopText)).toBeInTheDocument(),
+      );
+    });
+
+    await step("hide controls", async () => {
+      await userEvent.click(screen.getByTestId("schedule-icon-button"));
+      await waitFor(() =>
+        expect(screen.queryByText(autostopText)).not.toBeInTheDocument(),
+      );
+    });
+  },
 };
 export const ConnectedWithMaxDeadline: Story = {
   args: {
@@ -130,6 +126,24 @@ export const ConnectedWithMaxDeadline: Story = {
       },
     },
   },
+  play: async ({ canvasElement, step }) => {
+    const screen = within(canvasElement);
+    const autostopText = "Stop in an hour";
+
+    await step("show controls", async () => {
+      await userEvent.click(screen.getByTestId("schedule-icon-button"));
+      await waitFor(() =>
+        expect(screen.getByText(autostopText)).toBeInTheDocument(),
+      );
+    });
+
+    await step("hide controls", async () => {
+      await userEvent.click(screen.getByTestId("schedule-icon-button"));
+      await waitFor(() =>
+        expect(screen.queryByText(autostopText)).not.toBeInTheDocument(),
+      );
+    });
+  },
 };
 export const ConnectedWithMaxDeadlineSoon: Story = {
   args: {
diff --git a/site/src/utils/schedule.tsx b/site/src/utils/schedule.tsx
@@ -114,11 +114,12 @@ export const autostopDisplay = (
     const deadline = dayjs(workspace.latest_build.deadline).tz(
       dayjs.tz.guess(),
     );
-    const maxDeadline = dayjs(workspace.latest_build.max_deadline);
     const now = dayjs(workspace.latest_build.deadline);
 
     if (activityStatus === "connected") {
-      if (maxDeadline.isBefore(now.add(2, "hour"))) {
+      const hasMaxDeadline = Boolean(workspace.latest_build.max_deadline);
+      const maxDeadline = dayjs(workspace.latest_build.max_deadline);
+      if (hasMaxDeadline && maxDeadline.isBefore(now.add(2, "hour"))) {
         return {
           message: `Required to stop soon`,
           tooltip: (
