fix: Site references to workspace.latest_build.deadline

mafredri · mafredri · commit e390cefa413e · 2022-08-25T15:26:44.000+03:00
diff --git a/site/src/components/WorkspaceSchedule/WorkspaceSchedule.stories.tsx b/site/src/components/WorkspaceSchedule/WorkspaceSchedule.stories.tsx
@@ -38,9 +38,7 @@ NoTTL.args = {
     ...Mocks.MockWorkspace,
     latest_build: {
       ...Mocks.MockWorkspaceBuild,
-      // a manual shutdown has a deadline of '"0001-01-01T00:00:00Z"'
-      // SEE: #1834
-      deadline: "0001-01-01T00:00:00Z",
+      deadline: undefined,
     },
     ttl_ms: undefined,
   },
diff --git a/site/src/components/WorkspaceScheduleBanner/WorkspaceScheduleBanner.test.tsx b/site/src/components/WorkspaceScheduleBanner/WorkspaceScheduleBanner.test.tsx
@@ -10,12 +10,12 @@ describe("WorkspaceScheduleBanner", () => {
   describe("shouldDisplay", () => {
     // Manual TTL case
     it("should not display if the build does not have a deadline", () => {
-      // Given: a workspace with deadline of '"0001-01-01T00:00:00Z"'
+      // Given: a workspace with deadline of undefined.
       const workspace: TypesGen.Workspace = {
         ...Mocks.MockWorkspace,
         latest_build: {
           ...Mocks.MockWorkspaceBuild,
-          deadline: "0001-01-01T00:00:00Z",
+          deadline: undefined,
           transition: "start",
         },
       }
diff --git a/site/src/components/WorkspaceScheduleBanner/WorkspaceScheduleBanner.tsx b/site/src/components/WorkspaceScheduleBanner/WorkspaceScheduleBanner.tsx
@@ -26,12 +26,12 @@ export const shouldDisplay = (workspace: TypesGen.Workspace): boolean => {
   if (!isWorkspaceOn(workspace)) {
     return false
   } else {
-    // a manual shutdown has a deadline of '"0001-01-01T00:00:00Z"'
-    // SEE: #1834
+    if (!workspace.latest_build.deadline) {
+      return false
+    }
     const deadline = dayjs(workspace.latest_build.deadline).utc()
-    const hasDeadline = deadline.year() > 1
     const thirtyMinutesFromNow = dayjs().add(30, "minutes").utc()
-    return hasDeadline && deadline.isSameOrBefore(thirtyMinutesFromNow)
+    return deadline.isSameOrBefore(thirtyMinutesFromNow)
   }
 }
 
diff --git a/site/src/components/WorkspaceScheduleButton/WorkspaceScheduleButton.stories.tsx b/site/src/components/WorkspaceScheduleButton/WorkspaceScheduleButton.stories.tsx
@@ -40,9 +40,7 @@ NoTTL.args = {
     ...Mocks.MockWorkspace,
     latest_build: {
       ...Mocks.MockWorkspaceBuild,
-      // a manual shutdown has a deadline of '"0001-01-01T00:00:00Z"'
-      // SEE: #1834
-      deadline: "0001-01-01T00:00:00Z",
+      deadline: undefined,
     },
     ttl_ms: undefined,
   },
diff --git a/site/src/components/WorkspaceScheduleButton/WorkspaceScheduleButton.tsx b/site/src/components/WorkspaceScheduleButton/WorkspaceScheduleButton.tsx
@@ -28,11 +28,7 @@ dayjs.extend(relativeTime)
 dayjs.extend(timezone)
 
 export const shouldDisplayPlusMinus = (workspace: Workspace): boolean => {
-  if (!isWorkspaceOn(workspace)) {
-    return false
-  }
-  const deadline = dayjs(workspace.latest_build.deadline).utc()
-  return deadline.year() > 1
+  return isWorkspaceOn(workspace) && !!workspace.latest_build.deadline
 }
 
 export interface WorkspaceScheduleButtonProps {
diff --git a/site/src/util/schedule.ts b/site/src/util/schedule.ts
@@ -73,27 +73,26 @@ export const autoStartDisplay = (schedule: string | undefined): string => {
 
 export const isShuttingDown = (workspace: Workspace, deadline?: Dayjs): boolean => {
   if (!deadline) {
+    if (!workspace.latest_build.deadline) {
+      return false
+    }
     deadline = dayjs(workspace.latest_build.deadline).utc()
   }
-  const hasDeadline = deadline.year() > 1
   const now = dayjs().utc()
-  return isWorkspaceOn(workspace) && hasDeadline && now.isAfter(deadline)
+  return isWorkspaceOn(workspace) && now.isAfter(deadline)
 }
 
 export const autoStopDisplay = (workspace: Workspace): string => {
-  const deadline = dayjs(workspace.latest_build.deadline).utc()
-  // a manual shutdown has a deadline of '"0001-01-01T00:00:00Z"'
-  // SEE: #1834
-  const hasDeadline = deadline.year() > 1
   const ttl = workspace.ttl_ms
 
-  if (isWorkspaceOn(workspace) && hasDeadline) {
+  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
     // running and depending on system semantics, the deadline may still
     // represent the previously defined ttl. Thus, we always derive from the
     // deadline as the source of truth.
 
+    const deadline = dayjs(workspace.latest_build.deadline).utc()
     if (isShuttingDown(workspace, deadline)) {
       return Language.workspaceShuttingDownLabel
     } else {
