2026-05-12 14:50:58 +02:00
|
|
|
'use client';
|
|
|
|
|
|
|
|
|
|
import { useState } from 'react';
|
2026-05-22 15:54:41 +02:00
|
|
|
import {
|
|
|
|
|
DndContext,
|
|
|
|
|
KeyboardSensor,
|
|
|
|
|
PointerSensor,
|
|
|
|
|
closestCenter,
|
|
|
|
|
useSensor,
|
|
|
|
|
useSensors,
|
|
|
|
|
type DragEndEvent,
|
|
|
|
|
} from '@dnd-kit/core';
|
|
|
|
|
import {
|
|
|
|
|
SortableContext,
|
|
|
|
|
arrayMove,
|
|
|
|
|
sortableKeyboardCoordinates,
|
|
|
|
|
useSortable,
|
|
|
|
|
verticalListSortingStrategy,
|
|
|
|
|
} from '@dnd-kit/sortable';
|
|
|
|
|
import { CSS } from '@dnd-kit/utilities';
|
|
|
|
|
import { GripVertical, LayoutGrid } from 'lucide-react';
|
2026-05-12 14:50:58 +02:00
|
|
|
|
|
|
|
|
import { Button } from '@/components/ui/button';
|
|
|
|
|
import {
|
|
|
|
|
Dialog,
|
|
|
|
|
DialogContent,
|
|
|
|
|
DialogDescription,
|
|
|
|
|
DialogFooter,
|
|
|
|
|
DialogHeader,
|
|
|
|
|
DialogTitle,
|
|
|
|
|
DialogTrigger,
|
|
|
|
|
} from '@/components/ui/dialog';
|
|
|
|
|
import { Switch } from '@/components/ui/switch';
|
2026-05-22 15:54:41 +02:00
|
|
|
import { cn } from '@/lib/utils';
|
2026-05-12 14:50:58 +02:00
|
|
|
import { useDashboardWidgets } from '@/hooks/use-dashboard-widgets';
|
2026-05-22 15:54:41 +02:00
|
|
|
import type { DashboardWidget } from './widget-registry';
|
2026-05-12 14:50:58 +02:00
|
|
|
|
|
|
|
|
/**
|
2026-05-22 15:54:41 +02:00
|
|
|
* Combined visibility + reorder picker for the dashboard header. Two
|
|
|
|
|
* sections in one modal:
|
|
|
|
|
*
|
|
|
|
|
* 1. "On dashboard" — visible widgets, each row with a drag handle
|
|
|
|
|
* (reorder via dnd-kit single SortableContext, no buckets); flipping
|
|
|
|
|
* a switch off moves the row to section 2.
|
|
|
|
|
* 2. "Hidden" — widgets currently off; flipping a switch on appends to
|
|
|
|
|
* the bottom of section 1.
|
2026-05-12 14:50:58 +02:00
|
|
|
*
|
2026-05-22 15:54:41 +02:00
|
|
|
* Both visibility toggles and order changes commit optimistically via
|
|
|
|
|
* `useDashboardWidgets` so the dashboard reflows in the background and
|
|
|
|
|
* the rep can keep editing. The "Rearrange" button on the header is
|
|
|
|
|
* gone — order lives here too now, keeping all dashboard layout
|
|
|
|
|
* controls in one place.
|
2026-05-12 14:50:58 +02:00
|
|
|
*/
|
|
|
|
|
export function CustomizeWidgetsMenu() {
|
|
|
|
|
const [open, setOpen] = useState(false);
|
2026-05-22 15:54:41 +02:00
|
|
|
const {
|
|
|
|
|
allWidgets,
|
|
|
|
|
visibleWidgets,
|
|
|
|
|
visibility,
|
|
|
|
|
setVisible,
|
|
|
|
|
setAll,
|
|
|
|
|
setOrder,
|
|
|
|
|
resetToDefaults,
|
|
|
|
|
isSaving,
|
|
|
|
|
} = useDashboardWidgets();
|
2026-05-12 14:50:58 +02:00
|
|
|
|
|
|
|
|
const visibleCount = Object.values(visibility).filter(Boolean).length;
|
|
|
|
|
const allVisible = visibleCount === allWidgets.length;
|
|
|
|
|
const allHidden = visibleCount === 0;
|
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 matchesDefaults = allWidgets.every((w) => (visibility[w.id] ?? false) === w.defaultVisible);
|
2026-05-12 14:50:58 +02:00
|
|
|
|
2026-05-22 15:54:41 +02:00
|
|
|
// Hidden = everything not currently rendered. Sorted by registry order
|
|
|
|
|
// so it reads predictably (newly-added widgets appear at the bottom
|
|
|
|
|
// until the rep explicitly enables them).
|
|
|
|
|
const hidden = allWidgets.filter((w) => !visibility[w.id]);
|
|
|
|
|
|
|
|
|
|
const sensors = useSensors(
|
|
|
|
|
useSensor(PointerSensor, { activationConstraint: { distance: 5 } }),
|
|
|
|
|
useSensor(KeyboardSensor, { coordinateGetter: sortableKeyboardCoordinates }),
|
|
|
|
|
);
|
|
|
|
|
|
|
|
|
|
function onDragEnd(event: DragEndEvent) {
|
|
|
|
|
const { active, over } = event;
|
|
|
|
|
if (!over || active.id === over.id) return;
|
|
|
|
|
const ids = visibleWidgets.map((w) => w.id);
|
|
|
|
|
const oldIndex = ids.indexOf(String(active.id));
|
|
|
|
|
const newIndex = ids.indexOf(String(over.id));
|
|
|
|
|
if (oldIndex === -1 || newIndex === -1) return;
|
|
|
|
|
setOrder(arrayMove(ids, oldIndex, newIndex));
|
|
|
|
|
}
|
|
|
|
|
|
2026-05-12 14:50:58 +02:00
|
|
|
return (
|
|
|
|
|
<Dialog open={open} onOpenChange={setOpen}>
|
|
|
|
|
<DialogTrigger asChild>
|
|
|
|
|
<Button variant="outline" size="sm" className="gap-1.5">
|
fix(audit-wave-10): aria-hidden sweep on decorative Lucide icons (#69)
Mechanical codemod added \`aria-hidden\` to 444 self-closing single-line
Lucide icon JSX elements across 267 .tsx files in:
- shared/, layout/, dashboard/
- admin/ (all sections)
- clients/, berths/, yachts/, companies/, interests/, documents/
- reminders/, reservations/, residential/, expenses/, email/
The regex targeted only the safe pattern \`<IconName className="..." />\`
(no other props, self-closing, capitalized component name). Every match
inspected is a decorative companion to visible text or sits inside a
button whose accessible name comes from \`aria-label\` / sr-only text
— the icon itself should not be announced.
Screen readers no longer double-read the icon + the adjacent label
text (e.g. "Pencil Pencil Edit" → just "Edit"). The existing
@axe-core/playwright smoke test (\`20-accessibility.spec.ts\`) continues
to pass.
Test suite stays at 1315/1315 vitest. typescript clean.
Closes task #69 (aria-hidden sweep) from the AUDIT-2026-05-12 follow-ups
backlog.
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
2026-05-13 12:37:22 +02:00
|
|
|
<LayoutGrid className="h-4 w-4" aria-hidden />
|
2026-05-12 14:50:58 +02:00
|
|
|
Customize
|
|
|
|
|
</Button>
|
|
|
|
|
</DialogTrigger>
|
|
|
|
|
<DialogContent className="max-w-xl">
|
|
|
|
|
<DialogHeader>
|
|
|
|
|
<DialogTitle>Customize dashboard</DialogTitle>
|
|
|
|
|
<DialogDescription>
|
2026-05-22 15:54:41 +02:00
|
|
|
Drag a visible widget to change its position. Toggle the switch to show or hide. Hidden
|
|
|
|
|
widgets leave no empty space - the layout reflows to fill the available width.
|
2026-05-12 14:50:58 +02:00
|
|
|
</DialogDescription>
|
|
|
|
|
</DialogHeader>
|
|
|
|
|
|
2026-05-22 15:54:41 +02:00
|
|
|
{/* Toggle + reorder list. Capped at ~60vh with internal scroll so
|
|
|
|
|
the modal doesn't push the action footer off-screen. */}
|
2026-05-12 14:50:58 +02:00
|
|
|
<div className="max-h-[60vh] -mx-2 overflow-y-auto px-2">
|
2026-05-22 15:54:41 +02:00
|
|
|
{visibleWidgets.length > 0 ? (
|
|
|
|
|
<Section title={`On dashboard (${visibleWidgets.length})`}>
|
|
|
|
|
<DndContext
|
|
|
|
|
sensors={sensors}
|
|
|
|
|
collisionDetection={closestCenter}
|
|
|
|
|
onDragEnd={onDragEnd}
|
2026-05-12 14:50:58 +02:00
|
|
|
>
|
2026-05-22 15:54:41 +02:00
|
|
|
<SortableContext
|
|
|
|
|
items={visibleWidgets.map((w) => w.id)}
|
|
|
|
|
strategy={verticalListSortingStrategy}
|
|
|
|
|
>
|
|
|
|
|
<ul className="space-y-1">
|
|
|
|
|
{visibleWidgets.map((w, idx) => (
|
|
|
|
|
<SortableVisibleRow
|
|
|
|
|
key={w.id}
|
|
|
|
|
widget={w}
|
|
|
|
|
position={idx + 1}
|
|
|
|
|
disabled={isSaving}
|
|
|
|
|
onToggle={(checked) => setVisible(w.id, checked)}
|
|
|
|
|
/>
|
|
|
|
|
))}
|
|
|
|
|
</ul>
|
|
|
|
|
</SortableContext>
|
|
|
|
|
</DndContext>
|
|
|
|
|
</Section>
|
|
|
|
|
) : null}
|
|
|
|
|
|
|
|
|
|
{hidden.length > 0 ? (
|
|
|
|
|
<Section title={`Hidden (${hidden.length})`}>
|
|
|
|
|
<ul className="space-y-1">
|
|
|
|
|
{hidden.map((w) => (
|
|
|
|
|
<HiddenRow
|
|
|
|
|
key={w.id}
|
|
|
|
|
widget={w}
|
|
|
|
|
disabled={isSaving}
|
|
|
|
|
onToggle={(checked) => setVisible(w.id, checked)}
|
|
|
|
|
/>
|
|
|
|
|
))}
|
|
|
|
|
</ul>
|
|
|
|
|
</Section>
|
|
|
|
|
) : null}
|
2026-05-12 14:50:58 +02:00
|
|
|
</div>
|
|
|
|
|
|
|
|
|
|
<DialogFooter className="flex flex-col gap-3 sm:flex-row sm:items-center sm:justify-between sm:gap-2">
|
|
|
|
|
<span className="text-xs text-muted-foreground sm:order-first">
|
|
|
|
|
{visibleCount} of {allWidgets.length} visible
|
|
|
|
|
</span>
|
|
|
|
|
<div className="flex flex-wrap items-center gap-2 sm:flex-nowrap">
|
|
|
|
|
<Button
|
|
|
|
|
variant="ghost"
|
|
|
|
|
size="sm"
|
|
|
|
|
disabled={matchesDefaults || isSaving}
|
|
|
|
|
onClick={resetToDefaults}
|
|
|
|
|
>
|
|
|
|
|
Reset to defaults
|
|
|
|
|
</Button>
|
|
|
|
|
<Button
|
|
|
|
|
variant="outline"
|
|
|
|
|
size="sm"
|
|
|
|
|
disabled={allHidden || isSaving}
|
|
|
|
|
onClick={() => setAll(false)}
|
|
|
|
|
>
|
|
|
|
|
Hide all
|
|
|
|
|
</Button>
|
|
|
|
|
<Button
|
|
|
|
|
variant="outline"
|
|
|
|
|
size="sm"
|
|
|
|
|
disabled={allVisible || isSaving}
|
|
|
|
|
onClick={() => setAll(true)}
|
|
|
|
|
>
|
|
|
|
|
Show all
|
|
|
|
|
</Button>
|
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
|
|
|
<Button size="sm" onClick={() => setOpen(false)} className="w-full sm:w-auto">
|
2026-05-12 14:50:58 +02:00
|
|
|
Done
|
|
|
|
|
</Button>
|
|
|
|
|
</div>
|
|
|
|
|
</DialogFooter>
|
|
|
|
|
</DialogContent>
|
|
|
|
|
</Dialog>
|
|
|
|
|
);
|
|
|
|
|
}
|
2026-05-22 15:54:41 +02:00
|
|
|
|
|
|
|
|
function Section({ title, children }: { title: string; children: React.ReactNode }) {
|
|
|
|
|
return (
|
|
|
|
|
<div className="py-2 first:pt-1">
|
|
|
|
|
<div className="px-1 pb-1.5 text-[11px] font-semibold uppercase tracking-wide text-muted-foreground">
|
|
|
|
|
{title}
|
|
|
|
|
</div>
|
|
|
|
|
{children}
|
|
|
|
|
</div>
|
|
|
|
|
);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
function SortableVisibleRow({
|
|
|
|
|
widget,
|
|
|
|
|
position,
|
|
|
|
|
disabled,
|
|
|
|
|
onToggle,
|
|
|
|
|
}: {
|
|
|
|
|
widget: DashboardWidget;
|
|
|
|
|
position: number;
|
|
|
|
|
disabled: boolean;
|
|
|
|
|
onToggle: (checked: boolean) => void;
|
|
|
|
|
}) {
|
|
|
|
|
const { attributes, listeners, setNodeRef, transform, transition, isDragging } = useSortable({
|
|
|
|
|
id: widget.id,
|
|
|
|
|
});
|
|
|
|
|
return (
|
|
|
|
|
<li
|
|
|
|
|
ref={setNodeRef}
|
|
|
|
|
style={{ transform: CSS.Transform.toString(transform), transition }}
|
|
|
|
|
className={cn(
|
|
|
|
|
'flex items-start gap-2 rounded-md border bg-background px-2 py-2.5',
|
|
|
|
|
isDragging && 'opacity-60 shadow-md',
|
|
|
|
|
)}
|
|
|
|
|
>
|
|
|
|
|
<button
|
|
|
|
|
type="button"
|
|
|
|
|
className="mt-0.5 inline-flex h-7 w-7 shrink-0 cursor-grab items-center justify-center rounded text-muted-foreground hover:bg-accent active:cursor-grabbing"
|
|
|
|
|
aria-label={`Drag handle for ${widget.label}`}
|
|
|
|
|
{...attributes}
|
|
|
|
|
{...listeners}
|
|
|
|
|
>
|
|
|
|
|
<GripVertical className="h-4 w-4" aria-hidden />
|
|
|
|
|
</button>
|
|
|
|
|
<span className="mt-1 w-5 shrink-0 text-right text-xs tabular-nums text-muted-foreground">
|
|
|
|
|
{position}
|
|
|
|
|
</span>
|
|
|
|
|
<div className="min-w-0 flex-1">
|
|
|
|
|
<div className="text-sm font-medium text-foreground">{widget.label}</div>
|
|
|
|
|
<p className="text-xs text-muted-foreground">{widget.description}</p>
|
|
|
|
|
</div>
|
|
|
|
|
<Switch
|
|
|
|
|
aria-label={`Show ${widget.label}`}
|
|
|
|
|
checked
|
|
|
|
|
disabled={disabled}
|
|
|
|
|
onCheckedChange={onToggle}
|
|
|
|
|
className="mt-0.5 shrink-0"
|
|
|
|
|
/>
|
|
|
|
|
</li>
|
|
|
|
|
);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
function HiddenRow({
|
|
|
|
|
widget,
|
|
|
|
|
disabled,
|
|
|
|
|
onToggle,
|
|
|
|
|
}: {
|
|
|
|
|
widget: DashboardWidget;
|
|
|
|
|
disabled: boolean;
|
|
|
|
|
onToggle: (checked: boolean) => void;
|
|
|
|
|
}) {
|
|
|
|
|
return (
|
|
|
|
|
<li className="flex items-start gap-3 rounded-md px-3 py-2.5 hover:bg-accent/40">
|
|
|
|
|
<div className="min-w-0 flex-1">
|
|
|
|
|
<div className="text-sm font-medium text-foreground">{widget.label}</div>
|
|
|
|
|
<p className="text-xs text-muted-foreground">{widget.description}</p>
|
|
|
|
|
</div>
|
|
|
|
|
<Switch
|
|
|
|
|
aria-label={`Show ${widget.label}`}
|
|
|
|
|
checked={false}
|
|
|
|
|
disabled={disabled}
|
|
|
|
|
onCheckedChange={onToggle}
|
|
|
|
|
className="mt-0.5 shrink-0"
|
|
|
|
|
/>
|
|
|
|
|
</li>
|
|
|
|
|
);
|
|
|
|
|
}
|