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

package/src/middleware/govcyReviewPostHandler.mjs

@@ -1,13 +1,14 @@
 import * as govcyResources from "../resources/govcyResources.mjs";
-import { validateFormElements  } from "../utils/govcyValidator.mjs"; // Import your validator
+import { validateFormElements } from "../utils/govcyValidator.mjs"; // Import your validator
 import * as dataLayer from "../utils/govcyDataLayer.mjs";
 import { logger } from "../utils/govcyLogger.mjs";
-import {prepareSubmissionData, prepareSubmissionDataAPI, generateSubmitEmail } from "../utils/govcySubmitData.mjs";
+import { prepareSubmissionData, prepareSubmissionDataAPI, generateSubmitEmail } from "../utils/govcySubmitData.mjs";
 import { govcyApiRequest } from "../utils/govcyApiRequest.mjs";
 import { getEnvVariable, getEnvVariableBool } from "../utils/govcyEnvVariables.mjs";
 import { handleMiddlewareError } from "../utils/govcyUtils.mjs";
 import { sendEmail } from "../utils/govcyNotification.mjs"
 import { evaluatePageConditions } from "../utils/govcyExpressions.mjs";
+import { validateMultipleThings } from "../utils/govcyMultipleThingsValidation.mjs";
 
 /**
  * Middleware to handle review page form submission
@@ -17,7 +18,7 @@ export function govcyReviewPostHandler() {
     return async (req, res, next) => {
         try {
             const { siteId } = req.params;
-    
+
             // ✅ Load service and check if it exists
             const service = req.serviceData;
             let validationErrors = {};
@@ -26,7 +27,7 @@ export function govcyReviewPostHandler() {
             for (const page of service.pages) {
                 //get page url
                 const pageUrl = page.pageData.url;
-                
+
                 // ----- Conditional logic comes here
                 // ✅ Skip validation if page is conditionally excluded
                 const conditionResult = evaluatePageConditions(page, req.session, siteId, req);
@@ -46,9 +47,32 @@ export function govcyReviewPostHandler() {
 
                 // Get stored form data for this page (or default to empty)
                 const formData = dataLayer.getPageData(req.session, siteId, pageUrl) || {};
-                
-                // Run validations
-                const errors = validateFormElements(formElement.params.elements, formData, pageUrl);
+
+                let errors = {};
+                // ----- MultipleThings hub handling -----
+                if (page.multipleThings) {
+                    // Use multiple things validator
+                    const items = Array.isArray(formData) ? formData : [];
+                    const mtErrors = validateMultipleThings(page, items, service.site.lang);
+
+                    if (Object.keys(mtErrors).length > 0) {
+                        errors[pageUrl] = {
+                            type: "multipleThings",   // ✅ mark it
+                            hub: { errors: mtErrors } // keep hub-style structure
+                        };
+                    }
+                } else { // ----- Normal form handling -----
+                    // Normal page validation
+                    const v = validateFormElements(formElement.params.elements, formData, pageUrl);
+                    if (Object.keys(v).length > 0) {
+                        errors[pageUrl] = {
+                            type: "normal",           // ✅ mark it
+                            ...v
+                        };
+                    }
+                    // // Run validations
+                    // errors = validateFormElements(formElement.params.elements, formData, pageUrl);
+                }
 
                 // Add errors to the validationErrors object
                 validationErrors = { ...validationErrors, ...errors };
@@ -68,7 +92,7 @@ export function govcyReviewPostHandler() {
                 const clientKey = getEnvVariable(service?.site?.submissionAPIEndpoint?.clientKey || "", false);
                 const serviceId = getEnvVariable(service?.site?.submissionAPIEndpoint?.serviceId || "", false);
                 const dsfGtwApiKey = getEnvVariable(service?.site?.submissionAPIEndpoint?.dsfgtwApiKey || "", "");
-                const allowSelfSignedCerts = getEnvVariableBool("ALLOW_SELF_SIGNED_CERTIFICATES",false) ; // Default to false if not set
+                const allowSelfSignedCerts = getEnvVariableBool("ALLOW_SELF_SIGNED_CERTIFICATES", false); // Default to false if not set
                 if (!submissionUrl) {
                     return handleMiddlewareError("🚨 Submission API endpoint URL is missing", 500, next);
                 }
@@ -78,13 +102,13 @@ export function govcyReviewPostHandler() {
                 if (!serviceId) {
                     return handleMiddlewareError("🚨 Submission API serviceId is missing", 500, next);
                 }
-                
+
                 // Prepare submission data
                 const submissionData = prepareSubmissionData(req, siteId, service);
 
                 // Prepare submission data for API
                 const submissionDataAPI = prepareSubmissionDataAPI(submissionData);
-                
+
                 logger.debug("Prepared submission data for API:", submissionDataAPI);
 
                 // Call the API to submit the data
@@ -94,7 +118,7 @@ export function govcyReviewPostHandler() {
                     submissionDataAPI,                 // Pass the prepared submission data
                     true,                           // Use access token authentication
                     dataLayer.getUser(req.session), // Get the user from the session
-                    { 
+                    {
                         accept: "text/plain",       // Set Accept header to text/plain
                         "client-key": clientKey,    // Set the client key header
                         "service-id": serviceId,    // Set the service ID header
@@ -103,44 +127,44 @@ export function govcyReviewPostHandler() {
                     3,
                     allowSelfSignedCerts
                 );
-                
+
                 // Check if the response is successful
                 if (response.Succeeded) {
                     let referenceNo = response?.Data?.referenceValue || "";
                     // Add the reference number to the submission data
-                    submissionData.referenceNumber = referenceNo; 
+                    submissionData.referenceNumber = referenceNo;
                     logger.info("✅ Data submitted", siteId, referenceNo);
                     // handle data layer submission
                     dataLayer.storeSiteSubmissionData(
                         req.session,
-                        siteId, 
+                        siteId,
                         submissionData);
-                        
+
                     //-- Send email to user
                     // Generate the email body
                     let emailBody = generateSubmitEmail(service, submissionData.printFriendlyData, referenceNo, req);
                     logger.debug("Email generated:", emailBody);
                     // Send the email
-                    sendEmail(service.site.title[service.site.lang],emailBody,[dataLayer.getUser(req.session).email], "eMail").catch(err => {
+                    sendEmail(service.site.title[service.site.lang], emailBody, [dataLayer.getUser(req.session).email], "eMail").catch(err => {
                         logger.error("Email sending failed (async):", err);
                     });
                     // --- End of email sending
-                    
-                    logger.debug("🔄 Redirecting to success page:",  req);
+
+                    logger.debug("🔄 Redirecting to success page:", req);
                     // redirect to success
                     return res.redirect(govcyResources.constructPageUrl(siteId, `success`));
-                    
+
                     // logger.debug("The submission data prepared:", printFriendlyData);
                     // let reviewSummary = generateReviewSummary(printFriendlyData,req, siteId, false);
                     // res.send(emailBody);
-                    
+
                     // // Clear any existing submission errors from the session
                     // dataLayer.clearSiteSubmissionErrors(req.session, siteId);
                 } else {
                     // Handle submission failure
                     const errorCode = response.ErrorCode;
                     const errorPage = service.site?.submissionAPIEndpoint?.response?.errorResponse?.[errorCode]?.page;
-                    
+
                     if (errorPage) {
                         logger.info("🚨 Submission returned failed:", response.ErrorCode);
                         return res.redirect(errorPage);
@@ -148,7 +172,7 @@ export function govcyReviewPostHandler() {
                         return handleMiddlewareError("🚨 Unknown error code received from API.", 500, next);
                     }
                 }
-                
+
             }
 
             // Proceed to final submission if no errors
@@ -159,5 +183,5 @@ export function govcyReviewPostHandler() {
             return next(error);
         }
     };
-    
+
 }

package/src/middleware/govcyRoutePageHandler.mjs

@@ -45,8 +45,10 @@ export function govcyRoutePageHandler(req, res, next) {
     pageData.site.lang = req.globalLang; 
     //if user is logged in add he user bane section in the page template
     if (dataLayer.getUser(req.session)) {
-    pageTemplate.sections.push(govcyResources.userNameSection(dataLayer.getUser(req.session).name)); // Add user name section
+        pageTemplate.sections.push(govcyResources.userNameSection(dataLayer.getUser(req.session).name)); // Add user name section
     }
+    // Add custom CSS path
+    pageData.site.customCSSFile = `/css/govcyExpress.css`;
     const renderer = new govcyFrontendRenderer();
     const html = renderer.renderFromJSON(pageTemplate, pageData);
     res.send(html);

package/src/middleware/govcySuccessPageHandler.mjs

@@ -98,11 +98,6 @@ export function govcySuccessPageHandler(isPDF = false) {
             // Append generated summary list to the page template
             pageTemplate.sections.push({ name: "main", elements: mainElements });
             
-            //if user is logged in add he user bane section in the page template
-            if (dataLayer.getUser(req.session)) {
-                pageTemplate.sections.push(govcyResources.userNameSection(dataLayer.getUser(req.session).name)); // Add user name section
-            }
-            
             //prepare pageData
             pageData.site = serviceCopy.site;
             pageData.pageData.title = govcyResources.staticResources.text.submissionSuccessTitle;

package/src/public/css/govcyExpress.css

@@ -0,0 +1,33 @@
+
+dl.govcy-summary-list-row-internal:not(:first-of-type) {
+    margin-top: 0.5rem !important;
+}
+
+.list-inline-item:not(:last-child) {
+    margin-right: 0 !important;
+}
+.list-inline-item:not(:first-child) {
+    margin-left: .5rem;
+}
+
+.govcy-add-new-item {
+  display: inline-flex;
+  align-items: center;
+  text-decoration: underline;
+}
+
+.govcy-add-new-item::before {
+  content: "";
+  display: inline-block;
+  width: 24px;
+  height: 24px;
+  background: url("/img/Plus_24x24.svg") no-repeat center center;
+  background-size: contain;
+  margin-right: 0.25rem; /* Fallback for browsers without flex gap */
+}
+
+@media (max-width: 767.98px) {
+    #multipleThingsList>tbody>tr>td {
+        padding: .5rem .5rem;
+    }
+}

