extract [-+] disable logic to util/schedule, add unit tests

johnstcn · johnstcn · commit 1c49a931eb6a · 2022-08-18T21:55:05.000Z
diff --git a/site/src/pages/WorkspacePage/WorkspacePage.tsx b/site/src/pages/WorkspacePage/WorkspacePage.tsx
@@ -11,7 +11,7 @@ import { FullScreenLoader } from "../../components/Loader/FullScreenLoader"
 import { Workspace, WorkspaceErrors } from "../../components/Workspace/Workspace"
 import { firstOrItem } from "../../util/array"
 import { pageTitle } from "../../util/page"
-import { maxDeadline, minDeadline } from "../../util/schedule"
+import { canExtendDeadline, canReduceDeadline, maxDeadline, minDeadline } from "../../util/schedule"
 import { getFaviconByStatus } from "../../util/workspace"
 import { selectUser } from "../../xServices/auth/authSelectors"
 import { XServiceContext } from "../../xServices/StateContext"
@@ -112,10 +112,10 @@ export const WorkspacePage: React.FC = () => {
               })
             },
             deadlineMinusEnabled: () => {
-              return deadline > minDeadline()
+              return canReduceDeadline(deadline)
             },
             deadlinePlusEnabled: () => {
-              return deadline < maxDeadline(workspace, template)
+              return canExtendDeadline(deadline, workspace, template)
             },
           }}
           workspace={workspace}
diff --git a/site/src/util/schedule.test.ts b/site/src/util/schedule.test.ts
@@ -3,6 +3,8 @@ import duration from "dayjs/plugin/duration"
 import { Template, Workspace } from "../api/typesGenerated"
 import * as Mocks from "../testHelpers/entities"
 import {
+  canExtendDeadline,
+  canReduceDeadline,
   deadlineExtensionMax,
   deadlineExtensionMin,
   extractTimezone,
@@ -78,3 +80,37 @@ describe("minDeadline", () => {
     expect(delta).toBeGreaterThanOrEqual(deadlineExtensionMin.asMilliseconds())
   })
 })
+
+describe("canExtendDeadline", () => {
+  it("should be falsy if the deadline is more than 24 hours in the future", () => {
+    expect(
+      canExtendDeadline(dayjs().add(25, "hours"), Mocks.MockWorkspace, Mocks.MockTemplate),
+    ).toBeFalsy()
+  })
+
+  it("should be falsy if the deadline is more than the template max_ttl", () => {
+    const tooFarAhead = dayjs().add(dayjs.duration(Mocks.MockTemplate.max_ttl_ms, "milliseconds"))
+    expect(canExtendDeadline(tooFarAhead, Mocks.MockWorkspace, Mocks.MockTemplate)).toBeFalsy()
+  })
+
+  it("should be truth if the deadline is within the template max_ttl", () => {
+    const okDeadline = dayjs().add(
+      dayjs.duration(Mocks.MockTemplate.max_ttl_ms / 2, "milliseconds"),
+    )
+    expect(canExtendDeadline(okDeadline, Mocks.MockWorkspace, Mocks.MockTemplate)).toBeFalsy()
+  })
+})
+
+describe("canReduceDeadline", () => {
+  it("should be falsy if the deadline is 30 minutes or less in the future", () => {
+    expect(canReduceDeadline(dayjs())).toBeFalsy()
+    expect(canReduceDeadline(dayjs().add(1, "minutes"))).toBeFalsy()
+    expect(canReduceDeadline(dayjs().add(29, "minutes"))).toBeFalsy()
+    expect(canReduceDeadline(dayjs().add(30, "minutes"))).toBeFalsy()
+  })
+
+  it("should be truthy if the deadline is 30 minutes or more in the future", () => {
+    expect(canReduceDeadline(dayjs().add(31, "minutes"))).toBeTruthy()
+    expect(canReduceDeadline(dayjs().add(100, "years"))).toBeTruthy()
+  })
+})
