8000 feat: update workspace deadline when workspace ttl updated by johnstcn · Pull Request #2165 · coder/coder · GitHub
[go: up one dir, main page]
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
Merge remote-tracking branch 'origin/main' into cj/1783/updating-work… 
…space-ttl-updates-deadline
  • Loading branch information
@johnstcn
johnstcn committed Jun 9, 2022
commit a52d8156f8c4580b006f38049fc186ca535b97b3
12 changes: 6 additions & 6 deletions site/src/components/WorkspaceScheduleForm/WorkspaceScheduleForm.stories.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import utc from "dayjs/plugin/utc"
import * as Mocks from "../../testHelpers/entities"
import {
WorkspaceScheduleForm,
WorkspaceScheduleFormInitialValues,
defaultWorkspaceSchedule,
WorkspaceScheduleFormProps,
} from "./WorkspaceScheduleForm"

Expand All @@ -26,7 +26,7 @@ export const WorkspaceNotRunning = Template.bind({})
WorkspaceNotRunning.args = {
now: dayjs("2022-05-17T17:40:00Z"),
Copy link
Contributor

Choose a reason for hiding this comment

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

Praise: Thank you for making this constant.

initialValues: {
...WorkspaceScheduleFormInitialValues,
...defaultWorkspaceSchedule(5, "asdfasdf"),
timezone: "UTC",
},
workspace: {
Expand All @@ -45,7 +45,7 @@ export const WorkspaceWillNotShutDown = Template.bind({})
WorkspaceWillNotShutDown.args = {
now: dayjs("2022-05-17T17:40:00Z"),
initialValues: {
...WorkspaceScheduleFormInitialValues,
...defaultWorkspaceSchedule(5, "asdfasdf"),
timezone: "UTC",
ttl: 0,
},
8000 Expand All @@ -64,7 +64,7 @@ export const WorkspaceWillShutdown = Template.bind({})
WorkspaceWillShutdown.args = {
now: dayjs("2022-05-17T17:40:00Z"),
initialValues: {
...WorkspaceScheduleFormInitialValues,
...defaultWorkspaceSchedule(5, "asdfasdf"),
timezone: "UTC",
},
workspace: {
Expand All @@ -82,7 +82,7 @@ export const WorkspaceWillShutdownSoon = Template.bind({})
WorkspaceWillShutdownSoon.args = {
now: dayjs("2022-05-17T18:10:00Z"),
initialValues: {
...WorkspaceScheduleFormInitialValues,
...defaultWorkspaceSchedule(5, "asdfasdf"),
timezone: "UTC",
ttl: 1,
},
Expand All @@ -101,7 +101,7 @@ export const WorkspaceWillShutdownImmediately = Template.bind({})
WorkspaceWillShutdownImmediately.args = {
now: dayjs("2022-05-17T18:40:00Z"),
initialValues: {
...WorkspaceScheduleFormInitialValues,
...defaultWorkspaceSchedule(5, "asdfasdf"),
timezone: "UTC",
ttl: 1,
},
Expand Down
16 changes: 1 addition & 15 deletions site/src/components/WorkspaceScheduleForm/WorkspaceScheduleForm.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,20 +79,6 @@ export interface WorkspaceScheduleFormValues {
ttl: number
}

export const WorkspaceScheduleFormInitialValues = {
sunday: false,
monday: true,
tuesday: true,
wednesday: true,
thursday: true,
friday: true,
saturday: false,

startTime: "09:30",
timezone: "",
ttl: 5,
}

export const validationSchema = Yup.object({
sunday: Yup.boolean(),
monday: Yup.boolean().test("at-least-one-day", Language.errorNoDayOfWeek, function (value) {
Expand Down Expand Up @@ -197,7 +183,7 @@ export const defaultWorkspaceSchedule = (

export const WorkspaceScheduleForm: FC<WorkspaceScheduleFormProps> = ({
fieldErrors,
initialValues = WorkspaceScheduleFormInitialValues,
initialValues = defaultWorkspaceSchedule(),
isLoading,
now = dayjs(),
onCancel,
Expand Down
You are viewing a condensed version of this merge commit. You can view the full changes here.
0