scandic/web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(SW-2385): handle error messages provided from zod validation in forms client side

Browse Source
This commit is contained in:
Christian Andolf
2025-04-15 15:04:32 +02:00
committed by Michael Zetterberg
parent 2648b17744
commit 595eb575d7
7 changed files with 257 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
apps/scandic-web/components/Forms/Edit/Profile/schema.ts
View File

@@ -3,26 +3,36 @@ import { z } from "zod"
import { passwordValidator } from "@/utils/zod/passwordValidator"
import { phoneValidator } from "@/utils/zod/phoneValidator"
const countryRequiredMsg = "Country is required"
export const editProfileErrors = {
COUNTRY_REQUIRED: "COUNTRY_REQUIRED",
ZIP_CODE_REQUIRED: "ZIP_CODE_REQUIRED",
PHONE_REQUIRED: "PHONE_REQUIRED",
PHONE_REQUESTED: "PHONE_REQUESTED",
PASSWORD_NEW_REQUIRED: "PASSWORD_NEW_REQUIRED",
PASSWORD_RETYPE_NEW_REQUIRED: "PASSWORD_RETYPE_NEW_REQUIRED",
PASSWORD_CURRENT_REQUIRED: "PASSWORD_CURRENT_REQUIRED",
PASSWORD_NEW_NOT_MATCH: "PASSWORD_NEW_NOT_MATCH",
} as const
export const editProfileSchema = z
.object({
address: z.object({
city: z.string().optional(),
countryCode: z
.string({
required_error: countryRequiredMsg,
invalid_type_error: countryRequiredMsg,
required_error: editProfileErrors.COUNTRY_REQUIRED,
invalid_type_error: editProfileErrors.COUNTRY_REQUIRED,
})
.min(1, countryRequiredMsg),
.min(1, editProfileErrors.COUNTRY_REQUIRED),
streetAddress: z.string().optional(),
zipCode: z.string().min(1, "Zip code is required"),
zipCode: z.string().min(1, editProfileErrors.ZIP_CODE_REQUIRED),
}),
dateOfBirth: z.string().min(1),
email: z.string().email(),
language: z.string(),
phoneNumber: phoneValidator(
"Phone is required",
"Please enter a valid phone number"
editProfileErrors.PHONE_REQUIRED,
editProfileErrors.PHONE_REQUESTED
),
password: z.string().optional(),
@@ -34,14 +44,14 @@ export const editProfileSchema = z
if (!data.newPassword) {
ctx.addIssue({
code: "custom",
message: "New password is required",
message: editProfileErrors.PASSWORD_NEW_REQUIRED,
path: ["newPassword"],
})
}
if (!data.retypeNewPassword) {
ctx.addIssue({
code: "custom",
message: "Retype new password is required",
message: editProfileErrors.PASSWORD_RETYPE_NEW_REQUIRED,
path: ["retypeNewPassword"],
})
}
@@ -49,7 +59,7 @@ export const editProfileSchema = z
if (data.newPassword || data.retypeNewPassword) {
ctx.addIssue({
code: "custom",
message: "Current password is required",
message: editProfileErrors.PASSWORD_CURRENT_REQUIRED,
path: ["password"],
})
}
@@ -58,7 +68,7 @@ export const editProfileSchema = z
if (data.newPassword && !data.retypeNewPassword) {
ctx.addIssue({
code: "custom",
message: "Retype new password is required",
message: editProfileErrors.PASSWORD_RETYPE_NEW_REQUIRED,
path: ["retypeNewPassword"],
})
}
@@ -66,7 +76,7 @@ export const editProfileSchema = z
if (data.retypeNewPassword !== data.newPassword) {
ctx.addIssue({
code: "custom",
message: "Retype new password does not match new password",
message: editProfileErrors.PASSWORD_NEW_NOT_MATCH,
path: ["retypeNewPassword"],
})
}