2026-04-24 12:20:40 +02:00
|
|
|
import { and, desc, eq } from 'drizzle-orm';
|
|
|
|
|
|
|
|
|
|
import { db } from '@/lib/db';
|
|
|
|
|
import { berths } from '@/lib/db/schema/berths';
|
|
|
|
|
import { clients, clientAddresses, clientContacts } from '@/lib/db/schema/clients';
|
|
|
|
|
import { companies, companyAddresses } from '@/lib/db/schema/companies';
|
feat(interests): EOI/contract/reservation tabs + contact log + berth interest milestone + interest list overhaul
Major interest workflow expansion driven by the rapid-fire UX session.
EOI / Contract / Reservation tabs replace the generic Documents tab when
the deal is at the relevant stage — workspace pattern with active-doc
hero, signing progress, paper-signed upload, and history strip. Stage-
conditional visibility wired through interest-tabs.tsx so the tab set
shrinks/expands as the deal moves through the pipeline.
Contact log: per-interaction structured log (channel/direction/summary/
optional follow-up reminder). New `interest_contact_log` table + service
+ tab UI (timeline with channel-coded icons + compose dialog).
auto-creates a reminder when followUpAt is set.
Berth Interest milestone: first milestone in the OverviewTab's pipeline
strip, completes the moment any berth is linked via the junction. Drives
the "have we captured what they want?" sanity check for general_interest
leads before they move to EOI.
Stage-conditional milestones: past phases collapse into a one-liner
strip, current phase expands, future phases hide behind a "Show
upcoming" toggle. Inline stage picker now defers reason capture to an
override-confirm view (only required for illegal transitions, not the
default flow).
Notes blob → threaded: dropped `interests.notes` column entirely; the
threaded `interest_notes` table is the single source of truth. Latest-
note teaser on Overview links into the dedicated Notes tab. Polymorphic
notes service gains aggregated client view (unions client + interest +
yacht notes with source chips and group-by-source toggle).
Berth interest list overhaul:
- Configurable columns via ColumnPicker (18 toggleable, 5 default-on)
- Natural-sort SQL ORDER BY on mooring number (A1, A2, A10 not A10, A2)
- Per-letter row tinting via colored left-border accent + dot in cell
- Documents tab merged Files (single attachments section)
Topbar improvements:
- Always-visible back arrow on detail pages (path depth > 2)
- Breadcrumb-hint store + useBreadcrumbHint hook so detail pages can
push their entity hierarchy (Clients › Mary Smith › Interest › B17)
- Tighter spacing, softer separators, 160px crumb truncation
DataTable upgrades:
- Page-size selector with All option (validator cap raised to 1000)
- getRowClassName slot for per-row styling (used by berth tinting)
- Fixed Radix SelectItem crash on empty-string values via __any__
sentinel (was crashing every list page that opened a select filter)
Interest list:
- Configurable columns picker
- Stage cell clickable into detail
- TagPicker + SavedViewsDropdown sized h-8 to match adjacent buttons
- Save view moved into ColumnPicker menu; Views button hidden when
no views are saved
- Pipeline kanban board endpoint at /api/v1/interests/board with
minimal projection, 5000-row cap + truncated banner, filter
pass-through
Mobile chrome + sidebar collapse removed (always-expanded design choice).
User management lists super-admins (was inner-joined on user_port_roles
which excluded global super-admins).
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
2026-05-07 20:59:28 +02:00
|
|
|
import { interests, interestBerths, interestNotes } from '@/lib/db/schema/interests';
|
2026-04-24 12:20:40 +02:00
|
|
|
import { ports } from '@/lib/db/schema/ports';
|
|
|
|
|
import { yachts } from '@/lib/db/schema/yachts';
|
chore(i18n): drop legacy free-text country/nationality columns
Test-data only — no production migration needed (per earlier decision).
Schema is now ISO-only; readers convert ISO codes to localized names where
human-readable output is required (EOI documents, invoices, portal).
Migration 0016 drops:
- clients.nationality
- companies.incorporation_country
- client_addresses.{state_province, country}
- company_addresses.{state_province, country}
Code paths that previously read free-text values now read the ISO column
and pass through `getCountryName()` / `getSubdivisionName()` for rendering.
Document templates ({{client.nationality}}), portal client view, EOI/
reservation-agreement contexts, and invoice billing addresses all updated.
Public yacht-interest endpoint (/api/public/interests) drops the legacy
fields from its insert path and writes ISO codes only. The Zod validators
no longer accept the legacy fields — older website builds posting raw
'incorporationCountry' / 'country' / 'stateProvince' will get 400s.
Server-side phone normalization is unchanged.
Seed data updated to use ISO codes (GB/FR/ES/GR/SE/IT/GH/MC/PA), spread
across continents to keep test fixtures realistic.
Test assertions updated to match the new render shape (e.g.
'United States' not 'US', 'California' not 'CA').
Vitest: 741 -> 741 (unchanged count; assertions updated, no new tests).
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
2026-04-28 19:00:57 +02:00
|
|
|
import { getCountryName } from '@/lib/i18n/countries';
|
2026-04-24 12:20:40 +02:00
|
|
|
import { NotFoundError, ValidationError } from '@/lib/errors';
|
2026-05-05 02:41:52 +02:00
|
|
|
import { getPrimaryBerth } from '@/lib/services/interest-berths.service';
|
feat(eoi): multi-berth EOI generation + berth-range formatter
Plan §4.6 + §1: a render function that compresses every berth marked
is_in_eoi_bundle=true on an interest into a compact range string
("A1-A3, B5-B7"), wired into both EOI generation paths (the Documenso
template-generate call and the in-app pdf-lib AcroForm fill).
- src/lib/templates/berth-range.ts: pure formatBerthRange() with the
full edge-case set from §4.6 - empty, single, run, gap, multiple
prefixes, sort/dedup, multi-letter prefixes, non-canonical
passthrough, long ranges. Sorts by (prefix, number); dedupes; passes
non-canonical inputs through with a logger warning.
- src/lib/templates/merge-fields.ts: new {{eoi.berthRange}} token
added to VALID_MERGE_TOKENS allow-list under a fresh `eoi` scope so
unknown-token validation at template creation time still rejects
typos.
- src/lib/services/eoi-context.ts: EoiContext gains eoiBerthRange.
Resolved by joining interest_berths (is_in_eoi_bundle=true) →
berths and feeding the mooring numbers through formatBerthRange.
- src/lib/services/documenso-payload.ts: formValues now includes
"Berth Range" alongside the legacy "Berth Number". Multi-berth EOIs
surface here; single-berth EOIs duplicate the primary.
- src/lib/pdf/fill-eoi-form.ts: in-app AcroForm fill mirrors the
Documenso payload by populating "Berth Range". Falls back silently
when older PDFs don't have the field (setText is no-op-on-missing).
15 unit tests on the formatter; existing EoiContext + Documenso
payload tests updated to assert the new field. 1022 -> 1037 passing.
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
2026-05-05 03:03:29 +02:00
|
|
|
import { formatBerthRange } from '@/lib/templates/berth-range';
|
2026-04-24 12:20:40 +02:00
|
|
|
|
|
|
|
|
// ─── Types ────────────────────────────────────────────────────────────────────
|
|
|
|
|
|
|
|
|
|
export type EoiContext = {
|
|
|
|
|
client: {
|
|
|
|
|
fullName: string;
|
|
|
|
|
nationality: string | null;
|
|
|
|
|
primaryEmail: string | null;
|
|
|
|
|
primaryPhone: string | null;
|
|
|
|
|
address: { street: string; city: string; country: string } | null;
|
|
|
|
|
};
|
2026-05-02 03:11:14 +02:00
|
|
|
/** Optional. The EOI's Section 3 yacht block is left blank when null. */
|
2026-04-24 12:20:40 +02:00
|
|
|
yacht: {
|
|
|
|
|
name: string;
|
|
|
|
|
lengthFt: string | null;
|
|
|
|
|
widthFt: string | null;
|
|
|
|
|
draftFt: string | null;
|
|
|
|
|
lengthM: string | null;
|
|
|
|
|
widthM: string | null;
|
|
|
|
|
draftM: string | null;
|
|
|
|
|
hullNumber: string | null;
|
|
|
|
|
flag: string | null;
|
|
|
|
|
yearBuilt: number | null;
|
2026-05-02 03:11:14 +02:00
|
|
|
} | null;
|
2026-04-24 12:20:40 +02:00
|
|
|
company: {
|
|
|
|
|
name: string;
|
|
|
|
|
legalName: string | null;
|
|
|
|
|
taxId: string | null;
|
|
|
|
|
billingAddress: string | null;
|
|
|
|
|
} | null;
|
2026-05-02 03:11:14 +02:00
|
|
|
/** Inferred from the yacht's polymorphic owner. Falls back to the interest's
|
|
|
|
|
* client when no yacht is linked (so the EOI's signing party is still
|
|
|
|
|
* resolvable). */
|
2026-04-24 12:20:40 +02:00
|
|
|
owner: {
|
|
|
|
|
type: 'client' | 'company';
|
|
|
|
|
name: string;
|
|
|
|
|
legalName?: string;
|
|
|
|
|
};
|
2026-05-02 03:11:14 +02:00
|
|
|
/** Optional. The EOI's Section 3 berth-number is left blank when null. */
|
2026-04-24 12:20:40 +02:00
|
|
|
berth: {
|
|
|
|
|
mooringNumber: string;
|
|
|
|
|
area: string | null;
|
|
|
|
|
lengthFt: string | null;
|
|
|
|
|
price: string | null;
|
|
|
|
|
priceCurrency: string;
|
|
|
|
|
tenureType: string;
|
2026-05-02 03:11:14 +02:00
|
|
|
} | null;
|
feat(eoi): multi-berth EOI generation + berth-range formatter
Plan §4.6 + §1: a render function that compresses every berth marked
is_in_eoi_bundle=true on an interest into a compact range string
("A1-A3, B5-B7"), wired into both EOI generation paths (the Documenso
template-generate call and the in-app pdf-lib AcroForm fill).
- src/lib/templates/berth-range.ts: pure formatBerthRange() with the
full edge-case set from §4.6 - empty, single, run, gap, multiple
prefixes, sort/dedup, multi-letter prefixes, non-canonical
passthrough, long ranges. Sorts by (prefix, number); dedupes; passes
non-canonical inputs through with a logger warning.
- src/lib/templates/merge-fields.ts: new {{eoi.berthRange}} token
added to VALID_MERGE_TOKENS allow-list under a fresh `eoi` scope so
unknown-token validation at template creation time still rejects
typos.
- src/lib/services/eoi-context.ts: EoiContext gains eoiBerthRange.
Resolved by joining interest_berths (is_in_eoi_bundle=true) →
berths and feeding the mooring numbers through formatBerthRange.
- src/lib/services/documenso-payload.ts: formValues now includes
"Berth Range" alongside the legacy "Berth Number". Multi-berth EOIs
surface here; single-berth EOIs duplicate the primary.
- src/lib/pdf/fill-eoi-form.ts: in-app AcroForm fill mirrors the
Documenso payload by populating "Berth Range". Falls back silently
when older PDFs don't have the field (setText is no-op-on-missing).
15 unit tests on the formatter; existing EoiContext + Documenso
payload tests updated to assert the new field. 1022 -> 1037 passing.
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
2026-05-05 03:03:29 +02:00
|
|
|
/**
|
|
|
|
|
* Compact range string for every berth in the interest's EOI bundle
|
|
|
|
|
* (rows where `interest_berths.is_in_eoi_bundle=true`). Populates the
|
|
|
|
|
* Documenso `Berth Range` form field for multi-berth EOIs (plan §1
|
|
|
|
|
* + §4.6). Empty string when the bundle is empty.
|
|
|
|
|
*/
|
|
|
|
|
eoiBerthRange: string;
|
2026-04-24 12:20:40 +02:00
|
|
|
interest: {
|
|
|
|
|
stage: string;
|
|
|
|
|
leadCategory: string | null;
|
|
|
|
|
dateFirstContact: Date | null;
|
|
|
|
|
notes: string | null;
|
|
|
|
|
};
|
|
|
|
|
port: {
|
|
|
|
|
name: string;
|
|
|
|
|
defaultCurrency: string;
|
|
|
|
|
};
|
|
|
|
|
date: {
|
|
|
|
|
today: string;
|
|
|
|
|
year: string;
|
|
|
|
|
};
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
// ─── buildEoiContext ──────────────────────────────────────────────────────────
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* Assembles the shared context object used by EOI generation, templates, and
|
|
|
|
|
* any other flow that needs a denormalised snapshot of an interest + its
|
|
|
|
|
* surrounding entities (client, yacht, berth, owner, port, etc.).
|
|
|
|
|
*
|
|
|
|
|
* Pure read-only: no audit logs, no socket emits, no mutations.
|
|
|
|
|
*
|
|
|
|
|
* Tenant-scoped: every fetch is gated by `portId`, and missing rows surface
|
2026-05-02 03:11:14 +02:00
|
|
|
* as NotFoundError. The hard gate matches the EOI document's top paragraph
|
2026-05-04 22:57:01 +02:00
|
|
|
* (Section 2 - name, address, email): without those the EOI is unsignable
|
|
|
|
|
* and we throw. Yacht and berth (Section 3) are optional - the rendered PDF
|
2026-05-02 03:11:14 +02:00
|
|
|
* leaves those fields blank when not set.
|
2026-04-24 12:20:40 +02:00
|
|
|
*/
|
|
|
|
|
export async function buildEoiContext(interestId: string, portId: string): Promise<EoiContext> {
|
|
|
|
|
// 1. Interest (tenant-scoped)
|
|
|
|
|
const interest = await db.query.interests.findFirst({
|
|
|
|
|
where: and(eq(interests.id, interestId), eq(interests.portId, portId)),
|
|
|
|
|
});
|
|
|
|
|
if (!interest) {
|
|
|
|
|
throw new NotFoundError('Interest');
|
|
|
|
|
}
|
|
|
|
|
|
2026-05-05 02:41:52 +02:00
|
|
|
// Resolve the interest's primary berth via the junction (plan §3.4).
|
|
|
|
|
// EOI Section 3 stays blank when no primary is set.
|
|
|
|
|
const primaryBerth = await getPrimaryBerth(interest.id);
|
|
|
|
|
const primaryBerthId = primaryBerth?.berthId ?? null;
|
|
|
|
|
|
feat(interests): EOI/contract/reservation tabs + contact log + berth interest milestone + interest list overhaul
Major interest workflow expansion driven by the rapid-fire UX session.
EOI / Contract / Reservation tabs replace the generic Documents tab when
the deal is at the relevant stage — workspace pattern with active-doc
hero, signing progress, paper-signed upload, and history strip. Stage-
conditional visibility wired through interest-tabs.tsx so the tab set
shrinks/expands as the deal moves through the pipeline.
Contact log: per-interaction structured log (channel/direction/summary/
optional follow-up reminder). New `interest_contact_log` table + service
+ tab UI (timeline with channel-coded icons + compose dialog).
auto-creates a reminder when followUpAt is set.
Berth Interest milestone: first milestone in the OverviewTab's pipeline
strip, completes the moment any berth is linked via the junction. Drives
the "have we captured what they want?" sanity check for general_interest
leads before they move to EOI.
Stage-conditional milestones: past phases collapse into a one-liner
strip, current phase expands, future phases hide behind a "Show
upcoming" toggle. Inline stage picker now defers reason capture to an
override-confirm view (only required for illegal transitions, not the
default flow).
Notes blob → threaded: dropped `interests.notes` column entirely; the
threaded `interest_notes` table is the single source of truth. Latest-
note teaser on Overview links into the dedicated Notes tab. Polymorphic
notes service gains aggregated client view (unions client + interest +
yacht notes with source chips and group-by-source toggle).
Berth interest list overhaul:
- Configurable columns via ColumnPicker (18 toggleable, 5 default-on)
- Natural-sort SQL ORDER BY on mooring number (A1, A2, A10 not A10, A2)
- Per-letter row tinting via colored left-border accent + dot in cell
- Documents tab merged Files (single attachments section)
Topbar improvements:
- Always-visible back arrow on detail pages (path depth > 2)
- Breadcrumb-hint store + useBreadcrumbHint hook so detail pages can
push their entity hierarchy (Clients › Mary Smith › Interest › B17)
- Tighter spacing, softer separators, 160px crumb truncation
DataTable upgrades:
- Page-size selector with All option (validator cap raised to 1000)
- getRowClassName slot for per-row styling (used by berth tinting)
- Fixed Radix SelectItem crash on empty-string values via __any__
sentinel (was crashing every list page that opened a select filter)
Interest list:
- Configurable columns picker
- Stage cell clickable into detail
- TagPicker + SavedViewsDropdown sized h-8 to match adjacent buttons
- Save view moved into ColumnPicker menu; Views button hidden when
no views are saved
- Pipeline kanban board endpoint at /api/v1/interests/board with
minimal projection, 5000-row cap + truncated banner, filter
pass-through
Mobile chrome + sidebar collapse removed (always-expanded design choice).
User management lists super-admins (was inner-joined on user_port_roles
which excluded global super-admins).
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
2026-05-07 20:59:28 +02:00
|
|
|
// The legacy `interests.notes` blob was dropped in favour of the
|
|
|
|
|
// threaded `interest_notes` timeline. Templates / merge fields still
|
|
|
|
|
// expose `interest.notes`, so we surface the most-recent threaded
|
|
|
|
|
// note's content here. Returns null when the interest has no notes.
|
|
|
|
|
const [latestNote] = await db
|
|
|
|
|
.select({ content: interestNotes.content })
|
|
|
|
|
.from(interestNotes)
|
|
|
|
|
.where(eq(interestNotes.interestId, interest.id))
|
|
|
|
|
.orderBy(desc(interestNotes.createdAt))
|
|
|
|
|
.limit(1);
|
|
|
|
|
const interestNotesContent = latestNote?.content ?? null;
|
|
|
|
|
|
feat(eoi): multi-berth EOI generation + berth-range formatter
Plan §4.6 + §1: a render function that compresses every berth marked
is_in_eoi_bundle=true on an interest into a compact range string
("A1-A3, B5-B7"), wired into both EOI generation paths (the Documenso
template-generate call and the in-app pdf-lib AcroForm fill).
- src/lib/templates/berth-range.ts: pure formatBerthRange() with the
full edge-case set from §4.6 - empty, single, run, gap, multiple
prefixes, sort/dedup, multi-letter prefixes, non-canonical
passthrough, long ranges. Sorts by (prefix, number); dedupes; passes
non-canonical inputs through with a logger warning.
- src/lib/templates/merge-fields.ts: new {{eoi.berthRange}} token
added to VALID_MERGE_TOKENS allow-list under a fresh `eoi` scope so
unknown-token validation at template creation time still rejects
typos.
- src/lib/services/eoi-context.ts: EoiContext gains eoiBerthRange.
Resolved by joining interest_berths (is_in_eoi_bundle=true) →
berths and feeding the mooring numbers through formatBerthRange.
- src/lib/services/documenso-payload.ts: formValues now includes
"Berth Range" alongside the legacy "Berth Number". Multi-berth EOIs
surface here; single-berth EOIs duplicate the primary.
- src/lib/pdf/fill-eoi-form.ts: in-app AcroForm fill mirrors the
Documenso payload by populating "Berth Range". Falls back silently
when older PDFs don't have the field (setText is no-op-on-missing).
15 unit tests on the formatter; existing EoiContext + Documenso
payload tests updated to assert the new field. 1022 -> 1037 passing.
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
2026-05-05 03:03:29 +02:00
|
|
|
// Resolve every berth in the EOI bundle (is_in_eoi_bundle=true) for the
|
|
|
|
|
// multi-berth EOI compact-range merge field. Empty bundle → "" so the
|
|
|
|
|
// Documenso template renders blank rather than "undefined".
|
|
|
|
|
const bundleRows = await db
|
|
|
|
|
.select({ mooringNumber: berths.mooringNumber })
|
|
|
|
|
.from(interestBerths)
|
|
|
|
|
.innerJoin(berths, eq(berths.id, interestBerths.berthId))
|
|
|
|
|
.where(and(eq(interestBerths.interestId, interest.id), eq(interestBerths.isInEoiBundle, true)));
|
|
|
|
|
const eoiBerthRange = formatBerthRange(bundleRows.map((r) => r.mooringNumber));
|
|
|
|
|
|
2026-05-04 22:57:01 +02:00
|
|
|
// Parallelise independent reads. Yacht and berth are both nullable -
|
2026-05-02 03:11:14 +02:00
|
|
|
// the EOI's Section 3 stays blank when they're absent.
|
2026-04-24 12:20:40 +02:00
|
|
|
const [yacht, berth, client, port] = await Promise.all([
|
2026-05-02 03:11:14 +02:00
|
|
|
interest.yachtId
|
|
|
|
|
? db.query.yachts.findFirst({
|
|
|
|
|
where: and(eq(yachts.id, interest.yachtId), eq(yachts.portId, portId)),
|
|
|
|
|
})
|
|
|
|
|
: Promise.resolve(undefined),
|
2026-05-05 02:41:52 +02:00
|
|
|
primaryBerthId
|
2026-05-02 03:11:14 +02:00
|
|
|
? db.query.berths.findFirst({
|
2026-05-05 02:41:52 +02:00
|
|
|
where: and(eq(berths.id, primaryBerthId), eq(berths.portId, portId)),
|
2026-05-02 03:11:14 +02:00
|
|
|
})
|
|
|
|
|
: Promise.resolve(undefined),
|
2026-04-24 12:20:40 +02:00
|
|
|
db.query.clients.findFirst({
|
|
|
|
|
where: and(eq(clients.id, interest.clientId), eq(clients.portId, portId)),
|
|
|
|
|
}),
|
|
|
|
|
db.query.ports.findFirst({
|
|
|
|
|
where: eq(ports.id, portId),
|
|
|
|
|
}),
|
|
|
|
|
]);
|
|
|
|
|
|
|
|
|
|
if (!client) throw new NotFoundError('Client');
|
|
|
|
|
if (!port) throw new NotFoundError('Port');
|
|
|
|
|
|
2026-05-04 22:57:01 +02:00
|
|
|
// 5. Primary contacts - email + phone for the interest's client.
|
2026-04-24 12:20:40 +02:00
|
|
|
const contactRows = await db
|
|
|
|
|
.select({
|
|
|
|
|
channel: clientContacts.channel,
|
|
|
|
|
value: clientContacts.value,
|
|
|
|
|
isPrimary: clientContacts.isPrimary,
|
|
|
|
|
updatedAt: clientContacts.updatedAt,
|
|
|
|
|
})
|
|
|
|
|
.from(clientContacts)
|
|
|
|
|
.where(eq(clientContacts.clientId, client.id))
|
|
|
|
|
.orderBy(desc(clientContacts.isPrimary), desc(clientContacts.updatedAt));
|
|
|
|
|
|
|
|
|
|
const firstEmail = contactRows.find((c) => c.channel === 'email');
|
|
|
|
|
const firstPhone =
|
|
|
|
|
contactRows.find((c) => c.channel === 'phone') ??
|
|
|
|
|
contactRows.find((c) => c.channel === 'whatsapp');
|
|
|
|
|
|
chore(i18n): drop legacy free-text country/nationality columns
Test-data only — no production migration needed (per earlier decision).
Schema is now ISO-only; readers convert ISO codes to localized names where
human-readable output is required (EOI documents, invoices, portal).
Migration 0016 drops:
- clients.nationality
- companies.incorporation_country
- client_addresses.{state_province, country}
- company_addresses.{state_province, country}
Code paths that previously read free-text values now read the ISO column
and pass through `getCountryName()` / `getSubdivisionName()` for rendering.
Document templates ({{client.nationality}}), portal client view, EOI/
reservation-agreement contexts, and invoice billing addresses all updated.
Public yacht-interest endpoint (/api/public/interests) drops the legacy
fields from its insert path and writes ISO codes only. The Zod validators
no longer accept the legacy fields — older website builds posting raw
'incorporationCountry' / 'country' / 'stateProvince' will get 400s.
Server-side phone normalization is unchanged.
Seed data updated to use ISO codes (GB/FR/ES/GR/SE/IT/GH/MC/PA), spread
across continents to keep test fixtures realistic.
Test assertions updated to match the new render shape (e.g.
'United States' not 'US', 'California' not 'CA').
Vitest: 741 -> 741 (unchanged count; assertions updated, no new tests).
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
2026-04-28 19:00:57 +02:00
|
|
|
// 6. Primary address. Country is rendered as the localized name (English by
|
|
|
|
|
// default for documents) from the ISO code.
|
2026-04-24 12:20:40 +02:00
|
|
|
const [primaryAddress] = await db
|
|
|
|
|
.select({
|
|
|
|
|
streetAddress: clientAddresses.streetAddress,
|
|
|
|
|
city: clientAddresses.city,
|
chore(i18n): drop legacy free-text country/nationality columns
Test-data only — no production migration needed (per earlier decision).
Schema is now ISO-only; readers convert ISO codes to localized names where
human-readable output is required (EOI documents, invoices, portal).
Migration 0016 drops:
- clients.nationality
- companies.incorporation_country
- client_addresses.{state_province, country}
- company_addresses.{state_province, country}
Code paths that previously read free-text values now read the ISO column
and pass through `getCountryName()` / `getSubdivisionName()` for rendering.
Document templates ({{client.nationality}}), portal client view, EOI/
reservation-agreement contexts, and invoice billing addresses all updated.
Public yacht-interest endpoint (/api/public/interests) drops the legacy
fields from its insert path and writes ISO codes only. The Zod validators
no longer accept the legacy fields — older website builds posting raw
'incorporationCountry' / 'country' / 'stateProvince' will get 400s.
Server-side phone normalization is unchanged.
Seed data updated to use ISO codes (GB/FR/ES/GR/SE/IT/GH/MC/PA), spread
across continents to keep test fixtures realistic.
Test assertions updated to match the new render shape (e.g.
'United States' not 'US', 'California' not 'CA').
Vitest: 741 -> 741 (unchanged count; assertions updated, no new tests).
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
2026-04-28 19:00:57 +02:00
|
|
|
countryIso: clientAddresses.countryIso,
|
2026-04-24 12:20:40 +02:00
|
|
|
})
|
|
|
|
|
.from(clientAddresses)
|
|
|
|
|
.where(and(eq(clientAddresses.clientId, client.id), eq(clientAddresses.isPrimary, true)))
|
|
|
|
|
.limit(1);
|
|
|
|
|
|
|
|
|
|
const clientAddress = primaryAddress
|
|
|
|
|
? {
|
|
|
|
|
street: primaryAddress.streetAddress ?? '',
|
|
|
|
|
city: primaryAddress.city ?? '',
|
chore(i18n): drop legacy free-text country/nationality columns
Test-data only — no production migration needed (per earlier decision).
Schema is now ISO-only; readers convert ISO codes to localized names where
human-readable output is required (EOI documents, invoices, portal).
Migration 0016 drops:
- clients.nationality
- companies.incorporation_country
- client_addresses.{state_province, country}
- company_addresses.{state_province, country}
Code paths that previously read free-text values now read the ISO column
and pass through `getCountryName()` / `getSubdivisionName()` for rendering.
Document templates ({{client.nationality}}), portal client view, EOI/
reservation-agreement contexts, and invoice billing addresses all updated.
Public yacht-interest endpoint (/api/public/interests) drops the legacy
fields from its insert path and writes ISO codes only. The Zod validators
no longer accept the legacy fields — older website builds posting raw
'incorporationCountry' / 'country' / 'stateProvince' will get 400s.
Server-side phone normalization is unchanged.
Seed data updated to use ISO codes (GB/FR/ES/GR/SE/IT/GH/MC/PA), spread
across continents to keep test fixtures realistic.
Test assertions updated to match the new render shape (e.g.
'United States' not 'US', 'California' not 'CA').
Vitest: 741 -> 741 (unchanged count; assertions updated, no new tests).
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
2026-04-28 19:00:57 +02:00
|
|
|
country: primaryAddress.countryIso ? getCountryName(primaryAddress.countryIso, 'en') : '',
|
2026-04-24 12:20:40 +02:00
|
|
|
}
|
|
|
|
|
: null;
|
|
|
|
|
|
2026-05-02 03:11:14 +02:00
|
|
|
// EOI hard gate: the document's top paragraph (Section 2) requires Name,
|
|
|
|
|
// Address, and Email. Without these the rendered EOI is unsignable. Yacht
|
|
|
|
|
// and berth (Section 3) are intentionally optional and may be left blank.
|
|
|
|
|
const missing: string[] = [];
|
|
|
|
|
if (!client.fullName?.trim()) missing.push('client name');
|
|
|
|
|
if (!firstEmail?.value?.trim()) missing.push('client email');
|
|
|
|
|
if (!clientAddress || !clientAddress.street.trim()) missing.push('client address');
|
|
|
|
|
if (missing.length > 0) {
|
|
|
|
|
throw new ValidationError(
|
2026-05-04 22:57:01 +02:00
|
|
|
`Cannot generate EOI - missing required client details: ${missing.join(', ')}.`,
|
2026-05-02 03:11:14 +02:00
|
|
|
);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// Owner block. When a yacht is linked, derive from the yacht's polymorphic
|
|
|
|
|
// owner. When no yacht is linked, fall back to the interest's client so the
|
|
|
|
|
// EOI's signing party is still resolvable.
|
2026-04-24 12:20:40 +02:00
|
|
|
let ownerBlock: EoiContext['owner'];
|
|
|
|
|
let companyBlock: EoiContext['company'] = null;
|
|
|
|
|
|
2026-05-02 03:11:14 +02:00
|
|
|
if (!yacht) {
|
|
|
|
|
ownerBlock = { type: 'client', name: client.fullName };
|
|
|
|
|
} else if (yacht.currentOwnerType === 'client') {
|
2026-04-24 12:20:40 +02:00
|
|
|
// The yacht-owning client may or may not be the same as the interest's client.
|
|
|
|
|
const ownerClient =
|
|
|
|
|
yacht.currentOwnerId === client.id
|
|
|
|
|
? client
|
|
|
|
|
: await db.query.clients.findFirst({
|
|
|
|
|
where: and(eq(clients.id, yacht.currentOwnerId), eq(clients.portId, portId)),
|
|
|
|
|
});
|
|
|
|
|
if (!ownerClient) throw new NotFoundError('Client');
|
|
|
|
|
ownerBlock = { type: 'client', name: ownerClient.fullName };
|
|
|
|
|
} else if (yacht.currentOwnerType === 'company') {
|
|
|
|
|
const company = await db.query.companies.findFirst({
|
|
|
|
|
where: and(eq(companies.id, yacht.currentOwnerId), eq(companies.portId, portId)),
|
|
|
|
|
});
|
|
|
|
|
if (!company) throw new NotFoundError('Company');
|
|
|
|
|
|
|
|
|
|
ownerBlock = {
|
|
|
|
|
type: 'company',
|
|
|
|
|
name: company.name,
|
|
|
|
|
...(company.legalName ? { legalName: company.legalName } : {}),
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
const [companyPrimaryAddress] = await db
|
|
|
|
|
.select({
|
|
|
|
|
streetAddress: companyAddresses.streetAddress,
|
|
|
|
|
city: companyAddresses.city,
|
chore(i18n): drop legacy free-text country/nationality columns
Test-data only — no production migration needed (per earlier decision).
Schema is now ISO-only; readers convert ISO codes to localized names where
human-readable output is required (EOI documents, invoices, portal).
Migration 0016 drops:
- clients.nationality
- companies.incorporation_country
- client_addresses.{state_province, country}
- company_addresses.{state_province, country}
Code paths that previously read free-text values now read the ISO column
and pass through `getCountryName()` / `getSubdivisionName()` for rendering.
Document templates ({{client.nationality}}), portal client view, EOI/
reservation-agreement contexts, and invoice billing addresses all updated.
Public yacht-interest endpoint (/api/public/interests) drops the legacy
fields from its insert path and writes ISO codes only. The Zod validators
no longer accept the legacy fields — older website builds posting raw
'incorporationCountry' / 'country' / 'stateProvince' will get 400s.
Server-side phone normalization is unchanged.
Seed data updated to use ISO codes (GB/FR/ES/GR/SE/IT/GH/MC/PA), spread
across continents to keep test fixtures realistic.
Test assertions updated to match the new render shape (e.g.
'United States' not 'US', 'California' not 'CA').
Vitest: 741 -> 741 (unchanged count; assertions updated, no new tests).
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
2026-04-28 19:00:57 +02:00
|
|
|
countryIso: companyAddresses.countryIso,
|
2026-04-24 12:20:40 +02:00
|
|
|
})
|
|
|
|
|
.from(companyAddresses)
|
|
|
|
|
.where(and(eq(companyAddresses.companyId, company.id), eq(companyAddresses.isPrimary, true)))
|
|
|
|
|
.limit(1);
|
|
|
|
|
|
|
|
|
|
const billingAddress = companyPrimaryAddress
|
|
|
|
|
? [
|
|
|
|
|
companyPrimaryAddress.streetAddress,
|
|
|
|
|
companyPrimaryAddress.city,
|
chore(i18n): drop legacy free-text country/nationality columns
Test-data only — no production migration needed (per earlier decision).
Schema is now ISO-only; readers convert ISO codes to localized names where
human-readable output is required (EOI documents, invoices, portal).
Migration 0016 drops:
- clients.nationality
- companies.incorporation_country
- client_addresses.{state_province, country}
- company_addresses.{state_province, country}
Code paths that previously read free-text values now read the ISO column
and pass through `getCountryName()` / `getSubdivisionName()` for rendering.
Document templates ({{client.nationality}}), portal client view, EOI/
reservation-agreement contexts, and invoice billing addresses all updated.
Public yacht-interest endpoint (/api/public/interests) drops the legacy
fields from its insert path and writes ISO codes only. The Zod validators
no longer accept the legacy fields — older website builds posting raw
'incorporationCountry' / 'country' / 'stateProvince' will get 400s.
Server-side phone normalization is unchanged.
Seed data updated to use ISO codes (GB/FR/ES/GR/SE/IT/GH/MC/PA), spread
across continents to keep test fixtures realistic.
Test assertions updated to match the new render shape (e.g.
'United States' not 'US', 'California' not 'CA').
Vitest: 741 -> 741 (unchanged count; assertions updated, no new tests).
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
2026-04-28 19:00:57 +02:00
|
|
|
companyPrimaryAddress.countryIso
|
|
|
|
|
? getCountryName(companyPrimaryAddress.countryIso, 'en')
|
|
|
|
|
: null,
|
2026-04-24 12:20:40 +02:00
|
|
|
]
|
|
|
|
|
.filter((s): s is string => Boolean(s))
|
|
|
|
|
.join(', ') || null
|
|
|
|
|
: null;
|
|
|
|
|
|
|
|
|
|
companyBlock = {
|
|
|
|
|
name: company.name,
|
|
|
|
|
legalName: company.legalName,
|
|
|
|
|
taxId: company.taxId,
|
|
|
|
|
billingAddress,
|
|
|
|
|
};
|
|
|
|
|
} else {
|
|
|
|
|
throw new ValidationError(`unknown yacht owner type: ${String(yacht.currentOwnerType)}`);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// 10. Date.
|
|
|
|
|
const now = new Date();
|
|
|
|
|
const today = now.toISOString().slice(0, 10);
|
|
|
|
|
const year = String(now.getFullYear());
|
|
|
|
|
|
|
|
|
|
return {
|
|
|
|
|
client: {
|
|
|
|
|
fullName: client.fullName,
|
chore(i18n): drop legacy free-text country/nationality columns
Test-data only — no production migration needed (per earlier decision).
Schema is now ISO-only; readers convert ISO codes to localized names where
human-readable output is required (EOI documents, invoices, portal).
Migration 0016 drops:
- clients.nationality
- companies.incorporation_country
- client_addresses.{state_province, country}
- company_addresses.{state_province, country}
Code paths that previously read free-text values now read the ISO column
and pass through `getCountryName()` / `getSubdivisionName()` for rendering.
Document templates ({{client.nationality}}), portal client view, EOI/
reservation-agreement contexts, and invoice billing addresses all updated.
Public yacht-interest endpoint (/api/public/interests) drops the legacy
fields from its insert path and writes ISO codes only. The Zod validators
no longer accept the legacy fields — older website builds posting raw
'incorporationCountry' / 'country' / 'stateProvince' will get 400s.
Server-side phone normalization is unchanged.
Seed data updated to use ISO codes (GB/FR/ES/GR/SE/IT/GH/MC/PA), spread
across continents to keep test fixtures realistic.
Test assertions updated to match the new render shape (e.g.
'United States' not 'US', 'California' not 'CA').
Vitest: 741 -> 741 (unchanged count; assertions updated, no new tests).
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
2026-04-28 19:00:57 +02:00
|
|
|
nationality: client.nationalityIso ? getCountryName(client.nationalityIso, 'en') : null,
|
2026-04-24 12:20:40 +02:00
|
|
|
primaryEmail: firstEmail?.value ?? null,
|
|
|
|
|
primaryPhone: firstPhone?.value ?? null,
|
|
|
|
|
address: clientAddress,
|
|
|
|
|
},
|
2026-05-02 03:11:14 +02:00
|
|
|
yacht: yacht
|
|
|
|
|
? {
|
|
|
|
|
name: yacht.name,
|
|
|
|
|
lengthFt: yacht.lengthFt,
|
|
|
|
|
widthFt: yacht.widthFt,
|
|
|
|
|
draftFt: yacht.draftFt,
|
|
|
|
|
lengthM: yacht.lengthM,
|
|
|
|
|
widthM: yacht.widthM,
|
|
|
|
|
draftM: yacht.draftM,
|
|
|
|
|
hullNumber: yacht.hullNumber,
|
|
|
|
|
flag: yacht.flag,
|
|
|
|
|
yearBuilt: yacht.yearBuilt,
|
|
|
|
|
}
|
|
|
|
|
: null,
|
2026-04-24 12:20:40 +02:00
|
|
|
company: companyBlock,
|
|
|
|
|
owner: ownerBlock,
|
2026-05-02 03:11:14 +02:00
|
|
|
berth: berth
|
|
|
|
|
? {
|
|
|
|
|
mooringNumber: berth.mooringNumber,
|
|
|
|
|
area: berth.area,
|
|
|
|
|
lengthFt: berth.lengthFt,
|
|
|
|
|
price: berth.price,
|
|
|
|
|
priceCurrency: berth.priceCurrency,
|
|
|
|
|
tenureType: berth.tenureType,
|
|
|
|
|
}
|
|
|
|
|
: null,
|
feat(eoi): multi-berth EOI generation + berth-range formatter
Plan §4.6 + §1: a render function that compresses every berth marked
is_in_eoi_bundle=true on an interest into a compact range string
("A1-A3, B5-B7"), wired into both EOI generation paths (the Documenso
template-generate call and the in-app pdf-lib AcroForm fill).
- src/lib/templates/berth-range.ts: pure formatBerthRange() with the
full edge-case set from §4.6 - empty, single, run, gap, multiple
prefixes, sort/dedup, multi-letter prefixes, non-canonical
passthrough, long ranges. Sorts by (prefix, number); dedupes; passes
non-canonical inputs through with a logger warning.
- src/lib/templates/merge-fields.ts: new {{eoi.berthRange}} token
added to VALID_MERGE_TOKENS allow-list under a fresh `eoi` scope so
unknown-token validation at template creation time still rejects
typos.
- src/lib/services/eoi-context.ts: EoiContext gains eoiBerthRange.
Resolved by joining interest_berths (is_in_eoi_bundle=true) →
berths and feeding the mooring numbers through formatBerthRange.
- src/lib/services/documenso-payload.ts: formValues now includes
"Berth Range" alongside the legacy "Berth Number". Multi-berth EOIs
surface here; single-berth EOIs duplicate the primary.
- src/lib/pdf/fill-eoi-form.ts: in-app AcroForm fill mirrors the
Documenso payload by populating "Berth Range". Falls back silently
when older PDFs don't have the field (setText is no-op-on-missing).
15 unit tests on the formatter; existing EoiContext + Documenso
payload tests updated to assert the new field. 1022 -> 1037 passing.
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
2026-05-05 03:03:29 +02:00
|
|
|
eoiBerthRange,
|
2026-04-24 12:20:40 +02:00
|
|
|
interest: {
|
|
|
|
|
stage: interest.pipelineStage,
|
|
|
|
|
leadCategory: interest.leadCategory,
|
|
|
|
|
dateFirstContact: interest.dateFirstContact,
|
feat(interests): EOI/contract/reservation tabs + contact log + berth interest milestone + interest list overhaul
Major interest workflow expansion driven by the rapid-fire UX session.
EOI / Contract / Reservation tabs replace the generic Documents tab when
the deal is at the relevant stage — workspace pattern with active-doc
hero, signing progress, paper-signed upload, and history strip. Stage-
conditional visibility wired through interest-tabs.tsx so the tab set
shrinks/expands as the deal moves through the pipeline.
Contact log: per-interaction structured log (channel/direction/summary/
optional follow-up reminder). New `interest_contact_log` table + service
+ tab UI (timeline with channel-coded icons + compose dialog).
auto-creates a reminder when followUpAt is set.
Berth Interest milestone: first milestone in the OverviewTab's pipeline
strip, completes the moment any berth is linked via the junction. Drives
the "have we captured what they want?" sanity check for general_interest
leads before they move to EOI.
Stage-conditional milestones: past phases collapse into a one-liner
strip, current phase expands, future phases hide behind a "Show
upcoming" toggle. Inline stage picker now defers reason capture to an
override-confirm view (only required for illegal transitions, not the
default flow).
Notes blob → threaded: dropped `interests.notes` column entirely; the
threaded `interest_notes` table is the single source of truth. Latest-
note teaser on Overview links into the dedicated Notes tab. Polymorphic
notes service gains aggregated client view (unions client + interest +
yacht notes with source chips and group-by-source toggle).
Berth interest list overhaul:
- Configurable columns via ColumnPicker (18 toggleable, 5 default-on)
- Natural-sort SQL ORDER BY on mooring number (A1, A2, A10 not A10, A2)
- Per-letter row tinting via colored left-border accent + dot in cell
- Documents tab merged Files (single attachments section)
Topbar improvements:
- Always-visible back arrow on detail pages (path depth > 2)
- Breadcrumb-hint store + useBreadcrumbHint hook so detail pages can
push their entity hierarchy (Clients › Mary Smith › Interest › B17)
- Tighter spacing, softer separators, 160px crumb truncation
DataTable upgrades:
- Page-size selector with All option (validator cap raised to 1000)
- getRowClassName slot for per-row styling (used by berth tinting)
- Fixed Radix SelectItem crash on empty-string values via __any__
sentinel (was crashing every list page that opened a select filter)
Interest list:
- Configurable columns picker
- Stage cell clickable into detail
- TagPicker + SavedViewsDropdown sized h-8 to match adjacent buttons
- Save view moved into ColumnPicker menu; Views button hidden when
no views are saved
- Pipeline kanban board endpoint at /api/v1/interests/board with
minimal projection, 5000-row cap + truncated banner, filter
pass-through
Mobile chrome + sidebar collapse removed (always-expanded design choice).
User management lists super-admins (was inner-joined on user_port_roles
which excluded global super-admins).
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
2026-05-07 20:59:28 +02:00
|
|
|
notes: interestNotesContent,
|
2026-04-24 12:20:40 +02:00
|
|
|
},
|
|
|
|
|
port: {
|
|
|
|
|
name: port.name,
|
|
|
|
|
defaultCurrency: port.defaultCurrency,
|
|
|
|
|
},
|
|
|
|
|
date: {
|
|
|
|
|
today,
|
|
|
|
|
year,
|
|
|
|
|
},
|
|
|
|
|
};
|
|
|
|
|
}
|