Commit76bfa9b

authored

fix(site): fix validation server error on change password form (#15170)

1 parent212aeff commit76bfa9bCopy full SHA for 76bfa9b

File tree

+36

-3

lines changed

+36

-3

lines changed

Lines changed: 27 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,7 @@ export const WrongConfirmationPassword: Story = {`
`51`	`51`	`},`
`52`	`52`	`};`
`53`	`53`
`54`		`-exportconstServerError:Story={`
	`54`	`+exportconstGeneralServerError:Story={`
`55`	`55`	`play:async({ canvasElement})=>{`
`56`	`56`	`constserverError=`
`57`	`57`	`"New password should be different from the old password";`
`@@ -71,3 +71,29 @@ export const ServerError: Story = {`
`71`	`71`	`awaitcanvas.findByText(serverError);`
`72`	`72`	`},`
`73`	`73`	`};`
	`74`	`+`
	`75`	`+exportconstValidationServerError:Story={`
	`76`	`+play:async({ canvasElement})=>{`
	`77`	`+constvalidationDetail=`
	`78`	`+"insecure password, try including more special characters, using uppercase letters, using numbers or using a longer password";`
	`79`	`+consterror=mockApiError({`
	`80`	`+message:"Invalid password.",`
	`81`	`+validations:[`
	`82`	`+{`
	`83`	`+field:"password",`
	`84`	`+detail:validationDetail,`
	`85`	`+},`
	`86`	`+],`
	`87`	`+});`
	`88`	`+spyOn(API,"changePasswordWithOTP").mockRejectedValueOnce(error);`
	`89`	`+constcanvas=within(canvasElement);`
	`90`	`+constuser=userEvent.setup();`
	`91`	`+constnewPasswordInput=awaitcanvas.findByLabelText("Password *");`
	`92`	`+awaituser.type(newPasswordInput,"password");`
	`93`	`+constconfirmPasswordInput=`
	`94`	`+awaitcanvas.findByLabelText("Confirm password *");`
	`95`	`+awaituser.type(confirmPasswordInput,"password");`
	`96`	`+awaituser.click(canvas.getByRole("button",{name:/resetpassword/i}));`
	`97`	`+awaitcanvas.findByText(validationDetail);`
	`98`	`+},`
	`99`	`+};`

Lines changed: 4 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,7 @@ import type { Interpolation, Theme } from "@emotion/react";`
`2`	`2`	`importLoadingButtonfrom"@mui/lab/LoadingButton";`
`3`	`3`	`importButtonfrom"@mui/material/Button";`
`4`	`4`	`importTextFieldfrom"@mui/material/TextField";`
	`5`	`+import{isApiError,isApiValidationError}from"api/errors";`
`5`	`6`	`import{changePasswordWithOTP}from"api/queries/users";`
`6`	`7`	`import{ErrorAlert}from"components/Alert/ErrorAlert";`
`7`	`8`	`import{CustomLogo}from"components/CustomLogo/CustomLogo";`
`@@ -64,7 +65,7 @@ const ChangePasswordPage: FC<ChangePasswordChangeProps> = ({ redirect }) => {`
`64`	`65`	`}`
`65`	`66`	`},`
`66`	`67`	`});`
`67`		`-constgetFieldHelpers=getFormHelpers(form);`
	`68`	`+constgetFieldHelpers=getFormHelpers(form,changePasswordMutation.error);`
`68`	`69`
`69`	`70`	`return(`
`70`	`71`	`<>`
`@@ -86,7 +87,8 @@ const ChangePasswordPage: FC<ChangePasswordChangeProps> = ({ redirect }) => {`
`86`	`87`	`>`
`87`	`88`	`Choose a new password`
`88`	`89`	`</h1>`
`89`		`-{changePasswordMutation.error ?(`
	`90`	`+{changePasswordMutation.error&&`
	`91`	`+!isApiValidationError(changePasswordMutation.error) ?(`
`90`	`92`	`<ErrorAlert`
`91`	`93`	`error={changePasswordMutation.error}`
`92`	`94`	`css={{marginBottom:24}}`

Lines changed: 5 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -375,6 +375,11 @@ export const components = {`
`375`	`375`	`sx:{`
`376`	`376`	`marginLeft:0,`
`377`	`377`	`marginTop:1,`
	`378`	`+"&::first-letter":{`
	`379`	`+// Server errors are returned in all lowercase. To display them as`
	`380`	`+// field errors in the UI, we capitalize the first letter.`
	`381`	`+textTransform:"uppercase",`
	`382`	`+},`
`378`	`383`	`},`
`379`	`384`	`},`
`380`	`385`	`},`

Comments

(0)