## 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
277 lines
9.6 KiB
TypeScript
277 lines
9.6 KiB
TypeScript
import Link from 'next/link';
|
|
|
|
import {
|
|
ChevronLeft,
|
|
ChevronRight,
|
|
Mail,
|
|
Plus,
|
|
Send,
|
|
Users,
|
|
} from 'lucide-react';
|
|
import { getTranslations } from 'next-intl/server';
|
|
|
|
import { createNewsletterApi } from '@kit/newsletter/api';
|
|
import { formatDate } 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 { ListToolbar } from '@kit/ui/list-toolbar';
|
|
|
|
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 {
|
|
NEWSLETTER_STATUS_VARIANT,
|
|
NEWSLETTER_STATUS_LABEL_KEYS,
|
|
} from '~/lib/status-badges';
|
|
|
|
const PAGE_SIZE = 25;
|
|
|
|
interface PageProps {
|
|
params: Promise<{ account: string }>;
|
|
searchParams: Promise<Record<string, string | string[] | undefined>>;
|
|
}
|
|
|
|
function buildQuery(
|
|
base: Record<string, string | undefined>,
|
|
overrides: Record<string, string | number | undefined>,
|
|
): string {
|
|
const params = new URLSearchParams();
|
|
for (const [key, value] of Object.entries({ ...base, ...overrides })) {
|
|
if (value !== undefined && value !== '') {
|
|
params.set(key, String(value));
|
|
}
|
|
}
|
|
const qs = params.toString();
|
|
return qs ? `?${qs}` : '';
|
|
}
|
|
|
|
export default async function NewsletterPage({
|
|
params,
|
|
searchParams,
|
|
}: PageProps) {
|
|
const { account } = await params;
|
|
const search = await searchParams;
|
|
const client = getSupabaseServerClient();
|
|
const t = await getTranslations('newsletter');
|
|
|
|
const { data: acct } = await client
|
|
.from('accounts')
|
|
.select('id')
|
|
.eq('slug', account)
|
|
.single();
|
|
|
|
if (!acct) return <AccountNotFound />;
|
|
|
|
const q = typeof search.q === 'string' ? search.q : undefined;
|
|
const status = typeof search.status === 'string' ? search.status : undefined;
|
|
const page = Math.max(1, Number(search.page) || 1);
|
|
|
|
const api = createNewsletterApi(client);
|
|
const result = await api.listNewsletters(acct.id, {
|
|
search: q,
|
|
status,
|
|
page,
|
|
pageSize: PAGE_SIZE,
|
|
});
|
|
|
|
const newsletters = result.data;
|
|
const totalItems = result.total;
|
|
const totalPages = result.totalPages;
|
|
const safePage = result.page;
|
|
|
|
const totalRecipients = newsletters.reduce(
|
|
(sum: number, n: Record<string, unknown>) =>
|
|
sum + (Number(n.total_recipients) || 0),
|
|
0,
|
|
);
|
|
|
|
const queryBase = { q, status };
|
|
|
|
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">
|
|
<div>
|
|
<p className="text-muted-foreground">{t('list.subtitle')}</p>
|
|
</div>
|
|
|
|
<Link href={`/home/${account}/newsletter/new`}>
|
|
<Button data-test="newsletter-new-btn">
|
|
<Plus className="mr-2 h-4 w-4" />
|
|
{t('list.newNewsletter')}
|
|
</Button>
|
|
</Link>
|
|
</div>
|
|
|
|
{/* Stats */}
|
|
<div className="grid grid-cols-1 gap-4 sm:grid-cols-3">
|
|
<StatsCard
|
|
title={t('list.title')}
|
|
value={totalItems}
|
|
icon={<Mail className="h-5 w-5" />}
|
|
/>
|
|
<StatsCard
|
|
title={t('list.totalSent')}
|
|
value={newsletters.length}
|
|
icon={<Send className="h-5 w-5" />}
|
|
/>
|
|
<StatsCard
|
|
title={t('list.totalRecipients')}
|
|
value={totalRecipients}
|
|
icon={<Users className="h-5 w-5" />}
|
|
/>
|
|
</div>
|
|
|
|
{/* Toolbar */}
|
|
<ListToolbar
|
|
searchPlaceholder="Newsletter suchen..."
|
|
filters={[
|
|
{
|
|
param: 'status',
|
|
label: 'Status',
|
|
options: [
|
|
{ value: '', label: 'Alle' },
|
|
{ value: 'draft', label: 'Entwurf' },
|
|
{ value: 'scheduled', label: 'Geplant' },
|
|
{ value: 'sending', label: 'Wird gesendet' },
|
|
{ value: 'sent', label: 'Gesendet' },
|
|
{ value: 'failed', label: 'Fehlgeschlagen' },
|
|
],
|
|
},
|
|
]}
|
|
/>
|
|
|
|
{/* Table or Empty State */}
|
|
{totalItems === 0 ? (
|
|
<EmptyState
|
|
icon={<Mail className="h-8 w-8" />}
|
|
title={t('list.noNewsletters')}
|
|
description={t('list.createFirst')}
|
|
actionLabel={t('list.newNewsletter')}
|
|
actionHref={`/home/${account}/newsletter/new`}
|
|
/>
|
|
) : (
|
|
<Card>
|
|
<CardHeader>
|
|
<CardTitle>
|
|
{t('list.title')} ({totalItems})
|
|
</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.subject')}
|
|
</th>
|
|
<th scope="col" className="p-3 text-left font-medium">
|
|
Status
|
|
</th>
|
|
<th scope="col" className="p-3 text-right font-medium">
|
|
{t('list.recipients')}
|
|
</th>
|
|
<th scope="col" className="p-3 text-left font-medium">
|
|
{t('list.created')}
|
|
</th>
|
|
<th scope="col" className="p-3 text-left font-medium">
|
|
{t('list.sent')}
|
|
</th>
|
|
</tr>
|
|
</thead>
|
|
<tbody>
|
|
{newsletters.map((nl: Record<string, unknown>) => (
|
|
<tr
|
|
key={String(nl.id)}
|
|
className="hover:bg-muted/30 border-b"
|
|
>
|
|
<td className="p-3 font-medium">
|
|
<Link
|
|
href={`/home/${account}/newsletter/${String(nl.id)}`}
|
|
className="hover:underline"
|
|
>
|
|
{String(nl.subject ?? t('list.noSubject'))}
|
|
</Link>
|
|
</td>
|
|
<td className="p-3">
|
|
<Badge
|
|
variant={
|
|
NEWSLETTER_STATUS_VARIANT[String(nl.status)] ??
|
|
'secondary'
|
|
}
|
|
>
|
|
{t(NEWSLETTER_STATUS_LABEL_KEYS[String(nl.status)] ?? String(nl.status))}
|
|
</Badge>
|
|
</td>
|
|
<td className="p-3 text-right">
|
|
{nl.total_recipients != null
|
|
? String(nl.total_recipients)
|
|
: '—'}
|
|
</td>
|
|
<td className="p-3">
|
|
{formatDate(nl.created_at as string | null)}
|
|
</td>
|
|
<td className="p-3">
|
|
{formatDate(nl.sent_at as string | null)}
|
|
</td>
|
|
</tr>
|
|
))}
|
|
</tbody>
|
|
</table>
|
|
</div>
|
|
|
|
{/* Pagination */}
|
|
{totalPages > 1 && (
|
|
<div className="flex items-center justify-between pt-4">
|
|
<p className="text-muted-foreground text-sm">
|
|
Seite {safePage} von {totalPages}
|
|
</p>
|
|
<div className="flex items-center gap-1">
|
|
{safePage > 1 ? (
|
|
<Button variant="outline" size="sm" asChild>
|
|
<Link
|
|
href={`/home/${account}/newsletter${buildQuery(queryBase, { page: safePage - 1 })}`}
|
|
aria-label={t('common.previous')}
|
|
>
|
|
<ChevronLeft className="h-4 w-4" aria-hidden="true" />
|
|
</Link>
|
|
</Button>
|
|
) : (
|
|
<Button variant="outline" size="sm" disabled aria-label={t('common.previous')}>
|
|
<ChevronLeft className="h-4 w-4" aria-hidden="true" />
|
|
</Button>
|
|
)}
|
|
|
|
<span className="px-3 text-sm font-medium">
|
|
{safePage} / {totalPages}
|
|
</span>
|
|
|
|
{safePage < totalPages ? (
|
|
<Button variant="outline" size="sm" asChild>
|
|
<Link
|
|
href={`/home/${account}/newsletter${buildQuery(queryBase, { page: safePage + 1 })}`}
|
|
aria-label={t('common.next')}
|
|
>
|
|
<ChevronRight className="h-4 w-4" aria-hidden="true" />
|
|
</Link>
|
|
</Button>
|
|
) : (
|
|
<Button variant="outline" size="sm" disabled aria-label={t('common.next')}>
|
|
<ChevronRight className="h-4 w-4" aria-hidden="true" />
|
|
</Button>
|
|
)}
|
|
</div>
|
|
</div>
|
|
)}
|
|
</CardContent>
|
|
</Card>
|
|
)}
|
|
</div>
|
|
</CmsPageShell>
|
|
);
|
|
}
|