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>
181 lines
5.6 KiB
TypeScript
181 lines
5.6 KiB
TypeScript
import { describe, it, expect } from 'vitest';
|
|
|
|
import { derivePublicStatus, toPublicBerth } from '@/lib/services/public-berths';
|
|
import type { Berth, BerthMapData } from '@/lib/db/schema/berths';
|
|
|
|
function makeBerth(overrides: Partial<Berth> = {}): Berth {
|
|
return {
|
|
id: 'b1',
|
|
portId: 'p1',
|
|
mooringNumber: 'A1',
|
|
area: 'A',
|
|
status: 'available',
|
|
lengthFt: '206.69',
|
|
widthFt: '46.56',
|
|
draftFt: '14.5',
|
|
lengthM: '63',
|
|
widthM: '14.19',
|
|
draftM: '4.42',
|
|
widthIsMinimum: false,
|
|
nominalBoatSize: '200',
|
|
nominalBoatSizeM: '60.96',
|
|
waterDepth: '16.08',
|
|
waterDepthM: '4.9',
|
|
waterDepthIsMinimum: false,
|
|
sidePontoon: 'Quay PT',
|
|
powerCapacity: '330',
|
|
voltage: '480',
|
|
mooringType: 'Side Pier / Med Mooring',
|
|
cleatType: 'A5',
|
|
cleatCapacity: '20-24 ton break load',
|
|
bollardType: 'Bull bollard type B',
|
|
bollardCapacity: '40 ton break load',
|
|
access: 'Car (3t) to Vessel',
|
|
price: '3528000',
|
|
priceCurrency: 'USD',
|
|
weeklyRateHighUsd: null,
|
|
weeklyRateLowUsd: null,
|
|
dailyRateHighUsd: null,
|
|
dailyRateLowUsd: null,
|
|
pricingValidUntil: null,
|
|
bowFacing: 'East',
|
|
berthApproved: false,
|
|
tenureType: 'permanent',
|
|
tenureYears: null,
|
|
tenureStartDate: null,
|
|
tenureEndDate: null,
|
|
statusLastChangedBy: null,
|
|
statusLastChangedReason: null,
|
|
statusLastModified: null,
|
|
statusOverrideMode: null,
|
|
lastImportedAt: null,
|
|
currentPdfVersionId: null,
|
|
lengthUnit: 'ft',
|
|
widthUnit: 'ft',
|
|
draftUnit: 'ft',
|
|
nominalBoatSizeUnit: 'ft',
|
|
waterDepthUnit: 'ft',
|
|
createdAt: new Date(),
|
|
updatedAt: new Date(),
|
|
...overrides,
|
|
};
|
|
}
|
|
|
|
function makeMapData(overrides: Partial<BerthMapData> = {}): BerthMapData {
|
|
return {
|
|
id: 'm1',
|
|
berthId: 'b1',
|
|
svgPath: 'M0 0',
|
|
x: '922.819',
|
|
y: '930.721',
|
|
transform: '',
|
|
fontSize: '32',
|
|
extraData: {},
|
|
updatedAt: new Date(),
|
|
...overrides,
|
|
};
|
|
}
|
|
|
|
describe('derivePublicStatus', () => {
|
|
it('"sold" wins over the specific-interest signal', () => {
|
|
expect(derivePublicStatus('sold', true)).toBe('Sold');
|
|
expect(derivePublicStatus('sold', false)).toBe('Sold');
|
|
});
|
|
it('"under_offer" maps to "Under Offer"', () => {
|
|
expect(derivePublicStatus('under_offer', false)).toBe('Under Offer');
|
|
});
|
|
it('a specific-interest link promotes "available" → "Under Offer"', () => {
|
|
expect(derivePublicStatus('available', true)).toBe('Under Offer');
|
|
});
|
|
it('plain available stays available', () => {
|
|
expect(derivePublicStatus('available', false)).toBe('Available');
|
|
});
|
|
});
|
|
|
|
describe('toPublicBerth', () => {
|
|
it('maps every NocoDB-style field with numeric coercion', () => {
|
|
const out = toPublicBerth(makeBerth(), makeMapData(), false);
|
|
expect(out.Id).toBe('b1');
|
|
expect(out['Mooring Number']).toBe('A1');
|
|
expect(out.Length).toBe(206.69);
|
|
expect(out.Width).toBe(46.56);
|
|
expect(out.Draft).toBe(14.5);
|
|
expect(out['Power Capacity']).toBe(330);
|
|
expect(out.Voltage).toBe(480);
|
|
expect(out['Nominal Boat Size']).toBe(200);
|
|
expect(out.Status).toBe('Available');
|
|
expect(out['Mooring Type']).toBe('Side Pier / Med Mooring');
|
|
expect(out['Bow Facing']).toBe('East');
|
|
expect(out.Area).toBe('A');
|
|
expect(out.Access).toBe('Car (3t) to Vessel');
|
|
});
|
|
|
|
it('exposes booleans + metric variants + timestamps for verbatim NocoDB parity', () => {
|
|
const out = toPublicBerth(makeBerth(), null, false);
|
|
expect(out['Berth Approved']).toBe(false);
|
|
expect(out['Water Depth']).toBe(16.08);
|
|
expect(out['Width Is Minimum']).toBe(false);
|
|
expect(out['Water Depth Is Minimum']).toBe(false);
|
|
expect(out['Length (Metric)']).toBe(63);
|
|
expect(out['Width (Metric)']).toBe(14.19);
|
|
expect(out['Draft (Metric)']).toBe(4.42);
|
|
expect(out['Water Depth (Metric)']).toBe(4.9);
|
|
expect(out['Nominal Boat Size (Metric)']).toBe(60.96);
|
|
expect(out.CreatedAt).toMatch(/^\d{4}-\d{2}-\d{2}T/);
|
|
expect(out.UpdatedAt).toMatch(/^\d{4}-\d{2}-\d{2}T/);
|
|
});
|
|
|
|
it('preserves null booleans (NocoDB checkbox-tri-state parity)', () => {
|
|
const out = toPublicBerth(
|
|
makeBerth({ berthApproved: null, widthIsMinimum: null, waterDepthIsMinimum: null }),
|
|
null,
|
|
false,
|
|
);
|
|
expect(out['Berth Approved']).toBeNull();
|
|
expect(out['Width Is Minimum']).toBeNull();
|
|
expect(out['Water Depth Is Minimum']).toBeNull();
|
|
});
|
|
|
|
it('inlines map data when present', () => {
|
|
const out = toPublicBerth(makeBerth(), makeMapData(), false);
|
|
expect(out['Map Data']).toEqual({
|
|
path: 'M0 0',
|
|
x: '922.819',
|
|
y: '930.721',
|
|
transform: '',
|
|
fontSize: '32',
|
|
});
|
|
});
|
|
|
|
it('omits map data entirely when missing', () => {
|
|
const out = toPublicBerth(makeBerth(), null, false);
|
|
expect(out['Map Data']).toBeUndefined();
|
|
});
|
|
|
|
it('numeric fields stored as strings round-trip cleanly', () => {
|
|
const out = toPublicBerth(makeBerth({ lengthFt: '42' }), null, false);
|
|
expect(out.Length).toBe(42);
|
|
});
|
|
|
|
it('null numeric inputs surface as null (not NaN)', () => {
|
|
const out = toPublicBerth(
|
|
makeBerth({ lengthFt: null, widthFt: null, draftFt: null }),
|
|
null,
|
|
false,
|
|
);
|
|
expect(out.Length).toBeNull();
|
|
expect(out.Width).toBeNull();
|
|
expect(out.Draft).toBeNull();
|
|
});
|
|
|
|
it('promotes status to "Under Offer" when a specific-interest link exists', () => {
|
|
const out = toPublicBerth(makeBerth({ status: 'available' }), null, true);
|
|
expect(out.Status).toBe('Under Offer');
|
|
});
|
|
|
|
it('preserves "Sold" even when a specific-interest link exists (defensive)', () => {
|
|
const out = toPublicBerth(makeBerth({ status: 'sold' }), null, true);
|
|
expect(out.Status).toBe('Sold');
|
|
});
|
|
});
|