16d98d630e
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>
93 lines
2.7 KiB
TypeScript
93 lines
2.7 KiB
TypeScript
'use client';
|
|
|
|
import { useState } from 'react';
|
|
import { Loader2, Pencil } from 'lucide-react';
|
|
import { toast } from 'sonner';
|
|
|
|
import { CountryCombobox } from '@/components/shared/country-combobox';
|
|
import { getCountryName, type CountryCode } from '@/lib/i18n/countries';
|
|
import { cn } from '@/lib/utils';
|
|
|
|
interface InlineCountryFieldProps {
|
|
value: string | null | undefined;
|
|
onSave: (next: CountryCode | null) => Promise<void>;
|
|
emptyText?: string;
|
|
disabled?: boolean;
|
|
className?: string;
|
|
'data-testid'?: string;
|
|
}
|
|
|
|
/**
|
|
* Click-to-edit country picker. Renders the localized country name with a
|
|
* regional-indicator flag glyph; opens a CountryCombobox on click.
|
|
*/
|
|
export function InlineCountryField({
|
|
value,
|
|
onSave,
|
|
emptyText = '—',
|
|
disabled,
|
|
className,
|
|
'data-testid': testId,
|
|
}: InlineCountryFieldProps) {
|
|
const [editing, setEditing] = useState(false);
|
|
const [saving, setSaving] = useState(false);
|
|
|
|
async function commit(next: CountryCode | null) {
|
|
if (next === (value ?? null)) {
|
|
setEditing(false);
|
|
return;
|
|
}
|
|
setSaving(true);
|
|
try {
|
|
await onSave(next);
|
|
setEditing(false);
|
|
} catch (err) {
|
|
toast.error(err instanceof Error ? err.message : 'Failed to save');
|
|
} finally {
|
|
setSaving(false);
|
|
}
|
|
}
|
|
|
|
if (editing) {
|
|
return (
|
|
<div className={cn('flex items-center gap-1', className)}>
|
|
<CountryCombobox value={value} onChange={(iso) => void commit(iso)} data-testid={testId} />
|
|
{saving && <Loader2 className="h-3 w-3 animate-spin text-muted-foreground" />}
|
|
</div>
|
|
);
|
|
}
|
|
|
|
const display = value
|
|
? `${flagEmoji(value)} ${getCountryName(value, typeof navigator !== 'undefined' ? navigator.language : 'en')}`
|
|
: null;
|
|
|
|
return (
|
|
<button
|
|
type="button"
|
|
disabled={disabled}
|
|
onClick={() => setEditing(true)}
|
|
data-testid={testId}
|
|
className={cn(
|
|
'group inline-flex items-center gap-1.5 rounded px-1 -mx-1 py-0.5 text-left text-sm',
|
|
'hover:bg-muted/60 focus-visible:bg-muted/60 focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-ring',
|
|
disabled && 'cursor-not-allowed opacity-60 hover:bg-transparent',
|
|
className,
|
|
)}
|
|
>
|
|
<span className={cn('flex-1', !display && 'text-muted-foreground')}>
|
|
{display ?? emptyText}
|
|
</span>
|
|
{!disabled && (
|
|
<Pencil className="h-3 w-3 opacity-0 transition-opacity group-hover:opacity-50" />
|
|
)}
|
|
</button>
|
|
);
|
|
}
|
|
|
|
function flagEmoji(code: string): string {
|
|
if (code.length !== 2) return '';
|
|
const A = 0x1f1e6;
|
|
const a = 'A'.charCodeAt(0);
|
|
return String.fromCodePoint(A + code.charCodeAt(0) - a, A + code.charCodeAt(1) - a);
|
|
}
|