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>
This commit is contained in:
@@ -1377,7 +1377,10 @@ async function expandGraph(
|
||||
JOIN interests i ON ib.interest_id = i.id
|
||||
JOIN clients c ON i.client_id = c.id
|
||||
JOIN berths b ON ib.berth_id = b.id
|
||||
WHERE ib.berth_id IN (${sql.join(direct.berthIds.map((id) => sql`${id}`), sql`, `)})
|
||||
WHERE ib.berth_id IN (${sql.join(
|
||||
direct.berthIds.map((id) => sql`${id}`),
|
||||
sql`, `,
|
||||
)})
|
||||
AND i.port_id = ${portId}
|
||||
AND i.archived_at IS NULL
|
||||
ORDER BY ib.is_primary DESC, i.created_at DESC
|
||||
@@ -1420,7 +1423,10 @@ async function expandGraph(
|
||||
ORDER BY ib2.is_primary DESC
|
||||
LIMIT 1
|
||||
) b ON TRUE
|
||||
WHERE i.id IN (${sql.join(direct.interestIds.map((id) => sql`${id}`), sql`, `)})
|
||||
WHERE i.id IN (${sql.join(
|
||||
direct.interestIds.map((id) => sql`${id}`),
|
||||
sql`, `,
|
||||
)})
|
||||
AND i.port_id = ${portId}
|
||||
`)
|
||||
: [];
|
||||
@@ -1447,7 +1453,10 @@ async function expandGraph(
|
||||
WHERE ib.interest_id = i.id
|
||||
ORDER BY ib.is_primary DESC LIMIT 1
|
||||
) b ON TRUE
|
||||
WHERE i.client_id IN (${sql.join(direct.clientIds.map((id) => sql`${id}`), sql`, `)})
|
||||
WHERE i.client_id IN (${sql.join(
|
||||
direct.clientIds.map((id) => sql`${id}`),
|
||||
sql`, `,
|
||||
)})
|
||||
AND i.port_id = ${portId}
|
||||
AND i.archived_at IS NULL
|
||||
ORDER BY i.created_at DESC
|
||||
@@ -1468,7 +1477,10 @@ async function expandGraph(
|
||||
FROM yachts y
|
||||
JOIN clients c ON y.current_owner_id = c.id
|
||||
WHERE y.current_owner_type = 'client'
|
||||
AND y.current_owner_id IN (${sql.join(direct.clientIds.map((id) => sql`${id}`), sql`, `)})
|
||||
AND y.current_owner_id IN (${sql.join(
|
||||
direct.clientIds.map((id) => sql`${id}`),
|
||||
sql`, `,
|
||||
)})
|
||||
AND y.port_id = ${portId}
|
||||
ORDER BY y.name
|
||||
LIMIT ${perBucketCap * direct.clientIds.length}
|
||||
@@ -1488,7 +1500,10 @@ async function expandGraph(
|
||||
FROM company_memberships cm
|
||||
JOIN companies co ON cm.company_id = co.id
|
||||
JOIN clients c ON cm.client_id = c.id
|
||||
WHERE cm.client_id IN (${sql.join(direct.clientIds.map((id) => sql`${id}`), sql`, `)})
|
||||
WHERE cm.client_id IN (${sql.join(
|
||||
direct.clientIds.map((id) => sql`${id}`),
|
||||
sql`, `,
|
||||
)})
|
||||
AND cm.end_date IS NULL
|
||||
AND co.port_id = ${portId}
|
||||
ORDER BY co.name
|
||||
@@ -1522,7 +1537,10 @@ async function expandGraph(
|
||||
WHERE ib.interest_id = i.id
|
||||
ORDER BY ib.is_primary DESC LIMIT 1
|
||||
) b ON TRUE
|
||||
WHERE i.yacht_id IN (${sql.join(direct.yachtIds.map((id) => sql`${id}`), sql`, `)})
|
||||
WHERE i.yacht_id IN (${sql.join(
|
||||
direct.yachtIds.map((id) => sql`${id}`),
|
||||
sql`, `,
|
||||
)})
|
||||
AND i.port_id = ${portId}
|
||||
AND i.archived_at IS NULL
|
||||
ORDER BY i.created_at DESC
|
||||
@@ -1545,7 +1563,10 @@ async function expandGraph(
|
||||
ON y.current_owner_type = 'client' AND y.current_owner_id = c.id
|
||||
LEFT JOIN companies co
|
||||
ON y.current_owner_type = 'company' AND y.current_owner_id = co.id
|
||||
WHERE y.id IN (${sql.join(direct.yachtIds.map((id) => sql`${id}`), sql`, `)})
|
||||
WHERE y.id IN (${sql.join(
|
||||
direct.yachtIds.map((id) => sql`${id}`),
|
||||
sql`, `,
|
||||
)})
|
||||
AND y.port_id = ${portId}
|
||||
AND y.current_owner_id IS NOT NULL
|
||||
`),
|
||||
@@ -1567,7 +1588,10 @@ async function expandGraph(
|
||||
FROM company_memberships cm
|
||||
JOIN clients c ON cm.client_id = c.id
|
||||
JOIN companies co ON cm.company_id = co.id
|
||||
WHERE cm.company_id IN (${sql.join(direct.companyIds.map((id) => sql`${id}`), sql`, `)})
|
||||
WHERE cm.company_id IN (${sql.join(
|
||||
direct.companyIds.map((id) => sql`${id}`),
|
||||
sql`, `,
|
||||
)})
|
||||
AND cm.end_date IS NULL
|
||||
AND c.port_id = ${portId}
|
||||
ORDER BY c.full_name
|
||||
@@ -1727,9 +1751,11 @@ async function expandGraph(
|
||||
* in both, the direct version wins. Direct matches sort before
|
||||
* related matches.
|
||||
*/
|
||||
function mergeWithExpansion<
|
||||
T extends { id: string; relatedVia?: RelatedVia | null },
|
||||
>(direct: T[], expansion: T[], cap: number): T[] {
|
||||
function mergeWithExpansion<T extends { id: string; relatedVia?: RelatedVia | null }>(
|
||||
direct: T[],
|
||||
expansion: T[],
|
||||
cap: number,
|
||||
): T[] {
|
||||
const seen = new Set(direct.map((r) => r.id));
|
||||
const merged = [
|
||||
...direct.map((r) => ({ ...r, relatedVia: null as RelatedVia | null })),
|
||||
|
||||
Reference in New Issue
Block a user