@gov-cy/govcy-express-services 1.1.1 → 1.3.0-alpha

package/src/utils/govcyMultipleThingsValidation.mjs

@@ -0,0 +1,132 @@
+// utils/govcyMultipleThingsValidation.mjs
+import { validateFormElements } from "./govcyValidator.mjs";
+import * as govcyResources from "../resources/govcyResources.mjs";
+import { getPageConfigData } from "../utils/govcyLoadConfigData.mjs";
+
+/**
+ * Validate multipleThings items against the page's form definition.
+ * @param {object} page the page configuration object
+ * @param {array} items the array of items to validate
+ * @param {string} lang the language code for error messages
+ * @returns {object} errors object containing validation errors, if any
+ */
+export function validateMultipleThings(page, items, lang) {
+    const errors = {};
+
+    // 1. Min check
+    if (items.length < page.multipleThings.min) {
+        // Deep copy page title (so we don’t mutate template)
+        let minMsg = JSON.parse(JSON.stringify(govcyResources.staticResources.text.multipleThingsMinMessage));
+
+        // Replace label placeholders on page title
+        for (const lang of Object.keys(minMsg)) {
+            minMsg[lang] = minMsg[lang].replace("{{min}}", page.multipleThings.min);
+        }
+        errors._global = {
+            message: minMsg,
+            link: "#addNewItem0"
+        };
+
+        return errors; // early exit
+    }
+
+    // 2. Max check (rare, but safe)
+    if (items.length > page.multipleThings.max) {
+        // Deep copy page title (so we don’t mutate template)
+        let maxMsg = JSON.parse(JSON.stringify(govcyResources.staticResources.text.multipleThingsMaxMessage));
+
+        // Replace label placeholders on page title
+        for (const lang of Object.keys(maxMsg)) {
+            maxMsg[lang] = maxMsg[lang].replace("{{max}}", page.multipleThings.max);
+        }
+        errors._global = {
+            message: maxMsg,
+            link: "#multipleThingsList"
+        };
+        return errors; // early exit
+    }
+
+    // 3. Per-item validation
+    items.forEach((item, idx) => {
+        const formElement = page.pageTemplate.sections
+            .flatMap(s => s.elements)
+            .find(el => el.element === "form");
+        if (!formElement) return; // safety
+
+        const vErrors = validateFormElements(formElement.params.elements, item);
+        if (Object.keys(vErrors).length > 0) {
+            errors[idx] = vErrors;
+        }
+    });
+
+    return errors;
+}
+
+
+/**
+ * Normalize validation errors into a summary list array.
+ * Works for both hub- and review-level errors.
+ *
+ * @param {object} service - The full service configuration object
+ * @param {object} hubErrors - Validation errors object (from dataLayer)
+ * @param {string} siteId - Current site id
+ * @param {string} pageUrl - Page url (for hub links)
+ * @param {object} req - Express request (for lang + route info)
+ * @param {string} route - Current route (e.g. "review" or "")
+ * @param {boolean} isHub - Whether this is for the hub page (true) or review page (false)
+ * 
+ * @returns {Array<{text: object, link: string}>}
+ */
+export function buildMultipleThingsValidationSummary(service, hubErrors, siteId, pageUrl, req, route = "", isHub = true) {
+    let validationErrors = [];
+
+    // For each error
+    for (const [key, err] of Object.entries(hubErrors)) {
+        let pageTitle = { en: "", el: "", tr: "" };
+        if (!isHub) {
+            // 🔍 Find the page by pageUrl
+            const page = getPageConfigData(service, pageUrl);
+            for (const lang of Object.keys(page.multipleThings.listPage.title)) {
+                pageTitle[lang] = (page.multipleThings.listPage.title[lang] || "") + " - ";
+            }
+        }
+
+        if (key === "_global") {
+            let msg = err.message;
+            // Replace label placeholders on page title
+            for (const lang of Object.keys(msg)) {
+                msg[lang] = pageTitle[lang]
+                    + (msg[lang] || '');
+            }
+
+            // Add to validationErrors array
+            validationErrors.push({
+                text: msg,
+                link: (isHub 
+                    ? err.link || `#multipleThingsList` 
+                    : `/${siteId}/${pageUrl}` + (route === "review" ? "?route=review" : ""))
+            });
+        } else {
+            // Deep copy page title (so we don’t mutate template)
+            let msg = JSON.parse(JSON.stringify(govcyResources.staticResources.text.multipleThingsItemsValidationPrefix));
+            const idx = parseInt(key, 10);
+
+            for (const fieldErr of Object.values(err)) {
+                // Replace label placeholders on page title
+                for (const lang of Object.keys(msg)) {
+                    msg[lang] = pageTitle[lang]
+                        + msg[lang].replace("{{index}}", idx + 1)
+                        + (fieldErr.message?.[req.globalLang] || '');
+                }
+
+                // Add to validationErrors array
+                validationErrors.push({
+                    text: msg,
+                    link: `/${siteId}/${pageUrl}/multiple/edit/${idx}${route === "review" ? "?route=review" : ""}`
+                });
+            }
+        }
+    }
+
+    return validationErrors;
+}

