Per the trips/events design discussion: instead of building a full
events domain (table + CRUD UI + calendar) for the 6–12 yacht shows
a year, ship the cheap version that covers the actual asks.
Expenses — `tripLabel` free-text:
- New `expenses.trip_label` text column (migration 0039) + index for
filter / autocomplete lookup.
- Validator: createExpenseShape + listExpensesSchema +
exportExpensePdfSchema.filter all accept tripLabel.
- Service: createExpense + updateExpense persist; listExpenses filters;
new `listTripLabels(portId, search?)` returns distinct values
ordered by most-recent expenseDate so the autocomplete surfaces
recently-used labels first.
- New `GET /api/v1/expenses/trip-labels` endpoint (gated by
expenses.view) backs the autocomplete.
- Form dialog: native `<datalist>` powered by the autocomplete query
so reps don't end up with "Palm Beach 2026" / "palm-beach 2026"
fragmented across two PDF sections.
- Expense list: new "Trip" column (badge) + free-text filter.
- Detail page: trip label rendered alongside Category / Payer.
- PDF export: GroupBy gains 'trip'; filter.tripLabel narrows the
export. Untagged rows fall under "(no trip)".
- Trim/normalize on write so " Palm Beach 2026 " === "Palm Beach 2026".
Interests — event tagging via existing tag system:
- Reps can tag interests with an event tag (e.g. "Palm Beach 2026")
via the existing InlineTagEditor on the detail page; tags are
port-scoped and reusable.
- Interest list now has a TagPicker filter rendered next to the
FilterBar so reps can sort prospects by event attended ("show me
every lead from Palm Beach"). Hidden 'relation'-typed
FilterDefinition for tagIds wires URL round-trip + saved-views
capture without rendering inside the FilterBar.
- FilterBar deserializer now handles `relation` types as comma-joined
arrays on URL load.
Why a free-text trip label and not a trips table:
- 6–12 events/year doesn't justify a domain. The CRUD UI cost would
be most of the engineering, and reps already have the events on
their personal calendars.
- If usage proves demand for per-event ROI dashboards or richer
attribution, promote to a real `trips` table later. Migration
path: trip_label → tripId is a backfill+swap.
Test status: 1168/1168 vitest. tsc clean. Migration 0039 applied
in dev (also caught + fixed an unrelated audit-v3 follow-up: 0037
had `idx_br_interest` colliding with the existing
`berth_recommendations.idx_br_interest`; renamed to
`idx_brr_interest` / `idx_brr_contract_file`).
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
193 lines
5.5 KiB
TypeScript
193 lines
5.5 KiB
TypeScript
'use client';
|
|
|
|
import Link from 'next/link';
|
|
import { format } from 'date-fns';
|
|
import { MoreHorizontal, Pencil, Archive, Eye } from 'lucide-react';
|
|
import type { ColumnDef } from '@tanstack/react-table';
|
|
|
|
import { Button } from '@/components/ui/button';
|
|
import { Badge } from '@/components/ui/badge';
|
|
import {
|
|
DropdownMenu,
|
|
DropdownMenuContent,
|
|
DropdownMenuItem,
|
|
DropdownMenuTrigger,
|
|
} from '@/components/ui/dropdown-menu';
|
|
|
|
export interface ExpenseRow {
|
|
id: string;
|
|
establishmentName: string | null;
|
|
amount: string;
|
|
currency: string;
|
|
amountUsd: string | null;
|
|
category: string | null;
|
|
paymentStatus: string | null;
|
|
paymentMethod: string | null;
|
|
expenseDate: string;
|
|
description: string | null;
|
|
payer: string | null;
|
|
receiptFileIds: string[] | null;
|
|
noReceiptAcknowledged?: boolean;
|
|
tripLabel: string | null;
|
|
archivedAt: string | null;
|
|
createdAt: string;
|
|
/** Set by the dedup engine when this expense looks like a duplicate of another. */
|
|
duplicateOf: string | null;
|
|
dedupScannedAt: string | null;
|
|
}
|
|
|
|
const PAYMENT_STATUS_COLORS: Record<string, string> = {
|
|
unpaid: 'bg-red-100 text-red-700 border-red-200',
|
|
paid: 'bg-green-100 text-green-700 border-green-200',
|
|
partial: 'bg-yellow-100 text-yellow-700 border-yellow-200',
|
|
};
|
|
|
|
interface GetColumnsOptions {
|
|
portSlug: string;
|
|
onEdit: (expense: ExpenseRow) => void;
|
|
onArchive: (expense: ExpenseRow) => void;
|
|
}
|
|
|
|
export function getExpenseColumns({
|
|
portSlug,
|
|
onEdit,
|
|
onArchive,
|
|
}: GetColumnsOptions): ColumnDef<ExpenseRow, unknown>[] {
|
|
return [
|
|
{
|
|
id: 'expenseDate',
|
|
accessorKey: 'expenseDate',
|
|
header: 'Date',
|
|
cell: ({ getValue }) => (
|
|
<span className="text-sm text-muted-foreground">
|
|
{format(new Date(getValue() as string), 'MMM d, yyyy')}
|
|
</span>
|
|
),
|
|
},
|
|
{
|
|
id: 'establishmentName',
|
|
accessorKey: 'establishmentName',
|
|
header: 'Establishment',
|
|
cell: ({ row }) => (
|
|
<Link
|
|
href={`/${portSlug}/expenses/${row.original.id}`}
|
|
className="font-medium text-primary hover:underline"
|
|
onClick={(e) => e.stopPropagation()}
|
|
>
|
|
{row.original.establishmentName ?? '-'}
|
|
</Link>
|
|
),
|
|
},
|
|
{
|
|
id: 'amount',
|
|
header: 'Amount',
|
|
enableSorting: false,
|
|
cell: ({ row }) => (
|
|
<span className="font-medium tabular-nums">
|
|
{Number(row.original.amount).toLocaleString('en-US', {
|
|
minimumFractionDigits: 2,
|
|
maximumFractionDigits: 2,
|
|
})}{' '}
|
|
{row.original.currency}
|
|
</span>
|
|
),
|
|
},
|
|
{
|
|
id: 'amountUsd',
|
|
header: 'USD Equiv.',
|
|
enableSorting: false,
|
|
cell: ({ row }) =>
|
|
row.original.amountUsd ? (
|
|
<span className="text-sm text-muted-foreground tabular-nums">
|
|
$
|
|
{Number(row.original.amountUsd).toLocaleString('en-US', {
|
|
minimumFractionDigits: 2,
|
|
maximumFractionDigits: 2,
|
|
})}
|
|
</span>
|
|
) : (
|
|
<span className="text-sm text-muted-foreground">N/A</span>
|
|
),
|
|
},
|
|
{
|
|
id: 'category',
|
|
accessorKey: 'category',
|
|
header: 'Category',
|
|
cell: ({ getValue }) => {
|
|
const cat = getValue() as string | null;
|
|
if (!cat) return <span className="text-muted-foreground">-</span>;
|
|
return (
|
|
<Badge variant="outline" className="capitalize text-xs">
|
|
{cat.replace(/_/g, ' ')}
|
|
</Badge>
|
|
);
|
|
},
|
|
},
|
|
{
|
|
id: 'tripLabel',
|
|
accessorKey: 'tripLabel',
|
|
header: 'Trip',
|
|
enableSorting: false,
|
|
cell: ({ getValue }) => {
|
|
const trip = getValue() as string | null;
|
|
if (!trip) return <span className="text-muted-foreground text-xs">-</span>;
|
|
return (
|
|
<Badge variant="secondary" className="text-xs font-normal">
|
|
{trip}
|
|
</Badge>
|
|
);
|
|
},
|
|
},
|
|
{
|
|
id: 'paymentStatus',
|
|
accessorKey: 'paymentStatus',
|
|
header: 'Status',
|
|
cell: ({ getValue }) => {
|
|
const status = (getValue() as string | null) ?? 'unpaid';
|
|
const colorClass = PAYMENT_STATUS_COLORS[status] ?? '';
|
|
return (
|
|
<Badge variant="outline" className={`capitalize text-xs border ${colorClass}`}>
|
|
{status}
|
|
</Badge>
|
|
);
|
|
},
|
|
},
|
|
{
|
|
id: 'actions',
|
|
header: '',
|
|
enableSorting: false,
|
|
size: 48,
|
|
cell: ({ row }) => (
|
|
<DropdownMenu>
|
|
<DropdownMenuTrigger asChild>
|
|
<Button
|
|
variant="ghost"
|
|
size="icon"
|
|
className="h-7 w-7"
|
|
onClick={(e) => e.stopPropagation()}
|
|
>
|
|
<MoreHorizontal className="h-4 w-4" />
|
|
</Button>
|
|
</DropdownMenuTrigger>
|
|
<DropdownMenuContent align="end">
|
|
<DropdownMenuItem asChild>
|
|
<Link href={`/${portSlug}/expenses/${row.original.id}`}>
|
|
<Eye className="mr-2 h-3.5 w-3.5" />
|
|
View
|
|
</Link>
|
|
</DropdownMenuItem>
|
|
<DropdownMenuItem onClick={() => onEdit(row.original)}>
|
|
<Pencil className="mr-2 h-3.5 w-3.5" />
|
|
Edit
|
|
</DropdownMenuItem>
|
|
<DropdownMenuItem className="text-destructive" onClick={() => onArchive(row.original)}>
|
|
<Archive className="mr-2 h-3.5 w-3.5" />
|
|
Archive
|
|
</DropdownMenuItem>
|
|
</DropdownMenuContent>
|
|
</DropdownMenu>
|
|
),
|
|
},
|
|
];
|
|
}
|