From 9516956d00004ac851d66652c3f3925f0f64bda4 Mon Sep 17 00:00:00 2001 From: Sluijsens Date: Thu, 12 Nov 2026 11:08:42 +0100 Subject: [PATCH] Pakkettenblok: live CMS-OfferingBanner (GET /api/v1/offerings/banner), optionele knop, 204 = geen banner Co-Authored-By: Claude Sonnet 5.5 --- .../__tests__/PackagesSection.test.tsx | 68 +++++++++++++++---- .../landing/components/OfferingBanner.tsx | 28 ++++++++ .../landing/components/PackagesSection.tsx | 8 ++- .../landing/hooks/useOfferingBannerQuery.ts | 44 ++++++++++++ 4 files changed, 134 insertions(+), 14 deletions(-) create mode 100644 src/features/landing/components/OfferingBanner.tsx create mode 100644 src/features/landing/hooks/useOfferingBannerQuery.ts diff --git a/src/features/landing/__tests__/PackagesSection.test.tsx b/src/features/landing/__tests__/PackagesSection.test.tsx index ee186af..4287b2d 100644 --- a/src/features/landing/__tests__/PackagesSection.test.tsx +++ b/src/features/landing/__tests__/PackagesSection.test.tsx @@ -26,8 +26,26 @@ function renderSection() { ); } -function mockApi(data: unknown, init: ResponseInit = { status: 200 }) { - vi.stubGlobal('fetch', vi.fn().mockResolvedValue(new Response(JSON.stringify(data), init))); +const BANNER_PATH = '/api/v1/offerings/banner'; + +/** Routes the optional CMS banner request (204 = none, or the given banner) apart from the packages call. */ +function stubFetch(offerings: () => Promise, banner: unknown = null) { + const fn = vi.fn((url: string) => { + if (String(url).endsWith(BANNER_PATH)) { + return Promise.resolve( + banner === null + ? new Response(null, { status: 204 }) + : new Response(JSON.stringify(banner), { status: 200 }), + ); + } + return offerings(); + }); + vi.stubGlobal('fetch', fn); + return fn; +} + +function mockApi(data: unknown, init: ResponseInit = { status: 200 }, banner: unknown = null) { + stubFetch(() => Promise.resolve(new Response(JSON.stringify(data), init)), banner); } function pkg(slug: string, extra: Partial = {}): PackageCardData { @@ -104,10 +122,7 @@ describe('PackagesSection', () => { describe('states (BR-U3-10)', () => { it('shows three skeletons while loading and reserves the same container', async () => { let resolveFetch: (r: Response) => void; - vi.stubGlobal( - 'fetch', - vi.fn().mockReturnValue(new Promise((resolve) => (resolveFetch = resolve))), - ); + stubFetch(() => new Promise((resolve) => (resolveFetch = resolve))); renderSection(); expect(screen.getAllByTestId('package-card-skeleton')).toHaveLength(3); expect(screen.queryByTestId('packages-status')).not.toBeInTheDocument(); @@ -117,12 +132,13 @@ describe('PackagesSection', () => { }); it('shows an error with a retry button that refetches', async () => { - vi.stubGlobal( - 'fetch', - vi - .fn() - .mockResolvedValueOnce(new Response(null, { status: 500 })) - .mockResolvedValue(new Response(JSON.stringify(packages), { status: 200 })), + let calls = 0; + stubFetch(() => + Promise.resolve( + ++calls === 1 + ? new Response(null, { status: 500 }) + : new Response(JSON.stringify(packages), { status: 200 }), + ), ); renderSection(); expect(await screen.findByTestId('packages-error')).toHaveTextContent( @@ -130,7 +146,33 @@ describe('PackagesSection', () => { ); fireEvent.click(screen.getByTestId('packages-retry')); await waitFor(() => expect(screen.getByTestId('package-card-pakket_01')).toBeInTheDocument()); - expect(fetch).toHaveBeenCalledTimes(2); + expect(calls).toBe(2); + }); + + it('shows the live CMS banner with its optional button, and nothing when there is none (204)', async () => { + mockApi( + packages, + { status: 200 }, + { + title: 'Zomeractie', + text: 'Tijdelijk korting.', + linkLabel: 'Bekijk', + linkUrl: 'https://example.com/actie', + }, + ); + renderSection(); + expect(await screen.findByTestId('offering-banner')).toHaveTextContent('Zomeractie'); + expect(screen.getByTestId('offering-banner-cta')).toHaveAttribute( + 'href', + 'https://example.com/actie', + ); + }); + + it('renders no banner without link when the CMS has none', async () => { + mockApi(packages); + renderSection(); + await loaded(); + expect(screen.queryByTestId('offering-banner')).not.toBeInTheDocument(); }); it('shows a short note when there are no packages', async () => { diff --git a/src/features/landing/components/OfferingBanner.tsx b/src/features/landing/components/OfferingBanner.tsx new file mode 100644 index 0000000..f417dd9 --- /dev/null +++ b/src/features/landing/components/OfferingBanner.tsx @@ -0,0 +1,28 @@ +import type { OfferingBannerData } from '../hooks/useOfferingBannerQuery'; + +/** Black banner under the package cards, filled from the CMS OfferingBanner (live, optional). */ +export function OfferingBanner({ banner }: { banner: OfferingBannerData }) { + const hasLink = banner.linkLabel !== null && banner.linkUrl !== null; + return ( +
+
+

+ {banner.title} +

+

{banner.text}

+
+ {hasLink ? ( + + {banner.linkLabel} + + ) : null} +
+ ); +} diff --git a/src/features/landing/components/PackagesSection.tsx b/src/features/landing/components/PackagesSection.tsx index 7fe1a1c..98ca448 100644 --- a/src/features/landing/components/PackagesSection.tsx +++ b/src/features/landing/components/PackagesSection.tsx @@ -2,6 +2,8 @@ import { packagesSettings } from '../data/content'; import { usePackagesQuery } from '../hooks/usePackagesQuery'; import { usePackageFilter } from '../../../shared/packages/usePackageFilter'; import { FilterChips } from './FilterChips'; +import { useOfferingBannerQuery } from '../hooks/useOfferingBannerQuery'; +import { OfferingBanner } from './OfferingBanner'; import { PackageBanner } from './PackageBanner'; import { PackageList } from './PackageList'; @@ -17,7 +19,11 @@ export function PackagesSection() { const { data, isLoading, isError, refetch } = usePackagesQuery(); const filter = usePackageFilter(data ?? [], packagesSettings); const loaded = !isLoading && !isError && data !== undefined; - const banner = filter.hasBanner ? ( + const { data: offeringBanner } = useOfferingBannerQuery(); + // The CMS OfferingBanner (live) takes precedence over the legacy per-site package banner. + const banner = offeringBanner ? ( + + ) : filter.hasBanner ? ( ) : null; diff --git a/src/features/landing/hooks/useOfferingBannerQuery.ts b/src/features/landing/hooks/useOfferingBannerQuery.ts new file mode 100644 index 0000000..a1041de --- /dev/null +++ b/src/features/landing/hooks/useOfferingBannerQuery.ts @@ -0,0 +1,44 @@ +import { useQuery } from '@tanstack/react-query'; + +/** Active offering banner as served by `GET /api/v1/offerings/banner` (no planning fields). */ +export interface OfferingBannerData { + title: string; + text: string; + linkLabel: string | null; + linkUrl: string | null; +} + +function bannerEndpoint() { + return `${import.meta.env.VITE_API_BASE_URL ?? ''}/api/v1/offerings/banner`; +} + +/** 204 (no active banner) and any failure resolve to `null`: the banner is optional, never an error. */ +async function fetchBanner(): Promise { + try { + const response = await fetch(bannerEndpoint()); + if (response.status === 204 || !response.ok) { + return null; + } + const data = (await response.json()) as Partial | null; + if (!data || typeof data.title !== 'string' || typeof data.text !== 'string') { + return null; + } + return { + title: data.title, + text: data.text, + linkLabel: data.linkLabel ?? null, + linkUrl: data.linkUrl ?? null, + }; + } catch { + return null; + } +} + +export function useOfferingBannerQuery() { + return useQuery({ + queryKey: ['offering-banner'], + queryFn: fetchBanner, + // Short staleness so a change in the CMS shows up quickly (the API itself caches for 60 s). + staleTime: 60_000, + }); +}