From 4b09089ffbd6bc54ebee7a47f9876a9de369666b Mon Sep 17 00:00:00 2001 From: Sluijsens Date: Sat, 14 Nov 2026 12:35:20 +0100 Subject: [PATCH] Offerings: banner krijgt positie top|bottom (backend, migratie, admin-tab, OpenAPI) - OfferingBanner.Position ('top'|'bottom'); bestaande banners worden 'bottom' (migratie AddOfferingBannerPosition) - GET /api/v1/offerings/banner?position=top|bottom: zonder parameter bottom, 204 zonder actieve banner, 400 bij ongeldige waarde; antwoord bevat position - Max 1 actieve banner per positie (laatst gewijzigde binnen de planning wint); top en bottom kunnen tegelijk actief zijn - Top: tekst max 120 tekens, titel optioneel; bottom: titel verplicht - Admin: Banner-tab met twee secties (Boven/Onder), eigen aanmaken en aan/uit per plek - OpenAPI-snapshot met de hand bijgewerkt (geen lokale MariaDB): CI bevestigt Co-Authored-By: Claude Sonnet 5.5 --- .../components/OfferingBannerDialog.tsx | 57 +++-- .../components/OfferingBannersTab.tsx | 221 ++++++++++++------ .../src/features/offerings/mocks/handlers.ts | 1 + .../offerings/pages/OfferingBanners.test.tsx | 158 +++++++++++-- .../offerings/schemas/offeringBanner.ts | 21 +- .../src/features/offerings/services/types.ts | 4 + frontend/src/i18n/locales/en/translation.json | 24 +- frontend/src/i18n/locales/nl/translation.json | 24 +- openapi/slpsoftware.v1.json | 13 ++ .../HostPipelineTests.cs | 5 + .../Services/OfferingBannersServiceTests.cs | 95 ++++++-- .../Controllers/OfferingBannersController.cs | 14 +- .../Data/Entities/OfferingBanner.cs | 18 ++ .../Data/OfferingsDbContext.cs | 1 + ...0000_AddOfferingBannerPosition.Designer.cs | 189 +++++++++++++++ ...0261114100000_AddOfferingBannerPosition.cs | 31 +++ .../OfferingsDbContextModelSnapshot.cs | 7 + .../Models/OfferingBannerModels.cs | 19 +- .../Services/OfferingBannersService.cs | 17 +- 19 files changed, 781 insertions(+), 138 deletions(-) create mode 100644 src/SlpModularCms.Modules.Offerings/Migrations/20261114100000_AddOfferingBannerPosition.Designer.cs create mode 100644 src/SlpModularCms.Modules.Offerings/Migrations/20261114100000_AddOfferingBannerPosition.cs diff --git a/frontend/src/features/offerings/components/OfferingBannerDialog.tsx b/frontend/src/features/offerings/components/OfferingBannerDialog.tsx index 34a94a6..84d63fd 100644 --- a/frontend/src/features/offerings/components/OfferingBannerDialog.tsx +++ b/frontend/src/features/offerings/components/OfferingBannerDialog.tsx @@ -1,5 +1,5 @@ import { useState } from 'react'; -import { useForm } from 'react-hook-form'; +import { useForm, useWatch } from 'react-hook-form'; import { zodResolver } from '@hookform/resolvers/zod'; import { useTranslation } from 'react-i18next'; import { toast } from 'sonner'; @@ -12,21 +12,23 @@ import { Dialog, DialogContent, DialogHeader, DialogTitle } from '@/components/u import { NetworkError } from '@/lib/api-client'; import { fromLocalInput, + bannerTextMaxLength, offeringBannerFormSchema, toLocalInput, type OfferingBannerFormData, } from '../schemas/offeringBanner'; import { useSaveOfferingBanner } from '../services/useSaveOfferingBanner'; -import type { OfferingBannerDto } from '../services/types'; +import type { BannerPosition, OfferingBannerDto } from '../services/types'; interface OfferingBannerDialogProps { - /** Open for editing this banner; null with `creating` = a new one. */ + /** Open for editing this banner (its own position applies); null with `creatingPosition` = a new one there. */ banner: OfferingBannerDto | null; - creating: boolean; + creatingPosition: BannerPosition | null; onClose: () => void; } -const EMPTY: OfferingBannerFormData = { +const emptyForm = (position: BannerPosition): OfferingBannerFormData => ({ + position, title: '', text: '', linkLabel: '', @@ -34,11 +36,12 @@ const EMPTY: OfferingBannerFormData = { isActive: true, startsAt: '', endsAt: '', -}; +}); -function toForm(banner: OfferingBannerDto | null): OfferingBannerFormData { - if (!banner) return EMPTY; +function toForm(banner: OfferingBannerDto | null, position: BannerPosition): OfferingBannerFormData { + if (!banner) return emptyForm(position); return { + position: banner.position, title: banner.title, text: banner.text, linkLabel: banner.linkLabel ?? '', @@ -49,26 +52,35 @@ function toForm(banner: OfferingBannerDto | null): OfferingBannerFormData { }; } -export function OfferingBannerDialog({ banner, creating, onClose }: OfferingBannerDialogProps) { +export function OfferingBannerDialog({ banner, creatingPosition, onClose }: OfferingBannerDialogProps) { const { t } = useTranslation(); - const open = creating || banner !== null; + const open = creatingPosition !== null || banner !== null; + const position: BannerPosition = banner?.position ?? creatingPosition ?? 'bottom'; return ( { if (!next) onClose(); }}> - {banner ? t('offerings.banners.editTitle') : t('offerings.banners.createTitle')} + {banner ? t(`offerings.banners.editTitle_${position}`) : t(`offerings.banners.createTitle_${position}`)} {/* Content is unmounted while closed, so every opening starts from fresh form state. */} - + ); } -function OfferingBannerForm({ banner, onClose }: { banner: OfferingBannerDto | null; onClose: () => void }) { +function OfferingBannerForm({ + banner, + position, + onClose, +}: { + banner: OfferingBannerDto | null; + position: BannerPosition; + onClose: () => void; +}) { const { t } = useTranslation(); const [serverError, setServerError] = useState(null); const save = useSaveOfferingBanner(); @@ -76,12 +88,15 @@ function OfferingBannerForm({ banner, onClose }: { banner: OfferingBannerDto | n const { register, handleSubmit, + control, formState: { errors }, } = useForm({ resolver: zodResolver(offeringBannerFormSchema), mode: 'onTouched', - defaultValues: toForm(banner), + defaultValues: toForm(banner, position), }); + const textMax = bannerTextMaxLength(position); + const textLength = (useWatch({ control, name: 'text' }) ?? '').length; const onSubmit = async (values: OfferingBannerFormData) => { setServerError(null); @@ -89,6 +104,7 @@ function OfferingBannerForm({ banner, onClose }: { banner: OfferingBannerDto | n await save.mutateAsync({ id: banner?.id, body: { + position: values.position, title: values.title, text: values.text, linkLabel: values.linkLabel || null, @@ -114,7 +130,7 @@ function OfferingBannerForm({ banner, onClose }: { banner: OfferingBannerDto | n
- +
@@ -124,11 +140,18 @@ function OfferingBannerForm({ banner, onClose }: { banner: OfferingBannerDto | n