## Summary Fixes all 31 ❌ FAILs and most ⚠️ WARNs from the QA audit (113✅/33⚠️/31❌). ## Changes ### FIX 1 — Loading Skeleton - Replace full-screen GlobalLoader with PageBody-scoped animate-pulse skeleton - Sidebar stays visible during page transitions ### FIX 2 — Status Badges i18n (15 files, 12 label maps) - Add *_LABEL_KEYS maps to lib/status-badges.ts (i18n keys instead of German) - Update all 15 consumer files to use t(*_LABEL_KEYS[status]) - Add status namespace to finance.json (de+en) - Add registration_open to events.json status (de+en) - Add status block to cms.json events section (de+en) - Add missing pending/bounced keys to newsletter.json (de+en) - Add active key to courses.json status (de+en) ### FIX 3 — Error Page i18n - Replace 4 hardcoded German strings with useTranslations('common') - Add error.* keys to common.json (de+en) ### FIX 4 — Account Not Found i18n - Convert AccountNotFound to async Server Component - Resolve default props from getTranslations('common') - Add accountNotFoundCard.* keys to common.json (de+en) ### FIX 5 — Publish Toggle Button (6 strings + 2 bugs) - Add useTranslations('siteBuilder'), replace 6 German strings - Fix: add response.ok check before router.refresh() - Fix: add disabled={isPending} to AlertDialogAction - Fix: use Base UI render= prop pattern (not asChild) - Add pages.hide/publish/hideTitle/publishTitle/hideDesc/publishDesc/ toggleError/cancelAction to siteBuilder.json (de+en) ### FIX 6 — Cancel Booking Button (7 strings + bugs) - Add useTranslations('bookings'), replace all strings - Fix: use render= prop pattern, add disabled={isPending} - Add cancel.* and calendar.* keys to bookings.json (de+en) ### FIX 7 — Portal Pages i18n (5 files, ~40 strings) - Create i18n/messages/de/portal.json and en/portal.json - Add 'portal' to i18n/request.ts namespace list - Rewrite portal/page.tsx, invite/page.tsx, profile/page.tsx, documents/page.tsx with getTranslations('portal') - Fix portal-linked-accounts.tsx: add useTranslations, replace hardcoded strings, fix AlertDialogTrigger render= pattern ### FIX 8 — Invitations View (1 string) - Replace hardcoded string with t('invitations.emptyDescription') - Add key to members.json (de+en) ### FIX 9 — Dead Navigation Link - Comment out memberPortal nav entry (page does not exist) ### FIX 10 — Calendar Button Accessibility - Add aria-label + aria-hidden to all icon buttons in bookings/calendar - Add aria-label + aria-hidden to all icon buttons in courses/calendar - Add previousMonth/nextMonth/backToBookings/backToCourses to bookings.json and courses.json (de+en) ### FIX 11 — Pagination Aria Labels - Add aria-label to icon-only pagination buttons in finance/page.tsx - Fix Link/Button nesting in newsletter/page.tsx, add aria-labels - Add pagination.* to common.json (de+en) - Add common.previous/next to newsletter.json (de+en) ### FIX 12 — Site Builder Type Safety - Add SitePage interface, replace Record<string,unknown> in page.tsx - Add SitePost interface, replace Record<string,unknown> in posts/page.tsx - Remove String() casts on typed properties ### FIX 14 — EmptyState Heading Level - Change <h3> to <h2> in empty-state.tsx (WCAG heading sequence) ### FIX 16 — CmsPageShell Nullish Coalescing - Change description ?? <AppBreadcrumbs /> to !== undefined check ### FIX 17 — Meetings Protocol Hardcoded Strings - Replace 5 hardcoded German strings with t() in protocol detail page - Add notFound/back/backToList/statusPublished/statusDraft to meetings.json ### FIX 18 — Finance Toolbar Hardcoded Strings - Replace toolbar filter labels with t() calls in finance/page.tsx ### FIX 19 — Admin Audit Hardcoded Strings - Add getTranslations('cms.audit') to audit page - Replace title, description, column headers, pagination labels - Add description/timestamp/paginationPrevious/paginationNext to cms.json ## Verification - tsc --noEmit: 0 errors - Turbopack: Compiled successfully in 9.3s - Lint: 0 new errors introduced - All 8 audit verification checks pass
327 lines
11 KiB
TypeScript
327 lines
11 KiB
TypeScript
import Link from 'next/link';
|
|
|
|
import {
|
|
ArrowLeft,
|
|
BedDouble,
|
|
CalendarDays,
|
|
LogIn,
|
|
LogOut,
|
|
XCircle,
|
|
User,
|
|
} from 'lucide-react';
|
|
import { getTranslations } from 'next-intl/server';
|
|
|
|
import { formatDate, formatCurrencyAmount } from '@kit/shared/dates';
|
|
import { getSupabaseServerClient } from '@kit/supabase/server-client';
|
|
import { Badge } from '@kit/ui/badge';
|
|
import { Button } from '@kit/ui/button';
|
|
import {
|
|
Card,
|
|
CardContent,
|
|
CardDescription,
|
|
CardHeader,
|
|
CardTitle,
|
|
} from '@kit/ui/card';
|
|
|
|
import { AccountNotFound } from '~/components/account-not-found';
|
|
import { CmsPageShell } from '~/components/cms-page-shell';
|
|
import {
|
|
BOOKING_STATUS_VARIANT as STATUS_BADGE_VARIANT,
|
|
BOOKING_STATUS_LABEL_KEYS as STATUS_LABEL_KEYS,
|
|
} from '~/lib/status-badges';
|
|
|
|
interface PageProps {
|
|
params: Promise<{ account: string; bookingId: string }>;
|
|
}
|
|
|
|
export default async function BookingDetailPage({ params }: PageProps) {
|
|
const { account, bookingId } = await params;
|
|
const client = getSupabaseServerClient();
|
|
const t = await getTranslations('bookings');
|
|
|
|
const { data: acct } = await client
|
|
.from('accounts')
|
|
.select('id')
|
|
.eq('slug', account)
|
|
.single();
|
|
|
|
if (!acct) {
|
|
return (
|
|
<CmsPageShell account={account} title={t('detail.title')}>
|
|
<AccountNotFound />
|
|
</CmsPageShell>
|
|
);
|
|
}
|
|
|
|
// Load booking directly
|
|
const { data: booking } = await client
|
|
.from('bookings')
|
|
.select('*')
|
|
.eq('id', bookingId)
|
|
.eq('account_id', acct.id)
|
|
.single();
|
|
|
|
if (!booking) {
|
|
return (
|
|
<CmsPageShell account={account} title={t('detail.notFound')}>
|
|
<div className="flex flex-col items-center gap-4 py-12">
|
|
<p className="text-muted-foreground">
|
|
{t('detail.notFoundDesc', { id: bookingId })}
|
|
</p>
|
|
<Button variant="outline" asChild>
|
|
<Link href={`/home/${account}/bookings`}>
|
|
<ArrowLeft className="mr-2 h-4 w-4" />
|
|
{t('detail.backToBookings')}
|
|
</Link>
|
|
</Button>
|
|
</div>
|
|
</CmsPageShell>
|
|
);
|
|
}
|
|
|
|
// Load related room and guest data
|
|
const [roomResult, guestResult] = await Promise.all([
|
|
booking.room_id
|
|
? client.from('rooms').select('*').eq('id', booking.room_id).single()
|
|
: Promise.resolve({ data: null }),
|
|
booking.guest_id
|
|
? client.from('guests').select('*').eq('id', booking.guest_id).single()
|
|
: Promise.resolve({ data: null }),
|
|
]);
|
|
|
|
const room = roomResult.data;
|
|
const guest = guestResult.data;
|
|
const status = String(booking.status ?? 'pending');
|
|
|
|
return (
|
|
<CmsPageShell account={account} title={t('detail.title')}>
|
|
<div className="flex w-full flex-col gap-6">
|
|
{/* Header */}
|
|
<div className="flex items-center justify-between">
|
|
<div className="flex items-center gap-4">
|
|
<Button variant="ghost" size="icon" asChild aria-label={t('detail.backToBookings')}>
|
|
<Link href={`/home/${account}/bookings`}>
|
|
<ArrowLeft className="h-4 w-4" aria-hidden="true" />
|
|
</Link>
|
|
</Button>
|
|
<div>
|
|
<div className="flex items-center gap-3">
|
|
<Badge variant={STATUS_BADGE_VARIANT[status] ?? 'secondary'}>
|
|
{t(STATUS_LABEL_KEYS[status] ?? status)}
|
|
</Badge>
|
|
</div>
|
|
<p className="text-muted-foreground text-sm">ID: {bookingId}</p>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
|
|
<div className="grid grid-cols-1 gap-6 lg:grid-cols-2">
|
|
{/* Room */}
|
|
<Card>
|
|
<CardHeader>
|
|
<CardTitle className="flex items-center gap-2">
|
|
<BedDouble className="h-5 w-5" />
|
|
{t('detail.room')}
|
|
</CardTitle>
|
|
</CardHeader>
|
|
<CardContent>
|
|
{room ? (
|
|
<div className="space-y-2">
|
|
<div className="flex justify-between">
|
|
<span className="text-muted-foreground text-sm">
|
|
{t('detail.roomNumber')}
|
|
</span>
|
|
<span className="font-medium">
|
|
{String(room.room_number)}
|
|
</span>
|
|
</div>
|
|
{room.name && (
|
|
<div className="flex justify-between">
|
|
<span className="text-muted-foreground text-sm">
|
|
{t('rooms.name')}
|
|
</span>
|
|
<span className="font-medium">{String(room.name)}</span>
|
|
</div>
|
|
)}
|
|
<div className="flex justify-between">
|
|
<span className="text-muted-foreground text-sm">
|
|
{t('detail.type')}
|
|
</span>
|
|
<span className="font-medium">
|
|
{String(room.room_type ?? '—')}
|
|
</span>
|
|
</div>
|
|
</div>
|
|
) : (
|
|
<p className="text-muted-foreground text-sm">
|
|
{t('detail.noRoom')}
|
|
</p>
|
|
)}
|
|
</CardContent>
|
|
</Card>
|
|
|
|
{/* Guest */}
|
|
<Card>
|
|
<CardHeader>
|
|
<CardTitle className="flex items-center gap-2">
|
|
<User className="h-5 w-5" />
|
|
{t('detail.guest')}
|
|
</CardTitle>
|
|
</CardHeader>
|
|
<CardContent>
|
|
{guest ? (
|
|
<div className="space-y-2">
|
|
<div className="flex justify-between">
|
|
<span className="text-muted-foreground text-sm">
|
|
{t('guests.name')}
|
|
</span>
|
|
<span className="font-medium">
|
|
{String(guest.first_name)} {String(guest.last_name)}
|
|
</span>
|
|
</div>
|
|
{guest.email && (
|
|
<div className="flex justify-between">
|
|
<span className="text-muted-foreground text-sm">
|
|
{t('detail.email')}
|
|
</span>
|
|
<span className="font-medium">{String(guest.email)}</span>
|
|
</div>
|
|
)}
|
|
{guest.phone && (
|
|
<div className="flex justify-between">
|
|
<span className="text-muted-foreground text-sm">
|
|
{t('detail.phone')}
|
|
</span>
|
|
<span className="font-medium">{String(guest.phone)}</span>
|
|
</div>
|
|
)}
|
|
</div>
|
|
) : (
|
|
<p className="text-muted-foreground text-sm">
|
|
{t('detail.noGuest')}
|
|
</p>
|
|
)}
|
|
</CardContent>
|
|
</Card>
|
|
|
|
{/* Stay */}
|
|
<Card>
|
|
<CardHeader>
|
|
<CardTitle className="flex items-center gap-2">
|
|
<CalendarDays className="h-5 w-5" />
|
|
{t('detail.stay')}
|
|
</CardTitle>
|
|
</CardHeader>
|
|
<CardContent>
|
|
<div className="space-y-2">
|
|
<div className="flex justify-between">
|
|
<span className="text-muted-foreground text-sm">
|
|
{t('list.checkIn')}
|
|
</span>
|
|
<span className="font-medium">
|
|
{formatDate(booking.check_in)}
|
|
</span>
|
|
</div>
|
|
<div className="flex justify-between">
|
|
<span className="text-muted-foreground text-sm">
|
|
{t('list.checkOut')}
|
|
</span>
|
|
<span className="font-medium">
|
|
{formatDate(booking.check_out)}
|
|
</span>
|
|
</div>
|
|
<div className="flex justify-between">
|
|
<span className="text-muted-foreground text-sm">
|
|
{t('detail.adults')}
|
|
</span>
|
|
<span className="font-medium">{booking.adults ?? '—'}</span>
|
|
</div>
|
|
<div className="flex justify-between">
|
|
<span className="text-muted-foreground text-sm">
|
|
{t('detail.children')}
|
|
</span>
|
|
<span className="font-medium">{booking.children ?? 0}</span>
|
|
</div>
|
|
</div>
|
|
</CardContent>
|
|
</Card>
|
|
|
|
{/* Amount */}
|
|
<Card>
|
|
<CardHeader>
|
|
<CardTitle>{t('detail.amount')}</CardTitle>
|
|
</CardHeader>
|
|
<CardContent>
|
|
<div className="space-y-2">
|
|
<div className="flex justify-between">
|
|
<span className="text-muted-foreground text-sm">
|
|
{t('detail.totalPrice')}
|
|
</span>
|
|
<span className="text-2xl font-bold">
|
|
{booking.total_price != null
|
|
? formatCurrencyAmount(booking.total_price as number)
|
|
: '—'}
|
|
</span>
|
|
</div>
|
|
{booking.notes && (
|
|
<div className="border-t pt-2">
|
|
<span className="text-muted-foreground text-sm">
|
|
{t('detail.notes')}
|
|
</span>
|
|
<p className="mt-1 text-sm">{String(booking.notes)}</p>
|
|
</div>
|
|
)}
|
|
</div>
|
|
</CardContent>
|
|
</Card>
|
|
</div>
|
|
|
|
{/* Status Workflow */}
|
|
<Card>
|
|
<CardHeader>
|
|
<CardTitle>{t('detail.actions')}</CardTitle>
|
|
<CardDescription>{t('detail.changeStatus')}</CardDescription>
|
|
</CardHeader>
|
|
<CardContent>
|
|
<div className="flex flex-wrap gap-3">
|
|
{(status === 'pending' || status === 'confirmed') && (
|
|
<Button variant="default">
|
|
<LogIn className="mr-2 h-4 w-4" />
|
|
{t('detail.checkIn')}
|
|
</Button>
|
|
)}
|
|
|
|
{status === 'checked_in' && (
|
|
<Button variant="default">
|
|
<LogOut className="mr-2 h-4 w-4" />
|
|
{t('detail.checkOut')}
|
|
</Button>
|
|
)}
|
|
|
|
{status !== 'cancelled' &&
|
|
status !== 'checked_out' &&
|
|
status !== 'no_show' && (
|
|
<Button variant="destructive">
|
|
<XCircle className="mr-2 h-4 w-4" />
|
|
{t('detail.cancel')}
|
|
</Button>
|
|
)}
|
|
|
|
{status === 'cancelled' || status === 'checked_out' ? (
|
|
<p className="text-muted-foreground py-2 text-sm">
|
|
{t('detail.noMoreActions', {
|
|
statusLabel:
|
|
status === 'cancelled'
|
|
? t('detail.cancelledStatus')
|
|
: t('detail.completedStatus'),
|
|
})}
|
|
</p>
|
|
) : null}
|
|
</div>
|
|
</CardContent>
|
|
</Card>
|
|
</div>
|
|
</CmsPageShell>
|
|
);
|
|
}
|