letsbe/pn-new-crm
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

feat: round 2 — stage prompts, berth header, EOI inline edit, measurement units

Browse Source 
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:
Matt
2026-05-12 15:28:22 +02:00
parent 3ffee79f3f
commit 04a594963f
44 changed files with 1404 additions and 255 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/lib/constants.ts
View File

@@ -192,9 +192,7 @@ const LABEL_OVERRIDES: Record<string, string> = {
function humanizeEnum(raw: string): string {
const override = LABEL_OVERRIDES[raw.toLowerCase()];
if (override) return override;
return raw
.replace(/_/g, ' ')
.replace(/\b\w/g, (c) => c.toUpperCase());
return raw.replace(/_/g, ' ').replace(/\b\w/g, (c) => c.toUpperCase());
}
export function toSelectOptions<T extends readonly string[]>(

64
src/lib/db/migrations/0053_measurement_units.sql Normal file
View File

@@ -0,0 +1,64 @@
-- 0053 — Measurement units (entry-unit tracking + interest dual-store)
--
-- Problem: dimensions on interests/yachts/berths are stored in ft OR m, but
-- the CRM blindly converts between them on display. When a rep edits the
-- converted side, the original entered value drifts by floating-point error
-- (e.g. 18.29m → 60.039ft → back to 18.297m).
--
-- Fix: every dimension gets two pieces of info — a value column per unit
-- (so we can render the user's literal entry verbatim) AND a small
-- discriminator column (`*_unit`) saying which side the user originally
-- typed in. The form prefers the entered unit when displaying; the other
-- unit is computed only for export pathways (EOI PDF, recommender).
--
-- Interests previously only stored ft; this migration adds *_m columns
-- alongside. Yachts + berths already store both; only the discriminator
-- needs to be added.
--
-- Backfill: existing rows are flagged as `ft`-entered since that was the
-- only way to enter them before this change. m-side values get computed
-- (only for interests where they were null) via `* 0.3048`.
-- ── interests: dual-store + discriminator ─────────────────────────────────
ALTER TABLE interests
ADD COLUMN IF NOT EXISTS desired_length_m numeric,
ADD COLUMN IF NOT EXISTS desired_width_m numeric,
ADD COLUMN IF NOT EXISTS desired_draft_m numeric,
ADD COLUMN IF NOT EXISTS desired_length_unit text NOT NULL DEFAULT 'ft',
ADD COLUMN IF NOT EXISTS desired_width_unit text NOT NULL DEFAULT 'ft',
ADD COLUMN IF NOT EXISTS desired_draft_unit text NOT NULL DEFAULT 'ft';
UPDATE interests SET desired_length_m = ROUND(desired_length_ft * 0.3048::numeric, 2) WHERE desired_length_m IS NULL AND desired_length_ft IS NOT NULL;
UPDATE interests SET desired_width_m = ROUND(desired_width_ft * 0.3048::numeric, 2) WHERE desired_width_m IS NULL AND desired_width_ft IS NOT NULL;
UPDATE interests SET desired_draft_m = ROUND(desired_draft_ft * 0.3048::numeric, 2) WHERE desired_draft_m IS NULL AND desired_draft_ft IS NOT NULL;
-- ── yachts: discriminator only ────────────────────────────────────────────
ALTER TABLE yachts
ADD COLUMN IF NOT EXISTS length_unit text NOT NULL DEFAULT 'ft',
ADD COLUMN IF NOT EXISTS width_unit text NOT NULL DEFAULT 'ft',
ADD COLUMN IF NOT EXISTS draft_unit text NOT NULL DEFAULT 'ft';
-- ── berths: discriminator only (multi-axis) ───────────────────────────────
ALTER TABLE berths
ADD COLUMN IF NOT EXISTS length_unit text NOT NULL DEFAULT 'ft',
ADD COLUMN IF NOT EXISTS width_unit text NOT NULL DEFAULT 'ft',
ADD COLUMN IF NOT EXISTS draft_unit text NOT NULL DEFAULT 'ft',
ADD COLUMN IF NOT EXISTS nominal_boat_size_unit text NOT NULL DEFAULT 'ft',
ADD COLUMN IF NOT EXISTS water_depth_unit text NOT NULL DEFAULT 'ft';
-- Constrain to known values. (Cheaper than a separate enum type for two
-- string values, and easier to drop if we ever add a third unit.)
ALTER TABLE interests
ADD CONSTRAINT chk_interest_desired_length_unit CHECK (desired_length_unit IN ('ft','m')),
ADD CONSTRAINT chk_interest_desired_width_unit CHECK (desired_width_unit IN ('ft','m')),
ADD CONSTRAINT chk_interest_desired_draft_unit CHECK (desired_draft_unit IN ('ft','m'));
ALTER TABLE yachts
ADD CONSTRAINT chk_yacht_length_unit CHECK (length_unit IN ('ft','m')),
ADD CONSTRAINT chk_yacht_width_unit CHECK (width_unit IN ('ft','m')),
ADD CONSTRAINT chk_yacht_draft_unit CHECK (draft_unit IN ('ft','m'));
ALTER TABLE berths
ADD CONSTRAINT chk_berth_length_unit CHECK (length_unit IN ('ft','m')),
ADD CONSTRAINT chk_berth_width_unit CHECK (width_unit IN ('ft','m')),
ADD CONSTRAINT chk_berth_draft_unit CHECK (draft_unit IN ('ft','m')),
ADD CONSTRAINT chk_berth_nominal_boat_size_unit CHECK (nominal_boat_size_unit IN ('ft','m')),
ADD CONSTRAINT chk_berth_water_depth_unit CHECK (water_depth_unit IN ('ft','m'));

6
src/lib/db/schema/berths.ts
View File

@@ -40,6 +40,12 @@ export const berths = pgTable(
nominalBoatSizeM: numeric('nominal_boat_size_m'),
waterDepth: numeric('water_depth'),
waterDepthM: numeric('water_depth_m'),
/** Entry-unit discriminators — see interests.desiredLengthUnit comment. */
lengthUnit: text('length_unit').notNull().default('ft'),
widthUnit: text('width_unit').notNull().default('ft'),
draftUnit: text('draft_unit').notNull().default('ft'),
nominalBoatSizeUnit: text('nominal_boat_size_unit').notNull().default('ft'),
waterDepthUnit: text('water_depth_unit').notNull().default('ft'),
waterDepthIsMinimum: boolean('water_depth_is_minimum').default(false),
sidePontoon: text('side_pontoon'),
powerCapacity: numeric('power_capacity'), // kW

14
src/lib/db/schema/interests.ts
View File

@@ -58,11 +58,21 @@ export const interests = pgTable(
outcomeReason: text('outcome_reason'),
/** When the outcome was decided. Lets us age 'how long ago did we lose'. */
outcomeAt: timestamp('outcome_at', { withTimezone: true }),
/** Recommender inputs - imperial; resolver treats nulls as "no constraint"
* on that axis, with a banner prompting the rep to add the missing dim. */
/** Recommender inputs - dual-stored. ft is the canonical unit the
* recommender SQL queries on; m is the human-friendly entry the rep
* may have actually typed. The matching `*_unit` column says which
* side is source-of-truth — display prefers that side and recomputes
* the other so the rep's literal entry doesn't drift through repeated
* conversions. Resolver treats nulls as "no constraint" on that axis. */
desiredLengthFt: numeric('desired_length_ft'),
desiredWidthFt: numeric('desired_width_ft'),
desiredDraftFt: numeric('desired_draft_ft'),
desiredLengthM: numeric('desired_length_m'),
desiredWidthM: numeric('desired_width_m'),
desiredDraftM: numeric('desired_draft_m'),
desiredLengthUnit: text('desired_length_unit').notNull().default('ft'),
desiredWidthUnit: text('desired_width_unit').notNull().default('ft'),
desiredDraftUnit: text('desired_draft_unit').notNull().default('ft'),
archivedAt: timestamp('archived_at', { withTimezone: true }),
createdAt: timestamp('created_at', { withTimezone: true }).notNull().defaultNow(),
updatedAt: timestamp('updated_at', { withTimezone: true }).notNull().defaultNow(),

6
src/lib/db/schema/yachts.ts
View File

@@ -35,6 +35,12 @@ export const yachts = pgTable(
lengthM: numeric('length_m'),
widthM: numeric('width_m'),
draftM: numeric('draft_m'),
/** Discriminator: which side ('ft' | 'm') the rep originally typed in.
* Used by the form to render that side verbatim (avoiding round-trip
* conversion drift on subsequent edits). */
lengthUnit: text('length_unit').notNull().default('ft'),
widthUnit: text('width_unit').notNull().default('ft'),
draftUnit: text('draft_unit').notNull().default('ft'),
currentOwnerType: text('current_owner_type').notNull(), // 'client' | 'company'
currentOwnerId: text('current_owner_id').notNull(),
status: text('status').notNull().default('active'), // 'active' | 'retired' | 'sold_away'

61
src/lib/services/berths.service.ts
View File

@@ -1,9 +1,11 @@
import { and, eq, gte, lte, inArray, sql } from 'drizzle-orm';
import { and, eq, gte, lte, inArray, isNull, sql } from 'drizzle-orm';
import { db } from '@/lib/db';
import { berths, berthTags, berthWaitingList, berthMaintenanceLog } from '@/lib/db/schema/berths';
import { clients } from '@/lib/db/schema/clients';
import { interestBerths, interests } from '@/lib/db/schema/interests';
import { tags } from '@/lib/db/schema/system';
import { PIPELINE_STAGES } from '@/lib/constants';
import { createAuditLog, type AuditMeta } from '@/lib/audit';
import { diffEntity } from '@/lib/entity-diff';
import { NotFoundError, ValidationError } from '@/lib/errors';
@@ -133,14 +135,63 @@ export async function listBerths(portId: string, query: ListBerthsQuery) {
}
}
const latestStageByBerthId = await getLatestInterestStageByBerth(berthIds, portId);
const data = (result.data as Array<Record<string, unknown>>).map((b) => ({
...b,
tags: tagsByBerthId[b.id as string] ?? [],
latestInterestStage: latestStageByBerthId[b.id as string] ?? null,
}));
return { data, total: result.total };
}
/**
* For each berth id, returns the most-advanced pipeline stage among its
* linked active interests (outcome IS NULL, not archived). Used by the
* berth list + detail to surface the deal furthest along on a berth so
* reps can see at a glance whether a berth is "Reservation Sent" via
* its connected interest, even though berth.status only tracks
* available/under_offer/sold.
*/
async function getLatestInterestStageByBerth(
berthIds: string[],
portId: string,
): Promise<Record<string, string>> {
if (berthIds.length === 0) return {};
const rows = await db
.select({
berthId: interestBerths.berthId,
pipelineStage: interests.pipelineStage,
})
.from(interestBerths)
.innerJoin(interests, eq(interestBerths.interestId, interests.id))
.where(
and(
eq(interests.portId, portId),
inArray(interestBerths.berthId, berthIds),
isNull(interests.outcome),
isNull(interests.archivedAt),
),
);
// Pipeline stages are an ordered enum — rank by position in PIPELINE_STAGES
// so "contract_signed" beats "eoi_sent". Falls back to 0 for any unknown
// legacy values so they're treated as least-advanced.
const rankOf = (stage: string) => {
const idx = (PIPELINE_STAGES as readonly string[]).indexOf(stage);
return idx === -1 ? -1 : idx;
};
const top: Record<string, string> = {};
for (const row of rows) {
const current = top[row.berthId];
if (!current || rankOf(row.pipelineStage) > rankOf(current)) {
top[row.berthId] = row.pipelineStage;
}
}
return top;
}
// ─── Get By ID ────────────────────────────────────────────────────────────────
export async function getBerthById(id: string, portId: string) {
@@ -160,7 +211,13 @@ export async function getBerthById(id: string, portId: string) {
.innerJoin(tags, eq(berthTags.tagId, tags.id))
.where(eq(berthTags.berthId, id));
return { ...berth, tags: tagRows };
const latestStageMap = await getLatestInterestStageByBerth([id], portId);
return {
...berth,
tags: tagRows,
latestInterestStage: latestStageMap[id] ?? null,
};
}
// ─── Update ───────────────────────────────────────────────────────────────────

4
src/lib/services/eoi-context.ts
View File

@@ -16,6 +16,7 @@ import { formatBerthRange } from '@/lib/templates/berth-range';
export type EoiContext = {
client: {
id: string;
fullName: string;
nationality: string | null;
primaryEmail: string | null;
@@ -24,6 +25,7 @@ export type EoiContext = {
};
/** Optional. The EOI's Section 3 yacht block is left blank when null. */
yacht: {
id: string;
name: string;
lengthFt: string | null;
widthFt: string | null;
@@ -275,6 +277,7 @@ export async function buildEoiContext(interestId: string, portId: string): Promi
return {
client: {
id: client.id,
fullName: client.fullName,
nationality: client.nationalityIso ? getCountryName(client.nationalityIso, 'en') : null,
primaryEmail: firstEmail?.value ?? null,
@@ -283,6 +286,7 @@ export async function buildEoiContext(interestId: string, portId: string): Promi
},
yacht: yacht
? {
id: yacht.id,
name: yacht.name,
lengthFt: yacht.lengthFt,
widthFt: yacht.widthFt,

48
src/lib/services/search.service.ts
View File

@@ -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 })),

8
src/lib/validators/interests.ts
View File

@@ -26,6 +26,8 @@ const optionalDesiredDimSchema = z
return String(Math.round(n * 100) / 100);
});
const desiredUnitSchema = z.enum(['ft', 'm']).optional();
export const createInterestSchema = z.object({
clientId: z.string().min(1),
yachtId: z.string().optional(),
@@ -42,6 +44,12 @@ export const createInterestSchema = z.object({
desiredLengthFt: optionalDesiredDimSchema,
desiredWidthFt: optionalDesiredDimSchema,
desiredDraftFt: optionalDesiredDimSchema,
desiredLengthM: optionalDesiredDimSchema,
desiredWidthM: optionalDesiredDimSchema,
desiredDraftM: optionalDesiredDimSchema,
desiredLengthUnit: desiredUnitSchema,
desiredWidthUnit: desiredUnitSchema,
desiredDraftUnit: desiredUnitSchema,
});
// ─── Update ──────────────────────────────────────────────────────────────────