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

package/src/resources/govcyResources.mjs

@@ -26,6 +26,16 @@ export const staticResources = {
             el: "Αλλαγή", 
             tr: "Değişiklik" 
         },
+        delete : {
+            en: "Delete",
+            el: "Διαγραφή",
+            tr: "Delete"
+        },
+        untitled : {
+            en: "Untitled",
+            el: "Χωρίς τίτλο",
+            tr: "Untitled"
+        },
         formSuccess: { 
             en: "Your form has been submitted!", 
             el: "Η φόρμα σας έχει υποβληθεί!" ,
@@ -150,6 +160,66 @@ export const staticResources = {
             en: "Υou have uploaded the same file more than once in this application. If you delete it, it will be deleted from all places in the application.",
             el: "Έχετε ανεβάσει το αρχείο αυτό και σε άλλα σημεία της αίτησης. Αν το διαγράψετε, θα διαγραφεί από όλα τα σημεία.",
             tr: "Υou have uploaded the same file more than once in this application. If you delete it, it will be deleted from all places in the application."
+        },
+        multipleThingsEnptyState: {
+            en: "You did not add any entries.",
+            el: "Δεν έχετε προσθέσει ακόμη κάποια καταχώρηση.",
+            tr: "You did not add any entries."
+        },
+        multipleThingsEmptyStateReview: {
+            en: "You did not add any entries.",
+            el: "Δεν έχετε προσθέσει κάποια καταχώρηση.",
+            tr: "You did not add any entries yet."
+        },
+        multipleThingsAddEntry: {
+            en: "Add new entry",
+            el: "Προσθήκη νέας καταχώρησης",
+            tr: "Add new entry"
+        },
+        multipleThingsDedupeMessage: {
+            en: "This entry already exists",
+            el: "Αυτή η καταχώριση υπάρχει ήδη",
+            tr: "This entry already exists"
+        },
+        multipleThingsMaxMessage: {
+            en: "You have reached the maximum number of entries. You can only add up to {{max}} entries",
+            el: "Έχετε φτάσει το μέγιστο αριθμό καταχωρίσεων. Μπορείτε να προσθέσετε μόνο έως {{max}} καταχωρίσεις",
+            tr: "You have reached the maximum number of entries. You can only add up to {{max}} entries"
+        },
+        multipleThingsMinMessage: {
+            en: "You have not added the minimum number of entries. You must add at least {{min}} entries",
+            el: "Δεν έχετε προσθέσει τον ελάχιστο αριθμό καταχωρίσεων. Πρέπει να προσθέσετε τουλάχιστον {{min}} καταχωρίσεις",
+            tr: "You have not added the minimum number of entries. You must add at least {{min}} entries"
+        },
+        multipleThingsItemsValidationPrefix: {
+            en: "Entry {{index}} - ",
+            el: "Καταχώρηση {{index}} - ",
+            tr: "Entry {{index}} - "
+        },
+        multipleThingsAddSuffix: {
+            en: " (Add)",
+            el: " (Προσθήκη)",
+            tr: " (Add)"
+        },
+        multipleThingsEditSuffix: {
+            en: " (Change)",
+            el: " (Αλλαγή)",
+            tr: " (Change)"
+        },
+        multipleThingsDeleteTitle: {
+            en: "Are you sure you want to delete the item \"{{item}}\"",
+            el: "Σίγουρα θέλετε να διαγράψετε την καταχώρηση \"{{item}}\"",
+            tr: "Are you sure you want to delete the item \"{{item}}\""
+        },
+        multipleThingsDeleteValidationError: {
+            en: "Select if you want to delete this item",
+            el: "Επιλέξτε αν θέλετε να διαγράψετε αυτή την καταχώρηση",
+            tr: "Select if you want to delete the item"
+        },
+        multipleThingsEntries: {
+            en: "Entries",
+            el: "Καταχωρήσεις",
+            tr: "Entries"
         }
     },
     //remderer sections
