Commitd9b857b

committed

fix(site): username validation in forms

1 parent53a55b5 commitd9b857bCopy full SHA for d9b857b

File tree

-5

lines changed

site/src/components
- CreateUserForm
  - CreateUserForm.tsx
- SettingsAccountForm
  - SettingsAccountForm.tsx

-5

lines changed

Lines changed: 2 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@ import { FormikContextType, FormikErrors, useFormik } from "formik"`
`4`	`4`	`importReactfrom"react"`
`5`	`5`	`import*asYupfrom"yup"`
`6`	`6`	`import*asTypesGenfrom"../../api/typesGenerated"`
`7`		`-import{getFormHelpers,onChangeTrimmed}from"../../util/formUtils"`
	`7`	`+import{getFormHelpers,nameValidator,onChangeTrimmed}from"../../util/formUtils"`
`8`	`8`	`import{FormFooter}from"../FormFooter/FormFooter"`
`9`	`9`	`import{FullPageForm}from"../FullPageForm/FullPageForm"`
`10`	`10`
`@@ -15,7 +15,6 @@ export const Language = {`
`15`	`15`	`emailInvalid:"Please enter a valid email address.",`
`16`	`16`	`emailRequired:"Please enter an email address.",`
`17`	`17`	`passwordRequired:"Please enter a password.",`
`18`		`-usernameRequired:"Please enter a username.",`
`19`	`18`	`createUser:"Create",`
`20`	`19`	`cancel:"Cancel",`
`21`	`20`	`}`
`@@ -32,7 +31,7 @@ export interface CreateUserFormProps {`
`32`	`31`	`constvalidationSchema=Yup.object({`
`33`	`32`	`email:Yup.string().trim().email(Language.emailInvalid).required(Language.emailRequired),`
`34`	`33`	`password:Yup.string().required(Language.passwordRequired),`
`35`		`-username:Yup.string().required(Language.usernameRequired),`
	`34`	`+username:nameValidator(Language.usernameLabel),`
`36`	`35`	`})`
`37`	`36`
`38`	`37`	`exportconstCreateUserForm:React.FC<CreateUserFormProps>=({`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@ import TextField from "@material-ui/core/TextField"`
`3`	`3`	`import{FormikContextType,FormikErrors,useFormik}from"formik"`
`4`	`4`	`importReactfrom"react"`
`5`	`5`	`import*asYupfrom"yup"`
`6`		`-import{getFormHelpers,onChangeTrimmed}from"../../util/formUtils"`
	`6`	`+import{getFormHelpers,nameValidator,onChangeTrimmed}from"../../util/formUtils"`
`7`	`7`	`import{LoadingButton}from"../LoadingButton/LoadingButton"`
`8`	`8`	`import{Stack}from"../Stack/Stack"`
`9`	`9`
`@@ -22,7 +22,7 @@ export const Language = {`
`22`	`22`
`23`	`23`	`constvalidationSchema=Yup.object({`
`24`	`24`	`email:Yup.string().trim().email(Language.emailInvalid).required(Language.emailRequired),`
`25`		`-username:Yup.string().trim(),`
	`25`	`+username:nameValidator(Language.usernameLabel),`
`26`	`26`	`})`
`27`	`27`
`28`	`28`	`exporttypeAccountFormErrors=FormikErrors<AccountFormValues>`

Comments

(0)