Commit377f17c

authored

fix: initialValues for ws schedule (#2213)

Summary:When a schedule is not set, we default to M-F, 5 hours ttl

1 parentd04d527 commit377f17cCopy full SHA for 377f17c

File tree

+37

-39

lines changed

+37

-39

lines changed

Lines changed: 20 additions & 13 deletions

Original file line number	Diff line number	Diff line change
`@@ -151,21 +151,28 @@ export const validationSchema = Yup.object({`
`151`	`151`	`.max(247/ 7 days */),`
`152`	`152`	`})`
`153`	`153`
	`154`	`+exportconstdefaultWorkspaceScheduleTTL=8`
	`155`	`+`
	`156`	`+exportconstdefaultWorkspaceSchedule=(`
	`157`	`+ttl=defaultWorkspaceScheduleTTL,`
	`158`	`+timezone=dayjs.tz.guess(),`
	`159`	`+):WorkspaceScheduleFormValues=>({`
	`160`	`+sunday:false,`
	`161`	`+monday:true,`
	`162`	`+tuesday:true,`
	`163`	`+wednesday:true,`
	`164`	`+thursday:true,`
	`165`	`+friday:true,`
	`166`	`+saturday:false,`
	`167`	`+`
	`168`	`+startTime:"09:30",`
	`169`	`+ timezone,`
	`170`	`+ ttl,`
	`171`	`+})`
	`172`	`+`
`154`	`173`	`exportconstWorkspaceScheduleForm:FC<WorkspaceScheduleFormProps>=({`
`155`	`174`	`fieldErrors,`
`156`		`- initialValues={`
`157`		`-sunday:false,`
`158`		`-monday:true,`
`159`		`-tuesday:true,`
`160`		`-wednesday:true,`
`161`		`-thursday:true,`
`162`		`-friday:true,`
`163`		`-saturday:false,`
`164`		`-`
`165`		`-startTime:"09:30",`
`166`		`-timezone:"",`
`167`		`-ttl:5,`
`168`		`-},`
	`175`	`+ initialValues=defaultWorkspaceSchedule(),`
`169`	`176`	`isLoading,`
`170`	`177`	`onCancel,`
`171`	`178`	`onSubmit,`

Lines changed: 13 additions & 13 deletions

Original file line number	Diff line number	Diff line change
`@@ -162,15 +162,15 @@ describe("WorkspaceSchedulePage", () => {`
`162`	`162`	`},`
`163`	`163`	`{`
`164`	`164`	`sunday:false,`
`165`		`-monday:false,`
`166`		`-tuesday:false,`
`167`		`-wednesday:false,`
`168`		`-thursday:false,`
`169`		`-friday:false,`
	`165`	`+monday:true,`
	`166`	`+tuesday:true,`
	`167`	`+wednesday:true,`
	`168`	`+thursday:true,`
	`169`	`+friday:true,`
`170`	`170`	`saturday:false,`
`171`		`-startTime:"",`
	`171`	`+startTime:"09:30",`
`172`	`172`	`timezone:"",`
`173`		`-ttl:0,`
	`173`	`+ttl:8,`
`174`	`174`	`},`
`175`	`175`	`],`
`176`	`176`
`@@ -183,13 +183,13 @@ describe("WorkspaceSchedulePage", () => {`
`183`	`183`	`},`
`184`	`184`	`{`
`185`	`185`	`sunday:false,`
`186`		`-monday:false,`
`187`		`-tuesday:false,`
`188`		`-wednesday:false,`
`189`		`-thursday:false,`
`190`		`-friday:false,`
	`186`	`+monday:true,`
	`187`	`+tuesday:true,`
	`188`	`+wednesday:true,`
	`189`	`+thursday:true,`
	`190`	`+friday:true,`
`191`	`191`	`saturday:false,`
`192`		`-startTime:"",`
	`192`	`+startTime:"09:30",`
`193`	`193`	`timezone:"",`
`194`	`194`	`ttl:2,`
`195`	`195`	`},`

Lines changed: 4 additions & 13 deletions

Original file line number	Diff line number	Diff line change
`@@ -9,6 +9,8 @@ import * as TypesGen from "../../api/typesGenerated"`
`9`	`9`	`import{ErrorSummary}from"../../components/ErrorSummary/ErrorSummary"`
`10`	`10`	`import{FullScreenLoader}from"../../components/Loader/FullScreenLoader"`
`11`	`11`	`import{`
	`12`	`+defaultWorkspaceSchedule,`
	`13`	`+defaultWorkspaceScheduleTTL,`
`12`	`14`	`WorkspaceScheduleForm,`
`13`	`15`	`WorkspaceScheduleFormValues,`
`14`	`16`	`}from"../../components/WorkspaceScheduleForm/WorkspaceScheduleForm"`
`@@ -97,21 +99,10 @@ export const workspaceToInitialValues = (`
`97`	`99`	`defaultTimeZone="",`
`98`	`100`	`):WorkspaceScheduleFormValues=>{`
`99`	`101`	`constschedule=workspace.autostart_schedule`
`100`		`-constttlHours=workspace.ttl_ms ?Math.round(workspace.ttl_ms/(10006060)) :0`
	`102`	`+constttlHours=workspace.ttl_ms ?Math.round(workspace.ttl_ms/(10006060)) :defaultWorkspaceScheduleTTL`
`101`	`103`
`102`	`104`	`if(!schedule){`
`103`		`-return{`
`104`		`-sunday:false,`
`105`		`-monday:false,`
`106`		`-tuesday:false,`
`107`		`-wednesday:false,`
`108`		`-thursday:false,`
`109`		`-friday:false,`
`110`		`-saturday:false,`
`111`		`-startTime:"",`
`112`		`-timezone:defaultTimeZone,`
`113`		`-ttl:ttlHours,`
`114`		`-}`
	`105`	`+returndefaultWorkspaceSchedule(ttlHours,defaultTimeZone)`
`115`	`106`	`}`
`116`	`107`
`117`	`108`	`consttimezone=extractTimezone(schedule,defaultTimeZone)`

Comments

(0)