@@ -475,6 +545,7 @@ export function getMultilingualObject(el, en, tr) {
  */
 export function getSameMultilingualObject(languages, value) {
     const obj = {};
+    if (!Array.isArray(languages)) return {el: value, en: value, tr: value};
     for (const lang of languages) {
         obj[lang.code] = value || "";
     }
@@ -510,4 +581,61 @@ export function getEmailObject( subject, preHeader, header, username, body, foot
             footerText: getLocalizeContent(footer, usedLang)
         }
     }
+}
+
+/**
+ * Get the link for multiple things hub and add/edit/delete pages
+ * @param {string} linkType The type of link. Can be `add`, `edit`, `delete`
+ * @param {string} siteId The site id
+ * @param {string} pageUrl The page url
+ * @param {string} lang The page language
+ * @param {string} entryKey The entry key. If not provided, it will be set to an empty string.
+ * @param {string} route Whether it comes from the `review` route
+ * @param {string} linkText The link text. If not provided, it will be set to an empty string.
+ * @param {number} count The current count of entries. If not provided, it will be set to null.
+ * @returns {string} The link htmlElement govcy-frontend-renderer object
+ */
+export function getMultipleThingsLink(linkType, siteId, pageUrl, lang , entryKey = "", route = "", linkText = "", count = null) {
+    // Generate the action part of the URL based on the linkType
+    let actionPart = "";
+    let linkTextString = "";
+    switch (linkType) {
+        case "add":
+            actionPart = `multiple/add`;
+            // if linkText is not provided, use the default text from staticResources
+            linkTextString = (linkText 
+                ? linkText 
+                : staticResources.text.multipleThingsAddEntry[lang] || staticResources.text.multipleThingsAddEntry["el"]
+            );
+            break;
+        case "edit":
+            actionPart = `multiple/edit/${entryKey}`;
+            linkTextString = staticResources.text.change[lang] || staticResources.text.change["el"];
+            break;
+        case "delete":
+            actionPart = `multiple/delete/${entryKey}`;
+            linkTextString = staticResources.text.delete[lang] || staticResources.text.delete["el"];
+            break;
+        default:
+            actionPart = `multiple/add`;
+            // if linkText is not provided, use the default text from staticResources
+            linkTextString = (linkText 
+                ? linkText 
+                : staticResources.text.multipleThingsAddEntry[lang] || staticResources.text.multipleThingsAddEntry["el"]
+            );
+    }
+    // full part of the URL
+    const fullPath = `/${siteId}${pageUrl ? `/${pageUrl}` : ""}/${actionPart}/${route ? `?route=${route}` : ""}`;
+    // return the link htmlElement govcy-frontend-renderer object
+    return {
+        element: "htmlElement",
+        params: {
+            text: {
+                en: `<p><a${(count !== null && linkType === "add" ? ` class="govcy-add-new-item" id="addNewItem${count}"` : "")} href="${fullPath}">${linkTextString}</a></p>`,
+                el: `<p><a${(count !== null && linkType === "add" ? ` class="govcy-add-new-item" id="addNewItem${count}"` : "")} href="${fullPath}">${linkTextString}</a></p>`,
+                tr: `<p><a${(count !== null && linkType === "add" ? ` class="govcy-add-new-item" id="addNewItem${count}"` : "")} href="${fullPath}">${linkTextString}</a></p>`
+            }
+        }
+    };
+
 }

package/src/utils/govcyApiDetection.mjs

@@ -10,7 +10,7 @@
 export function isApiRequest(req) {
   const acceptJson = (req.headers?.accept || "").toLowerCase().includes("application/json");
 
-  const apiUrlPattern =  /^\/apis\/[^/]+\/[^/]+\/(upload|download)$/;
+  const apiUrlPattern = /^\/apis\/[^/]+\/[^/]+(?:\/.*)?\/(upload|download)$/;
   const isStructuredApiUrl = apiUrlPattern.test(req.originalUrl || req.url);
 
   return acceptJson || isStructuredApiUrl;

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).
     }
 }
 
+