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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gov-cy/govcy-express-services",
-  "version": "1.0.0-alpha.8",
+  "version": "1.0.0-alpha.9",
   "description": "An Express-based system that dynamically renders services using @gov-cy/govcy-frontend-renderer and posts data to a submission API.",
   "author": "DMRID - DSF Team",
   "license": "MIT",

package/src/index.mjs

@@ -25,6 +25,7 @@ import { govcyRoutePageHandler } from './middleware/govcyRoutePageHandler.mjs';
 import { govcyServiceEligibilityHandler } from './middleware/govcyServiceEligibilityHandler.mjs';
 import { govcyLoadSubmissionData } from './middleware/govcyLoadSubmissionData.mjs';
 import { govcyUploadMiddleware } from './middleware/govcyUpload.mjs';
+import { govcyDeleteFilePageHandler, govcyDeleteFilePostHandler } from './middleware/govcyDeleteFileHandler.mjs';
 import { isProdOrStaging , getEnvVariable, whatsIsMyEnvironment } from './utils/govcyEnvVariables.mjs';
 import { logger } from "./utils/govcyLogger.mjs";
 
@@ -150,9 +151,15 @@ export default function initializeGovCyExpressService(){
   // ✅ -- ROUTE: Add Success Page Route (BEFORE the dynamic route)
   app.get('/:siteId/success',serviceConfigDataMiddleware, requireAuth, naturalPersonPolicy, govcyServiceEligibilityHandler(), govcySuccessPageHandler(), renderGovcyPage());
   
+  // ❌🗃️ -- ROUTE: Delete file (BEFORE the dynamic route)
+  app.get('/:siteId/:pageUrl/:elementName/delete-file', serviceConfigDataMiddleware, requireAuth, naturalPersonPolicy, govcyServiceEligibilityHandler(), govcyLoadSubmissionData(), govcyDeleteFilePageHandler(), renderGovcyPage());
+  
   // 📝 -- ROUTE: Dynamic route to render pages based on siteId and pageUrl, using govcyPageHandler middleware
   app.get('/:siteId/:pageUrl', serviceConfigDataMiddleware, requireAuth, naturalPersonPolicy, govcyServiceEligibilityHandler(true), govcyLoadSubmissionData(), govcyPageHandler(), renderGovcyPage());
   
+  // ❌🗃️📥 -- ROUTE: Handle POST requests for delete file
+  app.post('/:siteId/:pageUrl/:elementName/delete-file', serviceConfigDataMiddleware, requireAuth, naturalPersonPolicy, govcyServiceEligibilityHandler(true), govcyDeleteFilePostHandler());
+  
   // 📥 -- ROUTE: Handle POST requests for review page. The `submit` action
   app.post('/:siteId/review', serviceConfigDataMiddleware, requireAuth, naturalPersonPolicy, govcyServiceEligibilityHandler(), govcyReviewPostHandler());
   

package/src/middleware/govcyDeleteFileHandler.mjs

@@ -0,0 +1,234 @@
+import * as govcyResources from "../resources/govcyResources.mjs";
+import * as dataLayer from "../utils/govcyDataLayer.mjs";
+import { logger } from "../utils/govcyLogger.mjs";
+import { pageContainsFileInput } from "../utils/govcyHandleFiles.mjs";
+import { whatsIsMyEnvironment } from '../utils/govcyEnvVariables.mjs';
+import { handleMiddlewareError } from "../utils/govcyUtils.mjs";
+import { getPageConfigData } from "../utils/govcyLoadConfigData.mjs";
+import { evaluatePageConditions } from "../utils/govcyExpressions.mjs"; 
+import { URL } from "url";
+
+
+/**
+ * Middleware to handle the delete file page.
+ * This middleware processes the delete file page, populates the question, and shows validation errors.
+ */
+export function govcyDeleteFilePageHandler() {
+    return (req, res, next) => {
+        try {
+            const { siteId, pageUrl, elementName } = req.params;
+            
+            // Create a deep copy of the service to avoid modifying the original
+            let serviceCopy = req.serviceData;
+            
+            // ⤵️ Find the current page based on the URL
+            const page = getPageConfigData(serviceCopy, pageUrl);
+
+            // deep copy the page template to avoid modifying the original
+            const pageTemplateCopy = JSON.parse(JSON.stringify(page.pageTemplate));
+    
+            // ----- Conditional logic comes here
+            // ✅ Skip this POST handler if the page's conditions evaluate to true (redirect away)
+            const conditionResult = evaluatePageConditions(page, req.session, siteId, req);
+            if (conditionResult.result === false) {
+                logger.debug("⛔️ Page condition evaluated to true on POST — skipping form save and redirecting:", conditionResult);
+                return res.redirect(govcyResources.constructPageUrl(siteId, conditionResult.redirect));
+            }
+
+            // Validate the field: Only allow upload if the page contains a fileInput with the given name
+            const fileInputElement = pageContainsFileInput(pageTemplateCopy, elementName);
+            if (!fileInputElement) {
+                return handleMiddlewareError(`File input [${elementName}] not allowed on this page`, 404, next);
+            }
+
+            // Validate if the file input has a label
+            if (!fileInputElement?.params?.label) {
+                return handleMiddlewareError(`File input [${elementName}] does not have a label`, 404, next);
+            }
+
+            //get element data 
+            const elementData = dataLayer.getFormDataValue(req.session, siteId, pageUrl, elementName)
+            
+            // If the element data is not found, return an error response
+            if (!elementData) {
+                return handleMiddlewareError(`File input [${elementName}] data not found on this page`, 404, next);
+            }
+
+            // Deep copy page title (so we don’t mutate template)
+            const pageTitle = JSON.parse(JSON.stringify(govcyResources.staticResources.text.deleteFileTitle));
+
+            // Replace label placeholders on page title
+            for (const lang of Object.keys(pageTitle)) {
+                const labelForLang = fileInputElement.params.label[lang] || fileInputElement.params.label.el || ""; 
+                pageTitle[lang] = pageTitle[lang].replace("{{file}}", labelForLang);
+            }
+
+            
+            // Deep copy renderer pageData from
+            let pageData = JSON.parse(JSON.stringify(govcyResources.staticResources.rendererPageData));
+            
+            // Handle isTesting 
+            pageData.site.isTesting = (whatsIsMyEnvironment() === "staging");
+            
+            // Base page template structure
+            let pageTemplate = {
+                sections: [
+                    {
+                        name: "beforeMain",
+                        elements: [govcyResources.staticResources.elements.backLink]
+                    }
+                ]
+            };
+            
+            // Construct page title
+            const pageRadios = {
+                element: "radios",
+                params: {
+                    id: "deleteFile",
+                    name: "deleteFile",
+                    legend: pageTitle,
+                    isPageHeading: true,
+                    classes: "govcy-mb-6",
+                    items:[
+                        {
+                            value: "yes",
+                            text: govcyResources.staticResources.text.deleteYesOption
+                        },
+                        {
+                            value: "no",
+                            text: govcyResources.staticResources.text.deleteNoOption
+                        }
+                    ]
+
+                }
+            };
+            //-------------
+
+            // Construct submit button
+            const formElement = {
+                element: "form",
+                params: {
+                    action: govcyResources.constructPageUrl(siteId, `${pageUrl}/${elementName}/delete-file`,(req.query.route === "review" ? "review" : "")),
+                    method: "POST",
+                    elements: [
+                        pageRadios,
+                        {
+                            element: "button",
+                            params: {
+                                type: "submit",
+                                text: govcyResources.staticResources.text.continue
+                            }
+                        },
+                        govcyResources.csrfTokenInput(req.csrfToken())
+                    ]
+                }
+            };
+            
+            // --------- Handle Validation Errors ---------
+            // Check if validation errors exist in the request
+            const validationErrors = [];
+            let mainElements = [];
+            if (req?.query?.hasError ) {
+                validationErrors.push({
+                    link: '#deleteFile-option-1',
+                    text: govcyResources.staticResources.text.deleteFileValidationError
+                });
+                mainElements.push(govcyResources.errorSummary(validationErrors));
+                formElement.params.elements[0].params.error = govcyResources.staticResources.text.deleteFileValidationError;
+            } 
+            //--------- End Handle Validation Errors ---------
+            
+            // Add elements to the main section, the H1, summary list, the submit button and the JS
+            mainElements.push(formElement, govcyResources.staticResources.elements["govcyFormsJs"]);
+            // 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 = pageTitle;
+            
+            // Attach processed page data to the request
+            req.processedPage = {
+                pageData: pageData,
+                pageTemplate: pageTemplate
+            };
+            logger.debug("Processed delete file page data:", req.processedPage);
+            next();
+        } catch (error) {
+            return next(error); // Pass error to govcyHttpErrorHandler
+        }
+    };
+}
+
+
+/**
+ * Middleware to handle delete file post form processing
+ * This middleware processes the post, validates the form and handles the file data layer
+ */
+export function govcyDeleteFilePostHandler() {
+  return (req, res, next) => {
+    try {
+      // Extract siteId and pageUrl from request
+      let { siteId, pageUrl, elementName } = req.params; 
+      
+      // get service data
+      let serviceCopy = req.serviceData; 
+
+      // 🔍 Find the page by pageUrl
+      const page = getPageConfigData(serviceCopy, pageUrl);
+
+      // Deep copy pageTemplate to avoid modifying the original
+      const pageTemplateCopy = JSON.parse(JSON.stringify(page.pageTemplate));
+
+      // ----- Conditional logic comes here
+      // Check if the page has conditions and apply logic
+      const conditionResult = evaluatePageConditions(page, req.session, siteId, req);
+      if (conditionResult.result === false) {
+          logger.debug("⛔️ Page condition evaluated to true on POST — skipping form save and redirecting:", conditionResult);
+          return res.redirect(govcyResources.constructPageUrl(siteId, conditionResult.redirect));
+      }
+
+
+      // the page base return url
+      const pageBaseReturnUrl = `http://localhost:3000/${siteId}/${pageUrl}`;
+      
+      //check if input `deleteFile` has a value
+      if (!req?.body?.deleteFile ||
+        (req.body.deleteFile !== "yes" && req.body.deleteFile !== "no")) {
+        logger.debug("⛔️ No deleteFile value provided on POST — skipping form save and redirecting:", req.body);
+        //construct the page url with error 
+        let myUrl = new URL(pageBaseReturnUrl+`/${elementName}/delete-file`);
+        //check if the route is review
+        if (req.query.route === "review") {
+          myUrl.searchParams.set("route", "review");
+        }
+        //set the error flag
+        myUrl.searchParams.set("hasError", "1");
+        
+        //redirect to the same page with error summary (relative path)
+        return res.redirect(govcyResources.constructErrorSummaryUrl(myUrl.pathname + myUrl.search));
+      }
+
+      //if no validation errors
+      if (req.body.deleteFile === "yes") {
+        dataLayer.storePageDataElement(req.session, siteId, pageUrl, elementName, "");
+      } 
+      // construct the page url
+      let myUrl = new URL(pageBaseReturnUrl);
+      //check if the route is review
+      if (req.query.route === "review") {
+        myUrl.searchParams.set("route", "review");
+      }
+
+      // redirect to the page (relative path)
+      res.redirect(myUrl.pathname + myUrl.search);
+    } catch (error) {
+        return next(error);  // Pass error to govcyHttpErrorHandler
+    }
+  };
+}

package/src/middleware/govcyPageHandler.mjs

@@ -91,7 +91,7 @@ export function govcyPageHandler() {
             }
             //--------- End of Handle Validation Errors ---------
             
-            populateFormData(element.params.elements, theData,validationErrors, req.session, siteId, pageUrl, req.globalLang);
+            populateFormData(element.params.elements, theData,validationErrors, req.session, siteId, pageUrl, req.globalLang, null, req.query.route);
             // if there are validation errors, add an error summary
             if (validationErrors?.errorSummary?.length > 0) {
               element.params.elements.unshift(govcyResources.errorSummary(validationErrors.errorSummary));
@@ -120,3 +120,4 @@ export function govcyPageHandler() {
     }
   };
 }
