🧹

aslilac · aslilac · commit 2fe1d457efbd · 2024-02-09T19:02:24.000Z
diff --git a/site/src/pages/WorkspacePage/WorkspacePage.tsx b/site/src/pages/WorkspacePage/WorkspacePage.tsx
@@ -77,6 +77,15 @@ export const WorkspacePage: FC = () => {
       }
     },
   );
+  const getWorkspaceData = useEffectEvent(() => {
+    if (!workspace) {
+      throw new Error("Applying an update for a workspace that is undefined.");
+    }
+
+    return queryClient.getQueryData(
+      workspaceQueryOptions.queryKey,
+    ) as Workspace;
+  });
   const workspaceId = workspace?.id;
   useEffect(() => {
     if (!workspaceId) {
@@ -95,11 +104,7 @@ export const WorkspacePage: FC = () => {
       // Merge with a fresh object `{}` as the base, because `merge` uses an in-place algorithm,
       // and would otherwise mutate the `queryClient`'s internal state.
       await updateWorkspaceData(
-        merge(
-          {},
-          queryClient.getQueryData(workspaceQueryOptions.queryKey) as Workspace,
-          newWorkspaceData,
-        ),
+        merge({}, getWorkspaceData(), newWorkspaceData),
       );
     });
 
@@ -110,7 +115,7 @@ export const WorkspacePage: FC = () => {
     return () => {
       eventSource.close();
     };
-  }, [updateWorkspaceData, workspaceId]);
+  }, [updateWorkspaceData, getWorkspaceData, workspaceId]);
 
   // Page statuses
   const pageError =
diff --git a/site/src/pages/WorkspacePage/WorkspaceScheduleControls.test.tsx b/site/src/pages/WorkspacePage/WorkspaceScheduleControls.test.tsx
@@ -1,33 +1,35 @@
 import { render, screen } from "@testing-library/react";
-import { type FC } from "react";
+import userEvent from "@testing-library/user-event";
 import { QueryClient, QueryClientProvider } from "react-query";
 import { RouterProvider, createMemoryRouter } from "react-router-dom";
-import userEvent from "@testing-library/user-event";
 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 { getWorkspaceActivityStatus } from "modules/workspaces/activity";
 import { WorkspaceScheduleControls } from "./WorkspaceScheduleControls";
 
-const Wrapper: FC = () => {
-  return (
-    <WorkspaceScheduleControls
-      workspace={MockWorkspace}
-      template={MockTemplate}
-      canUpdateSchedule
-    />
-  );
-};
-
 const BASE_DEADLINE = dayjs().add(3, "hour");
 
 const renderScheduleControls = async () => {
   render(
     <ThemeProvider>
       <QueryClientProvider client={new QueryClient()}>
         <RouterProvider
-          router={createMemoryRouter([{ path: "/", element: <Wrapper /> }])}
+          router={createMemoryRouter([
+            {
+              path: "/",
+              element: (
+                <WorkspaceScheduleControls
+                  workspace={MockWorkspace}
+                  status={getWorkspaceActivityStatus(MockWorkspace)}
+                  template={MockTemplate}
+                  canUpdateSchedule
+                />
+              ),
+            },
+          ])}
         />
       </QueryClientProvider>
       <GlobalSnackbar />
diff --git a/site/src/utils/schedule.tsx b/site/src/utils/schedule.tsx
@@ -9,15 +9,9 @@ import utc from "dayjs/plugin/utc";
 import { type ReactNode } from "react";
 import { Link as RouterLink } from "react-router-dom";
 import type { Template, Workspace } from "api/typesGenerated";
-import {
-  HelpTooltipText,
-  HelpTooltipTitle,
-} from "components/HelpTooltip/HelpTooltip";
+import { HelpTooltipTitle } from "components/HelpTooltip/HelpTooltip";
+import type { WorkspaceActivityStatus } from "modules/workspaces/activity";
 import { isWorkspaceOn } from "./workspace";
-import {
-  WorkspaceActivityStatus,
-  getWorkspaceActivityStatus,
-} from "modules/workspaces/activity";
 
 // REMARK: some plugins depend on utc, so it's listed first. Otherwise they're
 //         sorted alphabetically.
@@ -133,7 +127,7 @@ export const autostopDisplay = (
         message: `Required to stop soon`,
         tooltip: (
           <>
-            <HelpTooltipTitle>Upcoming autostop required</HelpTooltipTitle>
+            <HelpTooltipTitle>Upcoming stop required</HelpTooltipTitle>
             This workspace will be required to stop by{" "}
             {dayjs(workspace.latest_build.max_deadline).format(
               "MMMM D [at] h:mm A",
@@ -154,7 +148,7 @@ export const autostopDisplay = (
           <>
             {" "}
             because this workspace has enabled autostop. You can disable
-            autostop from this workspace's{" "}
+            autostop from this workspace&apos;s{" "}
             <Link component={RouterLink} to="settings/schedule">
               schedule settings
             </Link>
