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
6 changed files with 82 additions and 18 deletions
Showing only changes of commit 75086362ee - Show all commits
@@ -95,7 +95,7 @@ async function openForm(s: ReturnType<typeof setup>) {
function fillValid() {
fireEvent.change(screen.getByLabelText('Naam'), { target: { value: 'Jan Jansen' } });
fireEvent.change(screen.getByLabelText('E-mail'), { target: { value: 'jan@example.nl' } });
fireEvent.change(screen.getByLabelText('Onderwerp'), { target: { value: 'website' } });
fireEvent.change(screen.getByLabelText('Onderwerp'), { target: { value: 'Website' } });
fireEvent.change(screen.getByLabelText('Bericht'), {
target: { value: 'Ik wil graag een offerte.' },
});
@@ -208,7 +208,7 @@ describe('contact form (BR-U4-4 .. BR-U4-15)', () => {
expect(JSON.parse(call.init?.body as string)).toEqual({
name: 'Jan Jansen',
email: 'jan@example.nl',
subject: 'website',
subject: 'Website',
message: 'Ik wil graag een offerte.',
hpCheck: '',
token: 'tok-1',
@@ -404,11 +404,11 @@ describe('contact form (BR-U4-4 .. BR-U4-15)', () => {
await openForm(s);
const subject = screen.getByLabelText('Onderwerp') as HTMLSelectElement;
fireEvent.click(screen.getByText('kies website'));
await waitFor(() => expect(subject.value).toBe('website'));
fireEvent.change(subject, { target: { value: 'other' } });
expect(subject.value).toBe('other');
await waitFor(() => expect(subject.value).toBe('Website'));
fireEvent.change(subject, { target: { value: 'Overig' } });
expect(subject.value).toBe('Overig');
fireEvent.click(screen.getByText('kies website'));
await waitFor(() => expect(subject.value).toBe('website'));
await waitFor(() => expect(subject.value).toBe('Website'));
});
it('never writes form data to the console, Sentry-style globals or analytics events', async () => {
@@ -9,6 +9,7 @@ import {
} from '../../../cms-client/contact';
import { trackEvent } from '../../../shared/analytics/trackEvent';
import { useContactPreselect } from '../../../shared/contact/useContactPreselect';
import { buildSubjectOptions, subjectForSlug } from '../../../shared/contact/subjects';
import { contactForm, contactInfo } from '../data/content';
import { usePackagesQuery } from '../hooks/usePackagesQuery';
@@ -52,17 +53,14 @@ export function ContactFormView({ client, token, refreshToken }: ContactFormView
const { data: packages } = usePackagesQuery();
const preselect = useContactPreselect();
const subjectOptions = useMemo<SubjectOption[]>(
() => [
...(packages ?? []).map((pkg) => ({ value: pkg.slug, label: pkg.title })),
{ value: 'other', label: contactForm.otherSubjectLabel },
],
() => buildSubjectOptions(packages, contactForm.otherSubjectLabel),
[packages],
);
const form = useContactForm({
idPrefix: 'contact',
subjectOptions,
preselect: { subject: preselect.subject, key: preselect.key },
preselect: { subject: subjectForSlug(packages, preselect.subject), key: preselect.key },
client,
token,
refreshToken,
@@ -0,0 +1,36 @@
import { describe, expect, it } from 'vitest';
import { buildSubjectOptions, subjectForSlug } from '../subjects';
const packages = [
{ slug: 'landingspagina', title: 'Landingspagina' },
{ slug: 'website', title: 'Website' },
];
describe('contact subjects', () => {
it('uses the readable label as value and appends the other option', () => {
expect(buildSubjectOptions(packages, 'Overig')).toEqual([
{ value: 'Landingspagina', label: 'Landingspagina' },
{ value: 'Website', label: 'Website' },
{ value: 'Overig', label: 'Overig' },
]);
});
it('starts with a capital letter for every package title and the other label', () => {
for (const option of buildSubjectOptions(packages, 'Overig')) {
expect(option.value[0]).toBe(option.value[0].toUpperCase());
}
});
it('maps a slug to its label, and an unknown or empty slug to null', () => {
expect(subjectForSlug(packages, 'website')).toBe('Website');
expect(subjectForSlug(packages, 'bestaat-niet')).toBeNull();
expect(subjectForSlug(packages, null)).toBeNull();
expect(subjectForSlug(undefined, 'website')).toBeNull();
});
it('handles packages that are not loaded yet', () => {
expect(buildSubjectOptions(undefined, 'Overig')).toEqual([
{ value: 'Overig', label: 'Overig' },
]);
});
});
+32
View File
@@ -0,0 +1,32 @@
import type { SubjectOption } from '../../cms-client/contact';
interface NamedPackage {
slug: string;
title: string;
}
/**
* Subject options of the contact form. The value is the readable label (e.g. "Website"), because
* that is what ends up in the e-mail and in the CMS message list. The slug only stays local, for
* the preselect (see `subjectForSlug`).
*/
export function buildSubjectOptions(
packages: readonly NamedPackage[] | undefined,
otherLabel: string,
): SubjectOption[] {
return [
...(packages ?? []).map((pkg) => ({ value: pkg.title, label: pkg.title })),
{ value: otherLabel, label: otherLabel },
];
}
/** Subject value (label) for a package slug, or null when the slug is unknown. */
export function subjectForSlug(
packages: readonly NamedPackage[] | undefined,
slug: string | null,
): string | null {
if (!slug) {
return null;
}
return packages?.find((pkg) => pkg.slug === slug)?.title ?? null;
}
+3 -5
View File
@@ -11,6 +11,7 @@ import { contactForm, contactInfo } from '../../features/landing/data/content';
import { usePackagesQuery } from '../../features/landing/hooks/usePackagesQuery';
import { trackEvent } from '../../shared/analytics/trackEvent';
import { useContactPreselect } from '../../shared/contact/useContactPreselect';
import { buildSubjectOptions, subjectForSlug } from '../../shared/contact/subjects';
import { terminalText } from './eraContent';
interface TerminalFormProps {
@@ -55,17 +56,14 @@ export function TerminalForm({ client, token, refreshToken }: TerminalFormProps)
const { data: packages } = usePackagesQuery();
const preselect = useContactPreselect();
const subjectOptions = useMemo<SubjectOption[]>(
() => [
...(packages ?? []).map((pkg) => ({ value: pkg.slug, label: pkg.title })),
{ value: 'other', label: contactForm.otherSubjectLabel },
],
() => buildSubjectOptions(packages, contactForm.otherSubjectLabel),
[packages],
);
const form = useContactForm({
idPrefix: 'contact',
subjectOptions,
preselect: { subject: preselect.subject, key: preselect.key },
preselect: { subject: subjectForSlug(packages, preselect.subject), key: preselect.key },
client,
token,
refreshToken,
+2 -2
View File
@@ -155,7 +155,7 @@ describe('LandingE (variant E, five eras)', () => {
await screen.findByTestId('contact-form');
fireEvent.click(screen.getByTestId('package-cta-pakket_02'));
const select = (await screen.findByLabelText(/^Onderwerp/)) as HTMLSelectElement;
await waitFor(() => expect(select.value).toBe('website'));
await waitFor(() => expect(select.value).toBe('Website'));
});
it('shows filter tabs for 4+ card packages and filters', async () => {
@@ -232,7 +232,7 @@ describe('LandingE (variant E, five eras)', () => {
);
fireEvent.change(screen.getByLabelText(/^Naam/), { target: { value: 'Jan Jansen' } });
fireEvent.change(screen.getByLabelText(/^E-mail/), { target: { value: 'jan@example.nl' } });
fireEvent.change(screen.getByLabelText(/^Onderwerp/), { target: { value: 'website' } });
fireEvent.change(screen.getByLabelText(/^Onderwerp/), { target: { value: 'Website' } });
fireEvent.change(screen.getByLabelText(/^Bericht/), {
target: { value: 'Ik wil graag een offerte.' },
});