## 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
315 lines
12 KiB
TypeScript
315 lines
12 KiB
TypeScript
import Link from 'next/link';
|
||
|
||
import { BedDouble, CalendarCheck, Plus, Euro, Search } from 'lucide-react';
|
||
import { getTranslations } from 'next-intl/server';
|
||
|
||
import { createBookingManagementApi } from '@kit/booking-management/api';
|
||
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, CardHeader, CardTitle } from '@kit/ui/card';
|
||
import { Input } from '@kit/ui/input';
|
||
|
||
import { AccountNotFound } from '~/components/account-not-found';
|
||
import { CmsPageShell } from '~/components/cms-page-shell';
|
||
import { EmptyState } from '~/components/empty-state';
|
||
import { StatsCard } from '~/components/stats-card';
|
||
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 }>;
|
||
searchParams: Promise<Record<string, string | string[] | undefined>>;
|
||
}
|
||
|
||
const PAGE_SIZE = 25;
|
||
|
||
export default async function BookingsPage({
|
||
params,
|
||
searchParams,
|
||
}: PageProps) {
|
||
const { account } = await params;
|
||
const search = await searchParams;
|
||
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('list.title')}>
|
||
<AccountNotFound />
|
||
</CmsPageShell>
|
||
);
|
||
}
|
||
|
||
const searchQuery = typeof search.q === 'string' ? search.q : '';
|
||
const page = Number(search.page) || 1;
|
||
|
||
const api = createBookingManagementApi(client);
|
||
const rooms = await api.listRooms(acct.id);
|
||
|
||
// Fetch bookings with joined room & guest names (avoids displaying raw UUIDs)
|
||
const bookingsQuery = client
|
||
.from('bookings')
|
||
.select(
|
||
'*, room:rooms(id, room_number, name), guest:guests(id, first_name, last_name)',
|
||
{ count: 'exact' },
|
||
)
|
||
.eq('account_id', acct.id)
|
||
.order('check_in', { ascending: false })
|
||
.range((page - 1) * PAGE_SIZE, page * PAGE_SIZE - 1);
|
||
|
||
const { data: bookingsRaw, count: bookingsTotal } = await bookingsQuery;
|
||
|
||
let bookingsData = (bookingsRaw ?? []) as Array<Record<string, unknown>>;
|
||
const total = bookingsTotal ?? 0;
|
||
|
||
// Post-filter by search query (guest name or room name/number)
|
||
if (searchQuery) {
|
||
const q = searchQuery.toLowerCase();
|
||
bookingsData = bookingsData.filter((booking) => {
|
||
const room = booking.room as Record<string, string> | null;
|
||
const guest = booking.guest as Record<string, string> | null;
|
||
const roomName = (room?.name ?? '').toLowerCase();
|
||
const roomNumber = (room?.room_number ?? '').toLowerCase();
|
||
const guestFirst = (guest?.first_name ?? '').toLowerCase();
|
||
const guestLast = (guest?.last_name ?? '').toLowerCase();
|
||
return (
|
||
roomName.includes(q) ||
|
||
roomNumber.includes(q) ||
|
||
guestFirst.includes(q) ||
|
||
guestLast.includes(q)
|
||
);
|
||
});
|
||
}
|
||
|
||
const activeBookings = bookingsData.filter(
|
||
(booking) =>
|
||
booking.status === 'confirmed' || booking.status === 'checked_in',
|
||
);
|
||
|
||
const totalPages = Math.ceil(total / PAGE_SIZE);
|
||
|
||
return (
|
||
<CmsPageShell account={account} title={t('list.title')}>
|
||
<div className="flex w-full flex-col gap-6">
|
||
{/* Header */}
|
||
<div className="flex items-center justify-between">
|
||
<p className="text-muted-foreground">{t('list.manage')}</p>
|
||
|
||
<Button data-test="bookings-new-btn" asChild>
|
||
<Link href={`/home/${account}/bookings/new`}>
|
||
<Plus className="mr-2 h-4 w-4" />
|
||
{t('list.newBooking')}
|
||
</Link>
|
||
</Button>
|
||
</div>
|
||
|
||
{/* Stats */}
|
||
<div className="grid grid-cols-1 gap-4 sm:grid-cols-2 lg:grid-cols-3">
|
||
<StatsCard
|
||
title={t('rooms.title')}
|
||
value={rooms.length}
|
||
icon={<BedDouble className="h-5 w-5" />}
|
||
/>
|
||
<StatsCard
|
||
title={t('list.activeBookings')}
|
||
value={activeBookings.length}
|
||
icon={<CalendarCheck className="h-5 w-5" />}
|
||
/>
|
||
<StatsCard
|
||
title={t('common.of')}
|
||
value={total}
|
||
icon={<Euro className="h-5 w-5" />}
|
||
/>
|
||
</div>
|
||
|
||
{/* Search */}
|
||
<form className="flex items-center gap-2">
|
||
<div className="relative max-w-sm flex-1">
|
||
<Search
|
||
className="text-muted-foreground absolute top-1/2 left-2.5 h-4 w-4 -translate-y-1/2"
|
||
aria-hidden="true"
|
||
/>
|
||
<Input
|
||
name="q"
|
||
defaultValue={searchQuery}
|
||
placeholder={t('list.searchPlaceholder')}
|
||
aria-label={t('list.searchPlaceholder')}
|
||
className="pl-9"
|
||
/>
|
||
</div>
|
||
<Button type="submit" variant="secondary" size="sm">
|
||
{t('list.search')}
|
||
</Button>
|
||
{searchQuery && (
|
||
<Button type="button" variant="ghost" size="sm" asChild>
|
||
<Link href={`/home/${account}/bookings`}>{t('list.reset')}</Link>
|
||
</Button>
|
||
)}
|
||
</form>
|
||
|
||
{/* Table or Empty State */}
|
||
{bookingsData.length === 0 ? (
|
||
<EmptyState
|
||
icon={<BedDouble className="h-8 w-8" />}
|
||
title={searchQuery ? t('list.noResults') : t('list.noBookings')}
|
||
description={
|
||
searchQuery
|
||
? t('list.noResultsFor', { query: searchQuery })
|
||
: t('list.createFirst')
|
||
}
|
||
actionLabel={searchQuery ? undefined : t('list.newBooking')}
|
||
actionHref={
|
||
searchQuery ? undefined : `/home/${account}/bookings/new`
|
||
}
|
||
/>
|
||
) : (
|
||
<Card>
|
||
<CardHeader>
|
||
<CardTitle>
|
||
{searchQuery
|
||
? t('list.searchResults', { count: bookingsData.length })
|
||
: t('list.allBookings', { count: total })}
|
||
</CardTitle>
|
||
</CardHeader>
|
||
<CardContent>
|
||
<div className="overflow-x-auto rounded-md border">
|
||
<table className="w-full min-w-[640px] text-sm">
|
||
<thead>
|
||
<tr className="bg-muted/50 border-b">
|
||
<th scope="col" className="p-3 text-left font-medium">
|
||
{t('list.room')}
|
||
</th>
|
||
<th scope="col" className="p-3 text-left font-medium">
|
||
{t('list.guest')}
|
||
</th>
|
||
<th scope="col" className="p-3 text-left font-medium">
|
||
{t('list.checkIn')}
|
||
</th>
|
||
<th scope="col" className="p-3 text-left font-medium">
|
||
{t('list.checkOut')}
|
||
</th>
|
||
<th scope="col" className="p-3 text-left font-medium">
|
||
{t('list.status')}
|
||
</th>
|
||
<th scope="col" className="p-3 text-right font-medium">
|
||
{t('list.amount')}
|
||
</th>
|
||
</tr>
|
||
</thead>
|
||
<tbody>
|
||
{bookingsData.map((booking) => {
|
||
const room = booking.room as Record<
|
||
string,
|
||
string
|
||
> | null;
|
||
const guest = booking.guest as Record<
|
||
string,
|
||
string
|
||
> | null;
|
||
|
||
return (
|
||
<tr
|
||
key={String(booking.id)}
|
||
className="hover:bg-muted/30 border-b"
|
||
>
|
||
<td className="p-3">
|
||
<Link
|
||
href={`/home/${account}/bookings/${String(booking.id)}`}
|
||
className="font-medium hover:underline"
|
||
>
|
||
{room
|
||
? `${room.room_number}${room.name ? ` – ${room.name}` : ''}`
|
||
: '—'}
|
||
</Link>
|
||
</td>
|
||
<td className="p-3">
|
||
{guest
|
||
? `${guest.first_name} ${guest.last_name}`
|
||
: '—'}
|
||
</td>
|
||
<td className="p-3">
|
||
{formatDate(booking.check_in as string)}
|
||
</td>
|
||
<td className="p-3">
|
||
{formatDate(booking.check_out as string)}
|
||
</td>
|
||
<td className="p-3">
|
||
<Badge
|
||
variant={
|
||
STATUS_BADGE_VARIANT[String(booking.status)] ??
|
||
'secondary'
|
||
}
|
||
>
|
||
{t(STATUS_LABEL_KEYS[String(booking.status)] ?? String(booking.status))}
|
||
</Badge>
|
||
</td>
|
||
<td className="p-3 text-right">
|
||
{booking.total_price != null
|
||
? formatCurrencyAmount(
|
||
booking.total_price as number,
|
||
)
|
||
: '—'}
|
||
</td>
|
||
</tr>
|
||
);
|
||
})}
|
||
</tbody>
|
||
</table>
|
||
</div>
|
||
|
||
{/* Pagination */}
|
||
{totalPages > 1 && !searchQuery && (
|
||
<div className="flex items-center justify-between border-t px-2 py-4">
|
||
<p className="text-muted-foreground text-sm">
|
||
{t('common.page')} {page} {t('common.of')} {totalPages} (
|
||
{total} {t('common.entries')})
|
||
</p>
|
||
<div className="flex items-center gap-2">
|
||
{page > 1 ? (
|
||
<Button variant="outline" size="sm" asChild>
|
||
<Link
|
||
href={`/home/${account}/bookings?page=${page - 1}`}
|
||
>
|
||
{t('common.previous')}
|
||
</Link>
|
||
</Button>
|
||
) : (
|
||
<Button variant="outline" size="sm" disabled>
|
||
{t('common.previous')}
|
||
</Button>
|
||
)}
|
||
|
||
{page < totalPages ? (
|
||
<Button variant="outline" size="sm" asChild>
|
||
<Link
|
||
href={`/home/${account}/bookings?page=${page + 1}`}
|
||
>
|
||
{t('common.next')}
|
||
</Link>
|
||
</Button>
|
||
) : (
|
||
<Button variant="outline" size="sm" disabled>
|
||
{t('common.next')}
|
||
</Button>
|
||
)}
|
||
</div>
|
||
</div>
|
||
)}
|
||
</CardContent>
|
||
</Card>
|
||
)}
|
||
</div>
|
||
</CmsPageShell>
|
||
);
|
||
}
|