package/src/utils/govcySubmitData.mjs

@@ -4,7 +4,9 @@ import * as dataLayer from "./govcyDataLayer.mjs";
 import { DSFEmailRenderer } from '@gov-cy/dsf-email-templates';
 import { ALLOWED_FORM_ELEMENTS } from "./govcyConstants.mjs";
 import { evaluatePageConditions } from "./govcyExpressions.mjs";
+import { getPageConfigData } from "./govcyLoadConfigData.mjs";
 import { logger } from "./govcyLogger.mjs";
+import nunjucks from "nunjucks";
 
 /**
  * Prepares the submission data for the service, including raw data, print-friendly data, and renderer data.
@@ -48,61 +50,110 @@ export function prepareSubmissionData(req, siteId, service) {
 
         if (!formElement) continue; // ⛔ Skip pages without a <form> element
 
-        // submissionData[pageUrl] = { formData: {} }; // ✅ Now initialize only if a form is present
-        submissionData[pageUrl] = {}; // ✅ Now initialize only if a form is present
+        // 🔹 Case A: multipleThings page → array of items
+        if (page.multipleThings) {
+            // get the items array from session (or empty array if not found / not an array)
+            let items = dataLayer.getPageData(req.session, siteId, pageUrl);
+            if (!Array.isArray(items)) items = [];
+
+            submissionData[pageUrl] = [];
+
+            items.forEach((item, idx) => {
+                const itemData = {};
+                for (const el of formElement.params.elements || []) {
+                    if (!ALLOWED_FORM_ELEMENTS.includes(el.element)) continue;
+                    const elId = el.params?.id || el.params?.name;
+                    if (!elId) continue;
+
+                    // ✅ normalized with index
+                    let value = getValue(el, pageUrl, req, siteId, idx);
+                    itemData[elId] = value;
+
+                    // handle fileInput special naming
+                    if (el.element === "fileInput") {
+                        itemData[elId + "Attachment"] = value;
+                        delete itemData[elId];
+                    }
 
-        // Traverse the form elements inside the form
-        for (const element of formElement.params.elements || []) {
-            const elType = element.element;
+                    // radios conditional elements
+                    if (el.element === "radios") {
+                        for (const radioItem of el.params.items || []) {
+                            for (const condEl of radioItem.conditionalElements || []) {
+                                if (!ALLOWED_FORM_ELEMENTS.includes(condEl.element)) continue;
+                                const condId = condEl.params?.id || condEl.params?.name;
+                                if (!condId) continue;
+                                let condValue = getValue(condEl, pageUrl, req, siteId, idx);
+                                itemData[condId] = condValue;
+
+                                if (condEl.element === "fileInput") {
+                                    itemData[condId + "Attachment"] = condValue;
+                                    delete itemData[condId];
+                                }
+                            }
+                        }
+                    }
+                }
+                submissionData[pageUrl].push(itemData);
+            });
+        } else {
+            // 🔹 Case B: normal page → single object
 
-            // ✅ Skip non-input elements like buttons
-            if (!ALLOWED_FORM_ELEMENTS.includes(elType)) continue;
+            // submissionData[pageUrl] = { formData: {} }; // ✅ Now initialize only if a form is present
+            submissionData[pageUrl] = {}; // ✅ Now initialize only if a form is present
 
-            const elId = element.params?.id || element.params?.name;
-            if (!elId) continue; // ⛔ Skip elements with no id/name
+            // Traverse the form elements inside the form
+            for (const element of formElement.params.elements || []) {
+                const elType = element.element;
 
-            // 🟢 Use helper to get session value (or "" fallback if missing)
-            const value = getValue(element, pageUrl, req, siteId) ?? "";
+                // ✅ Skip non-input elements like buttons
+                if (!ALLOWED_FORM_ELEMENTS.includes(elType)) continue;
 
-            // Store in submissionData
-            // submissionData[pageUrl].formData[elId] = value;
-            submissionData[pageUrl][elId] = value;
+                const elId = element.params?.id || element.params?.name;
+                if (!elId) continue; // ⛔ Skip elements with no id/name
 
-            // handle fileInput
-            if (elType === "fileInput") {
-                // change the name of the key to include "Attachment" at the end but not have the original key
-                // submissionData[pageUrl].formData[elId + "Attachment"] = value;
-                submissionData[pageUrl][elId + "Attachment"] = value;
-                // delete submissionData[pageUrl].formData[elId];
-                delete submissionData[pageUrl][elId];
-            }
+                // 🟢 Use helper to get session value (or "" fallback if missing)
+                const value = getValue(element, pageUrl, req, siteId) ?? "";
 
-            // 🔄 If radios with conditionalElements, walk ALL options
-            if (elType === "radios" && Array.isArray(element.params?.items)) {
-                for (const radioItem of element.params.items) {
-                    const condEls = radioItem.conditionalElements;
-                    if (!Array.isArray(condEls)) continue;
-
-                    for (const condElement of condEls) {
-                        const condType = condElement.element;
-                        if (!ALLOWED_FORM_ELEMENTS.includes(condType)) continue;
-
-                        const condId = condElement.params?.id || condElement.params?.name;
-                        if (!condId) continue;
-
-                        // Again: read from session or fallback to ""
-                        const condValue = getValue(condElement, pageUrl, req, siteId) ?? "";
-
-                        // Store even if the field was not visible to user
-                        // submissionData[pageUrl].formData[condId] = condValue;
-                        submissionData[pageUrl][condId] = condValue;
-                        // handle fileInput
-                        if (condType === "fileInput") {
-                            // change the name of the key to include "Attachment" at the end but not have the original key
-                            // submissionData[pageUrl].formData[condId + "Attachment"] = condValue;
-                            submissionData[pageUrl][condId + "Attachment"] = condValue;
-                            // delete submissionData[pageUrl].formData[condId];
-                            delete submissionData[pageUrl][condId];
+                // Store in submissionData
+                // submissionData[pageUrl].formData[elId] = value;
+                submissionData[pageUrl][elId] = value;
+
+                // handle fileInput
+                if (elType === "fileInput") {
+                    // change the name of the key to include "Attachment" at the end but not have the original key
+                    // submissionData[pageUrl].formData[elId + "Attachment"] = value;
+                    submissionData[pageUrl][elId + "Attachment"] = value;
+                    // delete submissionData[pageUrl].formData[elId];
+                    delete submissionData[pageUrl][elId];
+                }
+
+                // 🔄 If radios with conditionalElements, walk ALL options
+                if (elType === "radios" && Array.isArray(element.params?.items)) {
+                    for (const radioItem of element.params.items) {
+                        const condEls = radioItem.conditionalElements;
+                        if (!Array.isArray(condEls)) continue;
+
+                        for (const condElement of condEls) {
+                            const condType = condElement.element;
+                            if (!ALLOWED_FORM_ELEMENTS.includes(condType)) continue;
+
+                            const condId = condElement.params?.id || condElement.params?.name;
+                            if (!condId) continue;
+
+                            // Again: read from session or fallback to ""
+                            const condValue = getValue(condElement, pageUrl, req, siteId) ?? "";
+
+                            // Store even if the field was not visible to user
+                            // submissionData[pageUrl].formData[condId] = condValue;
+                            submissionData[pageUrl][condId] = condValue;
+                            // handle fileInput
+                            if (condType === "fileInput") {
+                                // change the name of the key to include "Attachment" at the end but not have the original key
+                                // submissionData[pageUrl].formData[condId + "Attachment"] = condValue;
+                                submissionData[pageUrl][condId + "Attachment"] = condValue;
+                                // delete submissionData[pageUrl].formData[condId];
+                                delete submissionData[pageUrl][condId];
+                            }
                         }
                     }
                 }
@@ -122,7 +173,7 @@ export function prepareSubmissionData(req, siteId, service) {
         submissionUsername: dataLayer.getUser(req.session).name,
         submissionEmail: dataLayer.getUser(req.session).email,
         submissionData: submissionData, // Raw data as submitted by the user in each page
-        submissionDataVersion: service.site?.submissionDataVersion || service.site?.submission_data_version ||"", // The submission data version
+        submissionDataVersion: service.site?.submissionDataVersion || service.site?.submission_data_version || "", // The submission data version
         printFriendlyData: printFriendlyData, // Print-friendly data
         rendererData: reviewSummaryList, // Renderer data of the summary list
         rendererVersion: service.site?.rendererVersion || service.site?.renderer_version || "", // The renderer version
@@ -174,7 +225,9 @@ export function preparePrintFriendlyData(req, siteId, service) {
     // and extract the form data from the session
     for (const page of service.pages) {
         const fields = [];
+        const items = []; // ✅ new
         // const currentPageUrl = page.pageData.url;
+
         // ----- Conditional logic comes here
         // Skip page if conditions indicate it should redirect (i.e. not be shown)
         const conditionResult = evaluatePageConditions(page, req.session, siteId, req);
@@ -196,7 +249,11 @@ export function preparePrintFriendlyData(req, siteId, service) {
 
                     //create the field object and push it to the fields array
                     // value of the field is handled by getValueLabel function
-                    const field = createFieldObject(formElement, rawValue, getValueLabel(formElement, rawValue, page.pageData.url, req, siteId, service), service);
+                    const field = createFieldObject(
+                        formElement,
+                        rawValue,
+                        getValueLabel(formElement, rawValue, page.pageData.url, req, siteId, service),
+                        service);
                     fields.push(field);
 
                     // Handle conditional elements (only for radios for now)
@@ -223,11 +280,24 @@ export function preparePrintFriendlyData(req, siteId, service) {
             }
         }
 
+        // Special case: multipleThings page → extract item titles // ✅ new
+        if (page.multipleThings) {
+            let mtItems = dataLayer.getPageData(req.session, siteId, page.pageData.url);
+            if (Array.isArray(mtItems)) {
+                const env = new nunjucks.Environment(null, { autoescape: false });
+                for (const item of mtItems) {
+                    const itemTitle = env.renderString(page.multipleThings.itemTitleTemplate, item);
+                    items.push({ itemTitle, ...item });
+                }
+            }
+        }
+
         if (fields.length > 0) {
             submissionData.push({
                 pageUrl: page.pageData.url,
                 pageTitle: page.pageData.title,
-                fields
+                fields,
+                items: (page.multipleThings ? items : null) // ✅ new
             });
         }
     }
@@ -243,12 +313,13 @@ export function preparePrintFriendlyData(req, siteId, service) {
  * @param {string} name The name of the form element
  * @param {object} req The request object
  * @param {string} siteId The site ID
+ * @param {number} index The index of the date input
  * @returns {string} The raw date input in ISO format (YYYY-MM-DD) or an empty string if not found
  */
