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

package/src/utils/govcyDataLayer.mjs

@@ -59,19 +59,33 @@ export function initializeSiteData(store, siteId, pageUrl = null) {
  * @param {string} pageUrl The page url 
  * @param {object} validationErrors The validation errors 
  * @param {object} formData The form data that produced the errors 
+ * @param {string} key The key to store the errors under. Used for multiple items. Defaults to null
  */
-export function storePageValidationErrors(store, siteId, pageUrl, validationErrors, formData) {
-    // Ensure session structure is initialized
-    initializeSiteData(store, siteId, pageUrl);
-
-    // Store the validation errors
+export function storePageValidationErrors(store, siteId, pageUrl, validationErrors, formData, key = null) {
+  // Ensure session structure is initialized
+  initializeSiteData(store, siteId, pageUrl);
+
+  // Build the error object
+  const errorObj = {
+    errors: validationErrors,
+    formData: formData,
+    errorSummary: []
+  };
+
+  // If a key is provided (e.g., "add" or "2"), store under that key
+  if (key !== null) {
+    const existing = store.siteData[siteId].inputData[pageUrl]["validationErrors"] || {};
     store.siteData[siteId].inputData[pageUrl]["validationErrors"] = {
-        errors: validationErrors,
-        formData: formData,
-        errorSummary: []
+      ...existing,
+      [key]: errorObj
     };
+  } else {
+    // Normal page (no key)
+    store.siteData[siteId].inputData[pageUrl]["validationErrors"] = errorObj;
+  }
 }
 
+
 /**
  * Stores the page's form data in the data layer
  * 
@@ -378,10 +392,43 @@ export function getSiteSubmissionData(store, siteId) {
  * @param {string} elementName The element name
  * @returns The value of the form data for the element or an empty string if none exist.
  */
-export function getFormDataValue(store, siteId, pageUrl, elementName) {
-    return store?.siteData?.[siteId]?.inputData?.[pageUrl]?.formData?.[elementName] || "";
+export function getFormDataValue(store, siteId, pageUrl, elementName, index = null) {
+    const pageData = store?.siteData?.[siteId]?.inputData?.[pageUrl];
+    if (!pageData) return "";
+
+    // Case 1: formData is an array (multipleThings edit)
+    if (Array.isArray(pageData.formData) && index !== null) {
+        return pageData?.formData[index]?.[elementName] || "";
+    }
+
+    // Case 2: formData is a flat object (single page or multipleThings add seed)
+    if (pageData.formData && !Array.isArray(pageData.formData)) {
+        const val = pageData.formData[elementName];
+        // If the flat value exists and is non-empty, prefer it.
+        const hasNonEmptyFlat =
+            val !== undefined &&
+            val !== "" &&
+            !(typeof val === "object" && val !== null && Object.keys(val).length === 0);
+        if (hasNonEmptyFlat) return val;
+
+        // Otherwise, fall back to multipleDraft (used in add flow) if present.
+        if (pageData.multipleDraft && typeof pageData.multipleDraft === "object") {
+            const draftVal = pageData.multipleDraft[elementName];
+            if (draftVal !== undefined && draftVal !== "") return draftVal;
+        }
+        // If neither exists, return an empty string
+        return "";
+    }
+
+    // Case 3: no flat formData; fall back to multipleDraft (used in add flow)
+    if (pageData.multipleDraft && typeof pageData.multipleDraft === "object") {
+        return pageData?.multipleDraft?.[elementName] || "";
+    }
+
+    return "";
 }
 
+
 /**
  * Get the user object from the session store
  * 
@@ -389,13 +436,51 @@ export function getFormDataValue(store, siteId, pageUrl, elementName) {
  * @returns The user object from the store or null if it doesn't exist.
  */
 export function getUser(store) {
-    return store.user || null;
+    return store?.user || null;
 }
 
 export function clearSiteData(store, siteId) {
     delete store?.siteData[siteId];
 }
 
+/**
+ * Get multiple things draft data while adding a new multiple thing
+ * 
+ * @param {object} store The session store
+ * @param {string} siteId The site id
+ * @param {string} pageUrl The page url
+ * @returns The multiple things draft data while adding a new multiple thing. 
+ */
+export function getMultipleDraft(store, siteId, pageUrl) {
+  return store?.siteData?.[siteId]?.inputData?.[pageUrl]?.multipleDraft || null;
+}
+
+/**
+ * Store multiple things draft data used while adding a new multiple thing
+ * 
+ * @param {object} store The session store
+ * @param {string} siteId The site id
+ * @param {string} pageUrl The page url
+ * @param {*} obj The multiple things draft data to be stored
+ */
+export function setMultipleDraft(store, siteId, pageUrl, obj) {
+  initializeSiteData(store, siteId, pageUrl);
+  store.siteData[siteId].inputData[pageUrl].multipleDraft = obj || {};
+}
+
+/**
+ * Clear multiple things draft data used while adding a new multiple thing
+ * 
+ * @param {object} store The session store
+ * @param {string} siteId The site id
+ * @param {string} pageUrl The page url 
+ */
+export function clearMultipleDraft(store, siteId, pageUrl) {
+  if (store?.siteData?.[siteId]?.inputData?.[pageUrl]) {
+    store.siteData[siteId].inputData[pageUrl].multipleDraft = null;
+  }
+}
+
 /**
  * Check if a file reference is used in more than one place (field) across the site's inputData.
  *
@@ -431,34 +516,55 @@ export function isFileUsedInSiteInputDataAgain(store, siteId, { fileId, sha256 }
 
     // Loop all pages under the site
     for (const pageKey of Object.keys(site)) {
-        const formData = site[pageKey]?.formData;
-        if (!formData || typeof formData !== 'object') continue;
-
-        // Loop all fields on the page
-        for (const [_, value] of Object.entries(formData)) {
-            if (value == null) continue;
-
-            // Normalize to an array to also support multi-value fields (e.g., multiple file inputs)
-            const candidates = Array.isArray(value) ? value : [value];
-
-            for (const candidate of candidates) {
-                // We only consider objects that look like file references
-                if (
-                    candidate &&
-                    typeof candidate === 'object' &&
-                    'fileId' in candidate &&
-                    'sha256' in candidate
-                ) {
-                    const idMatches = fileId ? candidate.fileId === fileId : true;
-                    const shaMatches = sha256 ? candidate.sha256 === sha256 : true;
-
-                    if (idMatches && shaMatches) {
-                        hits += 1;
-                        // As soon as we see it in more than one place, we can answer true
-                        if (hits > 1) return true;
+        const pageData = site[pageKey];
+        if (!pageData) continue;
+
+        // Helper to scan an object for file matches
+        const scanObject = (obj) => {
+            for (const value of Object.values(obj)) {
+                if (value == null) continue;
+                const candidates = Array.isArray(value) ? value : [value];
+                for (const candidate of candidates) {
+                    if (
+                        candidate &&
+                        typeof candidate === "object" &&
+                        "fileId" in candidate &&
+                        "sha256" in candidate
+                    ) {
+                        const idMatches = fileId ? candidate.fileId === fileId : true;
+                        const shaMatches = sha256 ? candidate.sha256 === sha256 : true;
+                        if (idMatches && shaMatches) {
+                            hits += 1;
+                            if (hits > 1) return true;
+                        }
                     }
                 }
             }
+            return false;
+        };
+
+        // Case 1: flat formData object
+        if (pageData.formData && !Array.isArray(pageData.formData)) {
+            if (scanObject(pageData.formData)) return true;
+        }
+
+        // Case 2: multipleDraft
+        if (pageData.multipleDraft) {
+            if (scanObject(pageData.multipleDraft)) return true;
+        }
+
+        // Case 3: formData as array (multiple items)
+        if (Array.isArray(pageData.formData)) {
+            for (const item of pageData.formData) {
+                if (scanObject(item)) return true;
+            }
+        }
+        
+        // Case 4: formData.multipleItems array (your current design)
+        if (Array.isArray(pageData.formData?.multipleItems)) {
+            for (const item of pageData.formData.multipleItems) {
+                if (scanObject(item)) return true;
+            }
         }
     }
 
@@ -498,6 +604,7 @@ export function removeAllFilesFromSite(
 ) {
     // Ensure session structure is initialized
     initializeSiteData(store, siteId);
+
     // --- Guard rails ---------------------------------------------------------
 
     // Nothing to remove if neither identifier is provided.
@@ -534,43 +641,77 @@ export function removeAllFilesFromSite(
     // --- Main traversal over all pages --------------------------------------
 
     for (const page of Object.values(site)) {
-        // Each page should be an object with a formData object
-        const formData =
-            page &&
-                typeof page === "object" &&
-                page.formData &&
-                typeof page.formData === "object"
-                ? page.formData
-                : null;
-
-        if (!formData) continue; // skip content-only pages, etc.
-
-        // For each field on this page…
-        for (const key of Object.keys(formData)) {
-            const val = formData[key];
-
-            // Case A: a single file object → replace with "" if it matches.
-            if (isMatch(val)) {
-                formData[key] = "";
-                continue;
+        if (!page || typeof page !== "object") continue;
+
+        // --- Case 1: flat formData object -----------------------------------
+        if (page.formData && !Array.isArray(page.formData)) {
+            const formData = page.formData;
+            for (const key of Object.keys(formData)) {
+                const val = formData[key];
+
+                // Case A: a single file object → replace with "" if it matches.
+                if (isMatch(val)) {
+                    formData[key] = "";
+                    continue;
+                }
+
+                // Case B: an array → replace ONLY the matching items with "".
+                if (Array.isArray(val)) {
+                    let changed = false;
+                    const mapped = val.map((item) => {
+                        if (isMatch(item)) {
+                            changed = true;
+                            return "";
+                        }
+                        return item;
+                    });
+                    if (changed) formData[key] = mapped;
+                }
             }
+        }
 
-            // Case B: an array → replace ONLY the matching items with "".
-            if (Array.isArray(val)) {
-                let changed = false;
-                const mapped = val.map((item) => {
-                    if (isMatch(item)) {
-                        changed = true;
-                        return "";
+        // --- Case 2: formData as array (multiple items) ---------------------
+        if (Array.isArray(page.formData)) {
+            for (const item of page.formData) {
+                if (!item || typeof item !== "object") continue;
+                for (const key of Object.keys(item)) {
+                    const val = item[key];
+                    if (isMatch(val)) {
+                        item[key] = "";
+                        continue;
+                    }
+                    if (Array.isArray(val)) {
+                        let changed = false;
+                        const mapped = val.map((sub) =>
+                            isMatch(sub) ? "" : sub
+                        );
+                        if (changed) item[key] = mapped;
                     }
-                    return item;
-                });
-                if (changed) formData[key] = mapped;
+                }
             }
+        }
 
-            // Note: If you later store file-like objects deeper in nested objects,
-            // add a recursive visitor here (with cycle protection / max depth).
+        // --- Case 3: multipleDraft ------------------------------------------
+        if (page.multipleDraft && typeof page.multipleDraft === "object") {
+            for (const key of Object.keys(page.multipleDraft)) {
+                const val = page.multipleDraft[key];
+                if (isMatch(val)) {
+                    page.multipleDraft[key] = "";
+                    continue;
+                }
+                if (Array.isArray(val)) {
+                    let changed = false;
+                    const mapped = val.map((sub) =>
+                        isMatch(sub) ? "" : sub
+                    );
+                    if (changed) page.multipleDraft[key] = mapped;
+                }
+            }
         }
+
+        // Note: If you later store file-like objects deeper in nested objects,
+        // add a recursive visitor here (with cycle protection / max depth).
     }
 }
 
+

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,43 @@ 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) {
+                    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 +142,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 +158,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 +168,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 +221,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 +241,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 +256,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 +273,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 +283,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) {