feat: enhance API response handling and add new components for module management
Some checks failed
Workflow / ʦ TypeScript (push) Failing after 4m50s
Workflow / ⚫️ Test (push) Has been skipped

This commit is contained in:
T. Zehetbauer
2026-04-01 15:18:24 +02:00
parent f82a366a52
commit 7b078f298b
58 changed files with 1845 additions and 398 deletions

View File

@@ -4,6 +4,7 @@ import {
CatchBooksDataTable,
} from '@kit/fischerei/components';
import { getSupabaseServerClient } from '@kit/supabase/server-client';
import { ListToolbar } from '@kit/ui/list-toolbar';
import { AccountNotFound } from '~/components/account-not-found';
import { CmsPageShell } from '~/components/cms-page-shell';
@@ -28,7 +29,18 @@ export default async function CatchBooksPage({ params, searchParams }: Props) {
const api = createFischereiApi(client);
const page = Number(search.page) || 1;
const currentYear = new Date().getFullYear();
const yearOptions = [
{ value: '', label: 'Alle Jahre' },
...Array.from({ length: 4 }, (_, i) => ({
value: String(currentYear - i),
label: String(currentYear - i),
})),
];
const result = await api.listCatchBooks(acct.id, {
search: search.q as string,
year: search.year ? Number(search.year) : undefined,
status: search.status as string,
page,
@@ -38,6 +50,22 @@ export default async function CatchBooksPage({ params, searchParams }: Props) {
return (
<CmsPageShell account={account} title="Fischerei - Fangbücher">
<FischereiTabNavigation account={account} activeTab="catch-books" />
<ListToolbar
searchPlaceholder="Mitglied suchen..."
filters={[
{ param: 'year', label: 'Jahr', options: yearOptions },
{
param: 'status',
label: 'Status',
options: [
{ value: '', label: 'Alle' },
{ value: 'open', label: 'Offen' },
{ value: 'submitted', label: 'Eingereicht' },
{ value: 'checked', label: 'Geprüft' },
],
},
]}
/>
<CatchBooksDataTable
data={result.data}
total={result.total}

View File

@@ -4,6 +4,7 @@ import {
CompetitionsDataTable,
} from '@kit/fischerei/components';
import { getSupabaseServerClient } from '@kit/supabase/server-client';
import { ListToolbar } from '@kit/ui/list-toolbar';
import { AccountNotFound } from '~/components/account-not-found';
import { CmsPageShell } from '~/components/cms-page-shell';
@@ -31,7 +32,19 @@ export default async function CompetitionsPage({
const api = createFischereiApi(client);
const page = Number(search.page) || 1;
const yearParam = search.year ? Number(search.year) : undefined;
const currentYear = new Date().getFullYear();
const yearOptions = [
{ value: '', label: 'Alle Jahre' },
...Array.from({ length: 4 }, (_, i) => ({
value: String(currentYear - i),
label: String(currentYear - i),
})),
];
const result = await api.listCompetitions(acct.id, {
year: yearParam,
page,
pageSize: 25,
});
@@ -39,6 +52,10 @@ export default async function CompetitionsPage({
return (
<CmsPageShell account={account} title="Fischerei - Wettbewerbe">
<FischereiTabNavigation account={account} activeTab="competitions" />
<ListToolbar
showSearch={false}
filters={[{ param: 'year', label: 'Jahr', options: yearOptions }]}
/>
<CompetitionsDataTable
data={result.data}
total={result.total}

View File

@@ -5,6 +5,7 @@ import { formatDate } from '@kit/shared/dates';
import { getSupabaseServerClient } from '@kit/supabase/server-client';
import { Badge } from '@kit/ui/badge';
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';
@@ -29,10 +30,28 @@ export default async function LeasesPage({ params, searchParams }: Props) {
const api = createFischereiApi(client);
const page = Number(search.page) || 1;
const result = await api.listLeases(acct.id, {
page,
pageSize: 25,
});
const waterId = (search.waterId as string) || undefined;
const activeParam = search.active as string | undefined;
const active =
activeParam === 'true' ? true : activeParam === 'false' ? false : undefined;
const [result, watersResult] = await Promise.all([
api.listLeases(acct.id, {
waterId,
active,
page,
pageSize: 25,
}),
api.listWaters(acct.id, { pageSize: 200 }),
]);
const waterOptions = [
{ value: '', label: 'Alle Gewässer' },
...watersResult.data.map((w) => ({
value: String(w.id),
label: String(w.name),
})),
];
return (
<CmsPageShell account={account} title="Fischerei - Pachten">
@@ -44,6 +63,21 @@ export default async function LeasesPage({ params, searchParams }: Props) {
Gewässerpachtverträge verwalten
</p>
</div>
<ListToolbar
showSearch={false}
filters={[
{ param: 'waterId', label: 'Gewässer', options: waterOptions },
{
param: 'active',
label: 'Status',
options: [
{ value: '', label: 'Alle' },
{ value: 'true', label: 'Aktiv' },
{ value: 'false', label: 'Archiviert' },
],
},
]}
/>
<Card>
<CardHeader>
<CardTitle>Pachten ({result.total})</CardTitle>

View File

@@ -4,6 +4,7 @@ import {
SpeciesDataTable,
} from '@kit/fischerei/components';
import { getSupabaseServerClient } from '@kit/supabase/server-client';
import { ListToolbar } from '@kit/ui/list-toolbar';
import { AccountNotFound } from '~/components/account-not-found';
import { CmsPageShell } from '~/components/cms-page-shell';
@@ -28,8 +29,13 @@ export default async function SpeciesPage({ params, searchParams }: Props) {
const api = createFischereiApi(client);
const page = Number(search.page) || 1;
const activeParam = search.active as string | undefined;
const active =
activeParam === 'true' ? true : activeParam === 'false' ? false : undefined;
const result = await api.listSpecies(acct.id, {
search: search.q as string,
active,
page,
pageSize: 50,
});
@@ -37,6 +43,20 @@ export default async function SpeciesPage({ params, searchParams }: Props) {
return (
<CmsPageShell account={account} title="Fischerei - Fischarten">
<FischereiTabNavigation account={account} activeTab="species" />
<ListToolbar
searchPlaceholder="Fischart suchen..."
filters={[
{
param: 'active',
label: 'Status',
options: [
{ value: '', label: 'Alle' },
{ value: 'true', label: 'Aktiv' },
{ value: 'false', label: 'Inaktiv' },
],
},
]}
/>
<SpeciesDataTable
data={result.data}
total={result.total}

View File

@@ -4,6 +4,7 @@ import {
StockingDataTable,
} from '@kit/fischerei/components';
import { getSupabaseServerClient } from '@kit/supabase/server-client';
import { ListToolbar } from '@kit/ui/list-toolbar';
import { AccountNotFound } from '~/components/account-not-found';
import { CmsPageShell } from '~/components/cms-page-shell';
@@ -28,14 +29,58 @@ export default async function StockingPage({ params, searchParams }: Props) {
const api = createFischereiApi(client);
const page = Number(search.page) || 1;
const result = await api.listStocking(acct.id, {
page,
pageSize: 25,
});
const waterId = (search.waterId as string) || undefined;
const speciesId = (search.speciesId as string) || undefined;
const yearParam = search.year ? Number(search.year) : undefined;
const [result, watersResult, speciesResult] = await Promise.all([
api.listStocking(acct.id, {
waterId,
speciesId,
year: yearParam,
page,
pageSize: 25,
}),
api.listWaters(acct.id, { pageSize: 200 }),
api.listSpecies(acct.id, { pageSize: 200 }),
]);
const currentYear = new Date().getFullYear();
const yearOptions = [
{ value: '', label: 'Alle Jahre' },
...Array.from({ length: 4 }, (_, i) => ({
value: String(currentYear - i),
label: String(currentYear - i),
})),
];
const waterOptions = [
{ value: '', label: 'Alle Gewässer' },
...watersResult.data.map((w) => ({
value: String(w.id),
label: String(w.name),
})),
];
const speciesOptions = [
{ value: '', label: 'Alle Arten' },
...speciesResult.data.map((s) => ({
value: String(s.id),
label: String(s.name),
})),
];
return (
<CmsPageShell account={account} title="Fischerei - Besatz">
<FischereiTabNavigation account={account} activeTab="stocking" />
<ListToolbar
showSearch={false}
filters={[
{ param: 'waterId', label: 'Gewässer', options: waterOptions },
{ param: 'speciesId', label: 'Fischart', options: speciesOptions },
{ param: 'year', label: 'Jahr', options: yearOptions },
]}
/>
<StockingDataTable
data={result.data}
total={result.total}