refactor: allow helperText in getFormHelpers

greyscaled · greyscaled · commit eeb29ca67625 · 2022-05-14T15:35:22.000Z
By passing in helperText, we will not accidentally overwrite it.
diff --git a/site/src/util/formUtils.ts b/site/src/util/formUtils.ts
@@ -13,7 +13,7 @@ interface FormHelpers {
 
 export const getFormHelpers =
   <T>(form: FormikContextType<T>, formErrors?: FormikErrors<T>) =>
-  (name: keyof T): FormHelpers => {
+  (name: keyof T, helperText = ""): FormHelpers => {
     if (typeof name !== "string") {
       throw new Error(`name must be type of string, instead received '${typeof name}'`)
     }
@@ -28,7 +28,7 @@ export const getFormHelpers =
       ...form.getFieldProps(name),
       id: name,
       error: touched && Boolean(error),
-      helperText: touched && error,
+      helperText: touched ? error : helperText,
     }
   }
 

Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ interface FormHelpers {`
`13`	`13`
`14`	`14`	`export const getFormHelpers =`
`15`	`15`	`<T>(form: FormikContextType<T>, formErrors?: FormikErrors<T>) =>`
`16`		`- (name: keyof T): FormHelpers => {`
	`16`	`+ (name: keyof T, helperText = ""): FormHelpers => {`
`17`	`17`	`if (typeof name !== "string") {`
`18`	`18`	throw new Error(`name must be type of string, instead received '${typeof name}'`)
`19`	`19`	`}`
`@@ -28,7 +28,7 @@ export const getFormHelpers =`
`28`	`28`	`...form.getFieldProps(name),`
`29`	`29`	`id: name,`
`30`	`30`	`error: touched && Boolean(error),`
`31`		`- helperText: touched && error,`
	`31`	`+ helperText: touched ? error : helperText,`
`32`	`32`	`}`
`33`	`33`	`}`
`34`	`34`