From 17eeaa2d2548dfd77e594b2b155bf09ada223d47 Mon Sep 17 00:00:00 2001 From: Anik Dhabal Babu <81948346+anikdhabal@users.noreply.github.com> Date: Mon, 20 Nov 2023 15:53:27 +0530 Subject: [PATCH] fix: improve the validation message for documenso app (#640) * fix: improve the validation message * fix: improve the validation message --------- Co-authored-by: Catalin Pit --- apps/web/src/components/forms/password.tsx | 15 ++++++++++++--- apps/web/src/components/forms/signin.tsx | 2 +- apps/web/src/components/forms/signup.tsx | 6 +++++- .../primitives/document-flow/add-signers.types.ts | 2 +- 4 files changed, 19 insertions(+), 6 deletions(-) diff --git a/apps/web/src/components/forms/password.tsx b/apps/web/src/components/forms/password.tsx index 5df5005f1..47cba1e88 100644 --- a/apps/web/src/components/forms/password.tsx +++ b/apps/web/src/components/forms/password.tsx @@ -20,9 +20,18 @@ import { FormErrorMessage } from '../form/form-error-message'; export const ZPasswordFormSchema = z .object({ - currentPassword: z.string().min(6).max(72), - password: z.string().min(6).max(72), - repeatedPassword: z.string().min(6).max(72), + currentPassword: z + .string() + .min(6, { message: 'Password should contain at least 6 characters' }) + .max(72, { message: 'Password should not contain more than 72 characters' }), + password: z + .string() + .min(6, { message: 'Password should contain at least 6 characters' }) + .max(72, { message: 'Password should not contain more than 72 characters' }), + repeatedPassword: z + .string() + .min(6, { message: 'Password should contain at least 6 characters' }) + .max(72, { message: 'Password should not contain more than 72 characters' }), }) .refine((data) => data.password === data.repeatedPassword, { message: 'Passwords do not match', diff --git a/apps/web/src/components/forms/signin.tsx b/apps/web/src/components/forms/signin.tsx index 43801038d..abdc1efe6 100644 --- a/apps/web/src/components/forms/signin.tsx +++ b/apps/web/src/components/forms/signin.tsx @@ -28,7 +28,7 @@ const LOGIN_REDIRECT_PATH = '/documents'; export const ZSignInFormSchema = z.object({ email: z.string().email().min(1), - password: z.string().min(6).max(72), + password: z.string().min(6, { message: 'Invalid password' }).max(72), }); export type TSignInFormSchema = z.infer; diff --git a/apps/web/src/components/forms/signup.tsx b/apps/web/src/components/forms/signup.tsx index fc85510f3..11068ac68 100644 --- a/apps/web/src/components/forms/signup.tsx +++ b/apps/web/src/components/forms/signup.tsx @@ -21,7 +21,10 @@ import { useToast } from '@documenso/ui/primitives/use-toast'; export const ZSignUpFormSchema = z.object({ name: z.string().trim().min(1, { message: 'Please enter a valid name.' }), email: z.string().email().min(1), - password: z.string().min(6).max(72), + password: z + .string() + .min(6, { message: 'Password should contain at least 6 characters' }) + .max(72, { message: 'Password should not contain more than 72 characters' }), signature: z.string().min(1, { message: 'We need your signature to sign documents' }), }); @@ -134,6 +137,7 @@ export const SignUpForm = ({ className }: SignUpFormProps) => { )} +
diff --git a/packages/ui/primitives/document-flow/add-signers.types.ts b/packages/ui/primitives/document-flow/add-signers.types.ts index 3dabd67e5..fc063ea3c 100644 --- a/packages/ui/primitives/document-flow/add-signers.types.ts +++ b/packages/ui/primitives/document-flow/add-signers.types.ts @@ -6,7 +6,7 @@ export const ZAddSignersFormSchema = z z.object({ formId: z.string().min(1), nativeId: z.number().optional(), - email: z.string().min(1).email(), + email: z.string().email().min(1), name: z.string(), }), ),