feat(form-error-ux): adopt useFormScrollToError + FormErrorSummary across remaining 10 forms
Completes the form-error rollout the prior session shipped on the 6 highest-impact forms (client/interest/yacht/company/berth/expense). Adds the scroll-to-first-error wrapper + the top-of-form summary banner to: - src/app/(auth)/login/page.tsx - src/app/(auth)/reset-password/page.tsx - src/app/(auth)/set-password/page.tsx - src/app/(auth)/setup/page.tsx - src/app/(dashboard)/[portSlug]/invoices/new/page.tsx - src/components/berths/berth-detail-header.tsx (status-change dialog) - src/components/companies/add-membership-dialog.tsx - src/components/invoices/invoice-detail.tsx (record-payment form) - src/components/reservations/berth-reserve-dialog.tsx - src/components/yachts/yacht-transfer-dialog.tsx Each call site: hook wraps handleSubmit, FormErrorSummary renders only when 2+ errors fire (no visual change otherwise), and per-form `labels` prop translates field names to human-readable strings. invoice-line-items is a sub-form via useFormContext, so it inherits from the parent. 1471/1471 vitest, tsc clean. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
This commit is contained in:
@@ -13,6 +13,8 @@ import { Input } from '@/components/ui/input';
|
|||||||
import { Label } from '@/components/ui/label';
|
import { Label } from '@/components/ui/label';
|
||||||
import { BrandedAuthShell } from '@/components/shared/branded-auth-shell';
|
import { BrandedAuthShell } from '@/components/shared/branded-auth-shell';
|
||||||
import { useAuthBranding } from '@/components/shared/auth-branding-provider';
|
import { useAuthBranding } from '@/components/shared/auth-branding-provider';
|
||||||
|
import { FormErrorSummary } from '@/components/forms/form-error-summary';
|
||||||
|
import { useFormScrollToError } from '@/hooks/use-form-scroll-to-error';
|
||||||
|
|
||||||
// `identifier` accepts either an email address or a username (3–30 lowercase
|
// `identifier` accepts either an email address or a username (3–30 lowercase
|
||||||
// letters / digits / dot / underscore / hyphen). The server endpoint
|
// letters / digits / dot / underscore / hyphen). The server endpoint
|
||||||
@@ -75,6 +77,7 @@ export default function LoginPage() {
|
|||||||
} = useForm<LoginFormData>({
|
} = useForm<LoginFormData>({
|
||||||
resolver: zodResolver(loginSchema),
|
resolver: zodResolver(loginSchema),
|
||||||
});
|
});
|
||||||
|
const submitWithScroll = useFormScrollToError(handleSubmit, errors);
|
||||||
|
|
||||||
async function onSubmit(data: LoginFormData) {
|
async function onSubmit(data: LoginFormData) {
|
||||||
setIsLoading(true);
|
setIsLoading(true);
|
||||||
@@ -112,7 +115,11 @@ export default function LoginPage() {
|
|||||||
<p className="text-sm text-gray-500 mt-1">Sign in to continue</p>
|
<p className="text-sm text-gray-500 mt-1">Sign in to continue</p>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<form onSubmit={handleSubmit(onSubmit)} className="space-y-4" noValidate>
|
<form onSubmit={submitWithScroll(onSubmit)} className="space-y-4" noValidate>
|
||||||
|
<FormErrorSummary
|
||||||
|
errors={errors}
|
||||||
|
labels={{ identifier: 'Email or username', password: 'Password' }}
|
||||||
|
/>
|
||||||
<div className="space-y-1.5">
|
<div className="space-y-1.5">
|
||||||
<Label htmlFor="identifier">Email or username</Label>
|
<Label htmlFor="identifier">Email or username</Label>
|
||||||
<Input
|
<Input
|
||||||
|
|||||||
@@ -11,6 +11,8 @@ import { Button } from '@/components/ui/button';
|
|||||||
import { Input } from '@/components/ui/input';
|
import { Input } from '@/components/ui/input';
|
||||||
import { Label } from '@/components/ui/label';
|
import { Label } from '@/components/ui/label';
|
||||||
import { BrandedAuthShell } from '@/components/shared/branded-auth-shell';
|
import { BrandedAuthShell } from '@/components/shared/branded-auth-shell';
|
||||||
|
import { FormErrorSummary } from '@/components/forms/form-error-summary';
|
||||||
|
import { useFormScrollToError } from '@/hooks/use-form-scroll-to-error';
|
||||||
import { cn } from '@/lib/utils';
|
import { cn } from '@/lib/utils';
|
||||||
|
|
||||||
const resetSchema = z.object({
|
const resetSchema = z.object({
|
||||||
@@ -32,6 +34,7 @@ export default function ResetPasswordPage() {
|
|||||||
} = useForm<ResetFormData>({
|
} = useForm<ResetFormData>({
|
||||||
resolver: zodResolver(resetSchema),
|
resolver: zodResolver(resetSchema),
|
||||||
});
|
});
|
||||||
|
const submitWithScroll = useFormScrollToError(handleSubmit, errors);
|
||||||
|
|
||||||
// If the user landed here from a stale email link that points to
|
// If the user landed here from a stale email link that points to
|
||||||
// `/reset-password?token=…` instead of `/set-password?token=…`, hand
|
// `/reset-password?token=…` instead of `/set-password?token=…`, hand
|
||||||
@@ -96,7 +99,8 @@ export default function ResetPasswordPage() {
|
|||||||
</Link>
|
</Link>
|
||||||
</div>
|
</div>
|
||||||
) : (
|
) : (
|
||||||
<form onSubmit={handleSubmit(onSubmit)} className="space-y-4" noValidate>
|
<form onSubmit={submitWithScroll(onSubmit)} className="space-y-4" noValidate>
|
||||||
|
<FormErrorSummary errors={errors} labels={{ email: 'Email' }} />
|
||||||
<div className="space-y-1.5">
|
<div className="space-y-1.5">
|
||||||
<Label htmlFor="email">Email</Label>
|
<Label htmlFor="email">Email</Label>
|
||||||
<Input
|
<Input
|
||||||
|
|||||||
@@ -12,6 +12,8 @@ import { Button } from '@/components/ui/button';
|
|||||||
import { Input } from '@/components/ui/input';
|
import { Input } from '@/components/ui/input';
|
||||||
import { Label } from '@/components/ui/label';
|
import { Label } from '@/components/ui/label';
|
||||||
import { BrandedAuthShell } from '@/components/shared/branded-auth-shell';
|
import { BrandedAuthShell } from '@/components/shared/branded-auth-shell';
|
||||||
|
import { FormErrorSummary } from '@/components/forms/form-error-summary';
|
||||||
|
import { useFormScrollToError } from '@/hooks/use-form-scroll-to-error';
|
||||||
|
|
||||||
const MIN_LENGTH = 9;
|
const MIN_LENGTH = 9;
|
||||||
|
|
||||||
@@ -65,6 +67,7 @@ function SetPasswordInner() {
|
|||||||
} = useForm<SetPasswordFormData>({
|
} = useForm<SetPasswordFormData>({
|
||||||
resolver: zodResolver(passwordSchema),
|
resolver: zodResolver(passwordSchema),
|
||||||
});
|
});
|
||||||
|
const submitWithScroll = useFormScrollToError(handleSubmit, errors);
|
||||||
|
|
||||||
async function onSubmit(data: SetPasswordFormData) {
|
async function onSubmit(data: SetPasswordFormData) {
|
||||||
if (!token) {
|
if (!token) {
|
||||||
@@ -138,7 +141,11 @@ function SetPasswordInner() {
|
|||||||
<p className="text-sm text-gray-500 mt-1">Choose a password for your CRM account</p>
|
<p className="text-sm text-gray-500 mt-1">Choose a password for your CRM account</p>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<form onSubmit={handleSubmit(onSubmit)} className="space-y-4" noValidate>
|
<form onSubmit={submitWithScroll(onSubmit)} className="space-y-4" noValidate>
|
||||||
|
<FormErrorSummary
|
||||||
|
errors={errors}
|
||||||
|
labels={{ password: 'Password', confirmPassword: 'Confirm password' }}
|
||||||
|
/>
|
||||||
<div className="space-y-1.5">
|
<div className="space-y-1.5">
|
||||||
<Label htmlFor="password">New password</Label>
|
<Label htmlFor="password">New password</Label>
|
||||||
<Input
|
<Input
|
||||||
|
|||||||
@@ -12,6 +12,8 @@ import { Input } from '@/components/ui/input';
|
|||||||
import { Label } from '@/components/ui/label';
|
import { Label } from '@/components/ui/label';
|
||||||
import { BrandedAuthShell } from '@/components/shared/branded-auth-shell';
|
import { BrandedAuthShell } from '@/components/shared/branded-auth-shell';
|
||||||
import { useAuthBranding } from '@/components/shared/auth-branding-provider';
|
import { useAuthBranding } from '@/components/shared/auth-branding-provider';
|
||||||
|
import { FormErrorSummary } from '@/components/forms/form-error-summary';
|
||||||
|
import { useFormScrollToError } from '@/hooks/use-form-scroll-to-error';
|
||||||
import { apiFetch } from '@/lib/api/client';
|
import { apiFetch } from '@/lib/api/client';
|
||||||
import { cn } from '@/lib/utils';
|
import { cn } from '@/lib/utils';
|
||||||
|
|
||||||
@@ -50,6 +52,7 @@ export default function SetupPage() {
|
|||||||
} = useForm<SetupFormData>({
|
} = useForm<SetupFormData>({
|
||||||
resolver: zodResolver(setupSchema),
|
resolver: zodResolver(setupSchema),
|
||||||
});
|
});
|
||||||
|
const submitWithScroll = useFormScrollToError(handleSubmit, errors);
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
let cancelled = false;
|
let cancelled = false;
|
||||||
@@ -119,7 +122,16 @@ export default function SetupPage() {
|
|||||||
</p>
|
</p>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<form onSubmit={handleSubmit(onSubmit)} className="space-y-4">
|
<form onSubmit={submitWithScroll(onSubmit)} className="space-y-4">
|
||||||
|
<FormErrorSummary
|
||||||
|
errors={errors}
|
||||||
|
labels={{
|
||||||
|
name: 'Name',
|
||||||
|
email: 'Email',
|
||||||
|
password: 'Password',
|
||||||
|
confirmPassword: 'Confirm password',
|
||||||
|
}}
|
||||||
|
/>
|
||||||
<div className="space-y-1.5">
|
<div className="space-y-1.5">
|
||||||
<Label htmlFor="setup-name">Your name</Label>
|
<Label htmlFor="setup-name">Your name</Label>
|
||||||
<Input
|
<Input
|
||||||
|
|||||||
@@ -24,6 +24,8 @@ import { Card, CardContent, CardHeader, CardTitle } from '@/components/ui/card';
|
|||||||
import { OwnerPicker } from '@/components/shared/owner-picker';
|
import { OwnerPicker } from '@/components/shared/owner-picker';
|
||||||
import { CurrencySelect } from '@/components/shared/currency-select';
|
import { CurrencySelect } from '@/components/shared/currency-select';
|
||||||
import { InvoiceLineItems } from '@/components/invoices/invoice-line-items';
|
import { InvoiceLineItems } from '@/components/invoices/invoice-line-items';
|
||||||
|
import { FormErrorSummary } from '@/components/forms/form-error-summary';
|
||||||
|
import { useFormScrollToError } from '@/hooks/use-form-scroll-to-error';
|
||||||
import { apiFetch } from '@/lib/api/client';
|
import { apiFetch } from '@/lib/api/client';
|
||||||
import { formatCurrency } from '@/lib/utils/currency';
|
import { formatCurrency } from '@/lib/utils/currency';
|
||||||
import type { z } from 'zod';
|
import type { z } from 'zod';
|
||||||
@@ -96,6 +98,7 @@ export default function NewInvoicePage() {
|
|||||||
setValue,
|
setValue,
|
||||||
formState: { errors },
|
formState: { errors },
|
||||||
} = methods;
|
} = methods;
|
||||||
|
const submitWithScroll = useFormScrollToError(handleSubmit, errors);
|
||||||
|
|
||||||
const watchedValues = watch();
|
const watchedValues = watch();
|
||||||
const isDepositInvoice = watchedValues.kind === 'deposit';
|
const isDepositInvoice = watchedValues.kind === 'deposit';
|
||||||
@@ -219,7 +222,18 @@ export default function NewInvoicePage() {
|
|||||||
</div>
|
</div>
|
||||||
|
|
||||||
<FormProvider {...methods}>
|
<FormProvider {...methods}>
|
||||||
<form onSubmit={handleSubmit(onSubmit)} className="space-y-6">
|
<form onSubmit={submitWithScroll(onSubmit)} className="space-y-6">
|
||||||
|
<FormErrorSummary
|
||||||
|
errors={errors}
|
||||||
|
labels={{
|
||||||
|
billingEntity: 'Billing entity',
|
||||||
|
billingEmail: 'Billing email',
|
||||||
|
dueDate: 'Due date',
|
||||||
|
lineItems: 'Line items',
|
||||||
|
currency: 'Currency',
|
||||||
|
paymentTerms: 'Payment terms',
|
||||||
|
}}
|
||||||
|
/>
|
||||||
{/* Step 1: Client Info */}
|
{/* Step 1: Client Info */}
|
||||||
{step === 1 && (
|
{step === 1 && (
|
||||||
<Card>
|
<Card>
|
||||||
|
|||||||
@@ -25,6 +25,8 @@ import {
|
|||||||
} from '@/components/ui/select';
|
} from '@/components/ui/select';
|
||||||
import { Textarea } from '@/components/ui/textarea';
|
import { Textarea } from '@/components/ui/textarea';
|
||||||
import { DetailHeaderStrip } from '@/components/shared/detail-header-strip';
|
import { DetailHeaderStrip } from '@/components/shared/detail-header-strip';
|
||||||
|
import { FormErrorSummary } from '@/components/forms/form-error-summary';
|
||||||
|
import { useFormScrollToError } from '@/hooks/use-form-scroll-to-error';
|
||||||
import { PermissionGate } from '@/components/shared/permission-gate';
|
import { PermissionGate } from '@/components/shared/permission-gate';
|
||||||
import { StatusPill, type StatusPillStatus } from '@/components/ui/status-pill';
|
import { StatusPill, type StatusPillStatus } from '@/components/ui/status-pill';
|
||||||
import { BerthForm } from './berth-form';
|
import { BerthForm } from './berth-form';
|
||||||
@@ -128,11 +130,12 @@ function StatusChangeDialog({
|
|||||||
setValue,
|
setValue,
|
||||||
watch,
|
watch,
|
||||||
reset,
|
reset,
|
||||||
formState: { isSubmitting },
|
formState: { errors, isSubmitting },
|
||||||
} = useForm<UpdateBerthStatusInput>({
|
} = useForm<UpdateBerthStatusInput>({
|
||||||
resolver: zodResolver(updateBerthStatusSchema),
|
resolver: zodResolver(updateBerthStatusSchema),
|
||||||
defaultValues: { status: currentStatus as (typeof BERTH_STATUSES)[number], reason: '' },
|
defaultValues: { status: currentStatus as (typeof BERTH_STATUSES)[number], reason: '' },
|
||||||
});
|
});
|
||||||
|
const submitWithScroll = useFormScrollToError(handleSubmit, errors);
|
||||||
|
|
||||||
const status = watch('status');
|
const status = watch('status');
|
||||||
const interestId = watch('interestId');
|
const interestId = watch('interestId');
|
||||||
@@ -180,7 +183,11 @@ function StatusChangeDialog({
|
|||||||
<DialogHeader>
|
<DialogHeader>
|
||||||
<DialogTitle>Change Status</DialogTitle>
|
<DialogTitle>Change Status</DialogTitle>
|
||||||
</DialogHeader>
|
</DialogHeader>
|
||||||
<form onSubmit={handleSubmit(onSubmit)} className="space-y-4">
|
<form onSubmit={submitWithScroll(onSubmit)} className="space-y-4">
|
||||||
|
<FormErrorSummary
|
||||||
|
errors={errors}
|
||||||
|
labels={{ status: 'Status', reason: 'Reason', interestId: 'Linked interest' }}
|
||||||
|
/>
|
||||||
<div className="space-y-2">
|
<div className="space-y-2">
|
||||||
<Label>New Status</Label>
|
<Label>New Status</Label>
|
||||||
<Select
|
<Select
|
||||||
|
|||||||
@@ -27,6 +27,8 @@ import {
|
|||||||
} from '@/components/ui/select';
|
} from '@/components/ui/select';
|
||||||
import { Textarea } from '@/components/ui/textarea';
|
import { Textarea } from '@/components/ui/textarea';
|
||||||
import { ClientPicker } from '@/components/shared/client-picker';
|
import { ClientPicker } from '@/components/shared/client-picker';
|
||||||
|
import { FormErrorSummary } from '@/components/forms/form-error-summary';
|
||||||
|
import { useFormScrollToError } from '@/hooks/use-form-scroll-to-error';
|
||||||
import { apiFetch } from '@/lib/api/client';
|
import { apiFetch } from '@/lib/api/client';
|
||||||
import { ROLES } from '@/lib/validators/company-memberships';
|
import { ROLES } from '@/lib/validators/company-memberships';
|
||||||
|
|
||||||
@@ -82,6 +84,7 @@ export function AddMembershipDialog({ open, onOpenChange, companyId }: AddMember
|
|||||||
notes: '',
|
notes: '',
|
||||||
},
|
},
|
||||||
});
|
});
|
||||||
|
const submitWithScroll = useFormScrollToError(handleSubmit, errors);
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
if (open) {
|
if (open) {
|
||||||
@@ -143,12 +146,16 @@ export function AddMembershipDialog({ open, onOpenChange, companyId }: AddMember
|
|||||||
</DialogHeader>
|
</DialogHeader>
|
||||||
|
|
||||||
<form
|
<form
|
||||||
onSubmit={handleSubmit((data) => {
|
onSubmit={submitWithScroll((data) => {
|
||||||
setFormError(null);
|
setFormError(null);
|
||||||
mutation.mutate(data);
|
mutation.mutate(data);
|
||||||
})}
|
})}
|
||||||
className="space-y-4"
|
className="space-y-4"
|
||||||
>
|
>
|
||||||
|
<FormErrorSummary
|
||||||
|
errors={errors}
|
||||||
|
labels={{ clientId: 'Client', role: 'Role', startDate: 'Start date' }}
|
||||||
|
/>
|
||||||
<div className="space-y-2">
|
<div className="space-y-2">
|
||||||
<Label>Client</Label>
|
<Label>Client</Label>
|
||||||
<ClientPicker value={clientId} onChange={(id) => setValue('clientId', id)} />
|
<ClientPicker value={clientId} onChange={(id) => setValue('clientId', id)} />
|
||||||
|
|||||||
@@ -11,6 +11,8 @@ import { format } from 'date-fns';
|
|||||||
import { Button } from '@/components/ui/button';
|
import { Button } from '@/components/ui/button';
|
||||||
import { Badge } from '@/components/ui/badge';
|
import { Badge } from '@/components/ui/badge';
|
||||||
import { Card, CardContent, CardHeader, CardTitle } from '@/components/ui/card';
|
import { Card, CardContent, CardHeader, CardTitle } from '@/components/ui/card';
|
||||||
|
import { FormErrorSummary } from '@/components/forms/form-error-summary';
|
||||||
|
import { useFormScrollToError } from '@/hooks/use-form-scroll-to-error';
|
||||||
import { PermissionGate } from '@/components/shared/permission-gate';
|
import { PermissionGate } from '@/components/shared/permission-gate';
|
||||||
import { toast } from 'sonner';
|
import { toast } from 'sonner';
|
||||||
import { Label } from '@/components/ui/label';
|
import { Label } from '@/components/ui/label';
|
||||||
@@ -145,6 +147,10 @@ export function InvoiceDetail({ invoiceId }: InvoiceDetailProps) {
|
|||||||
resolver: zodResolver(recordPaymentSchema),
|
resolver: zodResolver(recordPaymentSchema),
|
||||||
defaultValues: { paymentDate: new Date().toISOString().split('T')[0] },
|
defaultValues: { paymentDate: new Date().toISOString().split('T')[0] },
|
||||||
});
|
});
|
||||||
|
const submitPaymentWithScroll = useFormScrollToError(
|
||||||
|
paymentForm.handleSubmit,
|
||||||
|
paymentForm.formState.errors,
|
||||||
|
);
|
||||||
|
|
||||||
const paymentMutation = useMutation({
|
const paymentMutation = useMutation({
|
||||||
mutationFn: (values: RecordPaymentInput) =>
|
mutationFn: (values: RecordPaymentInput) =>
|
||||||
@@ -393,9 +399,13 @@ export function InvoiceDetail({ invoiceId }: InvoiceDetailProps) {
|
|||||||
</CardHeader>
|
</CardHeader>
|
||||||
<CardContent>
|
<CardContent>
|
||||||
<form
|
<form
|
||||||
onSubmit={paymentForm.handleSubmit((values) => paymentMutation.mutate(values))}
|
onSubmit={submitPaymentWithScroll((values) => paymentMutation.mutate(values))}
|
||||||
className="space-y-4"
|
className="space-y-4"
|
||||||
>
|
>
|
||||||
|
<FormErrorSummary
|
||||||
|
errors={paymentForm.formState.errors}
|
||||||
|
labels={{ paymentDate: 'Payment date', paymentMethod: 'Payment method' }}
|
||||||
|
/>
|
||||||
<div className="space-y-1">
|
<div className="space-y-1">
|
||||||
<Label htmlFor="paymentDate">Payment Date</Label>
|
<Label htmlFor="paymentDate">Payment Date</Label>
|
||||||
<Controller
|
<Controller
|
||||||
|
|||||||
@@ -27,6 +27,8 @@ import {
|
|||||||
} from '@/components/ui/select';
|
} from '@/components/ui/select';
|
||||||
import { ClientPicker } from '@/components/shared/client-picker';
|
import { ClientPicker } from '@/components/shared/client-picker';
|
||||||
import { YachtPicker } from '@/components/yachts/yacht-picker';
|
import { YachtPicker } from '@/components/yachts/yacht-picker';
|
||||||
|
import { FormErrorSummary } from '@/components/forms/form-error-summary';
|
||||||
|
import { useFormScrollToError } from '@/hooks/use-form-scroll-to-error';
|
||||||
import { apiFetch } from '@/lib/api/client';
|
import { apiFetch } from '@/lib/api/client';
|
||||||
|
|
||||||
type TenureType = 'permanent' | 'fixed_term' | 'seasonal';
|
type TenureType = 'permanent' | 'fixed_term' | 'seasonal';
|
||||||
@@ -66,6 +68,10 @@ export function BerthReserveDialog({ open, onOpenChange, berthId }: BerthReserve
|
|||||||
notes: '',
|
notes: '',
|
||||||
},
|
},
|
||||||
});
|
});
|
||||||
|
// Wraps handleSubmit so validation failures scroll the first errored
|
||||||
|
// field into view + focus it; matters in this Dialog because the body
|
||||||
|
// can grow past the viewport when long client/yacht lists render.
|
||||||
|
const submitWithScroll = useFormScrollToError(handleSubmit, errors);
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
if (open) {
|
if (open) {
|
||||||
@@ -169,6 +175,10 @@ export function BerthReserveDialog({ open, onOpenChange, berthId }: BerthReserve
|
|||||||
</DialogHeader>
|
</DialogHeader>
|
||||||
|
|
||||||
<form className="space-y-4">
|
<form className="space-y-4">
|
||||||
|
<FormErrorSummary
|
||||||
|
errors={errors}
|
||||||
|
labels={{ clientId: 'Client', yachtId: 'Yacht', startDate: 'Start date' }}
|
||||||
|
/>
|
||||||
<div className="space-y-2">
|
<div className="space-y-2">
|
||||||
<Label>Client</Label>
|
<Label>Client</Label>
|
||||||
<ClientPicker value={clientId} onChange={(id) => setValue('clientId', id)} />
|
<ClientPicker value={clientId} onChange={(id) => setValue('clientId', id)} />
|
||||||
@@ -230,7 +240,7 @@ export function BerthReserveDialog({ open, onOpenChange, berthId }: BerthReserve
|
|||||||
type="button"
|
type="button"
|
||||||
variant="outline"
|
variant="outline"
|
||||||
disabled={isPending}
|
disabled={isPending}
|
||||||
onClick={handleSubmit((data) => {
|
onClick={submitWithScroll((data) => {
|
||||||
setFormError(null);
|
setFormError(null);
|
||||||
createMutation.mutate(data);
|
createMutation.mutate(data);
|
||||||
})}
|
})}
|
||||||
@@ -243,7 +253,7 @@ export function BerthReserveDialog({ open, onOpenChange, berthId }: BerthReserve
|
|||||||
<Button
|
<Button
|
||||||
type="button"
|
type="button"
|
||||||
disabled={isPending}
|
disabled={isPending}
|
||||||
onClick={handleSubmit((data) => {
|
onClick={submitWithScroll((data) => {
|
||||||
setFormError(null);
|
setFormError(null);
|
||||||
createAndActivateMutation.mutate(data);
|
createAndActivateMutation.mutate(data);
|
||||||
})}
|
})}
|
||||||
|
|||||||
@@ -26,6 +26,8 @@ import {
|
|||||||
SelectValue,
|
SelectValue,
|
||||||
} from '@/components/ui/select';
|
} from '@/components/ui/select';
|
||||||
import { OwnerPicker, type OwnerRef } from '@/components/shared/owner-picker';
|
import { OwnerPicker, type OwnerRef } from '@/components/shared/owner-picker';
|
||||||
|
import { FormErrorSummary } from '@/components/forms/form-error-summary';
|
||||||
|
import { useFormScrollToError } from '@/hooks/use-form-scroll-to-error';
|
||||||
import { apiFetch } from '@/lib/api/client';
|
import { apiFetch } from '@/lib/api/client';
|
||||||
|
|
||||||
type TransferReason = 'sale' | 'inheritance' | 'gift' | 'company_restructure' | 'other';
|
type TransferReason = 'sale' | 'inheritance' | 'gift' | 'company_restructure' | 'other';
|
||||||
@@ -72,6 +74,7 @@ export function YachtTransferDialog({
|
|||||||
transferNotes: '',
|
transferNotes: '',
|
||||||
},
|
},
|
||||||
});
|
});
|
||||||
|
const submitWithScroll = useFormScrollToError(handleSubmit, errors);
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
if (open) {
|
if (open) {
|
||||||
@@ -135,12 +138,20 @@ export function YachtTransferDialog({
|
|||||||
</DialogHeader>
|
</DialogHeader>
|
||||||
|
|
||||||
<form
|
<form
|
||||||
onSubmit={handleSubmit((data) => {
|
onSubmit={submitWithScroll((data) => {
|
||||||
setFormError(null);
|
setFormError(null);
|
||||||
mutation.mutate(data);
|
mutation.mutate(data);
|
||||||
})}
|
})}
|
||||||
className="space-y-4"
|
className="space-y-4"
|
||||||
>
|
>
|
||||||
|
<FormErrorSummary
|
||||||
|
errors={errors}
|
||||||
|
labels={{
|
||||||
|
newOwner: 'New owner',
|
||||||
|
effectiveDate: 'Effective date',
|
||||||
|
transferReason: 'Reason',
|
||||||
|
}}
|
||||||
|
/>
|
||||||
<div className="space-y-2">
|
<div className="space-y-2">
|
||||||
<Label>New owner</Label>
|
<Label>New owner</Label>
|
||||||
<OwnerPicker
|
<OwnerPicker
|
||||||
|
|||||||
Reference in New Issue
Block a user