Skip to content

fix: workspace schedule time displays #2249

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 4 commits into from
Jun 10, 2022
Merged

fix: workspace schedule time displays #2249

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
770b1c3
fix: workspace schedule time displays
greyscaled Jun 10, 2022
8a99504
remove console.info
greyscaled Jun 10, 2022
69974e3
pluralize units in dayjs.add
greyscaled Jun 10, 2022
c70c01a
fixup! fix: workspace schedule time displays
greyscaled Jun 10, 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
pluralize units in dayjs.add
  • Loading branch information
@greyscaled
greyscaled authored Jun 10, 2022
commit 69974e378187eff18dcc8b3284a32547dd2e9b56
4 changes: 2 additions & 2 deletions site/src/components/WorkspaceScheduleForm/WorkspaceScheduleForm.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -296,10 +296,10 @@ export const ttlShutdownAt = (now: dayjs.Dayjs, workspace: Workspace, tz: string
} else if (formTTL === 0) {
return Language.ttlCausesNoShutdownHelperText
} else {
const newDeadline = dayjs(hasDeadline ? deadline : now).add(delta, "hour")
const newDeadline = dayjs(hasDeadline ? deadline : now).add(delta, "hours")
if (newDeadline.isSameOrBefore(now)) {
return `⚠️ ${Language.ttlCausesShutdownHelperText} ${Language.ttlCausesShutdownImmediately} ⚠️`
} else if (newDeadline.isSameOrBefore(now.add(30, "minute"))) {
} else if (newDeadline.isSameOrBefore(now.add(30, "minutes"))) {
return `⚠️ ${Language.ttlCausesShutdownHelperText} ${Language.ttlCausesShutdownSoon} ⚠️`
} else {
return `${Language.ttlCausesShutdownHelperText} ${Language.ttlCausesShutdownAt} ${newDeadline
Expand Down