Skip to content

feat: update workspace deadline when workspace ttl updated #2165

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 20 commits into from
Jun 9, 2022
Merged

feat: update workspace deadline when workspace ttl updated #2165

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
5c443de
RED: update unit test with new desired behaviour
johnstcn Jun 7, 2022
c2127c1
cli: warn user upon ttl-triggered workspace shutdown
johnstcn Jun 7, 2022
07320a4
GREEN: do the thing
johnstcn Jun 8, 2022
7846dd8
REFACTOR: coderd: putWorkspaceTTL: wrap in tx
johnstcn Jun 8, 2022
6d7187d
update unit tests
johnstcn Jun 8, 2022
daa9a5f
feat: WorkspaceScheduleForm: show shutdown time when editing workspac…
johnstcn Jun 8, 2022
fe79c0c
make it prettier
johnstcn Jun 8, 2022
85da57b
hopefully fix unit tests
johnstcn Jun 9, 2022
8c38a74
Merge remote-tracking branch 'origin/main' into cj/1783/updating-work…
johnstcn Jun 9, 2022
a4c07df
Address PR comments
johnstcn Jun 9, 2022
582873a
Merge origin/main
greyscaled Jun 9, 2022
9a7c623
chore: WorkspaceScheduleForm: add unit tests
johnstcn Jun 9, 2022
0278a93
WorkspaceScheduleForm: refactor ttlShutdownAt
johnstcn Jun 9, 2022
a372dce
apply suggestions from code review
johnstcn Jun 9, 2022
ac1d29a
fixup! apply suggestions from code review
johnstcn Jun 9, 2022
23b474c
yarn lint; more pr comments
johnstcn Jun 9, 2022
de28477
bump ci
johnstcn Jun 9, 2022
a52d815
Merge remote-tracking branch 'origin/main' into cj/1783/updating-work…
johnstcn Jun 9, 2022
fd86474
mind your language
johnstcn Jun 9, 2022
2b9f93c
fumpt
johnstcn Jun 9, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
WorkspaceScheduleForm: refactor ttlShutdownAt
  • Loading branch information
@johnstcn
johnstcn committed Jun 9, 2022
commit 0278a93acb9c6d0816c813be284ebdd4d1c0a09e
8 changes: 1 addition & 7 deletions site/src/components/WorkspaceScheduleForm/WorkspaceScheduleForm.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,13 +163,7 @@ describe("ttlShutdownAt", () => {
it.each<[dayjs.Dayjs, Workspace, string, number, string]>([
[
dayjs("2022-05-17T18:09:00Z"),
{
...Mocks.MockWorkspace,
latest_build: {
...Mocks.MockWorkspaceBuild,
transition: "stop",
},
},
Mocks.MockStoppedWorkspace,
"America/Chicago",
1,
"Your workspace will automatically shut down after this amount of time has elapsed.",
Expand Down
21 changes: 10 additions & 11 deletions site/src/components/WorkspaceScheduleForm/WorkspaceScheduleForm.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ import * as Yup from "yup"
import { FieldErrors } from "../../api/errors"
import { Workspace } from "../../api/typesGenerated"
import { getFormHelpers } from "../../util/formUtils"
import { isWorkspaceOn } from "../../util/workspace"
import { FormFooter } from "../FormFooter/FormFooter"
import { FullPageForm } from "../FullPageForm/FullPageForm"
import { Stack } from "../Stack/Stack"
Expand Down Expand Up @@ -278,22 +279,20 @@ export const WorkspaceScheduleForm: FC<WorkspaceScheduleFormProps> = ({
)
}

const ttlShutdownAt = (now: dayjs.Dayjs, workspace: Workspace, tz: string, newTTL: number): string => {
if (workspace.latest_build.transition !== "start") {
export const ttlShutdownAt = (now: dayjs.Dayjs, workspace: Workspace, tz: string, newTTL: number): string => {
const newDeadline = dayjs(workspace.latest_build.updated_at).add(newTTL, "hour")
if (!isWorkspaceOn(workspace)) {
return Language.ttlHelperText
}
if (newTTL === 0) {
} else if (newTTL === 0) {
return Language.ttlCausesNoShutdownHelperText
}
const newDeadline = dayjs(workspace.latest_build.updated_at).add(newTTL, "hour")
if (newDeadline.isBefore(now)) {
} else if (newDeadline.isBefore(now)) {
return `⚠️ ${Language.ttlCausesShutdownHelperText} ${Language.ttlCausesShutdownImmediately} ⚠️`
}
if (newDeadline.isBefore(now.add(30, "minute"))) {
} else if (newDeadline.isBefore(now.add(30, "minute"))) {
return `⚠️ ${Language.ttlCausesShutdownHelperText} ${Language.ttlCausesShutdownSoon} ⚠️`
} else {
const newDeadlineString = newDeadline.tz(tz).format("hh:mm A z")
return `${Language.ttlCausesShutdownHelperText} ${Language.ttlCausesShutdownAt} ${newDeadlineString}.`
}
const newDeadlineString = newDeadline.tz(tz).format("hh:mm A z")
return `${Language.ttlCausesShutdownHelperText} ${Language.ttlCausesShutdownAt} ${newDeadlineString}.`
}

const useStyles = makeStyles({
Expand Down