+

package/src/public/js/govcyFiles.js

@@ -9,94 +9,106 @@ fileInputs.forEach(function(input) {
 
 /**
  * Handles the upload of a file event
- * 
+ *
  * @param {object} event The event
  */
-async function _uploadFileEventHandler(event) {
+function _uploadFileEventHandler(event) {
   var input = event.target;
   var messages = {
-      "uploadSuccesful": {
-        "el": "Το αρχείο ανεβαστηκε",
-        "en": "File uploaded successfully",
-        "tr": "File uploaded successfully"
-      },
-      "uploadFailed": {
-        "el": "Αποτυχια ανεβασης",
-        "en": "File upload failed",
-        "tr": "File upload failed"
-      },
-      "uploadFailed406": {
-        "el": "Το επιλεγμένο αρχείο είναι κενό",
-        "en": "The selected file is empty",
-        "tr": "The selected file is empty"
-      },
-      "uploadFailed407": {
-        "el": "Το επιλεγμένο αρχείο πρέπει να είναι JPG, JPEG, PNG ή PDF",
-        "en": "The selected file must be a JPG, JPEG, PNG or PDF",
-        "tr": "The selected file must be a JPG, JPEG, PNG or PDF"
-      },
-      "uploadFailed408": {
-        "el": "Το επιλεγμένο αρχείο πρέπει να είναι JPG, JPEG, PNG ή PDF",
-        "en": "The selected file must be a JPG, JPEG, PNG or PDF",
-        "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"
+    "uploadSuccesful": {
+      "el": "Το αρχείο ανεβαστηκε",
+      "en": "File uploaded successfully",
+      "tr": "File uploaded successfully"
+    },
+    "uploadFailed": {
+      "el": "Αποτυχια ανεβασης",
+      "en": "File upload failed",
+      "tr": "File upload failed"
+    },
+    "uploadFailed406": {
+      "el": "Το επιλεγμένο αρχείο είναι κενό",
+      "en": "The selected file is empty",
+      "tr": "The selected file is empty"
+    },
+    "uploadFailed407": {
+      "el": "Το επιλεγμένο αρχείο πρέπει να είναι JPG, JPEG, PNG ή PDF",
+      "en": "The selected file must be a JPG, JPEG, PNG or PDF",
+      "tr": "The selected file must be a JPG, JPEG, PNG or PDF"
+    },
+    "uploadFailed408": {
+      "el": "Το επιλεγμένο αρχείο πρέπει να είναι JPG, JPEG, PNG ή PDF",
+      "en": "The selected file must be a JPG, JPEG, PNG or PDF",
+      "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"
+    }
+  };
+
+  // 🔐 Get the CSRF token from a hidden input field (generated by your backend)
+  var csrfEl = document.querySelector('input[type="hidden"][name="_csrf"]');
+  var csrfToken = csrfEl ? csrfEl.value : '';
+
+  // 🔧 Define siteId and pageUrl (you can dynamically extract these later)
+  var siteId = window._govcySiteId || "";
+  var pageUrl = window._govcyPageUrl || "";
+  var lang = window._govcyLang || "el";
+
+  // 📦 Grab the selected file
+  var file = event.target.files[0];
+  var elementName = input.name; // Form field's `name` attribute
+  var elementId = input.id;     // Form field's `id` attribute
+
+  if (!file) return; // Exit if no file was selected
+
+  // 🧵 Prepare form-data payload for the API
+  var formData = new FormData();
+  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`, {
+    method: "POST",
+    headers: {
+      "X-CSRF-Token": csrfToken // 🔐 Pass CSRF token in custom header
+    },
+    body: formData
+  })
+    .then(function(response) {
+      // 🚀 CHANGED: fetch does not auto-throw on error codes → check manually
+      if (!response.ok) {
+        return response.json().then(function(errData) {
+          throw { response: { data: errData } };
+        });
       }
-    };
-    // 🔐 Get the CSRF token from a hidden input field (generated by your backend)
-    var csrfEl = document.querySelector('input[type="hidden"][name="_csrf"]');
-    var csrfToken = csrfEl ? csrfEl.value : '';
-
-    // 🔧 Define siteId and pageUrl (you can dynamically extract these later)
-    var siteId = window._govcySiteId || "";
-    var pageUrl = window._govcyPageUrl || "";
-    var lang = window._govcyLang || "el";
-    // 📦 Grab the selected file
-    var file = event.target.files[0];
-    var elementName = input.name; // Form field's `name` attribute
-    var elementId = input.id; // Form field's `id` attribute
-
-    if (!file) return; // Exit if no file was selected
-
-    // 🧵 Prepare form-data payload for the API
-    var formData = new FormData();
-    formData.append('file', file);                  // Attach the actual file
-    formData.append('elementName', elementName);    // Attach the field name for backend lookup
-
-    try {
-      // 🚀 Send file to the backend upload API
-      var response = await axios.post(`/apis/${siteId}/${pageUrl}/upload`, formData, {
-        headers: {
-          'X-CSRF-Token': csrfToken // 🔐 Pass CSRF token in custom header
-        }
-      });
-
-      var sha256 = response.data.Data.sha256;
-      var fileId = response.data.Data.fileId;
-
-      // 📝 Store returned metadata in hidden fields for submission with the form
+      return response.json();
+    })
+    .then(function(data) {
+      // ✅ Success response
+      var sha256 = data.Data.sha256;
+      var fileId = data.Data.fileId;
+
+      // 📝 Store returned metadata in hidden fields if needed
       // document.querySelector('[name="' + elementName + 'Attachment[fileId]"]').value = fileId;
       // document.querySelector('[name="' + elementName + 'Attachment[sha256]"]').value = sha256;
 
       // Render the file view
       _renderFileElement("fileView", elementId, elementName, fileId, sha256, null);
-      
+
       // Accessibility: Update ARIA live region with success message
       var statusRegion = document.getElementById('_govcy-upload-status');
       if (statusRegion) {
         setTimeout(function() {
           statusRegion.textContent = messages.uploadSuccesful[lang];
-        }, 200)
+        }, 200);
         setTimeout(function() {
           statusRegion.textContent = '';
-        }, 5000); 
+        }, 5000);
       }
-      // alert('✅ File uploaded successfully');
-
-    } catch (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;
@@ -106,8 +118,8 @@ async function _uploadFileEventHandler(event) {
       }
 
       // Render the file input with error
-      _renderFileElement("fileInput", elementId, elementName, "","", errorMessage);
-      
+      _renderFileElement("fileInput", elementId, elementName, "", "", errorMessage);
+
       // Re-bind the file input's change handler
       var newInput = document.getElementById(elementId);
       if (newInput) {
@@ -116,10 +128,10 @@ async function _uploadFileEventHandler(event) {
 
       // Accessibility: Focus on the form field
       document.getElementById(elementId)?.focus();
-      
-    }
+    });
 }
 
+
 /**
  * Renders a file element in the DOM
  * 
@@ -131,6 +143,14 @@ async 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
+  var params = new URLSearchParams(queryString);
+  // Get the "route" value (null if not present)
+  var route = params.get("route");
+
   // Create an instance of GovcyFrontendRendererBrowser
   var renderer = new GovcyFrontendRendererBrowser();
   var lang = window._govcyLang || "el";
@@ -141,7 +161,7 @@ function _renderFileElement(elementState, elementId, elementName, fileId, sha256
       "lang": lang
     }
   };
-  var fileInputMap = window._govcyFileInputs || {};
+  var fileInputMap =  JSON.parse(JSON.stringify(window._govcyFileInputs));
   var fileElement = fileInputMap[elementName];
   fileElement.element = elementState;
   if (errorMessage != null) fileElement.params.error = errorMessage;
@@ -151,7 +171,8 @@ function _renderFileElement(elementState, elementId, elementName, fileId, sha256
     fileElement.params.visuallyHiddenText = fileElement.params.label;
     // TODO: Also need to set the `view` and `download` URLs 
     fileElement.params.viewHref = "#viewHref";
-    fileElement.params.deleteHref  = "#deleteHref";
+    fileElement.params.deleteHref  = "/" + window._govcySiteId + "/" + window._govcyPageUrl + "/" + elementName + "/delete-file" 
+      + (route !== null ? "?route=" + encodeURIComponent(route) : "");
   }
   // Construct the JSONTemplate
   var JSONTemplate = {

package/src/public/js/govcyForms.js

@@ -1,20 +1,31 @@
 document.addEventListener("DOMContentLoaded", function () {
     // --- Show conditionals for checked radios ---
-    document.querySelectorAll('.govcy-radio-input[data-aria-controls]:checked').forEach(radio => {
-        const targetId = radio.getAttribute('data-aria-controls');
-        const targetElement = document.getElementById(targetId);
+    // CHANGED: NodeList.prototype.forEach is not in IE11 → use Array.prototype.forEach.call
+    // CHANGED: Arrow function → function
+    Array.prototype.forEach.call(
+        document.querySelectorAll('.govcy-radio-input[data-aria-controls]:checked'),
+        function (radio) { // CHANGED: arrow → function
+            // CHANGED: const → var (ES5)
+            var targetId = radio.getAttribute('data-aria-controls');
+            var targetElement = document.getElementById(targetId);
 
-        if (targetElement) {
-            targetElement.classList.remove('govcy-radio__conditional--hidden');
+            if (targetElement) {
+                targetElement.classList.remove('govcy-radio__conditional--hidden');
+            }
         }
-    });
+    );
+
     // --- Disable submit button after form submission ---
-    document.querySelectorAll('form').forEach(form => {
+    // CHANGED: NodeList.forEach → Array.prototype.forEach.call
+    Array.prototype.forEach.call(document.querySelectorAll('form'), function (form) { // CHANGED
         form.addEventListener('submit', function (e) {
-            const submitButton = form.querySelector('[type="submit"]');
+            // CHANGED: const → var (ES5)
+            var submitButton = form.querySelector('[type="submit"]');
             if (submitButton) {
                 submitButton.disabled = true;
                 submitButton.setAttribute('aria-disabled', 'true');
+                // (Optional) announce busy state for AT:
+                // submitButton.setAttribute('aria-busy', 'true'); // CHANGED: optional a11y improvement
             }
         });
     });

package/src/resources/govcyResources.mjs

@@ -6,6 +6,11 @@ export const staticResources = {
             el: "Υποβολή", 
             tr: "Gönder" 
         },
+        continue: { 
+            en: "Continue", 
+            el: "Συνέχεια", 
+            tr: "Continue" 
+        },
         cancel: { 
             en: "Cancel", 
             el: "Ακύρωση", 
@@ -102,14 +107,39 @@ export const staticResources = {
             tr: "We have received your request. "
         },
         fileUploaded : {
-            en: "File has been uploaded. ",
-            el: "Το αρχείο ανεβάστηκε. ",
-            tr: "File has been uploaded. "
+            en: "File uploaded",
+            el: "Το αρχείο ανεβάστηκε",
+            tr: "File uploaded"
         },
         fileNotUploaded : {
             en: "File has not been uploaded. ",
             el: "Το αρχείο δεν ανεβάστηκε. ",
             tr: "File has not been uploaded. "
+        },
+        fileYouHaveUploaded : {
+            en: "You have uploaded the file for \"{{file}}\"",
+            el: "Έχετε ανεβάσει το αρχείο \"{{file}}\"",
+            tr: "You have uploaded the file for \"{{file}}\""
+        },
+        deleteFileTitle : {
+            en: "Are you sure you want to delete the file \"{{file}}\"? ",
+            el: "Είστε σίγουροι ότι θέλετε να διαγράψετε το αρχείο \"{{file}}\";",
+            tr: "Are you sure you want to delete the file \"{{file}}\"? "
+        },
+        deleteYesOption: {
+            el:"Ναι, θέλω να διαγράψω το αρχείο",
+            en:"Yes, I want to delete this file",
+            tr:"Yes, I want to delete this file"
+        },
+        deleteNoOption: {
+            el:"Όχι, δεν θέλω να διαγράψω το αρχείο",
+            en:"No, I don't want to delete this file",
+            tr:"No, I don't want to delete this file"
+        },
+        deleteFileValidationError: {
+            en: "Select if you want to delete the file",
+            el: "Επιλέξτε αν θέλετε να διαγράψετε το αρχείο",
+            tr: "Select if you want to delete the filez"
         }
     },
     //remderer sections
@@ -123,9 +153,9 @@ 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 src="/js/govcyForms.js"></script><script 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 src="/js/govcyForms.js"></script><script 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 src="/js/govcyForms.js"></script><script src="/js/govcyFiles.js"></script>`
+                    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>`
                 }
             }
         },

package/src/utils/govcyFormHandling.mjs

@@ -6,6 +6,7 @@
  */
 import { ALLOWED_FORM_ELEMENTS } from "./govcyConstants.mjs";
 import * as dataLayer from "./govcyDataLayer.mjs";
+import * as govcyResources from "../resources/govcyResources.mjs";
 
 
 /**
@@ -17,8 +18,10 @@ import * as dataLayer from "./govcyDataLayer.mjs";
  * @param {string} siteId The site ID
  * @param {string} pageUrl The page URL
  * @param {string} lang The language
+ * @param {Object} fileInputElements The file input elements
+ * @param {string} routeParam The route parameter
  */
-export function populateFormData(formElements, theData, validationErrors, store = {}, siteId = "", pageUrl = "", lang = "el", fileInputElements = null) {
+export function populateFormData(formElements, theData, validationErrors, store = {}, siteId = "", pageUrl = "", lang = "el", fileInputElements = null, routeParam = "") {
     const inputElements = ALLOWED_FORM_ELEMENTS;
     const isRootCall = !fileInputElements;
     if (isRootCall) {
@@ -76,7 +79,7 @@ export function populateFormData(formElements, theData, validationErrors, store
                     element.params.visuallyHiddenText = element.params.label;
                     // TODO: Also need to set the `view` and `download` URLs 
                     element.params.viewHref = "#viewHref";
-                    element.params.deleteHref  = "#deleteHref";
+                    element.params.deleteHref  = `/${siteId}/${pageUrl}/${fieldName}/delete-file${(routeParam) ? `?route=${routeParam}` : ''}`;
                 } else {
                     // TODO: Ask Andreas how to handle empty file inputs
                     element.params.value = "";
@@ -107,7 +110,7 @@ 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);
+                    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)) {

package/src/utils/govcyHandleFiles.mjs

@@ -234,11 +234,12 @@ function containsFileInput(elements = [], targetName) {
   for (const el of elements) {
     // ✅ Direct file input match
     if (el.element === 'fileInput' && el.params?.name === targetName) {
-      return true;
+      return el;
     }
     // 🔁 Recurse into nested elements (e.g. groups, conditionals)
     if (Array.isArray(el?.params?.elements)) {
-      if (containsFileInput(el.params.elements, targetName)) return true;
+      const nestedMatch = containsFileInput(el.params.elements, targetName);
+      if (nestedMatch) return nestedMatch; // ← propagate the found element
     }
 
     // 🎯 Special case: conditional radios/checkboxes
@@ -248,7 +249,8 @@ function containsFileInput(elements = [], targetName) {
     ) {
       for (const item of el.params.items) {
         if (Array.isArray(item?.conditionalElements)) {
-          if (containsFileInput(item.conditionalElements, targetName)) return true;
+          const match = containsFileInput(item.conditionalElements, targetName);
+          if (match) return match; // ← propagate the found element
         }
       }
     }
@@ -264,16 +266,24 @@ function containsFileInput(elements = [], targetName) {
  * @param {string} elementName The name of the element to check
  * @return {boolean} True if a fileInput exists, false otherwise
  */
-function pageContainsFileInput(pageTemplate, elementName) {
+export function pageContainsFileInput(pageTemplate, elementName) {
   const sections = pageTemplate?.sections || [];
-  return sections.some(section =>
-    section?.elements?.some(el =>
-      el.element === 'form' &&
-      containsFileInput(el.params?.elements, elementName)
-    )
-  );
+
+  for (const section of sections) {
+    for (const el of section?.elements || []) {
+      if (el.element === 'form') {
+        const match = containsFileInput(el.params?.elements, elementName);
+        if (match) {
+          return match; // ← return the actual element
+        }
+      }
+    }
+  }
+
+  return null; // no match found
 }
 
+
 /**
  * Validates magic bytes against expected mimetype
  * @param {Buffer} buffer