feat(i18n): country/phone/timezone/subdivision primitives + form wiring
Cross-cutting i18n polish for forms across the marina + residential + company
domains. Introduces a single source of truth for country/phone/timezone/
subdivision data and replaces every nationality-as-free-text and timezone-
as-string Input with a dedicated combobox.
PR1 Countries — ALL_COUNTRY_CODES (~250 ISO-3166-1 alpha-2), Intl.DisplayNames
for localized labels, detectDefaultCountry() with navigator-region
fallback to US, CountryCombobox with regional-indicator flag glyphs +
compact mode for inline use.
PR2 Phone — libphonenumber-js wrapper (parsePhone / formatAsYouType /
callingCodeFor), PhoneInput with flag dropdown + national-format
AsYouType + paste-detect that flips the country dropdown for pasted
international strings.
PR3 Timezones — country->IANA map (250 entries, multi-zone for AU/BR/CA/CD/
ID/KZ/MN/MX/RU/US), formatTimezoneLabel ("Europe/London (UTC+1)"),
TimezoneCombobox with Suggested/All grouping driven by countryHint.
PR4 Subdivisions — wraps the iso-3166-2 npm package (~5000 ISO 3166-2
codes for every country), per-country cache, SubdivisionCombobox with
"Pick a country first" / "No regions available" empty states.
PR5 Schema deltas (migration 0015) — clients.nationality_iso, clientContacts
{value_e164, value_country}, clientAddresses {country_iso, subdivision_iso},
residentialClients {phone_e164, phone_country, nationality_iso, timezone,
place_of_residence_country_iso, subdivision_iso}, companies {incorporation_
country_iso, incorporation_subdivision_iso}, companyAddresses {country_iso,
subdivision_iso}. Plus shared zod validators (validators/i18n.ts) used
by every entity validator + route handler.
PR6 ClientForm + ClientDetail — CountryCombobox replaces nationality Input,
TimezoneCombobox replaces timezone Input (driven by nationalityIso hint),
PhoneInput conditionally rendered for phone/whatsapp contacts. Inline
editors (InlineCountryField / InlineTimezoneField / InlinePhoneField)
for the detail-page overview rows + ContactsEditor.
PR7 Residential client form + detail — phone -> PhoneInput, nationality/
timezone/place-of-residence-country/subdivision rows in both create
sheet and inline-editable detail view. Subdivision wipes when country
flips since codes are country-scoped.
PR8 Company form + detail — incorporation country -> CountryCombobox,
incorporation region -> SubdivisionCombobox in both modes.
PR9 Public inquiry endpoint — accepts pre-normalized phoneE164/phoneCountry
and i18n fields from newer website builds, server-side parsePhone()
fallback for legacy raw-international submissions. Old Nuxt builds
keep working unchanged.
Tests: 4 unit suites for the primitives (25 tests), 1 integration spec for
the public phone-normalization path (3 tests), 1 smoke spec asserting the
combobox triggers render in all three create sheets.
Test totals: vitest 713 -> 741 (+28).
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
This commit is contained in:
@@ -20,6 +20,8 @@ export interface CompanyRow {
|
||||
taxId: string | null;
|
||||
registrationNumber: string | null;
|
||||
incorporationCountry: string | null;
|
||||
incorporationCountryIso: string | null;
|
||||
incorporationSubdivisionIso: string | null;
|
||||
incorporationDate: string | null;
|
||||
status: string;
|
||||
billingEmail: string | null;
|
||||
|
||||
@@ -21,6 +21,8 @@ interface CompanyDetailHeaderCompany {
|
||||
taxId: string | null;
|
||||
registrationNumber: string | null;
|
||||
incorporationCountry: string | null;
|
||||
incorporationCountryIso: string | null;
|
||||
incorporationSubdivisionIso: string | null;
|
||||
incorporationDate: string | null;
|
||||
status: string;
|
||||
billingEmail: string | null;
|
||||
@@ -131,6 +133,8 @@ export function CompanyDetailHeader({ company }: CompanyDetailHeaderProps) {
|
||||
taxId: company.taxId,
|
||||
registrationNumber: company.registrationNumber,
|
||||
incorporationCountry: company.incorporationCountry,
|
||||
incorporationCountryIso: company.incorporationCountryIso,
|
||||
incorporationSubdivisionIso: company.incorporationSubdivisionIso,
|
||||
incorporationDate: company.incorporationDate,
|
||||
status: company.status,
|
||||
billingEmail: company.billingEmail,
|
||||
|
||||
@@ -17,6 +17,8 @@ export interface CompanyData {
|
||||
taxId: string | null;
|
||||
registrationNumber: string | null;
|
||||
incorporationCountry: string | null;
|
||||
incorporationCountryIso: string | null;
|
||||
incorporationSubdivisionIso: string | null;
|
||||
incorporationDate: string | null;
|
||||
status: string;
|
||||
billingEmail: string | null;
|
||||
|
||||
@@ -21,8 +21,11 @@ import {
|
||||
import { Sheet, SheetContent, SheetFooter, SheetHeader, SheetTitle } from '@/components/ui/sheet';
|
||||
import { Separator } from '@/components/ui/separator';
|
||||
import { TagPicker } from '@/components/shared/tag-picker';
|
||||
import { CountryCombobox } from '@/components/shared/country-combobox';
|
||||
import { SubdivisionCombobox } from '@/components/shared/subdivision-combobox';
|
||||
import { apiFetch } from '@/lib/api/client';
|
||||
import { createCompanySchema, type CreateCompanyInput } from '@/lib/validators/companies';
|
||||
import type { CountryCode } from '@/lib/i18n/countries';
|
||||
|
||||
type CompanyStatus = 'active' | 'dissolved';
|
||||
|
||||
@@ -39,6 +42,8 @@ interface CompanyFormProps {
|
||||
taxId: string | null;
|
||||
registrationNumber: string | null;
|
||||
incorporationCountry: string | null;
|
||||
incorporationCountryIso: string | null;
|
||||
incorporationSubdivisionIso: string | null;
|
||||
incorporationDate: string | null;
|
||||
status: string;
|
||||
billingEmail: string | null;
|
||||
@@ -79,6 +84,8 @@ export function CompanyForm({ open, onOpenChange, company }: CompanyFormProps) {
|
||||
taxId: company.taxId ?? undefined,
|
||||
registrationNumber: company.registrationNumber ?? undefined,
|
||||
incorporationCountry: company.incorporationCountry ?? undefined,
|
||||
incorporationCountryIso: company.incorporationCountryIso ?? undefined,
|
||||
incorporationSubdivisionIso: company.incorporationSubdivisionIso ?? undefined,
|
||||
incorporationDate: company.incorporationDate
|
||||
? new Date(company.incorporationDate)
|
||||
: undefined,
|
||||
@@ -169,7 +176,24 @@ export function CompanyForm({ open, onOpenChange, company }: CompanyFormProps) {
|
||||
</div>
|
||||
<div className="space-y-1">
|
||||
<Label>Incorporation Country</Label>
|
||||
<Input {...register('incorporationCountry')} placeholder="e.g. MT" />
|
||||
<CountryCombobox
|
||||
value={watch('incorporationCountryIso')}
|
||||
onChange={(iso) => {
|
||||
setValue('incorporationCountryIso', iso ?? undefined);
|
||||
// Wipe subdivision when country flips — codes are country-scoped.
|
||||
setValue('incorporationSubdivisionIso', undefined);
|
||||
}}
|
||||
data-testid="company-incorp-country"
|
||||
/>
|
||||
</div>
|
||||
<div className="space-y-1">
|
||||
<Label>Incorporation Region</Label>
|
||||
<SubdivisionCombobox
|
||||
value={watch('incorporationSubdivisionIso')}
|
||||
onChange={(code) => setValue('incorporationSubdivisionIso', code ?? undefined)}
|
||||
country={(watch('incorporationCountryIso') as CountryCode | undefined) ?? null}
|
||||
data-testid="company-incorp-subdivision"
|
||||
/>
|
||||
</div>
|
||||
<div className="space-y-1">
|
||||
<Label>Incorporation Date</Label>
|
||||
|
||||
@@ -146,6 +146,8 @@ export function CompanyList() {
|
||||
taxId: editCompany.taxId,
|
||||
registrationNumber: editCompany.registrationNumber,
|
||||
incorporationCountry: editCompany.incorporationCountry,
|
||||
incorporationCountryIso: editCompany.incorporationCountryIso,
|
||||
incorporationSubdivisionIso: editCompany.incorporationSubdivisionIso,
|
||||
incorporationDate: editCompany.incorporationDate,
|
||||
status: editCompany.status,
|
||||
billingEmail: editCompany.billingEmail,
|
||||
|
||||
@@ -5,11 +5,14 @@ import { useMutation, useQueryClient } from '@tanstack/react-query';
|
||||
import type { DetailTab } from '@/components/shared/detail-layout';
|
||||
import { EmptyState } from '@/components/shared/empty-state';
|
||||
import { InlineEditableField } from '@/components/shared/inline-editable-field';
|
||||
import { InlineCountryField } from '@/components/shared/inline-country-field';
|
||||
import { SubdivisionCombobox } from '@/components/shared/subdivision-combobox';
|
||||
import { InlineTagEditor } from '@/components/shared/inline-tag-editor';
|
||||
import { NotesList } from '@/components/shared/notes-list';
|
||||
import { CompanyMembersTab } from '@/components/companies/company-members-tab';
|
||||
import { CompanyOwnedYachtsTab } from '@/components/companies/company-owned-yachts-tab';
|
||||
import { apiFetch } from '@/lib/api/client';
|
||||
import type { CountryCode } from '@/lib/i18n/countries';
|
||||
|
||||
type CompanyPatchField =
|
||||
| 'name'
|
||||
@@ -17,6 +20,8 @@ type CompanyPatchField =
|
||||
| 'taxId'
|
||||
| 'registrationNumber'
|
||||
| 'incorporationCountry'
|
||||
| 'incorporationCountryIso'
|
||||
| 'incorporationSubdivisionIso'
|
||||
| 'incorporationDate'
|
||||
| 'status'
|
||||
| 'billingEmail'
|
||||
@@ -34,6 +39,8 @@ interface CompanyTabsCompany {
|
||||
taxId: string | null;
|
||||
registrationNumber: string | null;
|
||||
incorporationCountry: string | null;
|
||||
incorporationCountryIso: string | null;
|
||||
incorporationSubdivisionIso: string | null;
|
||||
incorporationDate: string | null;
|
||||
status: string;
|
||||
billingEmail: string | null;
|
||||
@@ -114,9 +121,26 @@ function OverviewTab({ companyId, company }: { companyId: string; company: Compa
|
||||
/>
|
||||
</EditableRow>
|
||||
<EditableRow label="Incorporation Country">
|
||||
<InlineEditableField
|
||||
value={company.incorporationCountry}
|
||||
onSave={save('incorporationCountry')}
|
||||
<InlineCountryField
|
||||
value={company.incorporationCountryIso}
|
||||
onSave={async (iso) => {
|
||||
// Wipe subdivision when country flips — codes are country-scoped.
|
||||
await mutation.mutateAsync({
|
||||
incorporationCountryIso: iso,
|
||||
incorporationSubdivisionIso: null,
|
||||
});
|
||||
}}
|
||||
data-testid="company-incorp-country-inline"
|
||||
/>
|
||||
</EditableRow>
|
||||
<EditableRow label="Incorporation Region">
|
||||
<SubdivisionCombobox
|
||||
value={company.incorporationSubdivisionIso}
|
||||
onChange={(code) => {
|
||||
void mutation.mutateAsync({ incorporationSubdivisionIso: code });
|
||||
}}
|
||||
country={(company.incorporationCountryIso as CountryCode | null) ?? null}
|
||||
data-testid="company-incorp-subdivision-inline"
|
||||
/>
|
||||
</EditableRow>
|
||||
<EditableRow label="Incorporation Date">
|
||||
|
||||
Reference in New Issue
Block a user