🍒

aslilac · aslilac · commit d8efe91ab2b3 · 2024-01-26T21:32:08.000Z
diff --git a/site/src/pages/WorkspacePage/WorkspaceScheduleControls.tsx b/site/src/pages/WorkspacePage/WorkspaceScheduleControls.tsx
@@ -245,13 +245,14 @@ const AutoStopDisplay: FC<AutoStopDisplayProps> = ({ workspace }) => {
     return (
       <Tooltip title={display.tooltip}>
         <ScheduleSettingsLink
-          css={(theme) => ({
-            color: isShutdownSoon(workspace)
-              ? `${theme.palette.warning.light} !important`
-              : undefined,
-          })}
+          css={
+            isShutdownSoon(workspace) &&
+            ((theme) => ({
+              color: `${theme.palette.warning.light} !important`,
+            }))
+          }
         >
-          Stop {display.message}
+          {display.message}
         </ScheduleSettingsLink>
       </Tooltip>
     );
diff --git a/site/src/pages/WorkspaceSettingsPage/WorkspaceSchedulePage/WorkspaceSchedulePage.tsx b/site/src/pages/WorkspaceSettingsPage/WorkspaceSchedulePage/WorkspaceSchedulePage.tsx
@@ -80,11 +80,7 @@ export const WorkspaceSchedulePage: FC = () => {
       <Helmet>
         <title>{pageTitle([workspaceName, "Schedule"])}</title>
       </Helmet>
-      <PageHeader
-        css={{
-          paddingTop: 0,
-        }}
-      >
+      <PageHeader css={{ paddingTop: 0 }}>
         <PageHeaderTitle>Workspace Schedule</PageHeaderTitle>
       </PageHeader>
 
diff --git a/site/src/utils/schedule.ts b/site/src/utils/schedule.ts
@@ -1,12 +1,13 @@
 import cronstrue from "cronstrue";
-import dayjs, { Dayjs } from "dayjs";
+import cronParser from "cron-parser";
+import dayjs, { type Dayjs } from "dayjs";
 import duration from "dayjs/plugin/duration";
 import relativeTime from "dayjs/plugin/relativeTime";
 import timezone from "dayjs/plugin/timezone";
 import utc from "dayjs/plugin/utc";
-import { Template, Workspace } from "api/typesGenerated";
+import { type ReactNode } from "react";
+import type { Template, Workspace } from "api/typesGenerated";
 import { isWorkspaceOn } from "./workspace";
-import cronParser from "cron-parser";
 
 // REMARK: some plugins depend on utc, so it's listed first. Otherwise they're
 //         sorted alphabetically.
@@ -91,11 +92,18 @@ export const isShuttingDown = (
 export const autostopDisplay = (
   workspace: Workspace,
 ): {
-  message: string;
+  message: ReactNode;
   tooltip?: string;
 } => {
   const ttl = workspace.ttl_ms;
 
+  if (isWorkspaceOn(workspace) && true) {
+    return {
+      message: "Connected with SSH",
+      tooltip: "Workspace will not stop while there is an active connection",
+    };
+  }
+
   if (isWorkspaceOn(workspace) && workspace.latest_build.deadline) {
     // Workspace is on --> derive from latest_build.deadline. Note that the
     // user may modify their workspace object (ttl) while the workspace is
@@ -111,7 +119,7 @@ export const autostopDisplay = (
     } else {
       const deadlineTz = deadline.tz(dayjs.tz.guess());
       return {
-        message: deadlineTz.fromNow(),
+        message: `Stop ${deadlineTz.fromNow()}`,
         tooltip: deadlineTz.format("MMMM D, YYYY h:mm A"),
       };
     }
