Skip to content

fix: coderd: decouple ttl and deadline #2282

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 11 commits into from
Jun 14, 2022
Merged

fix: coderd: decouple ttl and deadline #2282

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
a19a0e9
fix: coderd: decouple ttl and deadline
johnstcn Jun 13, 2022
3999661
yarn lint
johnstcn Jun 13, 2022
f5ce8a3
update storybook
johnstcn Jun 13, 2022
987f785
fmt
johnstcn Jun 13, 2022
cd4dce3
fix ttl command
johnstcn Jun 14, 2022
91e3171
drive-by: default ttl to min(12 hours, template max) for new workspaces
johnstcn Jun 14, 2022
00ac2a2
fix: WorkspaceSchedule: show tz of schedule if available, default to …
johnstcn Jun 14, 2022
3faf3c8
cli: list: measure extension from provisioner job completed_at
johnstcn Jun 14, 2022
a763d2f
WorkspaceScheduleForm: fix "a few seconds after start"
johnstcn Jun 14, 2022
bbd8288
address PR comments
johnstcn Jun 14, 2022
feef823
Merge remote-tracking branch 'origin/main' into cj/2229/decouple-ws-d…
johnstcn Jun 14, 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
yarn lint
  • Loading branch information
@johnstcn
johnstcn committed Jun 14, 2022
commit 3999661ed654cd10a972ba3b36aadfa36aaf5250
10 changes: 3 additions & 7 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,7 +17,6 @@ import { useFormik } from "formik"
import { FC } from "react"
import * as Yup from "yup"
import { FieldErrors } from "../../api/errors"
import { Workspace } from "../../api/typesGenerated"
import { getFormHelpers } from "../../util/formUtils"
import { FormFooter } from "../FormFooter/FormFooter"
import { FullPageForm } from "../FullPageForm/FullPageForm"
Expand Down Expand Up @@ -58,10 +57,8 @@ export interface WorkspaceScheduleFormProps {
fieldErrors?: FieldErrors
initialValues?: WorkspaceScheduleFormValues
isLoading: boolean
now?: dayjs.Dayjs
onCancel: () => void
onSubmit: (values: WorkspaceScheduleFormValues) => void
workspace: Workspace
}

export interface WorkspaceScheduleFormValues {
Expand Down Expand Up @@ -184,10 +181,8 @@ export const WorkspaceScheduleForm: FC<WorkspaceScheduleFormProps> = ({
fieldErrors,
initialValues = defaultWorkspaceSchedule(),
isLoading,
now = dayjs(),
onCancel,
onSubmit,
workspace,
}) => {
const styles = useStyles()

Expand Down Expand Up @@ -285,8 +280,9 @@ export const ttlShutdownAt = (formTTL: number): string => {
if (formTTL === 0) {
return Language.ttlCausesNoShutdownHelperText
} else {
return `${Language.ttlCausesShutdownHelperText} ${dayjs.duration(formTTL, "hours").humanize()} ${Language.ttlCausesShutdownAfterStart
}.`
return `${Language.ttlCausesShutdownHelperText} ${dayjs.duration(formTTL, "hours").humanize()} ${
Language.ttlCausesShutdownAfterStart
}.`
}
}

Expand Down
1 change: 0 additions & 1 deletion site/src/pages/WorkspaceSchedulePage/WorkspaceSchedulePage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,6 @@ export const WorkspaceSchedulePage: React.FC = () => {
} else if (scheduleState.matches("presentForm") || scheduleState.matches("submittingSchedule")) {
return (
<WorkspaceScheduleForm
workspace={workspace}
fieldErrors={formErrors}
initialValues={workspaceToInitialValues(workspace, dayjs.tz.guess())}
isLoading={scheduleState.tags.has("loading")}
Expand Down