2026-04-24 13:32:28 +02:00
|
|
|
'use client';
|
|
|
|
|
|
2026-05-13 11:50:07 +02:00
|
|
|
import { useState } from 'react';
|
2026-04-24 13:32:28 +02:00
|
|
|
import { Check, ChevronsUpDown } from 'lucide-react';
|
|
|
|
|
import { useQuery } from '@tanstack/react-query';
|
|
|
|
|
|
|
|
|
|
import { Button } from '@/components/ui/button';
|
|
|
|
|
import {
|
|
|
|
|
Command,
|
|
|
|
|
CommandEmpty,
|
|
|
|
|
CommandGroup,
|
|
|
|
|
CommandInput,
|
|
|
|
|
CommandItem,
|
|
|
|
|
CommandList,
|
|
|
|
|
} from '@/components/ui/command';
|
|
|
|
|
import { Popover, PopoverContent, PopoverTrigger } from '@/components/ui/popover';
|
|
|
|
|
import { useDebounce } from '@/hooks/use-debounce';
|
|
|
|
|
import { apiFetch } from '@/lib/api/client';
|
|
|
|
|
import { cn } from '@/lib/utils';
|
|
|
|
|
|
|
|
|
|
export type OwnerRef = { type: 'client' | 'company'; id: string };
|
|
|
|
|
|
|
|
|
|
interface OwnerOption {
|
|
|
|
|
id: string;
|
|
|
|
|
name?: string | null;
|
|
|
|
|
fullName?: string | null;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
interface OwnerPickerProps {
|
|
|
|
|
value: OwnerRef | null;
|
|
|
|
|
onChange: (value: OwnerRef | null) => void;
|
|
|
|
|
/** Optional placeholder when empty */
|
|
|
|
|
placeholder?: string;
|
|
|
|
|
/** Disable the component */
|
|
|
|
|
disabled?: boolean;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
export function OwnerPicker({
|
|
|
|
|
value,
|
|
|
|
|
onChange,
|
|
|
|
|
placeholder = 'Select owner...',
|
|
|
|
|
disabled,
|
|
|
|
|
}: OwnerPickerProps) {
|
|
|
|
|
const [open, setOpen] = useState(false);
|
2026-05-13 11:50:07 +02:00
|
|
|
// `type` is derived: when an owner is selected the prop wins; with no
|
|
|
|
|
// selection the user's local tab pick is the source of truth. Render-
|
|
|
|
|
// phase derivation replaces the prior useEffect(setType, [value?.type])
|
|
|
|
|
// that the Compiler flagged as set-state-in-effect.
|
|
|
|
|
const [localType, setLocalType] = useState<'client' | 'company'>(value?.type ?? 'client');
|
|
|
|
|
const type: 'client' | 'company' = value?.type ?? localType;
|
|
|
|
|
const setType = setLocalType;
|
2026-04-24 13:32:28 +02:00
|
|
|
const [search, setSearch] = useState('');
|
|
|
|
|
const debounced = useDebounce(search, 300);
|
|
|
|
|
|
|
|
|
|
const endpoint =
|
|
|
|
|
type === 'client'
|
|
|
|
|
? `/api/v1/clients/options?search=${encodeURIComponent(debounced)}`
|
|
|
|
|
: `/api/v1/companies/autocomplete?q=${encodeURIComponent(debounced)}`;
|
|
|
|
|
|
|
|
|
|
const { data } = useQuery<{ data: OwnerOption[] }>({
|
|
|
|
|
queryKey: ['owner-picker', type, debounced],
|
|
|
|
|
queryFn: () => apiFetch(endpoint),
|
|
|
|
|
enabled: open,
|
|
|
|
|
});
|
|
|
|
|
|
|
|
|
|
const options = data?.data ?? [];
|
|
|
|
|
|
2026-05-12 14:50:58 +02:00
|
|
|
// Resolve the current value's display name even before the picker is opened.
|
|
|
|
|
// Without this primer query the trigger button rendered "Client <8-char-id>"
|
|
|
|
|
// on first paint and only filled in the real name after the user opened the
|
|
|
|
|
// dropdown (which kicked the list query). The lookup hits a per-id endpoint
|
|
|
|
|
// when possible and falls back to scanning the cached options array.
|
|
|
|
|
const valueLookupEndpoint = value
|
|
|
|
|
? value.type === 'client'
|
|
|
|
|
? `/api/v1/clients/${value.id}`
|
|
|
|
|
: `/api/v1/companies/${value.id}`
|
|
|
|
|
: null;
|
|
|
|
|
|
|
|
|
|
const { data: valueDetail } = useQuery<{
|
|
|
|
|
data: { id: string; name?: string | null; fullName?: string | null };
|
|
|
|
|
}>({
|
|
|
|
|
queryKey: ['owner-picker-resolve', value?.type, value?.id],
|
|
|
|
|
queryFn: () => apiFetch(valueLookupEndpoint!),
|
|
|
|
|
enabled: !!value && !!valueLookupEndpoint,
|
|
|
|
|
staleTime: 60_000,
|
|
|
|
|
});
|
|
|
|
|
|
|
|
|
|
// Selected display label - prefer the resolved entity name; fall back to a
|
|
|
|
|
// truncated id only when both the primer query and the options list miss.
|
2026-04-24 13:32:28 +02:00
|
|
|
const selectedLabel = (() => {
|
|
|
|
|
if (!value) return placeholder;
|
2026-05-12 14:50:58 +02:00
|
|
|
if (valueDetail?.data) {
|
feat: round 2 — stage prompts, berth header, EOI inline edit, measurement units
Berth surfaces
- New compact mooring-chip header (colored plate + status pill, dock-label
in tooltip) replaces the redundant "Berth B1 / Sold / B DOCK" stack
- Berth list gains a "Latest deal stage" column showing the most-advanced
pipeline stage of any active linked interest (server-aggregated, ranks by
PIPELINE_STAGES index)
- "Linked prospect" Select on the status-change dialog rebuilt as a Command
combobox: search, recent-first sort, stage-coloured pills
Pipeline UX
- Reverting an interest to Open with linked berths now prompts: keep the
links, unlink and reset, or cancel. Silent when no berths are linked
- Activity feed + entity-activity feed normalise enum field values via
STAGE_LABELS / formatSource: "deposit_10pct → contract_sent" reads as
"10% Deposit → Contract Sent"
EOI generate dialog
- Inline-editable rows for client name, nationality (country combobox), and
yacht name — pencil affordance saves directly via clients/yachts PATCH
- Replaces the single "Edit on client's page" link with two contextual links
framed by short copy explaining what's inline vs what needs the canonical
page
- Backend EoiContext now includes client.id + yacht.id so the dialog can
PATCH without an extra round-trip
Company form
- New "Connections" section lets the rep attach members (clients) and yachts
during create. Yacht attach uses the existing transfer endpoint so audit
log + ownership history capture the change
- Inline "+ New client" / "+ New yacht" buttons open the canonical forms
stacked over the company sheet
- After save, the form chains to a yacht pull-in prompt (if any attached
client owns yachts not yet linked) and an optional "Create interest" step
pre-filled with the first attached client
Admin
- /admin landing gains a searchable index — typed query flattens groups into
a result list matching label + description + group title
- "Documenso & EOI" card relabelled to "EOI signing service" (consistent
with the user-facing language rename from round 1)
Measurement units (migration 0053)
- interests gains desired_*_m columns + desired_*_unit discriminators so
the rep's literal entry (ft OR m) is preserved verbatim instead of being
reconstructed from a single canonical column on every render
- yachts + berths gain matching *_unit columns alongside their existing
ft + m pairs; defaults to 'ft' so legacy rows still render normally
- Interest form POST/PATCH now sends both ft + m + unit; computed m is
derived from the ft canonical to keep the recommender SQL unchanged
Misc
- Active-deals tile + topbar type their Link href as `Route` instead of `any`
- Unused REPORT_TYPE_LABELS const dropped from generate-report-form
- Test fixtures (fill-eoi-form, documenso-payload, public-berths) updated
to include the new id + unit fields on the EoiContext / Berth shapes
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
2026-05-12 15:28:22 +02:00
|
|
|
const name = value.type === 'client' ? valueDetail.data.fullName : valueDetail.data.name;
|
2026-05-12 14:50:58 +02:00
|
|
|
if (name) return name;
|
|
|
|
|
}
|
2026-04-24 13:32:28 +02:00
|
|
|
const match = options.find((o) => o.id === value.id);
|
|
|
|
|
if (match) {
|
|
|
|
|
return type === 'client'
|
|
|
|
|
? (match.fullName ?? '(unnamed client)')
|
|
|
|
|
: (match.name ?? '(unnamed company)');
|
|
|
|
|
}
|
|
|
|
|
return value.type === 'client'
|
|
|
|
|
? `Client ${value.id.slice(0, 8)}`
|
|
|
|
|
: `Company ${value.id.slice(0, 8)}`;
|
|
|
|
|
})();
|
|
|
|
|
|
|
|
|
|
return (
|
2026-05-12 14:50:58 +02:00
|
|
|
<Popover open={open} onOpenChange={setOpen} modal>
|
2026-04-24 13:32:28 +02:00
|
|
|
<PopoverTrigger asChild>
|
|
|
|
|
<Button
|
|
|
|
|
variant="outline"
|
|
|
|
|
role="combobox"
|
|
|
|
|
disabled={disabled}
|
|
|
|
|
className={cn('w-full justify-between', !value && 'text-muted-foreground')}
|
|
|
|
|
>
|
|
|
|
|
<span className="truncate">
|
|
|
|
|
{value && (
|
|
|
|
|
<span className="mr-2 text-xs opacity-60">
|
|
|
|
|
{value.type === 'client' ? 'Client:' : 'Company:'}
|
|
|
|
|
</span>
|
|
|
|
|
)}
|
|
|
|
|
{selectedLabel}
|
|
|
|
|
</span>
|
|
|
|
|
<ChevronsUpDown className="ml-2 h-4 w-4 shrink-0 opacity-50" />
|
|
|
|
|
</Button>
|
|
|
|
|
</PopoverTrigger>
|
|
|
|
|
<PopoverContent className="w-[320px] p-0" align="start">
|
|
|
|
|
{/* Type toggle */}
|
|
|
|
|
<div className="flex border-b">
|
|
|
|
|
<button
|
|
|
|
|
type="button"
|
|
|
|
|
onClick={() => {
|
|
|
|
|
setType('client');
|
|
|
|
|
setSearch('');
|
|
|
|
|
}}
|
|
|
|
|
className={cn(
|
|
|
|
|
'flex-1 px-3 py-2 text-xs',
|
|
|
|
|
type === 'client' ? 'bg-accent font-medium' : 'hover:bg-accent/50',
|
|
|
|
|
)}
|
|
|
|
|
>
|
|
|
|
|
Client
|
|
|
|
|
</button>
|
|
|
|
|
<button
|
|
|
|
|
type="button"
|
|
|
|
|
onClick={() => {
|
|
|
|
|
setType('company');
|
|
|
|
|
setSearch('');
|
|
|
|
|
}}
|
|
|
|
|
className={cn(
|
|
|
|
|
'flex-1 px-3 py-2 text-xs',
|
|
|
|
|
type === 'company' ? 'bg-accent font-medium' : 'hover:bg-accent/50',
|
|
|
|
|
)}
|
|
|
|
|
>
|
|
|
|
|
Company
|
|
|
|
|
</button>
|
|
|
|
|
</div>
|
|
|
|
|
|
|
|
|
|
<Command shouldFilter={false}>
|
|
|
|
|
<CommandInput placeholder={`Search ${type}s…`} value={search} onValueChange={setSearch} />
|
|
|
|
|
<CommandList>
|
|
|
|
|
<CommandEmpty>No results.</CommandEmpty>
|
|
|
|
|
<CommandGroup>
|
|
|
|
|
{options.map((opt) => {
|
|
|
|
|
const label =
|
|
|
|
|
type === 'client' ? (opt.fullName ?? '(unnamed)') : (opt.name ?? '(unnamed)');
|
|
|
|
|
const isSelected = value?.id === opt.id && value?.type === type;
|
|
|
|
|
return (
|
|
|
|
|
<CommandItem
|
|
|
|
|
key={opt.id}
|
|
|
|
|
value={opt.id}
|
|
|
|
|
onSelect={() => {
|
|
|
|
|
onChange({ type, id: opt.id });
|
|
|
|
|
setOpen(false);
|
|
|
|
|
}}
|
|
|
|
|
>
|
|
|
|
|
<Check
|
|
|
|
|
className={cn('mr-2 h-4 w-4', isSelected ? 'opacity-100' : 'opacity-0')}
|
|
|
|
|
/>
|
|
|
|
|
{label}
|
|
|
|
|
</CommandItem>
|
|
|
|
|
);
|
|
|
|
|
})}
|
|
|
|
|
</CommandGroup>
|
|
|
|
|
</CommandList>
|
|
|
|
|
</Command>
|
|
|
|
|
</PopoverContent>
|
|
|
|
|
</Popover>
|
|
|
|
|
);
|
|
|
|
|
}
|