@gov-cy/govcy-express-services 1.0.0-alpha.9 → 1.1.0

package/src/middleware/govcyReviewPageHandler.mjs

@@ -79,7 +79,10 @@ export function govcyReviewPageHandler() {
             //--------- End Handle Validation Errors ---------
 
             // Add elements to the main section, the H1, summary list, the submit button and the JS
-            mainElements.push(pageH1, summaryList, submitButton, govcyResources.staticResources.elements["govcyFormsJs"]);
+            mainElements.push(pageH1, 
+                summaryList, 
+                submitButton
+            );
             // Append generated summary list to the page template
             pageTemplate.sections.push({ name: "main", elements: mainElements });
             

package/src/middleware/govcyReviewPostHandler.mjs

@@ -118,7 +118,7 @@ export function govcyReviewPostHandler() {
                         
                     //-- Send email to user
                     // Generate the email body
-                    let emailBody = generateSubmitEmail(service, submissionData.print_friendly_data, referenceNo, req);
+                    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 => {

package/src/middleware/govcySuccessPageHandler.mjs

@@ -78,7 +78,7 @@ export function govcySuccessPageHandler(isPDF = false) {
                 }   
             }
 
-            let summaryList = submissionData.renderer_data;
+            let summaryList = submissionData.rendererData;
 
             let mainElements = [];
             // Add elements to the main section
@@ -87,8 +87,7 @@ export function govcySuccessPageHandler(isPDF = false) {
                 weHaveSendYouAnEmail, 
                 pdfLink,
                 theDataFromYourRequest, 
-                summaryList, 
-                govcyResources.staticResources.elements["govcyFormsJs"]
+                summaryList
             );
             // Append generated summary list to the page template
             pageTemplate.sections.push({ name: "main", elements: mainElements });

package/src/public/js/govcyFiles.js

@@ -1,11 +1,105 @@
 // 🔍 Select all file inputs that have the .govcy-file-upload class
 var fileInputs = document.querySelectorAll('input[type="file"].govcy-file-upload');
 
+// select overlay and app root elements
+var _govcyOverlay = document.getElementById("govcy--loadingOverlay");
+var _govcyAppRoot = document.getElementById("govcy--body");
+
+// Accessibility: Keep track of previously focused element and disabled elements
+var _govcyPrevFocus = null;
+var _govcyDisabledEls = [];
+
 // 🔁 Loop over each file input and attach a change event listener
 fileInputs.forEach(function(input) {
   input.addEventListener('change', _uploadFileEventHandler);
 });
 
+/**
+ * Disables all focusable elements within a given root element
+ * @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');
+}
+
+/**
+ * Restores all focusable elements within a given root element
+ * @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');
+}
+
+/**
+ * Traps tab key navigation within the overlay
+ * @param {*} e The event
+ * @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(); }
+}
+
+/**
+ * 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();
+}
+
+/**
+ * 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 = '';
+
+    if ('inert' in HTMLElement.prototype) {
+        _govcyAppRoot.inert = false;
+    } else {
+        restoreFocusables(_govcyAppRoot);
+        document.removeEventListener('keydown', trapTab, true);
+    }
+    if (_govcyPrevFocus && _govcyPrevFocus.focus) _govcyPrevFocus.focus();
+}
+
 
 /**
  * Handles the upload of a file event
@@ -41,9 +135,9 @@ function _uploadFileEventHandler(event) {
       "tr": "The selected file must be a JPG, JPEG, PNG or PDF"
     },
     "uploadFailed409": {
-      "el": "Το επιλεγμένο αρχείο πρέπει να είναι μικρότερο από 5MB",
-      "en": "The selected file must be smaller than 5MB",
-      "tr": "The selected file must be smaller than 5MB"
+      "el": "Το επιλεγμένο αρχείο πρέπει να είναι μικρότερο από 4MB",
+      "en": "The selected file must be smaller than 4MB",
+      "tr": "The selected file must be smaller than 4MB"
     }
   };
 
@@ -63,6 +157,9 @@ function _uploadFileEventHandler(event) {
 
   if (!file) return; // Exit if no file was selected
 
+  // Show loading spinner
+  showLoadingSpinner();
+
   // 🧵 Prepare form-data payload for the API
   var formData = new FormData();
   formData.append('file', file);               // Attach the actual file
@@ -93,6 +190,9 @@ 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();
 
       // Render the file view
       _renderFileElement("fileView", elementId, elementName, fileId, sha256, null);
@@ -117,6 +217,8 @@ function _uploadFileEventHandler(event) {
         errorMessage = messages["uploadFailed" + errorCode];
       }
 
+      // Hide loading spinner
+      hideLoadingSpinner();
       // Render the file input with error
       _renderFileElement("fileInput", elementId, elementName, "", "", errorMessage);
 
@@ -170,8 +272,9 @@ function _renderFileElement(elementState, elementId, elementName, fileId, sha256
   if (elementState == "fileView") {
     fileElement.params.visuallyHiddenText = fileElement.params.label;
     // TODO: Also need to set the `view` and `download` URLs 
-    fileElement.params.viewHref = "#viewHref";
-    fileElement.params.deleteHref  = "/" + window._govcySiteId + "/" + window._govcyPageUrl + "/" + elementName + "/delete-file" 
+    fileElement.params.viewHref = "/" + window._govcySiteId + "/" + window._govcyPageUrl + "/view-file/" + elementName;
+    fileElement.params.viewTarget = "_blank";
+    fileElement.params.deleteHref  = "/" + window._govcySiteId + "/" + window._govcyPageUrl + "/delete-file/" + elementName 
       + (route !== null ? "?route=" + encodeURIComponent(route) : "");
   }
   // Construct the JSONTemplate

package/src/resources/govcyResources.mjs

@@ -59,7 +59,7 @@ export const staticResources = {
         errorPage403NaturalOnlyPolicyBody: {
             el: "<p>Η πρόσβαση επιτρέπεται μόνο σε φυσικά πρόσωπα με επιβεβαιωμένο προφίλ. <a href=\"/logout\">Αποσυνδεθείτε</a> και δοκιμάστε ξανά αργότερα.</p>",
             en: "<p>Access is only allowed to individuals with a verified profile.<a href=\"/logout\">Sign out</a> and try again later.</p>",
-            tr: "<p>Access is only allowed to individuals with a confirmed profile.<a href=\"/logout\">Giriş yapmadan</a> sonra tekrar deneyiniz.</p>"
+            tr: "<p>Access is only allowed to individuals with a verified profile.<a href=\"/logout\">Giriş yapmadan</a> sonra tekrar deneyiniz.</p>"
         },
         errorPage500Title: {
             el: "Λυπούμαστε, υπάρχει πρόβλημα με την υπηρεσία",
@@ -123,7 +123,7 @@ export const staticResources = {
         },
         deleteFileTitle : {
             en: "Are you sure you want to delete the file \"{{file}}\"? ",
-            el: "Είστε σίγουροι ότι θέλετε να διαγράψετε το αρχείο \"{{file}}\";",
+            el: "Σίγουρα θέλετε να διαγράψετε το αρχείο \"{{file}}\";",
             tr: "Are you sure you want to delete the file \"{{file}}\"? "
         },
         deleteYesOption: {
@@ -139,7 +139,17 @@ export const staticResources = {
         deleteFileValidationError: {
             en: "Select if you want to delete the file",
             el: "Επιλέξτε αν θέλετε να διαγράψετε το αρχείο",
-            tr: "Select if you want to delete the filez"
+            tr: "Select if you want to delete the file"
+        },
+        viewFile: {
+            en: "View file",
+            el: "Προβολή αρχείου",
+            tr: "View file"
+        },
+        deleteSameFileWarning: {
+            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."
         }
     },
     //remderer sections
@@ -153,9 +163,19 @@ export const staticResources = {
             element: "htmlElement",
             params: {
                 text: {
-                    en: `<script src="https://cdn.jsdelivr.net/npm/axios@1.6.2/dist/axios.min.js"></script><script src="https://cdn.jsdelivr.net/gh/gov-cy/govcy-frontend-renderer@v1/dist/govcyCompiledTemplates.browser.js"></script><script src="https://cdn.jsdelivr.net/gh/gov-cy/govcy-frontend-renderer@v1/dist/govcyFrontendRenderer.browser.js"></script><script type="module" src="/js/govcyForms.js"></script><script type="module" src="/js/govcyFiles.js"></script>`,
-                    el: `<script src="https://cdn.jsdelivr.net/npm/axios@1.6.2/dist/axios.min.js"></script><script src="https://cdn.jsdelivr.net/gh/gov-cy/govcy-frontend-renderer@v1/dist/govcyCompiledTemplates.browser.js"></script><script src="https://cdn.jsdelivr.net/gh/gov-cy/govcy-frontend-renderer@v1/dist/govcyFrontendRenderer.browser.js"></script><script type="module" src="/js/govcyForms.js"></script><script type="module" src="/js/govcyFiles.js"></script>`,
-                    tr: `<script src="https://cdn.jsdelivr.net/npm/axios@1.6.2/dist/axios.min.js"></script><script src="https://cdn.jsdelivr.net/gh/gov-cy/govcy-frontend-renderer@v1/dist/govcyCompiledTemplates.browser.js"></script><script src="https://cdn.jsdelivr.net/gh/gov-cy/govcy-frontend-renderer@v1/dist/govcyFrontendRenderer.browser.js"></script><script type="module" src="/js/govcyForms.js"></script><script type="module" src="/js/govcyFiles.js"></script>`
+                    en: `<script src="https://cdn.jsdelivr.net/gh/gov-cy/govcy-frontend-renderer@v1.22.0/dist/govcyCompiledTemplates.browser.js"></script><script src="https://cdn.jsdelivr.net/gh/gov-cy/govcy-frontend-renderer@v1.22.0/dist/govcyFrontendRenderer.browser.js"></script><script type="module" src="/js/govcyForms.js"></script><script type="module" src="/js/govcyFiles.js"></script>`,
+                    el: `<script src="https://cdn.jsdelivr.net/gh/gov-cy/govcy-frontend-renderer@v1.22.0/dist/govcyCompiledTemplates.browser.js"></script><script src="https://cdn.jsdelivr.net/gh/gov-cy/govcy-frontend-renderer@v1.22.0/dist/govcyFrontendRenderer.browser.js"></script><script type="module" src="/js/govcyForms.js"></script><script type="module" src="/js/govcyFiles.js"></script>`,
+                    tr: `<script src="https://cdn.jsdelivr.net/gh/gov-cy/govcy-frontend-renderer@v1.22.0/dist/govcyCompiledTemplates.browser.js"></script><script src="https://cdn.jsdelivr.net/gh/gov-cy/govcy-frontend-renderer@v1.22.0/dist/govcyFrontendRenderer.browser.js"></script><script type="module" src="/js/govcyForms.js"></script><script type="module" src="/js/govcyFiles.js"></script>`
+                }
+            }
+        },
+        govcyLoadingOverlay: {
+            element: "htmlElement",
+            params: {
+                text: {
+                    en: `<style>.govcy-loadingOverlay{position:fixed;top:0;right:0;bottom:0;left:0;display:none;justify-content:center;align-items:center;background:rgba(255,255,255,.7);-webkit-backdrop-filter:blur(3px);backdrop-filter:blur(3px);z-index:1050}.govcy-loadingOverlay[aria-hidden="false"]{display:flex}</style><div id="govcy--loadingOverlay" class="govcy-loadingOverlay" aria-hidden="true" role="dialog" aria-modal="true" tabindex="-1"><div class="govcy-loadingOverlay__content" role="status" aria-live="polite"><div class="spinner-border govcy-text-primary" role="status"><span class="govcy-visually-hidden">Loading...</span></div></div></div>`,
+                    el: `<style>.govcy-loadingOverlay{position:fixed;top:0;right:0;bottom:0;left:0;display:none;justify-content:center;align-items:center;background:rgba(255,255,255,.7);-webkit-backdrop-filter:blur(3px);backdrop-filter:blur(3px);z-index:1050}.govcy-loadingOverlay[aria-hidden="false"]{display:flex}</style><div id="govcy--loadingOverlay" class="govcy-loadingOverlay" aria-hidden="true" role="dialog" aria-modal="true" tabindex="-1"><div class="govcy-loadingOverlay__content" role="status" aria-live="polite"><div class="spinner-border govcy-text-primary" role="status"><span class="govcy-visually-hidden">Φόρτωση...</span></div></div></div>`,
+                    tr: `<style>.govcy-loadingOverlay{position:fixed;top:0;right:0;bottom:0;left:0;display:none;justify-content:center;align-items:center;background:rgba(255,255,255,.7);-webkit-backdrop-filter:blur(3px);backdrop-filter:blur(3px);z-index:1050}.govcy-loadingOverlay[aria-hidden="false"]{display:flex}</style><div id="govcy--loadingOverlay" class="govcy-loadingOverlay" aria-hidden="true" role="dialog" aria-modal="true" tabindex="-1"><div class="govcy-loadingOverlay__content" role="status" aria-live="polite"><div class="spinner-border govcy-text-primary" role="status"><span class="govcy-visually-hidden">Loading...</span></div></div></div>`
                 }
             }
         },

package/src/utils/govcyConstants.mjs

@@ -4,5 +4,5 @@
 export const ALLOWED_FORM_ELEMENTS = ["textInput", "textArea", "select", "radios", "checkboxes", "datePicker", "dateInput","fileInput","fileView"];
 export const ALLOWED_FILE_MIME_TYPES = ['application/pdf', 'image/jpeg', 'image/png'];
 export const ALLOWED_FILE_EXTENSIONS = ['pdf', 'jpg', 'jpeg', 'png'];
-export const ALLOWED_FILE_SIZE_MB = 5; // Maximum file size in MB
+export const ALLOWED_FILE_SIZE_MB = 4; // Maximum file size in MB
 export const ALLOWED_MULTER_FILE_SIZE_MB = 10; // Maximum file size in MB

package/src/utils/govcyDataLayer.mjs

@@ -102,7 +102,7 @@ export function storePageData(store, siteId, pageUrl, formData) {
 export function storePageDataElement(store, siteId, pageUrl, elementName, value) {
     // Ensure session structure is initialized
     initializeSiteData(store, siteId, pageUrl);
-    
+
     // Store the element value
     store.siteData[siteId].inputData[pageUrl].formData[elementName] = value;
 }
@@ -191,11 +191,11 @@ export function storeSiteSubmissionData(store, siteId, submissionData) {
     // let rawData = getSiteInputData(store, siteId);
     // Store the submission data
     store.siteData[siteId].submissionData = submissionData;
-      
+
     // Clear validation errors from the session
     store.siteData[siteId].inputData = {};
     // Clear presaved/temporary save data
-    store.siteData[siteId].loadData = {}; 
+    store.siteData[siteId].loadData = {};
 
 }
 
@@ -208,7 +208,7 @@ export function storeSiteSubmissionData(store, siteId, submissionData) {
  * @param {object} result - API response
  */
 export function storeSiteEligibilityResult(store, siteId, endpointKey, result) {
-    
+
     initializeSiteData(store, siteId); // Ensure the structure exists
 
     if (!store.siteData[siteId].eligibility) store.siteData[siteId].eligibility = {};
@@ -244,7 +244,7 @@ export function getSiteEligibilityResult(store, siteId, endpointKey, maxAgeMs =
  */
 export function getPageValidationErrors(store, siteId, pageUrl) {
     const validationErrors = store?.siteData?.[siteId]?.inputData?.[pageUrl]?.validationErrors || null;
-    
+
     if (validationErrors) {
         // Clear validation errors from the session
         delete store.siteData[siteId].inputData[pageUrl].validationErrors;
@@ -275,7 +275,7 @@ export function getPageData(store, siteId, pageUrl) {
  */
 export function getSiteSubmissionErrors(store, siteId) {
     const validationErrors = store?.siteData?.[siteId]?.submissionErrors || null;
-    
+
     if (validationErrors) {
         // Clear validation errors from the session
         delete store.siteData[siteId].submissionErrors;
@@ -294,7 +294,7 @@ export function getSiteSubmissionErrors(store, siteId) {
  */
 export function getSiteData(store, siteId) {
     const inputData = store?.siteData?.[siteId] || {};
-    
+
     if (inputData) {
         return inputData;
     }
@@ -311,7 +311,7 @@ export function getSiteData(store, siteId) {
  */
 export function getSiteInputData(store, siteId) {
     const inputData = store?.siteData?.[siteId]?.inputData || {};
-    
+
     if (inputData) {
         return inputData;
     }
@@ -328,7 +328,7 @@ export function getSiteInputData(store, siteId) {
  */
 export function getSiteLoadData(store, siteId) {
     const loadData = store?.siteData?.[siteId]?.loadData || {};
-    
+
     if (loadData) {
         return loadData;
     }
@@ -344,9 +344,9 @@ export function getSiteLoadData(store, siteId) {
  * @returns {string|null} The reference number or null if not available
  */
 export function getSiteLoadDataReferenceNumber(store, siteId) {
-  const ref = store?.siteData?.[siteId]?.loadData?.referenceValue;
+    const ref = store?.siteData?.[siteId]?.loadData?.referenceValue;
 
-  return typeof ref === 'string' && ref.trim() !== '' ? ref : null;
+    return typeof ref === 'string' && ref.trim() !== '' ? ref : null;
 }
 
 
@@ -359,9 +359,9 @@ export function getSiteLoadDataReferenceNumber(store, siteId) {
  */
 export function getSiteSubmissionData(store, siteId) {
     initializeSiteData(store, siteId); // Ensure the structure exists
-    
+
     const submission = store?.siteData?.[siteId]?.submissionData || {};
-    
+
     if (submission) {
         return submission;
     }
@@ -388,7 +388,7 @@ export function getFormDataValue(store, siteId, pageUrl, elementName) {
  * @param {object} store The session store 
  * @returns The user object from the store or null if it doesn't exist.
  */
-export function getUser(store){
+export function getUser(store) {
     return store.user || null;
 }
 
@@ -396,3 +396,181 @@ export function clearSiteData(store, siteId) {
     delete store?.siteData[siteId];
 }
 
+/**
+ * Check if a file reference is used in more than one place (field) across the site's inputData.
+ *
+ * A "file reference" is an object like:
+ *   { sha256: "abc...", fileId: "xyz..." }
+ *
+ * Matching rules:
+ *  - If both fileId and sha256 are provided, both must match.
+ *  - If only one is provided, we match by that single property.
+ *
+ * Notes:
+ *  - Does NOT mutate the session.
+ *  - Safely handles missing site/pages.
+ *  - If a form field is an array (e.g., multiple file inputs), each item is checked.
+ *
+ * @param {object} store   The session object (e.g., req.session)
+ * @param {string} siteId  The site identifier
+ * @param {object} params  { fileId?: string, sha256?: string }
+ * @returns {boolean}      true if the file is found in more than one place, else false
+ */
+export function isFileUsedInSiteInputDataAgain(store, siteId, { fileId, sha256 } = {}) {
+    // If neither identifier is provided, we cannot match anything
+    if (!fileId && !sha256) return false;
+
+    // Ensure session structure is initialized
+    initializeSiteData(store, siteId);
+
+    // Site input data: session.siteData[siteId].inputData
+    const site = store?.siteData?.[siteId]?.inputData;
+    if (!site || typeof site !== 'object') return false;
+
+    let hits = 0; // how many fields across the site reference this file
+
+    // 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;
+                    }
+                }
+            }
+        }
+    }
+
+    // If we get here, it was used 0 or 1 times
+    return false;
+}
+
+
+/**
+ * Remove (replace with "") file values across ALL pages of a site,
+ * matching a specific fileId and/or sha256.
+ *
+ * Matching rules:
+ *  - If BOTH fileId and sha256 are provided, a file object must match BOTH.
+ *  - If ONLY fileId is provided, match on fileId.
+ *  - If ONLY sha256 is provided, match on sha256.
+ *
+ * Scope:
+ *  - Operates on every page under store.siteData[siteId].inputData.
+ *  - Shallow traversal of formData:
+ *      • Direct fields: formData[elementId] = { fileId, sha256, ... }
+ *      • Arrays: [ {fileId...}, {sha256...}, "other" ] → ["", "", "other"] (for matches)
+ *
+ * Side effects:
+ *  - Mutates store.siteData[siteId].inputData[*].formData in place.
+ *  - Intentionally returns nothing.
+ *
+ * @param {object} store - The data-layer store.
+ * @param {string} siteId - The site key under store.siteData to modify.
+ * @param {{ fileId?: string|null, sha256?: string|null }} match - Identifiers to match.
+ *   Provide at least one of fileId/sha256. If both are given, both must match.
+ */
+export function removeAllFilesFromSite(
+    store,
+    siteId,
+    { fileId = null, sha256 = null } = {}
+) {
+    // Ensure session structure is initialized
+    initializeSiteData(store, siteId);
+    // --- Guard rails ---------------------------------------------------------
+
+    // Nothing to remove if neither identifier is provided.
+    if (!fileId && !sha256) return;
+
+    // Per your structure: dig under .inputData for the site's pages.
+    const site = store?.siteData?.[siteId]?.inputData;
+    if (!site || typeof site !== "object") return;
+
+    // --- Helpers -------------------------------------------------------------
+
+    // Is this value a "file-like" object (has fileId and/or sha256)?
+    const isFileLike = (v) =>
+        v &&
+        typeof v === "object" &&
+        (Object.prototype.hasOwnProperty.call(v, "fileId") ||
+            Object.prototype.hasOwnProperty.call(v, "sha256"));
+
+    // Does a file-like object match the provided criteria?
+    const isMatch = (obj) => {
+        if (!isFileLike(obj)) return false;
+
+        // Strict when both are given
+        if (fileId && sha256) {
+            return obj.fileId === fileId && obj.sha256 === sha256;
+        }
+        // Otherwise match whichever was provided
+        if (fileId) return obj.fileId === fileId;
+        if (sha256) return obj.sha256 === sha256;
+
+        return false;
+    };
+
+    // --- 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;
+            }
+
+            // 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;
+            }
+
+            // 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

@@ -78,8 +78,9 @@ export function populateFormData(formElements, theData, validationErrors, store
                     element.params.sha256 = fileData.sha256;
                     element.params.visuallyHiddenText = element.params.label;
                     // TODO: Also need to set the `view` and `download` URLs 
-                    element.params.viewHref = "#viewHref";
-                    element.params.deleteHref  = `/${siteId}/${pageUrl}/${fieldName}/delete-file${(routeParam) ? `?route=${routeParam}` : ''}`;
+                    element.params.viewHref = `/${siteId}/${pageUrl}/view-file/${fieldName}`;
+                    element.params.viewTarget = "_blank";
+                    element.params.deleteHref  = `/${siteId}/${pageUrl}/delete-file/${fieldName}${(routeParam) ? `?route=${routeParam}` : ''}`;
                 } else {
                     // TODO: Ask Andreas how to handle empty file inputs
                     element.params.value = "";

package/src/utils/govcyHandleFiles.mjs

@@ -198,11 +198,11 @@ export async function handleFileUpload({ service, store, siteId, pageUrl, elemen
     return {
       status: 200,
       data: {
-        sha: response.Data.sha256,
+        sha256: response.Data.sha256,
         filename: response.Data.fileName || '',
         fileId: response.Data.fileId,
         mimeType: response.Data.contentType || '',
-        sha256: response.Data.fileSize || ''
+        fileSize: response.Data?.fileSize || ''
       }
     };
 
@@ -290,7 +290,7 @@ export function pageContainsFileInput(pageTemplate, elementName) {
  * @param {string} mimetype 
  * @returns {boolean}
  */
-function isMagicByteValid(buffer, mimetype) {
+export function isMagicByteValid(buffer, mimetype) {
   const signatures = {
     'application/pdf':      [0x25, 0x50, 0x44, 0x46],                // %PDF
     'image/png':            [0x89, 0x50, 0x4E, 0x47],                // PNG