@gov-cy/govcy-express-services 1.2.0 → 1.3.0-alpha.1

package/src/utils/govcyFormHandling.mjs

@@ -20,24 +20,53 @@ import * as govcyResources from "../resources/govcyResources.mjs";
  * @param {string} lang The language
  * @param {Object} fileInputElements The file input elements
  * @param {string} routeParam The route parameter
+ * @param {string} mode The mode, either "single" (default), "add", or "edit"
+ * @param {number|null} index The index of the item being edited (null for single or add mode)
  */
-export function populateFormData(formElements, theData, validationErrors, store = {}, siteId = "", pageUrl = "", lang = "el", fileInputElements = null, routeParam = "") {
+export function populateFormData(
+    formElements,
+    theData,
+    validationErrors,
+    store = {},
+    siteId = "",
+    pageUrl = "",
+    lang = "el",
+    fileInputElements = null,
+    routeParam = "",
+    mode = "single",
+    index = null
+) {
     const inputElements = ALLOWED_FORM_ELEMENTS;
     const isRootCall = !fileInputElements;
+    let elementId = "";
+    let firstElementId = "";
+
     if (isRootCall) {
         fileInputElements = {};
     }
     // Recursively populate form data with session data
     formElements.forEach(element => {
         if (inputElements.includes(element.element)) {
+            // Get the element ID and field name
+            elementId = (element.element === "checkboxes" || element.element === "radios") // if checkboxes or radios
+                ? `${element.params.id}-option-1` // use the id of the first option
+                : (element.element === "dateInput") //if dateInput
+                    ? `${element.params.id}_day`  // use the id of the day input
+                    : element.params.id; // else use the id of the element
+
             const fieldName = element.params.name;
 
+            // Store the ID of the first input element (for error summary link)
+            if (!firstElementId) {
+                firstElementId = elementId;
+            }
+
             // Handle `dateInput` separately
             if (element.element === "dateInput") {
                 element.params.dayValue = theData[`${fieldName}_day`] || "";
                 element.params.monthValue = theData[`${fieldName}_month`] || "";
                 element.params.yearValue = theData[`${fieldName}_year`] || "";
-            //Handle `datePicker` separately
+                //Handle `datePicker` separately
             } else if (element.element === "datePicker") {
                 const val = theData[fieldName];
 
@@ -68,25 +97,49 @@ export function populateFormData(formElements, theData, validationErrors, store
             } else if (element.element === "fileInput") {
                 // For fileInput, we change the element.element to "fileView" and set the 
                 // fileId and sha256 from the session store
-                // unneeded handle of `Attachment` at the end
-                // const fileData = dataLayer.getFormDataValue(store, siteId, pageUrl, fieldName + "Attachment");
-                const fileData = dataLayer.getFormDataValue(store, siteId, pageUrl, fieldName);
-                // TODO: Ask Andreas how to handle empty file inputs
+                // const fileData = dataLayer.getFormDataValue(store, siteId, pageUrl, fieldName);
+
+                // 1) Prefer file from theData (could be draft in add mode, or item object in edit)
+                let fileData = theData[fieldName];
+
+                // 2) If not found, fall back to dataLayer (normal page behaviour)
+                if (!fileData) {
+                    if (mode === "edit" && index !== null) {
+                        // In edit mode, try to get the file for the specific item index
+                        fileData = dataLayer.getFormDataValue(store, siteId, pageUrl, fieldName, index);
+                    } else {
+                        // In single or add mode, get the file normally
+                        fileData = dataLayer.getFormDataValue(store, siteId, pageUrl, fieldName);
+                    }
+                }
+
                 if (fileData) {
                     element.element = "fileView";
                     element.params.fileId = fileData.fileId;
                     element.params.sha256 = fileData.sha256;
                     element.params.visuallyHiddenText = element.params.label;
-                    // TODO: Also need to set the `view` and `download` URLs 
-                    element.params.viewHref = `/${siteId}/${pageUrl}/view-file/${fieldName}`;
+
+                    // Build base path based on mode
+                    let basePath = `/${siteId}/${pageUrl}`;
+                    if (mode === "add") {
+                        basePath += "/multiple/add";
+                    } else if (mode === "edit" && index !== null) {
+                        basePath += `/multiple/edit/${index}`;
+                    }
+
+                    // View link
+                    element.params.viewHref = `${basePath}/view-file/${fieldName}`;
                     element.params.viewTarget = "_blank";
-                    element.params.deleteHref  = `/${siteId}/${pageUrl}/delete-file/${fieldName}${(routeParam) ? `?route=${routeParam}` : ''}`;
+                    // Delete link (preserve ?route=review if present)
+                    element.params.deleteHref = `${basePath}/delete-file/${fieldName}${(routeParam) ? `?route=${routeParam}` : ''}`
+
+                   
                 } else {
                     // TODO: Ask Andreas how to handle empty file inputs
                     element.params.value = "";
-                }       
+                }
                 fileInputElements[fieldName] = element;
-            // Handle all other input elements (textInput, checkboxes, radios, etc.)
+                // Handle all other input elements (textInput, checkboxes, radios, etc.)
             } else {
                 element.params.value = theData[fieldName] || "";
             }
@@ -95,11 +148,11 @@ export function populateFormData(formElements, theData, validationErrors, store
             if (validationErrors?.errors?.[fieldName]) {
                 element.params.error = validationErrors.errors[fieldName].message;
                 //populate the error summary
-                const elementId = (element.element === "checkboxes" || element.element === "radios") // if checkboxes or radios
-                    ? `${element.params.id}-option-1` // use the id of the first option
-                    : (element.element === "dateInput") //if dateInput
-                    ? `${element.params.id}_day`  // use the id of the day input
-                    : element.params.id; // else use the id of the element
+                // const elementId = (element.element === "checkboxes" || element.element === "radios") // if checkboxes or radios
+                //     ? `${element.params.id}-option-1` // use the id of the first option
+                //     : (element.element === "dateInput") //if dateInput
+                //     ? `${element.params.id}_day`  // use the id of the day input
+                //     : element.params.id; // else use the id of the element
                 validationErrors.errorSummary.push({
                     link: `#${elementId}`,
                     text: validationErrors.errors[fieldName].message
@@ -111,8 +164,8 @@ export function populateFormData(formElements, theData, validationErrors, store
         if (element.element === "radios" && element.params.items) {
             element.params.items.forEach(item => {
                 if (item.conditionalElements) {
-                    populateFormData(item.conditionalElements, theData, validationErrors,store, siteId , pageUrl, lang, fileInputElements, routeParam);
-                  
+                    populateFormData(item.conditionalElements, theData, validationErrors, store, siteId, pageUrl, lang, fileInputElements, routeParam);
+
                     // Check if any conditional element has an error and add to the parent "conditionalHasErrors": true
                     if (item.conditionalElements.some(condEl => condEl.params?.error)) {
                         item.conditionalHasErrors = true;
@@ -121,6 +174,25 @@ export function populateFormData(formElements, theData, validationErrors, store
             });
         }
     });
+
+    // 🔴 Handle _global validation errors (collection-level, not tied to a field)
+    if (isRootCall && validationErrors?.errors?._global) {
+        validationErrors.errorSummary = validationErrors.errorSummary || [];
+
+        // Decide where the link should point
+        let linkTarget = `#${firstElementId}`; // default anchor at top of the form
+        if (validationErrors.errors._global.pageUrl) {
+            // If pageUrl is provided (e.g. for max items), point back to hub
+            linkTarget = `${validationErrors.errors._global.pageUrl}`;
+        }
+
+        // Push into the error summary
+        validationErrors.errorSummary.push({
+            link: linkTarget,
+            text: validationErrors.errors._global.message
+        });
+    }
+
     // add file input elements's definition in js object
     if (isRootCall && Object.keys(fileInputElements).length > 0) {
         const scriptTag = `
@@ -155,9 +227,10 @@ export function populateFormData(formElements, theData, validationErrors, store
  * @param {Object} store - The session store .
  * @param {string} siteId - The site ID .
  * @param {string} pageUrl - The page URL .
+ * @param {number|null} index - The index of the item being edited for multiple items
  * @returns {Object} filteredData - The filtered form data.
  */
-export function getFormData(elements, formData, store = {}, siteId = "", pageUrl = "") {
+export function getFormData(elements, formData, store = {}, siteId = "", pageUrl = "", index = null) {
     const filteredData = {};
     elements.forEach(element => {
         const { name } = element.params || {};
@@ -174,12 +247,12 @@ export function getFormData(elements, formData, store = {}, siteId = "", pageUrl
                         if (item.conditionalElements) {
                             Object.assign(
                                 filteredData,
-                                getFormData(item.conditionalElements, formData, store, siteId, pageUrl)
+                                getFormData(item.conditionalElements, formData, store, siteId, pageUrl, index)
                             );
                         }
                     });
                 }
-                
+
             }
             // Handle dateInput
             else if (element.element === "dateInput") {
@@ -189,13 +262,13 @@ export function getFormData(elements, formData, store = {}, siteId = "", pageUrl
                 filteredData[`${name}_day`] = day !== undefined && day !== null ? day : "";
                 filteredData[`${name}_month`] = month !== undefined && month !== null ? month : "";
                 filteredData[`${name}_year`] = year !== undefined && year !== null ? year : "";
-            // handle fileInput
+                // handle fileInput
             } else if (element.element === "fileInput") {
                 // fileInput elements are already stored in the store when it was uploaded
                 // so we just need to check if the file exists in the dataLayer in the store and add it the filteredData
                 // unneeded handle of `Attachment` at the end
                 // const fileData = dataLayer.getFormDataValue(store, siteId, pageUrl, name + "Attachment");
-                const fileData = dataLayer.getFormDataValue(store, siteId, pageUrl, name);
+                const fileData = dataLayer.getFormDataValue(store, siteId, pageUrl, name, index);
                 if (fileData) {
                     // unneeded handle of `Attachment` at the end
                     // filteredData[name + "Attachment"] = fileData;
@@ -206,7 +279,7 @@ export function getFormData(elements, formData, store = {}, siteId = "", pageUrl
                     // filteredData[name + "Attachment"] = ""; // or handle as needed
                     filteredData[name] = ""; // or handle as needed
                 }
-            // Handle other elements (e.g., textInput, textArea, datePicker)
+                // Handle other elements (e.g., textInput, textArea, datePicker)
             } else {
                 filteredData[name] = formData[name] !== undefined && formData[name] !== null ? formData[name] : "";
             }
@@ -216,9 +289,9 @@ export function getFormData(elements, formData, store = {}, siteId = "", pageUrl
             //     Object.assign(filteredData, getFormData(element.conditionalElements, formData));
             // }
         }
-    
+
     });
-    
+
 
     return filteredData;
-}
+}

package/src/utils/govcyHandleFiles.mjs

@@ -18,9 +18,21 @@ import { logger } from './govcyLogger.mjs';
  * @param {string} opts.pageUrl - Page URL
  * @param {string} opts.elementName - Name of file input
  * @param {object} opts.file - File object from multer (req.file)
+ * @param {string} opts.mode - Upload mode ("single" | "multipleThingsDraft" | "multipleThingsEdit")
+ * @param {number|null} opts.index - Numeric index for edit mode (0-based), or null
  * @returns {Promise<{ status: number, data?: object, errorMessage?: string }>}
  */
-export async function handleFileUpload({ service, store, siteId, pageUrl, elementName, file }) {
+export async function handleFileUpload({ 
+  service, 
+  store, 
+  siteId, 
+  pageUrl, 
+  elementName, 
+  file,
+  mode = "single",       // "single" | "multipleThingsDraft" | "multipleThingsEdit"
+  index = null           // numeric index for edit mode
+}) {
+  
   try {
     // Validate essentials
     // Early exit if key things are missing
@@ -187,23 +199,56 @@ export async function handleFileUpload({ service, store, siteId, pageUrl, elemen
 
     // ✅ Success
     // Store the file metadata in the session store
-    // unneeded handle of `Attachment` at the end
-    // dataLayer.storePageDataElement(store, siteId, pageUrl, elementName+"Attachment", {
-    dataLayer.storePageDataElement(store, siteId, pageUrl, elementName, {
+    const metadata = {
       sha256: response.Data.sha256,
       fileId: response.Data.fileId,
-    });
-    logger.debug("File upload successful", response.Data);
-    logger.info(`File uploaded successfully for element ${elementName} on page ${pageUrl} for site ${siteId}`);
-    return {
-      status: 200,
-      data: {
+      fileName: response.Data.fileName || file.originalname || "",
+      mimeType: response.Data.contentType || file.mimetype || "",
+      fileSize: response.Data.fileSize || file.size || 0,
+    };
+
+    if (mode === "multipleThingsDraft") {
+      // Store in draft object
+      let draft = dataLayer.getMultipleDraft(store, siteId, pageUrl);
+      if (!draft) draft = {};
+      draft[elementName] = {
         sha256: response.Data.sha256,
-        filename: response.Data.fileName || '',
         fileId: response.Data.fileId,
-        mimeType: response.Data.contentType || '',
-        fileSize: response.Data?.fileSize || ''
+      };
+      dataLayer.setMultipleDraft(store, siteId, pageUrl, draft);
+      logger.debug(`Stored file metadata in draft for ${siteId}/${pageUrl}`, metadata);
+    }
+    else if (mode === "multipleThingsEdit") {
+      // Store in item array
+      let items = dataLayer.getPageData(store, siteId, pageUrl);
+      if (!Array.isArray(items)) items = [];
+      if (index !== null && index >= 0 && index < items.length) {
+        items[index][elementName] = {
+          sha256: response.Data.sha256,
+          fileId: response.Data.fileId,
+        };
+        dataLayer.storePageData(store, siteId, pageUrl, items);
+        logger.debug(`Stored file metadata in item index=${index} for ${siteId}/${pageUrl}`, metadata);
+      } else {
+        return {
+          status: 400,
+          dataStatus: 412,
+          errorMessage: `Invalid index for multipleThingsEdit (index=${index})`
+        };
       }
+    }
+    else {
+      // Default: single-page behaviour
+      dataLayer.storePageDataElement(store, siteId, pageUrl, elementName, {
+        sha256: response.Data.sha256,
+        fileId: response.Data.fileId,
+      });
+      logger.debug(`Stored file metadata in single mode for ${siteId}/${pageUrl}`, metadata);
+    }
+
+    return {
+      status: 200,
+      data: metadata
     };
 
   } catch (err) {

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;
+}