NotificationsYou must be signed in to change notification settings
Fork928
Star10.1k

Commitb7fcf03

committed

web: use seconds in max TTL input

Milliseconds are more difficult to deal with due toall of the zeros.

1 parent7599ad4 commitb7fcf03Copy full SHA for b7fcf03

File tree

2 files changed

+16

-8

lines changed

site/src/pages/TemplateSettingsPage
- TemplateSettingsForm.tsx
- TemplateSettingsPage.test.tsx

2 files changed

+16

-8

lines changed

`‎site/src/pages/TemplateSettingsPage/TemplateSettingsForm.tsx`

Lines changed: 15 additions & 7 deletions

Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ export const Language = {`
`12`	`12`	`descriptionLabel:"Description",`
`13`	`13`	`maxTtlLabel:"Max TTL",`
`14`	`14`	`// This is the same from the CLI on https://github.com/coder/coder/blob/546157b63ef9204658acf58cb653aa9936b70c49/cli/templateedit.go#L59`
`15`		`-maxTtlHelperText:"Edit the template maximum time before shutdown inmilliseconds",`
	`15`	`+maxTtlHelperText:"Edit the template maximum time before shutdown inseconds",`
`16`	`16`	`formAriaLabel:"Template settings form",`
`17`	`17`	`}`
`18`	`18`
`@@ -21,6 +21,11 @@ export const validationSchema = Yup.object({`
`21`	`21`	`description:Yup.string(),`
`22`	`22`	`max_ttl_ms:Yup.number(),`
`23`	`23`	`})`
	`24`	`+exportinterfaceUpdateTemplateFormMeta{`
	`25`	`+readonlyname?:string`
	`26`	`+readonlydescription?:string`
	`27`	`+readonlymax_ttl?:number`
	`28`	`+}`
`24`	`29`
`25`	`30`	`exportinterfaceTemplateSettingsForm{`
`26`	`31`	`template:Template`
`@@ -29,7 +34,7 @@ export interface TemplateSettingsForm {`
`29`	`34`	`isSubmitting:boolean`
`30`	`35`	`error?:unknown`
`31`	`36`	`// Helpful to show field errors on Storybook`
`32`		`-initialTouched?:FormikTouched<UpdateTemplateMeta>`
	`37`	`+initialTouched?:FormikTouched<UpdateTemplateFormMeta>`
`33`	`38`	`}`
`34`	`39`
`35`	`40`	`exportconstTemplateSettingsForm:FC<TemplateSettingsForm>=({`
`@@ -40,19 +45,22 @@ export const TemplateSettingsForm: FC<TemplateSettingsForm> = ({`
`40`	`45`	`isSubmitting,`
`41`	`46`	`initialTouched,`
`42`	`47`	`})=>{`
`43`		`-constform:FormikContextType<UpdateTemplateMeta>=useFormik<UpdateTemplateMeta>({`
	`48`	`+constform:FormikContextType<UpdateTemplateFormMeta>=useFormik<UpdateTemplateFormMeta>({`
`44`	`49`	`initialValues:{`
`45`	`50`	`name:template.name,`
`46`	`51`	`description:template.description,`
`47`		`-max_ttl_ms:template.max_ttl_ms,`
	`52`	`+max_ttl:template.max_ttl_ms/1000,`
`48`	`53`	`},`
`49`	`54`	`validationSchema,`
`50`	`55`	`onSubmit:(data)=>{`
`51`		`-onSubmit(data)`
	`56`	`+onSubmit({`
	`57`	`+ ...data,`
	`58`	`+max_ttl_ms:data.max_ttl!==undefined ?data.max_ttl*1000 :undefined,`
	`59`	`+})`
`52`	`60`	`},`
`53`	`61`	`initialTouched,`
`54`	`62`	`})`
`55`		`-constgetFieldHelpers=getFormHelpersWithError<UpdateTemplateMeta>(form,error)`
	`63`	`+constgetFieldHelpers=getFormHelpersWithError<UpdateTemplateFormMeta>(form,error)`
`56`	`64`
`57`	`65`	`return(`
`58`	`66`	`<formonSubmit={form.handleSubmit}aria-label={Language.formAriaLabel}>`
`@@ -78,7 +86,7 @@ export const TemplateSettingsForm: FC<TemplateSettingsForm> = ({`
`78`	`86`	`/>`
`79`	`87`
`80`	`88`	`<TextField`
`81`		`-{...getFieldHelpers("max_ttl_ms")}`
	`89`	`+{...getFieldHelpers("max_ttl")}`
`82`	`90`	`helperText={Language.maxTtlHelperText}`
`83`	`91`	`disabled={isSubmitting}`
`84`	`92`	`fullWidth`

`‎site/src/pages/TemplateSettingsPage/TemplateSettingsPage.test.tsx`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ const renderTemplateSettingsPage = async () => {`
`22`	`22`	`constfillAndSubmitForm=async({`
`23`	`23`	`name,`
`24`	`24`	`description,`
`25`		`- max_ttl_ms,`
	`25`	`+max_ttl_ms:max_ttl_ms,`
`26`	`26`	`}:Omit<Required<UpdateTemplateMeta>,"min_autostart_interval_ms">)=>{`
`27`	`27`	`constnameField=awaitscreen.findByLabelText(FormLanguage.nameLabel)`
`28`	`28`	`awaituserEvent.clear(nameField)`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commitb7fcf03

File tree

2 files changed

2 files changed

`‎site/src/pages/TemplateSettingsPage/TemplateSettingsForm.tsx`

`‎site/src/pages/TemplateSettingsPage/TemplateSettingsPage.test.tsx`

0 commit comments