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

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
make it prettier
  • Loading branch information
@johnstcn
johnstcn committed Jun 8, 2022
commit fe79c0c6e098dc057b8050079e36609708638d18
13 changes: 7 additions & 6 deletions site/src/components/WorkspaceScheduleForm/WorkspaceScheduleForm.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import { useFormik } from "formik"
import { FC } from "react"
import * as Yup from "yup"
import { FieldErrors } from "../../api/errors"
import { Workspace, WorkspaceBuild } from "../../api/typesGenerated"
import { Workspace } from "../../api/typesGenerated"
import { getFormHelpers } from "../../util/formUtils"
import { FormFooter } from "../FormFooter/FormFooter"
import { FullPageForm } from "../FullPageForm/FullPageForm"
Expand Down Expand Up @@ -47,8 +47,8 @@ export const Language = {
timezoneLabel: "Timezone",
ttlLabel: "Time until shutdown (hours)",
ttlHelperText: "Your workspace will automatically shut down after this amount of time has elapsed.",
ttlCausesShutdownHelperText: "Your workspace will shut down ",
ttlCausesShutdownAt: "at ",
ttlCausesShutdownHelperText: "Your workspace will shut down",
ttlCausesShutdownAt: "at",
ttlCausesShutdownImmediately: "immediately!",
ttlCausesShutdownSoon: "within 30 minutes.",
ttlCausesNoShutdownHelperText: "Your workspace will not automatically shut down.",
Expand Down Expand Up @@ -287,12 +287,13 @@ const ttlShutdownAt = (now: dayjs.Dayjs, workspace: Workspace, tz: string, newTT
}
const newDeadline = dayjs(workspace.latest_build.updated_at).add(newTTL, "hour")
if (newDeadline.isBefore(now)) {
return Language.ttlCausesShutdownHelperText + Language.ttlCausesShutdownImmediately
return `⚠️ ${Language.ttlCausesShutdownHelperText} ${Language.ttlCausesShutdownImmediately} ⚠️`
}
if (newDeadline.isBefore(now.add(30, "minute"))) {
return Language.ttlCausesShutdownHelperText + Language.ttlCausesShutdownSoon
return `⚠️ ${Language.ttlCausesShutdownHelperText} ${Language.ttlCausesShutdownSoon} ⚠️`
}
return Language.ttlCausesShutdownHelperText + Language.ttlCausesShutdownAt + newDeadline.tz(tz).format("hh:mm A z")
const newDeadlineString = newDeadline.tz(tz).format("hh:mm A z")
return `${Language.ttlCausesShutdownHelperText} ${Language.ttlCausesShutdownAt} ${newDeadlineString}.`
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

NIT: would making the Language value a function alleviate the need for some of these keys? Example:

const Language = {
  ttlCausesShutdownAtText: (newDeadlineString: string): string => {
    return `Your workspace will shut down at ${newDeadlineString}`
  },
}

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I guess it would, but it would make the Language portion more complex. I feel like we'd want to keep Language as a simple lookup table and keep the complexity close to where it's used. I'm fine with going either way though if folks have strong opinions about it!

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No strong opinions here - that sounds good to me!

}

const useStyles = makeStyles({
Expand Down