package/src/public/img/Plus_24x24.svg

@@ -0,0 +1,8 @@
+<svg xmlns="http://www.w3.org/2000/svg"
+     width="24" height="24" viewBox="0 0 24 24" fill="none">
+  <path d="M12 5v14M5 12h14"
+        stroke="#31576F"
+        stroke-width="2"
+        stroke-linecap="round"
+        stroke-linejoin="round"/>
+</svg>

package/src/public/js/govcyFiles.js

@@ -10,7 +10,7 @@ var _govcyPrevFocus = null;
 var _govcyDisabledEls = [];
 
 // 🔁 Loop over each file input and attach a change event listener
-fileInputs.forEach(function(input) {
+fileInputs.forEach(function (input) {
   input.addEventListener('change', _uploadFileEventHandler);
 });
 
@@ -19,19 +19,19 @@ fileInputs.forEach(function(input) {
  * @param {*} root  The root element whose focusable children will be disabled
  */
 function disableFocusables(root) {
-    var sel = 'a[href],area[href],button,input,select,textarea,iframe,summary,[contenteditable="true"],[tabindex]:not([tabindex="-1"])';
-    var nodes = root.querySelectorAll(sel);
-    _govcyDisabledEls = [];
-    for (var i = 0; i < nodes.length; i++) {
-        var el = nodes[i];
-        if (_govcyOverlay.contains(el)) continue;                 // don’t disable overlay itself
-        var prev = el.getAttribute('tabindex');
-        el.setAttribute('data-prev-tabindex', prev === null ? '' : prev);
-        el.setAttribute('tabindex', '-1');
-        _govcyDisabledEls.push(el);
-    }
-    root.setAttribute('aria-hidden', 'true');              // hide from AT on fallback
-    root.setAttribute('aria-busy', 'true');
+  var sel = 'a[href],area[href],button,input,select,textarea,iframe,summary,[contenteditable="true"],[tabindex]:not([tabindex="-1"])';
+  var nodes = root.querySelectorAll(sel);
+  _govcyDisabledEls = [];
+  for (var i = 0; i < nodes.length; i++) {
+    var el = nodes[i];
+    if (_govcyOverlay.contains(el)) continue;                 // don’t disable overlay itself
+    var prev = el.getAttribute('tabindex');
+    el.setAttribute('data-prev-tabindex', prev === null ? '' : prev);
+    el.setAttribute('tabindex', '-1');
+    _govcyDisabledEls.push(el);
+  }
+  root.setAttribute('aria-hidden', 'true');              // hide from AT on fallback
+  root.setAttribute('aria-busy', 'true');
 }
 
 /**
@@ -39,15 +39,15 @@ function disableFocusables(root) {
  * @param {*} root  The root element whose focusable children will be restored
  */
 function restoreFocusables(root) {
-    for (var i = 0; i < _govcyDisabledEls.length; i++) {
-        var el = _govcyDisabledEls[i];
-        var prev = el.getAttribute('data-prev-tabindex');
-        if (prev === '') el.removeAttribute('tabindex'); else el.setAttribute('tabindex', prev);
-        el.removeAttribute('data-prev-tabindex');
-    }
-    _govcyDisabledEls = [];
-    root.removeAttribute('aria-hidden');
-    root.removeAttribute('aria-busy');
+  for (var i = 0; i < _govcyDisabledEls.length; i++) {
+    var el = _govcyDisabledEls[i];
+    var prev = el.getAttribute('data-prev-tabindex');
+    if (prev === '') el.removeAttribute('tabindex'); else el.setAttribute('tabindex', prev);
+    el.removeAttribute('data-prev-tabindex');
+  }
+  _govcyDisabledEls = [];
+  root.removeAttribute('aria-hidden');
+  root.removeAttribute('aria-busy');
 }
 
 /**
@@ -56,48 +56,48 @@ function restoreFocusables(root) {
  * @returns 
  */
 function trapTab(e) {
-    if (e.key !== 'Tab') return;
-    var focusables = _govcyOverlay.querySelectorAll('a[href],button,input,select,textarea,[tabindex]:not([tabindex="-1"])');
-    if (focusables.length === 0) { e.preventDefault(); _govcyOverlay.focus(); return; }
-    var first = focusables[0], last = focusables[focusables.length - 1];
-    if (e.shiftKey && document.activeElement === first) { e.preventDefault(); last.focus(); }
-    else if (!e.shiftKey && document.activeElement === last) { e.preventDefault(); first.focus(); }
+  if (e.key !== 'Tab') return;
+  var focusables = _govcyOverlay.querySelectorAll('a[href],button,input,select,textarea,[tabindex]:not([tabindex="-1"])');
+  if (focusables.length === 0) { e.preventDefault(); _govcyOverlay.focus(); return; }
+  var first = focusables[0], last = focusables[focusables.length - 1];
+  if (e.shiftKey && document.activeElement === first) { e.preventDefault(); last.focus(); }
+  else if (!e.shiftKey && document.activeElement === last) { e.preventDefault(); first.focus(); }
 }
 
 /**
  * Shows the loading spinner overlay and traps focus within it
  */
 function showLoadingSpinner() {
-    _govcyPrevFocus = document.activeElement;
-    _govcyOverlay.setAttribute('aria-hidden', 'false');
-    _govcyOverlay.setAttribute('tabindex', '-1');
-    _govcyOverlay.style.display = 'flex';
-    document.documentElement.style.overflow = 'hidden';
-
-    if ('inert' in HTMLElement.prototype) {               // progressive enhancement
-        _govcyAppRoot.inert = true;
-    } else {
-        disableFocusables(_govcyAppRoot);
-        document.addEventListener('keydown', trapTab, true);
-    }
-    _govcyOverlay.focus();
+  _govcyPrevFocus = document.activeElement;
+  _govcyOverlay.setAttribute('aria-hidden', 'false');
+  _govcyOverlay.setAttribute('tabindex', '-1');
+  _govcyOverlay.style.display = 'flex';
+  document.documentElement.style.overflow = 'hidden';
+
+  if ('inert' in HTMLElement.prototype) {               // progressive enhancement
+    _govcyAppRoot.inert = true;
+  } else {
+    disableFocusables(_govcyAppRoot);
+    document.addEventListener('keydown', trapTab, true);
+  }
+  _govcyOverlay.focus();
 }
 
 /**
  * Hides the loading spinner overlay and restores focus to the previously focused element
  */
 function hideLoadingSpinner() {
-    _govcyOverlay.style.display = 'none';
-    _govcyOverlay.setAttribute('aria-hidden', 'true');
-    document.documentElement.style.overflow = '';
+  _govcyOverlay.style.display = 'none';
+  _govcyOverlay.setAttribute('aria-hidden', 'true');
+  document.documentElement.style.overflow = '';
 
-    if ('inert' in HTMLElement.prototype) {
-        _govcyAppRoot.inert = false;
-    } else {
-        restoreFocusables(_govcyAppRoot);
-        document.removeEventListener('keydown', trapTab, true);
-    }
-    if (_govcyPrevFocus && _govcyPrevFocus.focus) _govcyPrevFocus.focus();
+  if ('inert' in HTMLElement.prototype) {
+    _govcyAppRoot.inert = false;
+  } else {
+    restoreFocusables(_govcyAppRoot);
+    document.removeEventListener('keydown', trapTab, true);
+  }
+  if (_govcyPrevFocus && _govcyPrevFocus.focus) _govcyPrevFocus.focus();
 }
 
 
@@ -165,24 +165,40 @@ function _uploadFileEventHandler(event) {
   formData.append('file', file);               // Attach the actual file
   formData.append('elementName', elementName); // Attach the field name for backend lookup
 
-  // 🚀 CHANGED: using fetch instead of axios.post
-  fetch(`/apis/${siteId}/${pageUrl}/upload`, {
+  // 🚀 Build upload URL depending on mode (single / multiple/add / multiple/edit/:index)
+  var pathname = window.location.pathname;
+  var uploadUrl;
+
+  if (/\/multiple\/add\/?$/.test(pathname)) {
+    uploadUrl = `/apis/${siteId}/${pageUrl}/multiple/add/upload`;
+  } else {
+    var editMatch = pathname.match(/\/multiple\/edit\/(\d+)(?:\/|$)/);
+    if (editMatch) {
+      var idx = editMatch[1];
+      uploadUrl = `/apis/${siteId}/${pageUrl}/multiple/edit/${idx}/upload`;
+    } else {
+      uploadUrl = `/apis/${siteId}/${pageUrl}/upload`;
+    }
+  }
+
+  fetch(uploadUrl, {
     method: "POST",
     headers: {
       "X-CSRF-Token": csrfToken // 🔐 Pass CSRF token in custom header
     },
     body: formData
   })
-    .then(function(response) {
+
+    .then(function (response) {
       // 🚀 CHANGED: fetch does not auto-throw on error codes → check manually
       if (!response.ok) {
-        return response.json().then(function(errData) {
+        return response.json().then(function (errData) {
           throw { response: { data: errData } };
         });
       }
       return response.json();
     })
-    .then(function(data) {
+    .then(function (data) {
       // ✅ Success response
       var sha256 = data.Data.sha256;
       var fileId = data.Data.fileId;
@@ -190,7 +206,7 @@ function _uploadFileEventHandler(event) {
       // 📝 Store returned metadata in hidden fields if needed
       // document.querySelector('[name="' + elementName + 'Attachment[fileId]"]').value = fileId;
       // document.querySelector('[name="' + elementName + 'Attachment[sha256]"]').value = sha256;
-      
+
       // Hide loading spinner
       hideLoadingSpinner();
 
@@ -200,15 +216,15 @@ function _uploadFileEventHandler(event) {
       // Accessibility: Update ARIA live region with success message
       var statusRegion = document.getElementById('_govcy-upload-status');
       if (statusRegion) {
-        setTimeout(function() {
+        setTimeout(function () {
           statusRegion.textContent = messages.uploadSuccesful[lang];
         }, 200);
-        setTimeout(function() {
+        setTimeout(function () {
           statusRegion.textContent = '';
         }, 5000);
       }
     })
-    .catch(function(err) {
+    .catch(function (err) {
       // ⚠️ Show an error message if upload fails
       var errorMessage = messages.uploadFailed;
       var errorCode = err && err.response && err.response.data && err.response.data.ErrorCode;
@@ -245,7 +261,7 @@ function _uploadFileEventHandler(event) {
  * @param {object} errorMessage The error message in all supported languages 
  */
 function _renderFileElement(elementState, elementId, elementName, fileId, sha256, errorMessage) {
-  
+
   // Grab the query string part (?foo=bar&route=something)
   var queryString = window.location.search;
   // Parse it
@@ -263,7 +279,7 @@ function _renderFileElement(elementState, elementId, elementName, fileId, sha256
       "lang": lang
     }
   };
-  var fileInputMap =  JSON.parse(JSON.stringify(window._govcyFileInputs));
+  var fileInputMap = JSON.parse(JSON.stringify(window._govcyFileInputs));
   var fileElement = fileInputMap[elementName];
   fileElement.element = elementState;
   if (errorMessage != null) fileElement.params.error = errorMessage;
@@ -271,22 +287,27 @@ function _renderFileElement(elementState, elementId, elementName, fileId, sha256
   if (sha256 != null) fileElement.params.sha256 = sha256;
   if (elementState == "fileView") {
     fileElement.params.visuallyHiddenText = fileElement.params.label;
-    // TODO: Also need to set the `view` and `download` URLs 
-    fileElement.params.viewHref = "/" + window._govcySiteId + "/" + window._govcyPageUrl + "/view-file/" + elementName;
+    // Use the actual current path (works for single, draft, edit)
+    var basePath = window.location.pathname.replace(/\/$/, "");
+
+    // View link
+    fileElement.params.viewHref = basePath + "/view-file/" + elementName;
     fileElement.params.viewTarget = "_blank";
-    fileElement.params.deleteHref  = "/" + window._govcySiteId + "/" + window._govcyPageUrl + "/delete-file/" + elementName 
+
+    // Delete link (preserve ?route=review if present)
+    fileElement.params.deleteHref = basePath + "/delete-file/" + elementName
       + (route !== null ? "?route=" + encodeURIComponent(route) : "");
   }
   // Construct the JSONTemplate
   var JSONTemplate = {
     "elements": [fileElement]
   };
-  
+
   //render HTML into string
-  var renderedHtml = renderer.renderFromJSON(JSONTemplate,inputData);
-  var outerElement = document.getElementById(`${elementId}-outer-control`) 
-        || document.getElementById(`${elementId}-input-control`) 
-        || document.getElementById(`${elementId}-view-control`);
+  var renderedHtml = renderer.renderFromJSON(JSONTemplate, inputData);
+  var outerElement = document.getElementById(`${elementId}-outer-control`)
+    || document.getElementById(`${elementId}-input-control`)
+    || document.getElementById(`${elementId}-view-control`);
 
   if (outerElement) {
     //remove all classes from outerElement