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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gov-cy/govcy-express-services",
-  "version": "1.0.0-alpha.7",
+  "version": "1.0.0-alpha.8",
   "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/middleware/govcyUpload.mjs

@@ -28,7 +28,7 @@ export const govcyUploadMiddleware = [
 
         if (result.status !== 200) {
             logger.error("Upload failed", result);
-            return res.status(result.status).json(errorResponse(result.status, result.errorMessage || 'File upload failed'));
+            return res.status(result.status).json(errorResponse(result.dataStatus, result.errorMessage || 'File upload failed'));
         }
 
         return res.json(successResponse(result.data));

package/src/public/js/govcyFiles.js

@@ -1,10 +1,20 @@
 // 🔍 Select all file inputs that have the .govcy-file-upload class
-const fileInputs = document.querySelectorAll('input[type="file"].govcy-file-upload');
+var fileInputs = document.querySelectorAll('input[type="file"].govcy-file-upload');
 
 // 🔁 Loop over each file input and attach a change event listener
-fileInputs.forEach(input => {
-  input.addEventListener('change', async (event) => {
-    const messages = {
+fileInputs.forEach(function(input) {
+  input.addEventListener('change', _uploadFileEventHandler);
+});
+
+
+/**
+ * Handles the upload of a file event
+ * 
+ * @param {object} event The event
+ */
+async function _uploadFileEventHandler(event) {
+  var input = event.target;
+  var messages = {
       "uploadSuccesful": {
         "el": "Το αρχείο ανεβαστηκε",
         "en": "File uploaded successfully",
@@ -14,139 +24,152 @@ fileInputs.forEach(input => {
         "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)
-    const csrfToken = document.querySelector('input[type="hidden"][name="_csrf"]')?.value;
+    var csrfEl = document.querySelector('input[type="hidden"][name="_csrf"]');
+    var csrfToken = csrfEl ? csrfEl.value : '';
+
     // 🔧 Define siteId and pageUrl (you can dynamically extract these later)
-    const siteId = window._govcySiteId || "";
-    const pageUrl = window._govcyPageUrl || "";
-    const lang = window._govcyLang || "el";
+    var siteId = window._govcySiteId || "";
+    var pageUrl = window._govcyPageUrl || "";
+    var lang = window._govcyLang || "el";
     // 📦 Grab the selected file
-    const file = event.target.files[0];
-    const elementName = input.name; // Form field's `name` attribute
+    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
-    const formData = new FormData();
+    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
-      const response = await axios.post(`/apis/${siteId}/${pageUrl}/upload`, formData, {
+      var response = await axios.post(`/apis/${siteId}/${pageUrl}/upload`, formData, {
         headers: {
           'X-CSRF-Token': csrfToken // 🔐 Pass CSRF token in custom header
         }
       });
 
-      const { sha256, fileId } = response.data.Data;
+      var sha256 = response.data.Data.sha256;
+      var fileId = response.data.Data.fileId;
 
       // 📝 Store returned metadata in hidden fields for submission with the form
-      document.querySelector(`[name="${elementName}Attachment[fileId]"`).value = fileId;
-      document.querySelector(`[name="${elementName}Attachment[sha256]"`).value = sha256;
-
-      // ✅ Success
-      // Create an instance of GovcyFrontendRendererBrowser
-      const renderer = new GovcyFrontendRendererBrowser();
-      // Define the input data
-        const inputData =
-        {
-          "site": {
-            "lang": lang
-          }
-        };
-
-        const fileInputMap = window._govcyFileInputs || {};
-        let fileElement = fileInputMap[elementName];
-        fileElement.element = "fileView";
-        fileElement.params.fileId = fileId;
-        fileElement.params.sha256 = sha256;
-        fileElement.params.visuallyHiddenText = fileElement.params.label;
-        fileElement.params.error = null;
-        // TODO: Also need to set the `view` and `download` URLs 
-        fileElement.params.viewHref = "#viewHref";
-        fileElement.params.deleteHref  = "#deleteHref";
-        // Construct the JSONTemplate
-        const JSONTemplate = {
-          "elements": [fileElement]
-        };
-        
-        //render HTML into string
-        let renderedHtml = renderer.renderFromJSON(JSONTemplate,inputData);
-        // look for element with id `${elementName}-outer-control`
-        // if not found look for element with id `${elementName}-input-control`
-        // if not found look for element with id `${elementName}-view-control`
-        var outerElement = document.getElementById(`${elementName}-outer-control`) 
-        || document.getElementById(`${elementName}-input-control`) 
-        || document.getElementById(`${elementName}-view-control`);
-
-        if (outerElement) {
-          //remove all classes from outerElement
-          outerElement.className = "";
-          //set the id of the outerElement to `${elementName}-outer-control`
-          outerElement.id = `${elementName}-outer-control`;
-          //update DOM and initialize the JS components
-          renderer.updateDOMAndInitialize(`${elementName}-outer-control`, renderedHtml);
-        }
-        // ✅ Update ARIA live region with success message
-        const statusRegion = document.getElementById('_govcy-upload-status');
-        if (statusRegion) {
+      // 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];
-          setTimeout(() => {
-            statusRegion.textContent = '';
-          }, 10000);
-        }
+        }, 200)
+        setTimeout(function() {
+          statusRegion.textContent = '';
+        }, 5000); 
+      }
       // alert('✅ File uploaded successfully');
 
     } catch (err) {
-      // Create an instance of GovcyFrontendRendererBrowser
-      const renderer = new GovcyFrontendRendererBrowser();
-      const lang = window._govcyLang || "el";
-      // Define the input data
-      const inputData =
-      {
-        "site": {
-          "lang": lang
-        }
-      };
-      const fileInputMap = window._govcyFileInputs || {};
-      let fileElement = fileInputMap[elementName];
-      fileElement.element = "fileInput";
-      fileElement.params.fileId = "";
-      fileElement.params.sha256 = ""
-      fileElement.params.error = messages.uploadFailed;
-
-      // Construct the JSONTemplate
-      const JSONTemplate = {
-        "elements": [fileElement]
-      };
-      //render HTML into string
-      let renderedHtml = renderer.renderFromJSON(JSONTemplate,inputData);
-      var outerElement = document.getElementById(`${elementName}-outer-control`) 
-        || document.getElementById(`${elementName}-input-control`) 
-        || document.getElementById(`${elementName}-view-control`);
-
-      if (outerElement) {
-        //remove all classes from outerElement
-        outerElement.className = "";
-        //set the id of the outerElement to `${elementName}-outer-control`
-        outerElement.id = `${elementName}-outer-control`;
-        //update DOM and initialize the JS components
-        renderer.updateDOMAndInitialize(`${elementName}-outer-control`, renderedHtml);
-        //TODO: Kamran need to figure a way to re register the DOM event on change
+      // ⚠️ Show an error message if upload fails
+      var errorMessage = messages.uploadFailed;
+      var errorCode = err && err.response && err.response.data && err.response.data.ErrorCode;
+
+      if (errorCode === 406 || errorCode === 407 || errorCode === 408 || errorCode === 409) {
+        errorMessage = messages["uploadFailed" + errorCode];
       }
-      // ✅ Update ARIA live region with success message
-      const statusRegion = document.getElementById('_govcy-upload-error');
-      if (statusRegion) {
-        statusRegion.textContent = messages.uploadFailed[lang];
-        setTimeout(() => {
-          statusRegion.textContent = '';
-        }, 10000);
+
+      // Render the file input with error
+      _renderFileElement("fileInput", elementId, elementName, "","", errorMessage);
+      
+      // Re-bind the file input's change handler
+      var newInput = document.getElementById(elementId);
+      if (newInput) {
+        newInput.addEventListener('change', _uploadFileEventHandler);
       }
-      // // ⚠️ Show an error message if upload fails
-      // alert('❌ Upload failed: ' + (err.response?.data?.error || err.message));
+
+      // Accessibility: Focus on the form field
+      document.getElementById(elementId)?.focus();
+      
     }
-  });
-});
+}
+
+/**
+ * Renders a file element in the DOM
+ * 
+ * @param {string} elementState The element state. Can be "fileInput" or "fileView" 
+ * @param {string} elementId The element id
+ * @param {string} elementName The element name 
+ * @param {string} fileId The file id 
+ * @param {string} sha256 The sha256 
+ * @param {object} errorMessage The error message in all supported languages 
+ */
+function _renderFileElement(elementState, elementId, elementName, fileId, sha256, errorMessage) {
+  // Create an instance of GovcyFrontendRendererBrowser
+  var renderer = new GovcyFrontendRendererBrowser();
+  var lang = window._govcyLang || "el";
+  // Define the input data
+  var inputData =
+  {
+    "site": {
+      "lang": lang
+    }
+  };
+  var fileInputMap = window._govcyFileInputs || {};
+  var fileElement = fileInputMap[elementName];
+  fileElement.element = elementState;
+  if (errorMessage != null) fileElement.params.error = errorMessage;
+  if (fileId != null) fileElement.params.fileId = fileId;
+  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 = "#viewHref";
+    fileElement.params.deleteHref  = "#deleteHref";
+  }
+  // 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`);
+
+  if (outerElement) {
+    //remove all classes from outerElement
+    outerElement.className = "";
+    //set the id of the outerElement to `${elementId}-outer-control`
+    outerElement.id = `${elementId}-outer-control`;
+    //update DOM and initialize the JS components
+    renderer.updateDOMAndInitialize(`${elementId}-outer-control`, renderedHtml);
+  }
+}

package/src/resources/govcyResources.mjs

@@ -100,6 +100,16 @@ export const staticResources = {
             en: "We have received your request. ",
             el: "Έχουμε λάβει την αίτησή σας. ",
             tr: "We have received your request. "
+        },
+        fileUploaded : {
+            en: "File has been uploaded. ",
+            el: "Το αρχείο ανεβάστηκε. ",
+            tr: "File has been uploaded. "
+        },
+        fileNotUploaded : {
+            en: "File has not been uploaded. ",
+            el: "Το αρχείο δεν ανεβάστηκε. ",
+            tr: "File has not been uploaded. "
         }
     },
     //remderer sections

package/src/utils/govcyFormHandling.mjs

@@ -18,9 +18,12 @@ import * as dataLayer from "./govcyDataLayer.mjs";
  * @param {string} pageUrl The page URL
  * @param {string} lang The language
  */
-export function populateFormData(formElements, theData, validationErrors, store = {}, siteId = "", pageUrl = "", lang = "el") {
+export function populateFormData(formElements, theData, validationErrors, store = {}, siteId = "", pageUrl = "", lang = "el", fileInputElements = null) {
     const inputElements = ALLOWED_FORM_ELEMENTS;
-    let fileInputElements = {};
+    const isRootCall = !fileInputElements;
+    if (isRootCall) {
+        fileInputElements = {};
+    }
     // Recursively populate form data with session data
     formElements.forEach(element => {
         if (inputElements.includes(element.element)) {
@@ -62,7 +65,9 @@ export function populateFormData(formElements, theData, validationErrors, store
             } else if (element.element === "fileInput") {
                 // For fileInput, we change the element.element to "fileView" and set the 
                 // fileId and sha256 from the session store
-                const fileData = dataLayer.getFormDataValue(store, siteId, pageUrl, fieldName + "Attachment");
+                // unneeded handle of `Attachment` at the end
+                // const fileData = dataLayer.getFormDataValue(store, siteId, pageUrl, fieldName + "Attachment");
+                const fileData = dataLayer.getFormDataValue(store, siteId, pageUrl, fieldName);
                 // TODO: Ask Andreas how to handle empty file inputs
                 if (fileData) {
                     element.element = "fileView";
@@ -102,7 +107,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);
+                    populateFormData(item.conditionalElements, theData, validationErrors,store, siteId , pageUrl, lang, fileInputElements);
                   
                     // Check if any conditional element has an error and add to the parent "conditionalHasErrors": true
                     if (item.conditionalElements.some(condEl => condEl.params?.error)) {
@@ -113,7 +118,7 @@ export function populateFormData(formElements, theData, validationErrors, store
         }
     });
     // add file input elements's definition in js object
-    if (fileInputElements != {}) {
+    if (isRootCall && Object.keys(fileInputElements).length > 0) {
         const scriptTag = `
         <script type="text/javascript">
             window._govcyFileInputs = ${JSON.stringify(fileInputElements)};
@@ -121,7 +126,7 @@ export function populateFormData(formElements, theData, validationErrors, store
             window._govcyPageUrl = "${pageUrl}";
             window._govcyLang = "${lang}";
         </script>
-        <div id="_govcy-upload-status" class="govcy-visually-hidden" role="status" aria-live="polite"></div>
+        <div id="_govcy-upload-status" class="govcy-visually-hidden" role="status" aria-live="assertive"></div>
         <div id="_govcy-upload-error" class="govcy-visually-hidden" role="alert" aria-live="assertive"></div>
         `.trim();
         formElements.push({
@@ -165,7 +170,7 @@ export function getFormData(elements, formData, store = {}, siteId = "", pageUrl
                         if (item.conditionalElements) {
                             Object.assign(
                                 filteredData,
-                                getFormData(item.conditionalElements, formData)
+                                getFormData(item.conditionalElements, formData, store, siteId, pageUrl)
                             );
                         }
                     });
@@ -184,12 +189,18 @@ export function getFormData(elements, formData, store = {}, siteId = "", pageUrl
             } else if (element.element === "fileInput") {
                 // fileInput elements are already stored in the store when it was uploaded
                 // so we just need to check if the file exists in the dataLayer in the store and add it the filteredData
-                const fileData = dataLayer.getFormDataValue(store, siteId, pageUrl, name + "Attachment");
+                // unneeded handle of `Attachment` at the end
+                // const fileData = dataLayer.getFormDataValue(store, siteId, pageUrl, name + "Attachment");
+                const fileData = dataLayer.getFormDataValue(store, siteId, pageUrl, name);
                 if (fileData) {
-                    filteredData[name + "Attachment"] = fileData;
+                    // unneeded handle of `Attachment` at the end
+                    // filteredData[name + "Attachment"] = fileData;
+                    filteredData[name] = fileData;
                 } else {
                     //TODO: Ask Andreas how to handle empty file inputs
-                    filteredData[name + "Attachment"] = ""; // or handle as needed
+                    // unneeded handle of `Attachment` at the end
+                    // filteredData[name + "Attachment"] = ""; // or handle as needed
+                    filteredData[name] = ""; // or handle as needed
                 }
             // Handle other elements (e.g., textInput, textArea, datePicker)
             } else {

package/src/utils/govcyHandleFiles.mjs

@@ -27,6 +27,7 @@ export async function handleFileUpload({ service, store, siteId, pageUrl, elemen
     if (!file || !elementName) {
       return {
         status: 400,
+        dataStatus: 400,
         errorMessage: 'Missing file or element name'
       };
     }
@@ -37,6 +38,7 @@ export async function handleFileUpload({ service, store, siteId, pageUrl, elemen
     if (!uploadCfg?.url || !uploadCfg?.clientKey || !uploadCfg?.serviceId) {
       return {
         status: 400,
+        dataStatus: 401,
         errorMessage: 'Missing upload configuration'
       };
     }
@@ -53,6 +55,7 @@ export async function handleFileUpload({ service, store, siteId, pageUrl, elemen
     if (!url || !clientKey) {
       return {
         status: 400,
+        dataStatus: 402,
         errorMessage: 'Missing environment variables for upload'
       };
     }
@@ -67,6 +70,7 @@ export async function handleFileUpload({ service, store, siteId, pageUrl, elemen
     if (!page?.pageTemplate) {
       return {
         status: 400,
+        dataStatus: 403,
         errorMessage: 'Invalid page configuration'
       };
     }
@@ -77,6 +81,7 @@ export async function handleFileUpload({ service, store, siteId, pageUrl, elemen
     if (conditionResult.result === false) {
       return {
         status: 403,
+        dataStatus: 404,
         errorMessage: 'This page is skipped by conditional logic'
       };
     }
@@ -88,6 +93,7 @@ export async function handleFileUpload({ service, store, siteId, pageUrl, elemen
     if (!isAllowed) {
       return {
         status: 403,
+        dataStatus: 405,
         errorMessage: `File input [${elementName}] not allowed on this page`
       };
     }
@@ -96,6 +102,7 @@ export async function handleFileUpload({ service, store, siteId, pageUrl, elemen
     if (file.size === 0) {
       return {
         status: 400,
+        dataStatus: 406,
         errorMessage: 'Uploaded file is empty'
       };
     }
@@ -105,6 +112,7 @@ export async function handleFileUpload({ service, store, siteId, pageUrl, elemen
     if (!ALLOWED_FILE_MIME_TYPES.includes(file.mimetype)) {
         return {
             status: 400,
+            dataStatus: 407,
             errorMessage: 'Invalid file type (MIME not allowed)'
         };
     }
@@ -113,6 +121,7 @@ export async function handleFileUpload({ service, store, siteId, pageUrl, elemen
     if (!isMagicByteValid(file.buffer, file.mimetype)) {
         return {
             status: 400,
+            dataStatus: 408,
             errorMessage: 'Invalid file type (magic byte mismatch)'
         };
     }
@@ -121,6 +130,7 @@ export async function handleFileUpload({ service, store, siteId, pageUrl, elemen
     if (file.size > ALLOWED_FILE_SIZE_MB * 1024 * 1024) {
       return {
         status: 400,
+        dataStatus: 409,
         errorMessage: 'File exceeds allowed size'
       };
     }
@@ -161,6 +171,7 @@ export async function handleFileUpload({ service, store, siteId, pageUrl, elemen
     if (!response?.Succeeded) {
       return {
         status: 500,
+        dataStatus: 410,
         errorMessage: `${response?.ErrorCode} - ${response?.ErrorMessage} - fileUploadAPIEndpoint returned succeeded false`
       };
     }
@@ -169,13 +180,16 @@ export async function handleFileUpload({ service, store, siteId, pageUrl, elemen
     if (!response?.Data?.fileId || !response?.Data?.sha256) {
       return {
         status: 500,
+        dataStatus: 411,
         errorMessage: 'Missing fileId or sha256 in response'
       };
     }
 
     // ✅ Success
     // Store the file metadata in the session store
-    dataLayer.storePageDataElement(store, siteId, pageUrl, elementName+"Attachment", {
+    // unneeded handle of `Attachment` at the end
+    // dataLayer.storePageDataElement(store, siteId, pageUrl, elementName+"Attachment", {
+    dataLayer.storePageDataElement(store, siteId, pageUrl, elementName, {
       sha256: response.Data.sha256,
       fileId: response.Data.fileId,
     });
@@ -195,6 +209,7 @@ export async function handleFileUpload({ service, store, siteId, pageUrl, elemen
   } catch (err) {
     return {
       status: 500,
+      dataStatus: 500,
       errorMessage: 'Upload failed' + (err.message ? `: ${err.message}` : ''),
     };
   }

package/src/utils/govcySubmitData.mjs

@@ -66,6 +66,12 @@ export function prepareSubmissionData(req, siteId, service) {
             // Store in submissionData
             submissionData[pageUrl].formData[elId] = value;
 
+            // handle fileInput
+            if (elType === "fileInput") {
+                // change the name of the key to include "Attachment" at the end but not have the original key
+                submissionData[pageUrl].formData[elId + "Attachment"] = value;
+                delete submissionData[pageUrl].formData[elId];
+            }
 
             // 🔄 If radios with conditionalElements, walk ALL options
             if (elType === "radios" && Array.isArray(element.params?.items)) {
@@ -85,6 +91,12 @@ export function prepareSubmissionData(req, siteId, service) {
 
                         // Store even if the field was not visible to user
                         submissionData[pageUrl].formData[condId] = condValue;
+                        // handle fileInput
+                        if (condType === "fileInput") {
+                            // change the name of the key to include "Attachment" at the end but not have the original key
+                            submissionData[pageUrl].formData[condId + "Attachment"] = condValue;
+                            delete submissionData[pageUrl].formData[condId];
+                        }
                     }
                 }
             }
@@ -291,6 +303,10 @@ function getValue(formElement, pageUrl, req, siteId) {
     let value = ""
     if (formElement.element === "dateInput") {
         value = getDateInputISO(pageUrl, formElement.params.name, req, siteId);
+    } else if (formElement.element === "fileInput") {
+        // unneeded handle of `Attachment` at the end
+        // value = dataLayer.getFormDataValue(req.session, siteId, pageUrl, formElement.params.name + "Attachment");
+        value = dataLayer.getFormDataValue(req.session, siteId, pageUrl, formElement.params.name);
     } else {
         value = dataLayer.getFormDataValue(req.session, siteId, pageUrl, formElement.params.name);
     }
@@ -340,6 +356,17 @@ function getValueLabel(formElement, value, pageUrl, req, siteId, service) {
         return govcyResources.getSameMultilingualObject(service.site.languages, formattedDate);
     }
 
+    // handle fileInput
+    if (formElement.element === "fileInput") {
+        // TODO: Ask Andreas how to handle empty file inputs 
+        if (value) {
+            return govcyResources.staticResources.text.fileUploaded;
+        } else {
+            return govcyResources.getSameMultilingualObject(service.site.languages, "");
+            // return govcyResources.staticResources.text.fileNotUploaded;
+        }
+    }
+
     // textInput, textArea, etc.
     return govcyResources.getSameMultilingualObject(service.site.languages, value);
 }

package/src/utils/govcyValidator.mjs

@@ -263,8 +263,9 @@ export function validateFormElements(elements, formData, pageUrl) {
         formData[`${field.params.name}_day`]]
           .filter(Boolean) // Remove empty values
           .join("-") // Join remaining parts
-        : (field.element === "fileInput") // Handle fileInput
-          ? formData[`${field.params.name}Attachment`] || ""
+        // unneeded handle of `Attachment` at the end
+        // : (field.element === "fileInput") // Handle fileInput
+        //   ? formData[`${field.params.name}Attachment`] || ""
         : formData[field.params.name] || ""; // Get submitted value
 
       //Autocheck: check for "checkboxes", "radios", "select" if `fieldValue` is one of the `field.params.items
@@ -313,7 +314,9 @@ export function validateFormElements(elements, formData, pageUrl) {
                     .filter(Boolean) // Remove empty values
                     .join("-") // Join remaining parts
                   : (conditionalElement.element === "fileInput") // Handle fileInput
-                      ? formData[`${conditionalElement.params.name}Attachment`] || ""
+                      // unneeded handle of `Attachment` at the end
+                      // ? formData[`${conditionalElement.params.name}Attachment`] || ""
+                      ? formData[`${conditionalElement.params.name}`] || ""
                   : formData[conditionalElement.params.name] || ""; // Get submitted value
 
                 //Autocheck: check for "checkboxes", "radios", "select" if `fieldValue` is one of the `field.params.items`