hi

aslilac · aslilac · commit 3c353b454949 · 2024-02-01T21:59:32.000Z
diff --git a/site/src/pages/WorkspacePage/WorkspaceScheduleControls.test.tsx b/site/src/pages/WorkspacePage/WorkspaceScheduleControls.test.tsx
@@ -1,49 +1,27 @@
 import { render, screen } from "@testing-library/react";
-import { ThemeProvider } from "contexts/ThemeProvider";
-import { QueryClient, QueryClientProvider, useQuery } from "react-query";
-import { MockWorkspace } from "testHelpers/entities";
-import { WorkspaceScheduleControls } from "./WorkspaceScheduleControls";
-import { workspaceByOwnerAndName } from "api/queries/workspaces";
+import { QueryClient, QueryClientProvider } from "react-query";
 import { RouterProvider, createMemoryRouter } from "react-router-dom";
 import userEvent from "@testing-library/user-event";
-import { server } from "testHelpers/server";
-import { rest } from "msw";
 import dayjs from "dayjs";
 import * as API from "api/api";
 import { GlobalSnackbar } from "components/GlobalSnackbar/GlobalSnackbar";
+import { ThemeProvider } from "contexts/ThemeProvider";
+import { MockTemplate, MockWorkspace } from "testHelpers/entities";
+import { WorkspaceScheduleControls } from "./WorkspaceScheduleControls";
 
 const Wrapper = () => {
-  const { data: workspace } = useQuery(
-    workspaceByOwnerAndName(MockWorkspace.owner_name, MockWorkspace.name),
+  return (
+    <WorkspaceScheduleControls
+      workspace={MockWorkspace}
+      template={MockTemplate}
+      canUpdateSchedule
+    />
   );
-
-  if (!workspace) {
-    return null;
-  }
-
-  return <WorkspaceScheduleControls workspace={workspace} canUpdateSchedule />;
 };
 
 const BASE_DEADLINE = dayjs().add(3, "hour");
 
 const renderScheduleControls = async () => {
-  server.use(
-    rest.get(
-      "/api/v2/users/:username/workspace/:workspaceName",
-      (req, res, ctx) => {
-        return res(
-          ctx.status(200),
-          ctx.json({
-            ...MockWorkspace,
-            latest_build: {
-              ...MockWorkspace.latest_build,
-              deadline: BASE_DEADLINE.toISOString(),
-            },
-          }),
-        );
-      },
-    ),
-  );
   render(
     <ThemeProvider>
       <QueryClientProvider client={new QueryClient()}>
diff --git a/site/src/pages/WorkspacePage/WorkspaceScheduleControls.tsx b/site/src/pages/WorkspacePage/WorkspaceScheduleControls.tsx
@@ -1,9 +1,16 @@
 import { type Interpolation, type Theme } from "@emotion/react";
-import Link, { LinkProps } from "@mui/material/Link";
+import Link, { type LinkProps } from "@mui/material/Link";
+import IconButton from "@mui/material/IconButton";
+import RemoveIcon from "@mui/icons-material/RemoveOutlined";
+import AddIcon from "@mui/icons-material/AddOutlined";
+import Tooltip from "@mui/material/Tooltip";
+import { visuallyHidden } from "@mui/utils";
+import { Dayjs } from "dayjs";
 import { forwardRef, type FC, useRef } from "react";
+import { useMutation, useQueryClient } from "react-query";
 import { Link as RouterLink } from "react-router-dom";
 import { isWorkspaceOn } from "utils/workspace";
-import type { Workspace } from "api/typesGenerated";
+import type { Template, Workspace } from "api/typesGenerated";
 import {
   autostartDisplay,
   autostopDisplay,
@@ -12,28 +19,22 @@ import {
   getMaxDeadlineChange,
   getMinDeadline,
 } from "utils/schedule";
-import IconButton from "@mui/material/IconButton";
-import RemoveIcon from "@mui/icons-material/RemoveOutlined";
-import AddIcon from "@mui/icons-material/AddOutlined";
-import Tooltip from "@mui/material/Tooltip";
-import _ from "lodash";
 import { getErrorMessage } from "api/errors";
 import {
   updateDeadline,
   workspaceByOwnerAndNameKey,
 } from "api/queries/workspaces";
 import { displayError, displaySuccess } from "components/GlobalSnackbar/utils";
-import { useMutation, useQueryClient } from "react-query";
-import { Dayjs } from "dayjs";
-import { visuallyHidden } from "@mui/utils";
 
 export interface WorkspaceScheduleControlsProps {
   workspace: Workspace;
+  template: Template;
   canUpdateSchedule: boolean;
 }
 
 export const WorkspaceScheduleControls: FC<WorkspaceScheduleControlsProps> = ({
   workspace,
+  template,
   canUpdateSchedule,
 }) => {
   const queryClient = useQueryClient();
@@ -90,7 +91,7 @@ export const WorkspaceScheduleControls: FC<WorkspaceScheduleControlsProps> = ({
   return (
     <div css={styles.scheduleValue} data-testid="schedule-controls">
       {isWorkspaceOn(workspace) ? (
-        <AutoStopDisplay workspace={workspace} />
+        <AutoStopDisplay workspace={workspace} template={template} />
       ) : (
         <ScheduleSettingsLink>
           Starts at {autostartDisplay(workspace.autostart_schedule)}
@@ -133,11 +134,14 @@ export const WorkspaceScheduleControls: FC<WorkspaceScheduleControlsProps> = ({
 
 interface AutoStopDisplayProps {
   workspace: Workspace;
+  template: Template;
 }
 
-const AutoStopDisplay: FC<AutoStopDisplayProps> = ({ workspace }) => {
+const AutoStopDisplay: FC<AutoStopDisplayProps> = ({ workspace, template }) => {
   const display = autostopDisplay(workspace);
 
+  console.log(template.autostop_requirement);
+
   if (display.tooltip) {
     return (
       <Tooltip title={display.tooltip}>
diff --git a/site/src/pages/WorkspacePage/WorkspaceTopbar.tsx b/site/src/pages/WorkspacePage/WorkspaceTopbar.tsx
@@ -228,6 +228,7 @@ export const WorkspaceTopbar: FC<WorkspaceProps> = ({
             </TopbarIcon>
             <WorkspaceScheduleControls
               workspace={workspace}
+              template={template}
               canUpdateSchedule={canUpdateWorkspace}
             />
           </TopbarData>
