Revert "🍒"

aslilac · aslilac · commit c958b2565b13 · 2024-01-26T21:48:58.000Z
This reverts commit d8efe91.
diff --git a/site/src/pages/WorkspacePage/WorkspaceScheduleControls.tsx b/site/src/pages/WorkspacePage/WorkspaceScheduleControls.tsx
@@ -245,14 +245,13 @@ const AutoStopDisplay: FC<AutoStopDisplayProps> = ({ workspace }) => {
     return (
       <Tooltip title={display.tooltip}>
         <ScheduleSettingsLink
-          css={
-            isShutdownSoon(workspace) &&
-            ((theme) => ({
-              color: `${theme.palette.warning.light} !important`,
-            }))
-          }
+          css={(theme) => ({
+            color: isShutdownSoon(workspace)
+              ? `${theme.palette.warning.light} !important`
+              : undefined,
+          })}
         >
-          {display.message}
+          Stop {display.message}
         </ScheduleSettingsLink>
       </Tooltip>
     );
diff --git a/site/src/pages/WorkspaceSettingsPage/WorkspaceSchedulePage/WorkspaceSchedulePage.tsx b/site/src/pages/WorkspaceSettingsPage/WorkspaceSchedulePage/WorkspaceSchedulePage.tsx
@@ -80,7 +80,11 @@ 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,13 +1,12 @@
 import cronstrue from "cronstrue";
-import cronParser from "cron-parser";
-import dayjs, { type Dayjs } from "dayjs";
+import dayjs, { 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 { type ReactNode } from "react";
-import type { Template, Workspace } from "api/typesGenerated";
+import { 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.
@@ -92,18 +91,11 @@ export const isShuttingDown = (
 export const autostopDisplay = (
   workspace: Workspace,
 ): {
-  message: ReactNode;
+  message: string;
   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
@@ -119,7 +111,7 @@ export const autostopDisplay = (
     } else {
       const deadlineTz = deadline.tz(dayjs.tz.guess());
       return {
-        message: `Stop ${deadlineTz.fromNow()}`,
+        message: deadlineTz.fromNow(),
         tooltip: deadlineTz.format("MMMM D, YYYY h:mm A"),
       };
     }
