feat(interests): linked berths list with role-flag toggles + EOI bypass
Implements plan §5.5: a per-interest "Linked berths" panel mounted above the
recommender on the interest detail Overview tab. Each junction row exposes
the role-flag controls reps need to manage the M:M `interest_berths` link
without the legacy single-berth flow.
UI (`src/components/interests/linked-berths-list.tsx`)
* Rows ordered with primary first; mooring number links to /berths/[id], with
area + a status pill (available/under_offer/sold) and a "Primary" chip.
* "Specifically pitching" Switch (writes `is_specific_interest`) with the
consequence text from §1: "This berth will appear as under interest on the
public map" / "This berth is hidden from the public map".
* "Mark in EOI bundle" Switch (writes `is_in_eoi_bundle`).
* "Set as primary" button when the row isn't primary - the existing
`upsertInterestBerth` helper demotes the prior primary in the same tx.
* "Bypass EOI for this berth" with reason textarea, ONLY rendered when the
parent interest's `eoiStatus === 'signed'`. Writes the bypass triple
(`eoi_bypass_reason`, `eoi_bypassed_by` = caller, `eoi_bypassed_at` = now);
also supports clearing.
* Remove-from-interest action gated by a confirmation dialog.
API (`src/app/api/v1/interests/[id]/berths/...`)
* `GET /` - list endpoint returning `listBerthsForInterest` plus the parent
interest's `eoiStatus` in `meta.eoiStatus` so the UI can decide whether to
show the bypass control.
* `PATCH /[berthId]` - partial update of the junction row's flags + bypass
fields. Server-side guard: rejects bypass writes when `eoiStatus !==
'signed'` (defence in depth - never trust the UI to gate this).
* `DELETE /[berthId]` - calls `removeInterestBerth`.
* The existing POST stays unchanged. All routes wrapped with
`withAuth(withPermission('interests', view|edit, ...))`. portId from ctx;
cross-port reads/writes return 404 for enumeration prevention (§14.10).
Service changes (`src/lib/services/interest-berths.service.ts`)
* `upsertInterestBerth` now accepts `eoiBypassReason` (tri-state: omit = no
change, non-empty = record, null = clear) and `eoiBypassedBy`. The bypass
triple moves as a unit, with `eoi_bypassed_at` stamped server-side.
* `listBerthsForInterest` now returns berth detail (area, status, dimensions)
alongside the junction row, typed as `InterestBerthWithDetails`.
Socket: added `interest:berthLinkUpdated` event for live UI refreshes.
Tests: 18 new integration tests in `tests/integration/api/interest-berths.test.ts`
covering happy paths, primary-demotion in same tx, bypass write/clear, the
"requires signed EOI" guard, cross-port 404s, missing-link 404s, empty-body
400, and viewer 403 through the permission gate.
This commit is contained in:
@@ -13,6 +13,7 @@ import { InlineEditableField } from '@/components/shared/inline-editable-field';
|
||||
import { InlineTagEditor } from '@/components/shared/inline-tag-editor';
|
||||
import { RecommendationList } from '@/components/interests/recommendation-list';
|
||||
import { BerthRecommenderPanel } from '@/components/interests/berth-recommender-panel';
|
||||
import { LinkedBerthsList } from '@/components/interests/linked-berths-list';
|
||||
import { InterestTimeline } from '@/components/interests/interest-timeline';
|
||||
import { InterestDocumentsTab } from '@/components/interests/interest-documents-tab';
|
||||
import { InterestFilesTab } from '@/components/interests/interest-files-tab';
|
||||
@@ -510,6 +511,12 @@ function OverviewTab({
|
||||
</div>
|
||||
</div>
|
||||
|
||||
{/* Linked berths (plan §5.5) - shown ABOVE the recommender so reps see
|
||||
what's already linked before browsing more options. Each row exposes
|
||||
per-berth role-flag toggles and the EOI bypass control (only visible
|
||||
once the parent interest's primary EOI is signed). */}
|
||||
<LinkedBerthsList interestId={interestId} />
|
||||
|
||||
{/* Berth recommender (plan §5.3) - always-mounted card driven by the
|
||||
interest's desired dimensions. Renders an inline guidance message
|
||||
when dimensions aren't set yet. */}
|
||||
|
||||
478
src/components/interests/linked-berths-list.tsx
Normal file
478
src/components/interests/linked-berths-list.tsx
Normal file
@@ -0,0 +1,478 @@
|
||||
'use client';
|
||||
|
||||
/**
|
||||
* Linked-berths list — plan §5.5.
|
||||
*
|
||||
* Shows every berth currently linked to the interest with per-row controls:
|
||||
* - "Specifically pitching" toggle (`is_specific_interest`) — drives the
|
||||
* public-map "Under Offer" sub-status. Each state surfaces its consequence
|
||||
* in plain text below the toggle.
|
||||
* - "Mark in EOI bundle" toggle (`is_in_eoi_bundle`).
|
||||
* - "Set as primary" button when this row isn't already primary. The
|
||||
* service helper handles the demote-prior-primary case in a single tx.
|
||||
* - "Bypass EOI for this berth" with a reason textarea. Only rendered when
|
||||
* the parent interest's `eoiStatus === 'signed'`. Writes
|
||||
* `eoi_bypass_reason`, `eoi_bypassed_by`, `eoi_bypassed_at`.
|
||||
* - "Remove" — calls `removeInterestBerth`.
|
||||
*/
|
||||
|
||||
import { useState } from 'react';
|
||||
import Link from 'next/link';
|
||||
import { useParams } from 'next/navigation';
|
||||
import { useMutation, useQuery, useQueryClient } from '@tanstack/react-query';
|
||||
import { Anchor, Loader2, Star, Trash2 } from 'lucide-react';
|
||||
|
||||
import { Button } from '@/components/ui/button';
|
||||
import { Card, CardContent, CardHeader, CardTitle } from '@/components/ui/card';
|
||||
import {
|
||||
Dialog,
|
||||
DialogContent,
|
||||
DialogDescription,
|
||||
DialogFooter,
|
||||
DialogHeader,
|
||||
DialogTitle,
|
||||
} from '@/components/ui/dialog';
|
||||
import { Label } from '@/components/ui/label';
|
||||
import { StatusPill, type StatusPillStatus } from '@/components/ui/status-pill';
|
||||
import { Switch } from '@/components/ui/switch';
|
||||
import { Textarea } from '@/components/ui/textarea';
|
||||
import { apiFetch } from '@/lib/api/client';
|
||||
import { cn } from '@/lib/utils';
|
||||
|
||||
// ─── Types (mirror the API GET shape — see interest-berths.service.ts) ─────
|
||||
|
||||
export interface LinkedBerthRow {
|
||||
id: string;
|
||||
interestId: string;
|
||||
berthId: string;
|
||||
isPrimary: boolean;
|
||||
isSpecificInterest: boolean;
|
||||
isInEoiBundle: boolean;
|
||||
eoiBypassReason: string | null;
|
||||
eoiBypassedBy: string | null;
|
||||
eoiBypassedAt: string | null;
|
||||
addedBy: string | null;
|
||||
addedAt: string;
|
||||
notes: string | null;
|
||||
mooringNumber: string | null;
|
||||
area: string | null;
|
||||
status: string;
|
||||
lengthFt: string | null;
|
||||
widthFt: string | null;
|
||||
draftFt: string | null;
|
||||
}
|
||||
|
||||
interface LinkedBerthsResponse {
|
||||
data: LinkedBerthRow[];
|
||||
meta: { eoiStatus: string | null };
|
||||
}
|
||||
|
||||
interface LinkedBerthsListProps {
|
||||
interestId: string;
|
||||
}
|
||||
|
||||
// ─── Helpers ────────────────────────────────────────────────────────────────
|
||||
|
||||
function statusToPill(status: string): StatusPillStatus {
|
||||
switch (status) {
|
||||
case 'available':
|
||||
return 'active';
|
||||
case 'under_offer':
|
||||
return 'sent';
|
||||
case 'sold':
|
||||
return 'completed';
|
||||
case 'reserved':
|
||||
return 'partial';
|
||||
default:
|
||||
return 'pending';
|
||||
}
|
||||
}
|
||||
|
||||
function formatStatus(status: string): string {
|
||||
return status.replace(/_/g, ' ').replace(/\b\w/g, (m) => m.toUpperCase());
|
||||
}
|
||||
|
||||
function formatDimensions(
|
||||
length: string | null,
|
||||
width: string | null,
|
||||
draft: string | null,
|
||||
): string | null {
|
||||
const parts: string[] = [];
|
||||
const toNum = (v: string | null) => {
|
||||
if (v === null) return null;
|
||||
const n = parseFloat(v);
|
||||
return Number.isFinite(n) ? n : null;
|
||||
};
|
||||
const l = toNum(length);
|
||||
const w = toNum(width);
|
||||
const d = toNum(draft);
|
||||
if (l !== null) parts.push(`${l.toFixed(1)}ft L`);
|
||||
if (w !== null) parts.push(`${w.toFixed(1)}ft W`);
|
||||
if (d !== null) parts.push(`${d.toFixed(1)}ft D`);
|
||||
return parts.length > 0 ? parts.join(' · ') : null;
|
||||
}
|
||||
|
||||
const SPECIFIC_CONSEQUENCE_ON = 'This berth will appear as under interest on the public map.';
|
||||
const SPECIFIC_CONSEQUENCE_OFF = 'This berth is hidden from the public map.';
|
||||
|
||||
// ─── Hooks ──────────────────────────────────────────────────────────────────
|
||||
|
||||
function useLinkedBerths(interestId: string) {
|
||||
return useQuery({
|
||||
queryKey: ['interest-berths', interestId] as const,
|
||||
queryFn: () => apiFetch<LinkedBerthsResponse>(`/api/v1/interests/${interestId}/berths`),
|
||||
staleTime: 30_000,
|
||||
});
|
||||
}
|
||||
|
||||
interface PatchPayload {
|
||||
isPrimary?: boolean;
|
||||
isSpecificInterest?: boolean;
|
||||
isInEoiBundle?: boolean;
|
||||
eoiBypassReason?: string | null;
|
||||
}
|
||||
|
||||
function useUpdateLink(interestId: string) {
|
||||
const qc = useQueryClient();
|
||||
return useMutation({
|
||||
mutationFn: async (args: { berthId: string; patch: PatchPayload }) =>
|
||||
apiFetch(`/api/v1/interests/${interestId}/berths/${args.berthId}`, {
|
||||
method: 'PATCH',
|
||||
body: args.patch,
|
||||
}),
|
||||
onSuccess: () => {
|
||||
qc.invalidateQueries({ queryKey: ['interest-berths', interestId] });
|
||||
qc.invalidateQueries({ queryKey: ['interests', interestId] });
|
||||
},
|
||||
});
|
||||
}
|
||||
|
||||
function useRemoveLink(interestId: string) {
|
||||
const qc = useQueryClient();
|
||||
return useMutation({
|
||||
mutationFn: async (berthId: string) =>
|
||||
apiFetch(`/api/v1/interests/${interestId}/berths/${berthId}`, { method: 'DELETE' }),
|
||||
onSuccess: () => {
|
||||
qc.invalidateQueries({ queryKey: ['interest-berths', interestId] });
|
||||
qc.invalidateQueries({ queryKey: ['interests', interestId] });
|
||||
qc.invalidateQueries({ queryKey: ['berth-recommendations', interestId] });
|
||||
},
|
||||
});
|
||||
}
|
||||
|
||||
// ─── Bypass dialog ──────────────────────────────────────────────────────────
|
||||
|
||||
interface BypassDialogProps {
|
||||
row: LinkedBerthRow;
|
||||
open: boolean;
|
||||
onOpenChange: (open: boolean) => void;
|
||||
onSubmit: (reason: string | null) => void;
|
||||
isPending: boolean;
|
||||
}
|
||||
|
||||
function BypassDialog({ row, open, onOpenChange, onSubmit, isPending }: BypassDialogProps) {
|
||||
const [reason, setReason] = useState(row.eoiBypassReason ?? '');
|
||||
return (
|
||||
<Dialog open={open} onOpenChange={onOpenChange}>
|
||||
<DialogContent>
|
||||
<DialogHeader>
|
||||
<DialogTitle>Bypass EOI for berth {row.mooringNumber}</DialogTitle>
|
||||
<DialogDescription>
|
||||
Record why this berth's individual EOI is being waived. The interest's primary
|
||||
EOI signature will cover it instead.
|
||||
</DialogDescription>
|
||||
</DialogHeader>
|
||||
<div className="space-y-2">
|
||||
<Label htmlFor={`bypass-reason-${row.berthId}`} className="text-xs">
|
||||
Reason
|
||||
</Label>
|
||||
<Textarea
|
||||
id={`bypass-reason-${row.berthId}`}
|
||||
value={reason}
|
||||
onChange={(e) => setReason(e.target.value)}
|
||||
placeholder="e.g. covered under bundle EOI signed 2025-04-12"
|
||||
rows={4}
|
||||
/>
|
||||
</div>
|
||||
<DialogFooter className="gap-2 sm:gap-2">
|
||||
{row.eoiBypassReason ? (
|
||||
<Button
|
||||
type="button"
|
||||
variant="outline"
|
||||
onClick={() => onSubmit(null)}
|
||||
disabled={isPending}
|
||||
>
|
||||
Clear bypass
|
||||
</Button>
|
||||
) : null}
|
||||
<Button
|
||||
type="button"
|
||||
variant="outline"
|
||||
onClick={() => onOpenChange(false)}
|
||||
disabled={isPending}
|
||||
>
|
||||
Cancel
|
||||
</Button>
|
||||
<Button
|
||||
type="button"
|
||||
onClick={() => onSubmit(reason.trim().length > 0 ? reason.trim() : null)}
|
||||
disabled={isPending || reason.trim().length === 0}
|
||||
>
|
||||
{isPending ? <Loader2 className="mr-1.5 size-3.5 animate-spin" /> : null}
|
||||
Save bypass
|
||||
</Button>
|
||||
</DialogFooter>
|
||||
</DialogContent>
|
||||
</Dialog>
|
||||
);
|
||||
}
|
||||
|
||||
// ─── Row ────────────────────────────────────────────────────────────────────
|
||||
|
||||
interface RowProps {
|
||||
row: LinkedBerthRow;
|
||||
portSlug: string;
|
||||
eoiStatus: string | null;
|
||||
onUpdate: (berthId: string, patch: PatchPayload) => void;
|
||||
onRemove: (berthId: string) => void;
|
||||
isPending: boolean;
|
||||
}
|
||||
|
||||
function LinkedBerthRowItem({ row, portSlug, eoiStatus, onUpdate, onRemove, isPending }: RowProps) {
|
||||
const [bypassOpen, setBypassOpen] = useState(false);
|
||||
const [confirmRemove, setConfirmRemove] = useState(false);
|
||||
const dims = formatDimensions(row.lengthFt, row.widthFt, row.draftFt);
|
||||
const showBypassControl = eoiStatus === 'signed';
|
||||
|
||||
return (
|
||||
<div
|
||||
className={cn(
|
||||
'rounded-lg border bg-card p-3 text-sm',
|
||||
row.isPrimary ? 'border-brand-300 ring-1 ring-brand-200' : 'border-border',
|
||||
)}
|
||||
>
|
||||
<div className="flex flex-wrap items-start justify-between gap-2">
|
||||
<div className="min-w-0 space-y-1">
|
||||
<div className="flex flex-wrap items-center gap-2">
|
||||
<Link
|
||||
href={`/${portSlug}/berths/${row.berthId}`}
|
||||
className="font-semibold text-primary hover:underline"
|
||||
>
|
||||
{row.mooringNumber ?? row.berthId}
|
||||
</Link>
|
||||
{row.area ? <span className="text-xs text-muted-foreground">{row.area}</span> : null}
|
||||
<StatusPill status={statusToPill(row.status)}>{formatStatus(row.status)}</StatusPill>
|
||||
{row.isPrimary ? (
|
||||
<span className="inline-flex items-center gap-1 rounded-md border border-brand-200 bg-brand-50 px-2 py-0.5 text-xs font-medium text-brand-800">
|
||||
<Star className="size-3" />
|
||||
Primary
|
||||
</span>
|
||||
) : null}
|
||||
{row.eoiBypassReason ? (
|
||||
<span className="inline-flex items-center rounded-md border border-amber-200 bg-amber-50 px-2 py-0.5 text-xs font-medium text-amber-800">
|
||||
EOI bypassed
|
||||
</span>
|
||||
) : null}
|
||||
</div>
|
||||
{dims ? <div className="text-xs text-muted-foreground">{dims}</div> : null}
|
||||
</div>
|
||||
<div className="flex flex-wrap items-center gap-2">
|
||||
{!row.isPrimary ? (
|
||||
<Button
|
||||
type="button"
|
||||
size="sm"
|
||||
variant="outline"
|
||||
onClick={() => onUpdate(row.berthId, { isPrimary: true })}
|
||||
disabled={isPending}
|
||||
>
|
||||
<Star className="mr-1.5 size-3.5" />
|
||||
Set as primary
|
||||
</Button>
|
||||
) : null}
|
||||
<Button
|
||||
type="button"
|
||||
size="sm"
|
||||
variant="ghost"
|
||||
onClick={() => setConfirmRemove(true)}
|
||||
disabled={isPending}
|
||||
className="text-destructive hover:text-destructive"
|
||||
aria-label={`Remove berth ${row.mooringNumber ?? row.berthId}`}
|
||||
>
|
||||
<Trash2 className="size-3.5" />
|
||||
</Button>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div className="mt-3 grid grid-cols-1 gap-3 border-t pt-3 sm:grid-cols-2">
|
||||
<div className="space-y-1">
|
||||
<div className="flex items-center justify-between gap-2">
|
||||
<Label htmlFor={`specific-${row.berthId}`} className="text-sm font-medium">
|
||||
Specifically pitching
|
||||
</Label>
|
||||
<Switch
|
||||
id={`specific-${row.berthId}`}
|
||||
checked={row.isSpecificInterest}
|
||||
disabled={isPending}
|
||||
onCheckedChange={(checked) => onUpdate(row.berthId, { isSpecificInterest: checked })}
|
||||
/>
|
||||
</div>
|
||||
<p className="text-xs text-muted-foreground">
|
||||
{row.isSpecificInterest ? SPECIFIC_CONSEQUENCE_ON : SPECIFIC_CONSEQUENCE_OFF}
|
||||
</p>
|
||||
</div>
|
||||
<div className="space-y-1">
|
||||
<div className="flex items-center justify-between gap-2">
|
||||
<Label htmlFor={`bundle-${row.berthId}`} className="text-sm font-medium">
|
||||
Mark in EOI bundle
|
||||
</Label>
|
||||
<Switch
|
||||
id={`bundle-${row.berthId}`}
|
||||
checked={row.isInEoiBundle}
|
||||
disabled={isPending}
|
||||
onCheckedChange={(checked) => onUpdate(row.berthId, { isInEoiBundle: checked })}
|
||||
/>
|
||||
</div>
|
||||
<p className="text-xs text-muted-foreground">
|
||||
{row.isInEoiBundle
|
||||
? 'Covered by the interest’s EOI signature.'
|
||||
: 'Not covered by the EOI bundle.'}
|
||||
</p>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
{showBypassControl ? (
|
||||
<div className="mt-3 flex flex-wrap items-start justify-between gap-2 border-t pt-3">
|
||||
<div className="min-w-0 space-y-0.5">
|
||||
<p className="text-sm font-medium">Bypass EOI for this berth</p>
|
||||
{row.eoiBypassReason ? (
|
||||
<p className="text-xs text-muted-foreground">
|
||||
<span className="font-medium text-foreground/80">Bypassed:</span>{' '}
|
||||
{row.eoiBypassReason}
|
||||
</p>
|
||||
) : (
|
||||
<p className="text-xs text-muted-foreground">
|
||||
Record a reason if this berth doesn't need its own EOI.
|
||||
</p>
|
||||
)}
|
||||
</div>
|
||||
<Button
|
||||
type="button"
|
||||
size="sm"
|
||||
variant="outline"
|
||||
onClick={() => setBypassOpen(true)}
|
||||
disabled={isPending}
|
||||
>
|
||||
{row.eoiBypassReason ? 'Edit bypass' : 'Add bypass'}
|
||||
</Button>
|
||||
</div>
|
||||
) : null}
|
||||
|
||||
{bypassOpen ? (
|
||||
<BypassDialog
|
||||
row={row}
|
||||
open={bypassOpen}
|
||||
onOpenChange={setBypassOpen}
|
||||
isPending={isPending}
|
||||
onSubmit={(reason) => {
|
||||
onUpdate(row.berthId, { eoiBypassReason: reason });
|
||||
setBypassOpen(false);
|
||||
}}
|
||||
/>
|
||||
) : null}
|
||||
|
||||
<Dialog open={confirmRemove} onOpenChange={setConfirmRemove}>
|
||||
<DialogContent>
|
||||
<DialogHeader>
|
||||
<DialogTitle>Remove berth {row.mooringNumber} from interest?</DialogTitle>
|
||||
<DialogDescription>
|
||||
The berth itself isn't deleted — only its link to this interest.
|
||||
</DialogDescription>
|
||||
</DialogHeader>
|
||||
<DialogFooter className="gap-2 sm:gap-2">
|
||||
<Button
|
||||
type="button"
|
||||
variant="outline"
|
||||
onClick={() => setConfirmRemove(false)}
|
||||
disabled={isPending}
|
||||
>
|
||||
Cancel
|
||||
</Button>
|
||||
<Button
|
||||
type="button"
|
||||
variant="destructive"
|
||||
onClick={() => {
|
||||
onRemove(row.berthId);
|
||||
setConfirmRemove(false);
|
||||
}}
|
||||
disabled={isPending}
|
||||
>
|
||||
Remove
|
||||
</Button>
|
||||
</DialogFooter>
|
||||
</DialogContent>
|
||||
</Dialog>
|
||||
</div>
|
||||
);
|
||||
}
|
||||
|
||||
// ─── Component ──────────────────────────────────────────────────────────────
|
||||
|
||||
export function LinkedBerthsList({ interestId }: LinkedBerthsListProps) {
|
||||
const params = useParams<{ portSlug: string }>();
|
||||
const portSlug = params?.portSlug ?? '';
|
||||
const { data, isLoading } = useLinkedBerths(interestId);
|
||||
const updateMutation = useUpdateLink(interestId);
|
||||
const removeMutation = useRemoveLink(interestId);
|
||||
|
||||
const rows = data?.data ?? [];
|
||||
const eoiStatus = data?.meta.eoiStatus ?? null;
|
||||
const isPending = updateMutation.isPending || removeMutation.isPending;
|
||||
|
||||
return (
|
||||
<Card>
|
||||
<CardHeader>
|
||||
<CardTitle className="flex items-center gap-2 text-base">
|
||||
<Anchor className="size-4 text-brand-600" />
|
||||
Linked berths{rows.length > 0 ? ` (${rows.length})` : ''}
|
||||
</CardTitle>
|
||||
</CardHeader>
|
||||
<CardContent className="space-y-3">
|
||||
{isLoading ? (
|
||||
<div className="space-y-2">
|
||||
{[0, 1].map((i) => (
|
||||
<div key={i} className="h-24 animate-pulse rounded-lg bg-muted" />
|
||||
))}
|
||||
</div>
|
||||
) : rows.length === 0 ? (
|
||||
<p className="py-6 text-center text-sm text-muted-foreground">
|
||||
No berths linked yet. Use the recommender below to add one.
|
||||
</p>
|
||||
) : (
|
||||
<div className="space-y-2">
|
||||
{rows.map((row) => (
|
||||
<LinkedBerthRowItem
|
||||
key={row.id}
|
||||
row={row}
|
||||
portSlug={portSlug}
|
||||
eoiStatus={eoiStatus}
|
||||
onUpdate={(berthId, patch) => updateMutation.mutate({ berthId, patch })}
|
||||
onRemove={(berthId) => removeMutation.mutate(berthId)}
|
||||
isPending={isPending}
|
||||
/>
|
||||
))}
|
||||
</div>
|
||||
)}
|
||||
{updateMutation.isError ? (
|
||||
<p className="text-sm text-destructive">
|
||||
{(updateMutation.error as Error)?.message ?? 'Failed to update berth.'}
|
||||
</p>
|
||||
) : null}
|
||||
{removeMutation.isError ? (
|
||||
<p className="text-sm text-destructive">
|
||||
{(removeMutation.error as Error)?.message ?? 'Failed to remove berth.'}
|
||||
</p>
|
||||
) : null}
|
||||
</CardContent>
|
||||
</Card>
|
||||
);
|
||||
}
|
||||
Reference in New Issue
Block a user