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>
105 lines
2.9 KiB
TypeScript
105 lines
2.9 KiB
TypeScript
import { and, asc, desc, eq, ilike, isNull, or, sql, type SQL } from 'drizzle-orm';
|
|
import type { PgTable, PgColumn } from 'drizzle-orm/pg-core';
|
|
import { db } from './index';
|
|
|
|
export interface BuildListQueryOptions {
|
|
table: PgTable;
|
|
portIdColumn: PgColumn;
|
|
portId: string;
|
|
idColumn: PgColumn;
|
|
updatedAtColumn: PgColumn;
|
|
filters?: SQL[];
|
|
sort?: { column: PgColumn; direction: 'asc' | 'desc' };
|
|
/**
|
|
* Custom ORDER BY clauses, used INSTEAD of `sort`. For cases where
|
|
* the natural ordering needs raw SQL (e.g. natural alphanumeric sort
|
|
* on berth mooring numbers like A1, A2, A10, B1...). Deterministic
|
|
* tail-sort on `updatedAt DESC, id DESC` is still appended.
|
|
*/
|
|
customOrderBy?: SQL[];
|
|
page: number;
|
|
pageSize: number;
|
|
searchColumns?: PgColumn[];
|
|
searchTerm?: string;
|
|
includeArchived?: boolean;
|
|
archivedAtColumn?: PgColumn;
|
|
}
|
|
|
|
export interface ListResult<T> {
|
|
data: T[];
|
|
total: number;
|
|
}
|
|
|
|
/**
|
|
* Generic Drizzle paginated query builder with port-scoping.
|
|
*
|
|
* - Port scoping is always the first condition in the AND chain.
|
|
* - `archivedAt IS NULL` by default (unless `includeArchived` is true).
|
|
* - Deterministic secondary sort: `updatedAt DESC, id DESC`.
|
|
*/
|
|
export async function buildListQuery<T>(opts: BuildListQueryOptions): Promise<ListResult<T>> {
|
|
const {
|
|
table,
|
|
portIdColumn,
|
|
portId,
|
|
idColumn,
|
|
updatedAtColumn,
|
|
filters = [],
|
|
sort,
|
|
customOrderBy,
|
|
page,
|
|
pageSize,
|
|
searchColumns = [],
|
|
searchTerm,
|
|
includeArchived = false,
|
|
archivedAtColumn,
|
|
} = opts;
|
|
|
|
const conditions: SQL[] = [eq(portIdColumn, portId)];
|
|
|
|
// Exclude archived by default
|
|
if (!includeArchived && archivedAtColumn) {
|
|
conditions.push(isNull(archivedAtColumn));
|
|
}
|
|
|
|
// Full-text search across multiple columns via ILIKE
|
|
if (searchTerm && searchColumns.length > 0) {
|
|
const searchConditions = searchColumns.map((col) => ilike(col, `%${searchTerm}%`));
|
|
conditions.push(or(...searchConditions)!);
|
|
}
|
|
|
|
// Append caller-supplied filters
|
|
conditions.push(...filters);
|
|
|
|
const where = and(...conditions);
|
|
|
|
// Count total
|
|
const countResult = await db
|
|
.select({ count: sql<number>`count(*)::int` })
|
|
.from(table)
|
|
.where(where);
|
|
const total = countResult[0]?.count ?? 0;
|
|
|
|
// Build order by: customOrderBy (if provided) wins over the default
|
|
// column-based sort. Deterministic secondary sort always trails.
|
|
const orderClauses: SQL[] = [];
|
|
if (customOrderBy && customOrderBy.length > 0) {
|
|
orderClauses.push(...customOrderBy);
|
|
} else if (sort) {
|
|
orderClauses.push(sort.direction === 'asc' ? asc(sort.column) : desc(sort.column));
|
|
}
|
|
orderClauses.push(desc(updatedAtColumn), desc(idColumn));
|
|
|
|
// Fetch page
|
|
const offset = (page - 1) * pageSize;
|
|
const data = await db
|
|
.select()
|
|
.from(table)
|
|
.where(where)
|
|
.orderBy(...orderClauses)
|
|
.limit(pageSize)
|
|
.offset(offset);
|
|
|
|
return { data: data as T[], total };
|
|
}
|