Merge branch 'main' into feature/III-6977-notification-publication-delay

Author: alduya

src/i18n/de.json

@@ -1422,6 +1422,7 @@
     "labels": {
       "title": "Titel",
       "type": "Typ",
+      "theme": "Thema",
       "labels": "Labels",
       "description": "Beschreibung",
       "location": "Wo",
@@ -1439,6 +1440,7 @@
     },
     "empty_value": {
       "description": "Keine Beschreibung",
+      "theme": "Kein Thema",
       "organiser": "Keine Organisationsinformationen",
       "price": "Keine Preisinformation",
       "booking": "Keine Reservierungsinformationen",

src/i18n/fr.json

@@ -1421,6 +1421,7 @@
     "labels": {
       "title": "Titre",
       "type": "Type",
+      "theme": "Thème",
       "labels": "Étiquettes",
       "description": "Description",
       "location": "Où",
@@ -1438,6 +1439,7 @@
     },
     "empty_value": {
       "description": "Aucune description",
+      "theme": "Aucun thème",
       "organiser": "Aucune information sur l'organisation",
       "price": "Pas d'information du prix",
       "booking": "Aucune information sur la réservation",

src/i18n/nl.json

@@ -1478,6 +1478,7 @@
     "labels": {
       "title": "Titel",
       "type": "Type",
+      "theme": "Thema",
       "labels": "Labels",
       "description": "Beschrijving",
       "location": "Waar",
@@ -1495,6 +1496,7 @@
     },
     "empty_value": {
       "description": "Geen beschrijving",
+      "theme": "Geen thema",
       "organiser": "Geen organisatie-informatie",
       "price": "Geen prijsinformatie",
       "booking": "Geen reservatie-informatie",

src/pages/events/[eventId]/preview/Preview.tsx

@@ -72,6 +72,7 @@ const Preview = () => {
   );
 
   const typeTerm = terms.find((term) => term.domain === 'eventtype');
+  const themeTerm = terms.find((term) => term.domain === 'theme');
 
   const description = getLanguageObjectOrFallback<string>(
     offer.description,
@@ -281,6 +282,14 @@ const Preview = () => {
   const tableData = [
     { field: t('preview.labels.title'), value: title },
     { field: t('preview.labels.type'), value: typeTerm.label },
+    {
+      field: t('preview.labels.theme'),
+      value: themeTerm ? (
+        themeTerm.label
+      ) : (
+        <EmptyValue>{t('preview.empty_value.theme')}</EmptyValue>
+      ),
+    },
     {
       field: t('preview.labels.labels'),
       value: (

src/test/e2e/events/create-calendar-multiple.spec.ts

@@ -77,6 +77,7 @@ test('create an event with calendarType multiple', async ({
   const expectedLabels = [
     'Titel',
     'Type',
+    'Thema',
     'Labels',
     'Beschrijving',
     'Waar',
@@ -103,18 +104,27 @@ test('create an event with calendarType multiple', async ({
   // Validate that some rows have "Geen" when empty
   const tableRows = await page.locator('table.table > tbody > tr').count();
 
-  const rowsWithGeenValue = [3, 6, 7, 10, 11, 13, 14];
-
-  const secondColumnCells = await page
-    .locator('table.table > tbody > tr > td:nth-child(2)')
-    .allTextContents();
+  const expectedEmptyFields = [
+    'Thema',
+    'Beschrijving',
+    'Organisatie',
+    'Prijsinfo',
+    'Reservatie',
+    'Contactgegevens',
+    'Afbeeldingen',
+    "Video's",
+  ];
 
   for (let i = 0; i < tableRows; i++) {
+    const firstColumnValue = await page
+      .locator(`table.table > tbody > tr:nth-child(${i + 1}) > td:nth-child(1)`)
+      .textContent();
+
     const secondColumnValue = await page
       .locator(`table.table > tbody > tr:nth-child(${i + 1}) > td:nth-child(2)`)
       .textContent();
 
-    if (rowsWithGeenValue.includes(i)) {
+    if (expectedEmptyFields.includes(firstColumnValue?.trim() ?? '')) {
       expect(secondColumnValue).toContain('Geen');
     } else {
       expect(secondColumnValue?.trim()).not.toBe('');