-function getDateInputISO(pageUrl, name, req, siteId) {
-    const day = dataLayer.getFormDataValue(req.session, siteId, pageUrl, `${name}_day`);
-    const month = dataLayer.getFormDataValue(req.session, siteId, pageUrl, `${name}_month`);
-    const year = dataLayer.getFormDataValue(req.session, siteId, pageUrl, `${name}_year`);
+function getDateInputISO(pageUrl, name, req, siteId, index = null) {
+    const day = dataLayer.getFormDataValue(req.session, siteId, pageUrl, `${name}_day`, index);
+    const month = dataLayer.getFormDataValue(req.session, siteId, pageUrl, `${name}_month`, index);
+    const year = dataLayer.getFormDataValue(req.session, siteId, pageUrl, `${name}_year`, index);
     if (!day || !month || !year) return "";
 
     // Pad day and month with leading zero if needed
@@ -265,12 +336,13 @@ function getDateInputISO(pageUrl, name, req, siteId) {
  * @param {string} name The name of the form element
  * @param {object} req The request object
  * @param {string} siteId The site ID
+ * @param {number} index The index of the date input
  * @returns {string} The raw date input in DMY format (DD/MM/YYYY) or an empty string if not found
  */
-function getDateInputDMY(pageUrl, name, req, siteId) {
-    const day = dataLayer.getFormDataValue(req.session, siteId, pageUrl, `${name}_day`);
-    const month = dataLayer.getFormDataValue(req.session, siteId, pageUrl, `${name}_month`);
-    const year = dataLayer.getFormDataValue(req.session, siteId, pageUrl, `${name}_year`);
+function getDateInputDMY(pageUrl, name, req, siteId, index = null) {
+    const day = dataLayer.getFormDataValue(req.session, siteId, pageUrl, `${name}_day`, index);
+    const month = dataLayer.getFormDataValue(req.session, siteId, pageUrl, `${name}_month`, index);
+    const year = dataLayer.getFormDataValue(req.session, siteId, pageUrl, `${name}_year`, index);
     if (!day || !month || !year) return "";
     return `${day}/${month}/${year}`;   // EU format: DD/MM/YYYY
 }
@@ -303,19 +375,20 @@ function createFieldObject(formElement, value, valueLabel, service) {
  * @param {string} pageUrl The page URL
  * @param {object} req The request object
  * @param {string} siteId The site ID
+ * @param {number} index The index of the form element (for multipleThings)
  * @returns {string} The value of the form element from the session or an empty string if not found
  */
-function getValue(formElement, pageUrl, req, siteId) {
+function getValue(formElement, pageUrl, req, siteId, index = null) {
     // handle raw value 
     let value = ""
     if (formElement.element === "dateInput") {
-        value = getDateInputISO(pageUrl, formElement.params.name, req, siteId);
+        value = getDateInputISO(pageUrl, formElement.params.name, req, siteId, index);
     } else if (formElement.element === "fileInput") {
         // unneeded handle of `Attachment` at the end
         // value = dataLayer.getFormDataValue(req.session, siteId, pageUrl, formElement.params.name + "Attachment");
-        value = dataLayer.getFormDataValue(req.session, siteId, pageUrl, formElement.params.name);
+        value = dataLayer.getFormDataValue(req.session, siteId, pageUrl, formElement.params.name, index);
     } else {
-        value = dataLayer.getFormDataValue(req.session, siteId, pageUrl, formElement.params.name);
+        value = dataLayer.getFormDataValue(req.session, siteId, pageUrl, formElement.params.name, index);
     }
 
     // 🔁 Normalize checkboxes: always return an array
@@ -486,26 +559,49 @@ export function generateReviewSummary(submissionData, req, siteId, showChangeLin
 
 
 
+    const env = new nunjucks.Environment(null, { autoescape: true });
+    // One template renders multiple things
+    const multipleThingsTemplate = `
+        <div><strong>${govcyResources.staticResources.text.multipleThingsEntries[req.globalLang] || govcyResources.staticResources.text.multipleThingsEntries["el"]}</strong></div>
+        <ol class="govcy-mt-2">
+        {% for it in items -%}
+            <li>{{ it.itemTitle | trim }}</li>
+        {%- endfor %}
+        </ol>
+        `;
 
     // Loop through each page in the submission data
     for (const page of submissionData) {
         // Get the page URL, title, and fields
-        const { pageUrl, pageTitle, fields } = page;
+        const { pageUrl, pageTitle, fields, items } = page;
 
 
         let summaryListInner = { element: "summaryList", params: { items: [] } };
 
-        // loop through each field and add it to the summary entry
-        for (const field of fields) {
-            const label = field.label;
-            const valueLabel = getSubmissionValueLabelString(field.valueLabel, req.globalLang);
-            // --- HACK --- to see if this is a file element
-            // check if field.value is an object with `sha256` and `fileId` properties
-            if (typeof field.value === "object" && field.value.hasOwnProperty("sha256") && field.value.hasOwnProperty("fileId") && showChangeLinks) {
-                summaryListInner.params.items.push(createSummaryListItemFileLink(label, valueLabel, siteId, pageUrl, field.name));
+        // Special handling: multipleThings page → show <ol> of itemTitle only
+        if (Array.isArray(items)) {
+            summaryListInner = { element: "htmlElement", params: { text: {} } };
+            if (items.length == 0) {
+                summaryListInner.params.text = govcyResources.staticResources.text.multipleThingsEmptyStateReview
             } else {
-                // add the field to the summary entry
-                summaryListInner.params.items.push(createSummaryListItem(label, valueLabel));
+                // Build ordered list HTML
+                let htmlByLang = env.renderString(multipleThingsTemplate, { items });
+                // Set the HTML for each language
+                summaryListInner.params.text = govcyResources.getMultilingualObject(htmlByLang, htmlByLang, htmlByLang);
+            }
+        } else { // Normal page → keep old behavior
+            // loop through each field and add it to the summary entry
+            for (const field of fields) {
+                const label = field.label;
+                const valueLabel = getSubmissionValueLabelString(field.valueLabel, req.globalLang);
+                // --- HACK --- to see if this is a file element
+                // check if field.value is an object with `sha256` and `fileId` properties
+                if (typeof field.value === "object" && field.value.hasOwnProperty("sha256") && field.value.hasOwnProperty("fileId") && showChangeLinks) {
+                    summaryListInner.params.items.push(createSummaryListItemFileLink(label, valueLabel, siteId, pageUrl, field.name));
+                } else {
+                    // add the field to the summary entry
+                    summaryListInner.params.items.push(createSummaryListItem(label, valueLabel));
+                }
             }
         }
 
@@ -557,7 +653,8 @@ export function generateSubmitEmail(service, submissionData, submissionId, req)
             {
                 component: "bodySuccess",
                 params: {
-                    title: govcyResources.getLocalizeContent(govcyResources.staticResources.text.submissionSuccessTitle, req.globalLang),
+                    title: service?.site?.successEmailHeader?.[req.globalLang]
+                        || govcyResources.getLocalizeContent(govcyResources.staticResources.text.submissionSuccessTitle, req.globalLang),
                     body: `${govcyResources.getLocalizeContent(govcyResources.staticResources.text.yourSubmissionId, req.globalLang)} ${submissionId}`
                 }
             }
@@ -572,10 +669,12 @@ export function generateSubmitEmail(service, submissionData, submissionId, req)
         }
     );
 
+    const env = new nunjucks.Environment(null, { autoescape: true })
+
     // For each page in the submission data
     for (const page of submissionData) {
         // Get the page URL, title, and fields
-        const { pageUrl, pageTitle, fields } = page;
+        const { pageUrl, pageTitle, fields, items } = page;
 
         // Add data title to the body
         body.push(
@@ -586,19 +685,54 @@ export function generateSubmitEmail(service, submissionData, submissionId, req)
             }
         );
 
-        let dataUl = [];
-        // loop through each field and add it to the summary entry
-        for (const field of fields) {
-            const label = govcyResources.getLocalizeContent(field.label, req.globalLang);
-            const valueLabel = getSubmissionValueLabelString(field.valueLabel, req.globalLang);
-            dataUl.push({ key: label, value: valueLabel });
+        if (Array.isArray(items)) {
+            // 🔹 MultipleThings page → loop through items
+            // multipleThings → use itemTitleTemplate
+            const pageConfig = getPageConfigData(service, pageUrl);
+            const template = pageConfig.multipleThings?.itemTitleTemplate || "{{itemTitle}}";
+
+            if (items.length === 0) {
+                // Empty state message
+                body.push({
+                    component: "bodyParagraph",
+                    body: govcyResources.getLocalizeContent(
+                        govcyResources.staticResources.text.multipleThingsEmptyStateReview,
+                        req.globalLang
+                    )
+                });
+            } else {
+                // Build ordered list of item titles
+                const listItems = items.map(item => {
+                    const safeTitle = env.renderString(template, item);
+                    return safeTitle; // already escaped
+                });
+
+                // Add ordered list to the body
+                body.push({
+                    component: "bodyList",
+                    params: {
+                        type: "ol",
+                        items: listItems
+                    }
+                });
+            }
+        } else {
+            // 🔹 Normal page → continue below
+            let dataUl = [];
+            // loop through each field and add it to the summary entry
+            for (const field of fields) {
+                const label = govcyResources.getLocalizeContent(field.label, req.globalLang);
+                const valueLabel = getSubmissionValueLabelString(field.valueLabel, req.globalLang);
+                dataUl.push({ key: label, value: valueLabel });
+            }
+            // add data to the body
+            body.push(
+                {
+                    component: "bodyKeyValue",
+                    params: { type: "ul", items: dataUl },
+                });
         }
-        // add data to the body
-        body.push(
-            {
-                component: "bodyKeyValue",
-                params: { type: "ul", items: dataUl },
-            });
+
 
     }
 

package/src/utils/govcyValidator.mjs

@@ -42,7 +42,7 @@ function validateValue(value, rules) {
     mobileCY: (val) => {
       const normalized = val.replace(/[\s\-()]/g, ''); // Remove spaces, hyphens, and parentheses
       return /^(?:\+357|00357)?9\d{7}$/.test(normalized); // Match Cypriot mobile numbers
-  },
+    },
     iban: (val) => {
       const cleanedIBAN = val.replace(/[\s-]/g, '').toUpperCase(); // Remove spaces/hyphens and convert to uppercase
       const regex = /^[A-Z]{2}\d{2}[A-Z0-9]{11,30}$/;
@@ -96,6 +96,13 @@ function validateValue(value, rules) {
       }
       return normalizedVal <= max;
     },
+    // ✅ New rule: maxCurrentYear
+    maxCurrentYear: (val) => {
+      const normalizedVal = normalizeNumber(val);
+      if (isNaN(normalizedVal)) return false;
+      const currentYear = new Date().getFullYear();
+      return normalizedVal <= currentYear;
+    },
     minValueDate: (val, minDate) => {
       const valueDate = parseDate(val); // Parse the input date
       const min = parseDate(minDate); // Parse the minimum date
@@ -129,6 +136,10 @@ function validateValue(value, rules) {
       }
     }
 
+    // Skip validation if the value is empty
+    if (value === null || value === undefined || (typeof value === 'string' && value.trim() === "")) {
+      continue; // let "required" handle emptiness
+    } 
     // Check for "valid" rules (e.g., numeric, telCY, etc.)
     if (check === "valid" && validationRules[checkValue]) {
       const isValid = validationRules[checkValue](value);
@@ -157,12 +168,12 @@ function validateValue(value, rules) {
     if (check === 'minValue' && !validationRules.minValue(value, checkValue)) {
       return message;
     }
-
+    
     // Check for "maxValue"
     if (check === 'maxValue' && !validationRules.maxValue(value, checkValue)) {
       return message;
     }
-
+    
     // Check for "minValueDate"
     if (check === 'minValueDate' && !validationRules.minValueDate(value, checkValue)) {
       return message;
@@ -178,6 +189,7 @@ function validateValue(value, rules) {
       return message;
     }
 
+
   }
 
   return null;
@@ -314,10 +326,10 @@ export function validateFormElements(elements, formData, pageUrl) {
                     .filter(Boolean) // Remove empty values
                     .join("-") // Join remaining parts
                   : (conditionalElement.element === "fileInput") // Handle fileInput
-                      // unneeded handle of `Attachment` at the end
-                      // ? formData[`${conditionalElement.params.name}Attachment`] || ""
-                      ? formData[`${conditionalElement.params.name}`] || ""
-                  : formData[conditionalElement.params.name] || ""; // Get submitted value
+                    // unneeded handle of `Attachment` at the end
+                    // ? formData[`${conditionalElement.params.name}Attachment`] || ""
+                    ? formData[`${conditionalElement.params.name}`] || ""
+                    : formData[conditionalElement.params.name] || ""; // Get submitted value
 
                 //Autocheck: check for "checkboxes", "radios", "select" if `fieldValue` is one of the `field.params.items`
                 if (["checkboxes", "radios", "select"].includes(conditionalElement.element) && conditionalFieldValue !== "") {