feat(tenancies-p2): rename berth_reservations → berth_tenancies (schema + perms + UI)
73-file atomic rename per docs/tenancies-design.md:
- Migration 0085: rename table + indexes + FK constraints; rename
documents.reservation_id → tenancy_id; migrate jsonb permission maps
(reservations resource → tenancies; collapse create+activate → manage);
rewrite historical audit_logs.entity_type='berth_reservation' →
'berth_tenancy'. FK renames wrapped in DO blocks so dev DBs that pre-date
the FK additions don't abort.
- Schema: berthReservations → berthTenancies; BerthReservation type →
BerthTenancy; indexes idx_br_* / idx_brr_* → idx_bt_*.
- RolePermissions: resource { view, create, activate, cancel } collapses to
{ view, manage, cancel }; all 8 default seed bundles + role-form + matrix
updated.
- Service: berth-reservations.service.ts → berth-tenancies.service.ts;
endReservation → endTenancy; listReservations → listTenancies.
- API: /api/v1/berth-reservations → /api/v1/tenancies (+ nested [id]);
/api/v1/berths/[id]/reservations → /api/v1/berths/[id]/tenancies.
- Validators: reservations.ts → tenancies.ts; RESERVATION_STATUSES →
TENANCY_STATUSES; endReservationSchema → endTenancySchema.
- Routes: /{portSlug}/berth-reservations → /{portSlug}/tenancies;
/portal/my-reservations → /portal/my-tenancies.
- Components: src/components/reservations/* → src/components/tenancies/*;
BerthReservationsTab → BerthTenanciesTab; ClientReservationsTab →
ClientTenanciesTab; ReservationList → TenancyList.
- Socket events: berth_reservation:* → berth_tenancy:*; payload
reservationId → tenancyId.
- Webhook events: berth_reservation.* → berth_tenancy.*.
- Portal: getPortalUserReservations → getPortalUserTenancies;
PortalReservation → PortalTenancy; PortalDashboard.counts.activeReservations
→ activeTenancies; PortalNav label "Reservations" → "Tenancies".
- Dossier: DossierReservation → DossierTenancy; reservationDecisions →
tenancyDecisions across smart-archive-dialog + bulk-archive routes.
- Documents schema: documents.reservationId → documents.tenancyId
(TS + DB column + index + FK constraint).
- Activity feed label berth_reservation → berth_tenancy (matched against
migrated historical audit rows).
KEPT (separate concepts):
- Reservation Agreement document type (the contract sent to clients).
- "Reservation" pipeline stage name.
- {{reservation.*}} merge tokens in template authoring.
- interest.reservationStatus / reservationDocStatus / dateReservationSent
fields (track agreement signing on the deal).
- reservation-agreement-context.ts service (builds merge context for the
Reservation Agreement doc; only its DB imports were renamed).
Verified: tsc clean, 1480/1480 vitest passing, migration applied.
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
This commit is contained in:
114
src/components/clients/client-tenancies-tab.tsx
Normal file
114
src/components/clients/client-tenancies-tab.tsx
Normal file
@@ -0,0 +1,114 @@
|
||||
'use client';
|
||||
|
||||
import { useState } from 'react';
|
||||
import { useQuery } from '@tanstack/react-query';
|
||||
|
||||
import { TenancyList, type TenancyRow } from '@/components/tenancies/tenancy-list';
|
||||
import { Button } from '@/components/ui/button';
|
||||
import { apiFetch } from '@/lib/api/client';
|
||||
|
||||
interface ClientTenanciesTabProps {
|
||||
clientId: string;
|
||||
activeTenancies: Array<{
|
||||
id: string;
|
||||
berthId: string;
|
||||
yachtId: string;
|
||||
startDate: string | Date;
|
||||
tenureType: string;
|
||||
status: string;
|
||||
}>;
|
||||
}
|
||||
|
||||
interface TenancyListResponse {
|
||||
data: TenancyRow[];
|
||||
pagination?: { total: number };
|
||||
}
|
||||
|
||||
export function ClientTenanciesTab({ clientId, activeTenancies }: ClientTenanciesTabProps) {
|
||||
const [showHistory, setShowHistory] = useState(false);
|
||||
|
||||
const activeRows: TenancyRow[] = activeTenancies.map((r) => ({
|
||||
id: r.id,
|
||||
berthId: r.berthId,
|
||||
portId: '',
|
||||
clientId,
|
||||
yachtId: r.yachtId,
|
||||
status: r.status as TenancyRow['status'],
|
||||
startDate: typeof r.startDate === 'string' ? r.startDate : r.startDate.toISOString(),
|
||||
endDate: null,
|
||||
tenureType: r.tenureType,
|
||||
contractFileId: null,
|
||||
notes: null,
|
||||
createdAt: '',
|
||||
}));
|
||||
|
||||
// Lazy-load history (ended + cancelled). Two parallel queries because
|
||||
// the API takes one status at a time; combining once both resolve.
|
||||
const endedQuery = useQuery({
|
||||
queryKey: ['tenancies', { clientId, status: 'ended' }],
|
||||
queryFn: () =>
|
||||
apiFetch<TenancyListResponse>(
|
||||
`/api/v1/tenancies?clientId=${encodeURIComponent(clientId)}&status=ended&pageSize=50`,
|
||||
),
|
||||
enabled: showHistory,
|
||||
});
|
||||
const cancelledQuery = useQuery({
|
||||
queryKey: ['tenancies', { clientId, status: 'cancelled' }],
|
||||
queryFn: () =>
|
||||
apiFetch<TenancyListResponse>(
|
||||
`/api/v1/tenancies?clientId=${encodeURIComponent(clientId)}&status=cancelled&pageSize=50`,
|
||||
),
|
||||
enabled: showHistory,
|
||||
});
|
||||
|
||||
const historyRows: TenancyRow[] = [
|
||||
...(endedQuery.data?.data ?? []),
|
||||
...(cancelledQuery.data?.data ?? []),
|
||||
].sort((a, b) => (a.startDate < b.startDate ? 1 : -1));
|
||||
|
||||
const isHistoryLoading = showHistory && (endedQuery.isLoading || cancelledQuery.isLoading);
|
||||
|
||||
return (
|
||||
<div className="space-y-6">
|
||||
<div>
|
||||
<div className="flex items-center justify-between">
|
||||
<h3 className="text-sm font-medium">Active tenancies</h3>
|
||||
</div>
|
||||
<TenancyList
|
||||
tenancies={activeRows}
|
||||
showBerth
|
||||
emptyMessage="This client has no active tenancies."
|
||||
/>
|
||||
</div>
|
||||
|
||||
<div>
|
||||
<div className="flex items-center justify-between mb-2">
|
||||
<h3 className="text-sm font-medium">History</h3>
|
||||
<Button
|
||||
size="sm"
|
||||
variant="outline"
|
||||
onClick={() => setShowHistory((v) => !v)}
|
||||
disabled={isHistoryLoading}
|
||||
>
|
||||
{showHistory ? 'Hide history' : 'Show history'}
|
||||
</Button>
|
||||
</div>
|
||||
{showHistory ? (
|
||||
isHistoryLoading ? (
|
||||
<p className="text-xs text-muted-foreground">Loading…</p>
|
||||
) : (
|
||||
<TenancyList
|
||||
tenancies={historyRows}
|
||||
showBerth
|
||||
emptyMessage="No ended or cancelled tenancies."
|
||||
/>
|
||||
)
|
||||
) : (
|
||||
<p className="text-xs text-muted-foreground">
|
||||
Click “Show history” to load ended and cancelled tenancies.
|
||||
</p>
|
||||
)}
|
||||
</div>
|
||||
</div>
|
||||
);
|
||||
}
|
||||
Reference in New Issue
Block a user