Redesign Modern/Tijdreis, contactformulier via CMS, taalbestanden #17

Merged
Sluijsens merged 48 commits from feature/redesign-modern-timetravel into master 2026-11-16 11:51:47 +01:00
4 changed files with 134 additions and 14 deletions
Showing only changes of commit 9516956d00 - Show all commits
@@ -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<Response>, 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> = {}): 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<Response>((resolve) => (resolveFetch = resolve))),
);
stubFetch(() => new Promise<Response>((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 () => {
@@ -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 (
<div
className="mt-4 flex flex-wrap items-center justify-between gap-x-14 gap-y-8 bg-inv p-[clamp(28px,4vw,48px)] text-white"
data-testid="offering-banner"
>
<div className="flex-[1_1_340px]">
<h3 className="mb-2.5 text-[clamp(30px,3.4vw,44px)] font-extrabold leading-none tracking-[-0.02em] [font-stretch:112%]">
{banner.title}
</h3>
<p className="max-w-[52ch] text-[#cfcac5]">{banner.text}</p>
</div>
{hasLink ? (
<a
href={banner.linkUrl ?? undefined}
className="bg-white px-[26px] py-[17px] text-base font-bold text-[#0e0d0d] no-underline transition-colors hover:bg-brand hover:text-on-brand"
data-testid="offering-banner-cta"
>
{banner.linkLabel}
</a>
) : null}
</div>
);
}
@@ -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 ? (
<OfferingBanner banner={offeringBanner} />
) : filter.hasBanner ? (
<PackageBanner pkg={filter.banners[0]} settings={packagesSettings} />
) : null;
@@ -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<OfferingBannerData | null> {
try {
const response = await fetch(bannerEndpoint());
if (response.status === 204 || !response.ok) {
return null;
}
const data = (await response.json()) as Partial<OfferingBannerData> | 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,
});
}