opensource/coder
3
0
Fork 0
mirror of https://github.com/coder/coder.git synced 2026-09-24 15:04:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

Make form show empty values when manual

Browse Source
This commit is contained in:
Presley Pizzo
2022-07-29 21:52:55 +00:00
parent ecc113705f
commit 6705076001
3 changed files with 50 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
site/src/components/WorkspaceScheduleForm/WorkspaceScheduleForm.tsx
+17
View File
@@ -164,6 +164,23 @@ export const validationSchema = Yup.object({
export const defaultWorkspaceScheduleTTL = 8
export const emptyWorkspaceSchedule = (
ttl = 0,
timezone = dayjs.tz.guess(),
): WorkspaceScheduleFormValues => ({
sunday: false,
monday: false,
tuesday: false,
wednesday: false,
thursday: false,
friday: false,
saturday: false,
startTime: "",
timezone,
ttl,
})
export const defaultWorkspaceSchedule = (
ttl = defaultWorkspaceScheduleTTL,
timezone = dayjs.tz.guess(),
site/src/pages/WorkspaceSchedulePage/WorkspaceSchedulePage.test.tsx
+30 -9
View File
@@ -166,15 +166,15 @@ describe("WorkspaceSchedulePage", () => {
},
{
sunday: false,
monday: true,
tuesday: true,
wednesday: true,
thursday: true,
friday: true,
monday: false,
tuesday: false,
wednesday: false,
thursday: false,
friday: false,
saturday: false,
startTime: "09:30",
startTime: "",
timezone: "",
ttl: 8,
ttl: 0,
},
],
@@ -185,6 +185,27 @@ describe("WorkspaceSchedulePage", () => {
autostart_schedule: "",
ttl_ms: 7_200_000,
},
{
sunday: false,
monday: false,
tuesday: false,
wednesday: false,
thursday: false,
friday: false,
saturday: false,
startTime: "",
timezone: "",
ttl: 2,
},
],
// start schedule only
[
{
...Mocks.MockWorkspace,
autostart_schedule: "CRON_TZ=UTC 30 9 * * 1-5",
ttl_ms: undefined,
},
{
sunday: false,
monday: true,
@@ -194,8 +215,8 @@ describe("WorkspaceSchedulePage", () => {
friday: true,
saturday: false,
startTime: "09:30",
timezone: "",
ttl: 2,
timezone: "UTC",
ttl: 0,
},
],
site/src/pages/WorkspaceSchedulePage/WorkspaceSchedulePage.tsx
+3 -4
View File
@@ -9,8 +9,7 @@ import * as TypesGen from "../../api/typesGenerated"
import { ErrorSummary } from "../../components/ErrorSummary/ErrorSummary"
import { FullScreenLoader } from "../../components/Loader/FullScreenLoader"
import {
defaultWorkspaceSchedule,
defaultWorkspaceScheduleTTL,
emptyWorkspaceSchedule,
WorkspaceScheduleForm,
WorkspaceScheduleFormValues,
} from "../../components/WorkspaceScheduleForm/WorkspaceScheduleForm"
@@ -111,10 +110,10 @@ export const workspaceToInitialValues = (
const schedule = workspace.autostart_schedule
const ttlHours = workspace.ttl_ms
? Math.round(workspace.ttl_ms / (1000 * 60 * 60))
: defaultWorkspaceScheduleTTL
: 0
if (!schedule) {
return defaultWorkspaceSchedule(ttlHours, defaultTimeZone)
return emptyWorkspaceSchedule(ttlHours, defaultTimeZone)
}
const timezone = extractTimezone(schedule, defaultTimeZone)