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

Merged in fix/STAY-15-validation-messages (pull request #3203)

Browse Source 
fix: Show correct validation errors in additionalInfoForm

* fix: Show correct validation errors in additionalInfoForm


Approved-by: Bianca Widstam
Approved-by: Erik Tiekstra
This commit is contained in:
Christel Westerberg
2025-11-24 08:36:17 +00:00
parent 8a5fef6d3a
commit 9ca7cfc0d3
3 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
apps/scandic-web/components/HotelReservation/FindMyBooking/AdditionalInfoForm.tsx
View File

@@ -31,6 +31,7 @@ export default function AdditionalInfoForm({
const intl = useIntl() const intl = useIntl()
const form = useForm<AdditionalInfoFormSchema>({ const form = useForm<AdditionalInfoFormSchema>({
resolver: zodResolver(additionalInfoFormSchema), resolver: zodResolver(additionalInfoFormSchema),
defaultValues: { firstName: "", email: "" },
mode: "all", mode: "all",
criteriaMode: "all", criteriaMode: "all",
reValidateMode: "onChange", reValidateMode: "onChange",

7
apps/scandic-web/components/HotelReservation/FindMyBooking/schema.ts
View File

@@ -13,6 +13,7 @@ const findMyBookingErrors = {
BOOKING_NUMBER_REQUIRED: "BOOKING_NUMBER_REQUIRED", BOOKING_NUMBER_REQUIRED: "BOOKING_NUMBER_REQUIRED",
FIRST_NAME_REQUIRED: "FIRST_NAME_REQUIRED", FIRST_NAME_REQUIRED: "FIRST_NAME_REQUIRED",
LAST_NAME_REQUIRED: "LAST_NAME_REQUIRED", LAST_NAME_REQUIRED: "LAST_NAME_REQUIRED",
EMAIL_INVALID: "EMAIL_INVALID",
EMAIL_REQUIRED: "EMAIL_REQUIRED", EMAIL_REQUIRED: "EMAIL_REQUIRED",
} as const } as const
@@ -22,7 +23,11 @@ const additionalInfoFormSchema = z.object({
.trim() .trim()
.max(250) .max(250)
.min(1, findMyBookingErrors.FIRST_NAME_REQUIRED), .min(1, findMyBookingErrors.FIRST_NAME_REQUIRED),
email: z.string().max(250).email(findMyBookingErrors.EMAIL_REQUIRED), email: z
.string()
.max(250)
.min(1, findMyBookingErrors.EMAIL_REQUIRED)
.email(findMyBookingErrors.EMAIL_INVALID),
}) })
const findMyBookingFormSchema = additionalInfoFormSchema.extend({ const findMyBookingFormSchema = additionalInfoFormSchema.extend({

4
apps/scandic-web/components/TempDesignSystem/Form/Input/index.tsx
View File

@@ -36,7 +36,7 @@ const Input = forwardRef<HTMLInputElement, InputProps>(function Input(
ref ref
) { ) {
const intl = useIntl() const intl = useIntl()
const { control, formState } = useFormContext() const { control } = useFormContext()
const numberAttributes: HTMLAttributes<HTMLInputElement> = {} const numberAttributes: HTMLAttributes<HTMLInputElement> = {}
if (type === "number") { if (type === "number") {
numberAttributes.onWheel = function (evt: WheelEvent<HTMLInputElement>) { numberAttributes.onWheel = function (evt: WheelEvent<HTMLInputElement>) {
@@ -50,7 +50,7 @@ const Input = forwardRef<HTMLInputElement, InputProps>(function Input(
control={control} control={control}
name={name} name={name}
rules={registerOptions} rules={registerOptions}
render={({ field, fieldState }) => ( render={({ field, fieldState, formState }) => (
<TextField <TextField
aria-label={ariaLabel} aria-label={ariaLabel}
className={className} className={className}