From 75086362ee99da23c5ba1ece505df83e0aa1c77c Mon Sep 17 00:00:00 2001 From: Sluijsens Date: Tue, 10 Nov 2026 23:00:26 +0100 Subject: [PATCH] Contactformulier stuurt het leesbare onderwerp (met hoofdletter) i.p.v. de slug Co-Authored-By: Claude Sonnet 5.5 --- .../landing/__tests__/ContactForm.test.tsx | 12 +++---- .../landing/components/ContactFormView.tsx | 8 ++--- src/shared/contact/__tests__/subjects.test.ts | 36 +++++++++++++++++++ src/shared/contact/subjects.ts | 32 +++++++++++++++++ src/variants/e/TerminalForm.tsx | 8 ++--- src/variants/e/__tests__/LandingE.test.tsx | 4 +-- 6 files changed, 82 insertions(+), 18 deletions(-) create mode 100644 src/shared/contact/__tests__/subjects.test.ts create mode 100644 src/shared/contact/subjects.ts diff --git a/src/features/landing/__tests__/ContactForm.test.tsx b/src/features/landing/__tests__/ContactForm.test.tsx index a348fde..2c5f8a8 100644 --- a/src/features/landing/__tests__/ContactForm.test.tsx +++ b/src/features/landing/__tests__/ContactForm.test.tsx @@ -95,7 +95,7 @@ async function openForm(s: ReturnType) { 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 () => { diff --git a/src/features/landing/components/ContactFormView.tsx b/src/features/landing/components/ContactFormView.tsx index 57daf00..fea8103 100644 --- a/src/features/landing/components/ContactFormView.tsx +++ b/src/features/landing/components/ContactFormView.tsx @@ -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( - () => [ - ...(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, diff --git a/src/shared/contact/__tests__/subjects.test.ts b/src/shared/contact/__tests__/subjects.test.ts new file mode 100644 index 0000000..495878f --- /dev/null +++ b/src/shared/contact/__tests__/subjects.test.ts @@ -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' }, + ]); + }); +}); diff --git a/src/shared/contact/subjects.ts b/src/shared/contact/subjects.ts new file mode 100644 index 0000000..e5839b3 --- /dev/null +++ b/src/shared/contact/subjects.ts @@ -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; +} diff --git a/src/variants/e/TerminalForm.tsx b/src/variants/e/TerminalForm.tsx index 48240ce..44f3289 100644 --- a/src/variants/e/TerminalForm.tsx +++ b/src/variants/e/TerminalForm.tsx @@ -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( - () => [ - ...(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, diff --git a/src/variants/e/__tests__/LandingE.test.tsx b/src/variants/e/__tests__/LandingE.test.tsx index d8746f8..534e04d 100644 --- a/src/variants/e/__tests__/LandingE.test.tsx +++ b/src/variants/e/__tests__/LandingE.test.tsx @@ -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.' }, });