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:
@@ -51,11 +51,14 @@ function parseTyped(raw: string): { display: string; numeric: number | null } {
|
||||
const fracPart = dot === -1 ? null : cleaned.slice(dot + 1);
|
||||
const intDigitsOnly = intPart.replace('-', '');
|
||||
const intNumeric = intDigitsOnly === '' ? 0 : Number(intDigitsOnly);
|
||||
const numeric = (negative ? -1 : 1) * (intNumeric + (fracPart ? Number(`0.${fracPart}`) || 0 : 0));
|
||||
const numeric =
|
||||
(negative ? -1 : 1) * (intNumeric + (fracPart ? Number(`0.${fracPart}`) || 0 : 0));
|
||||
|
||||
const intDisplay =
|
||||
intDigitsOnly === ''
|
||||
? (negative ? '-' : '')
|
||||
? negative
|
||||
? '-'
|
||||
: ''
|
||||
: (negative ? '-' : '') + groupFormatter.format(intNumeric);
|
||||
const display = fracPart === null ? intDisplay : `${intDisplay}.${fracPart}`;
|
||||
|
||||
|
||||
@@ -5,6 +5,7 @@ import { useQuery } from '@tanstack/react-query';
|
||||
import { formatDistanceToNow } from 'date-fns';
|
||||
|
||||
import { apiFetch } from '@/lib/api/client';
|
||||
import { STAGE_LABELS, formatSource, type PipelineStage } from '@/lib/constants';
|
||||
|
||||
interface AuditRow {
|
||||
id: string;
|
||||
@@ -35,7 +36,33 @@ function formatAction(action: string): string {
|
||||
|
||||
function formatField(field: string | null): string | null {
|
||||
if (!field) return null;
|
||||
return field.replace(/_/g, ' ');
|
||||
return field
|
||||
.replace(/_/g, ' ')
|
||||
.replace(/([a-z])([A-Z])/g, '$1 $2')
|
||||
.toLowerCase();
|
||||
}
|
||||
|
||||
/** Resolve enum-typed values to their human-readable label so the row reads
|
||||
* "10% Deposit" instead of "deposit_10pct". Returns the raw value for any
|
||||
* unrecognised field/value. */
|
||||
function formatValueForField(field: string | null, value: unknown): string {
|
||||
if (value === null || value === undefined) return '';
|
||||
if (field) {
|
||||
const f = field.replace(/_/g, '').toLowerCase();
|
||||
if (typeof value === 'string') {
|
||||
if (f === 'pipelinestage' || f === 'stage') {
|
||||
return STAGE_LABELS[value as PipelineStage] ?? value.replace(/_/g, ' ');
|
||||
}
|
||||
if (f === 'source') return formatSource(value) ?? value;
|
||||
if (f === 'leadcategory' || f === 'category' || f === 'outcome') {
|
||||
return value.replace(/_/g, ' ').replace(/\b\w/g, (c) => c.toUpperCase());
|
||||
}
|
||||
}
|
||||
}
|
||||
if (typeof value === 'string' || typeof value === 'number' || typeof value === 'boolean') {
|
||||
return String(value);
|
||||
}
|
||||
return JSON.stringify(value);
|
||||
}
|
||||
|
||||
function summarize(row: AuditRow): string {
|
||||
@@ -104,12 +131,12 @@ export function EntityActivityFeed({ endpoint, emptyText = 'No activity yet.' }:
|
||||
<div className="mt-1 text-xs space-x-2">
|
||||
{row.oldValue !== null && row.oldValue !== undefined ? (
|
||||
<span className="line-through text-muted-foreground">
|
||||
{String(JSON.stringify(row.oldValue)).slice(0, 80)}
|
||||
{formatValueForField(row.fieldChanged, row.oldValue).slice(0, 80)}
|
||||
</span>
|
||||
) : null}
|
||||
{row.newValue !== null && row.newValue !== undefined ? (
|
||||
<span className="text-foreground">
|
||||
→ {String(JSON.stringify(row.newValue)).slice(0, 80)}
|
||||
→ {formatValueForField(row.fieldChanged, row.newValue).slice(0, 80)}
|
||||
</span>
|
||||
) : null}
|
||||
</div>
|
||||
|
||||
@@ -66,15 +66,7 @@ export type InlineEditableFieldProps = TextProps | SelectFieldProps | TextareaPr
|
||||
* Enter/blur and cancels on Escape.
|
||||
*/
|
||||
export function InlineEditableField(props: InlineEditableFieldProps) {
|
||||
const {
|
||||
value,
|
||||
displayValue,
|
||||
onSave,
|
||||
placeholder,
|
||||
emptyText = '-',
|
||||
className,
|
||||
disabled,
|
||||
} = props;
|
||||
const { value, displayValue, onSave, placeholder, emptyText = '-', className, disabled } = props;
|
||||
const [editing, setEditing] = useState(false);
|
||||
const [draft, setDraft] = useState(value ?? '');
|
||||
const [saving, setSaving] = useState(false);
|
||||
|
||||
@@ -89,8 +89,7 @@ export function OwnerPicker({
|
||||
const selectedLabel = (() => {
|
||||
if (!value) return placeholder;
|
||||
if (valueDetail?.data) {
|
||||
const name =
|
||||
value.type === 'client' ? valueDetail.data.fullName : valueDetail.data.name;
|
||||
const name = value.type === 'client' ? valueDetail.data.fullName : valueDetail.data.name;
|
||||
if (name) return name;
|
||||
}
|
||||
const match = options.find((o) => o.id === value.id);
|
||||
|
||||
Reference in New Issue
Block a user