update document name validation

Author: RomanBachaloSigmaSoftware

lib/workspaces/controllers/eg002AddDocumentToWorkspace.js

@@ -9,7 +9,7 @@ const { addDocumentToWorkspace } = require('../../workspaces/examples/addDocumen
 const validator = require('validator');
 const { getExampleByNumber } = require('../../manifestService');
 const dsConfig = require('../../../config/index').config;
-const { API_TYPES } = require('../../utils');
+const { formatString, API_TYPES } = require('../../utils');
 
 const eg002AddDocumentToWorkspace = exports;
 const exampleNumber = 2;
@@ -92,6 +92,7 @@ eg002AddDocumentToWorkspace.getController = async (req, res) => {
     eg: eg,
     csrfToken: req.csrfToken(),
     workspaceIdOk: !!req.session.workspaceId,
+    documentFolder: formatString(res.locals.manifest.SupportingTexts.HelpingTexts.SelectPDFFileFromFolder, demoDocsPath),
     example: example,
     sourceFile: sourceFile,
     sourceUrl: dsConfig.githubExampleUrl + 'workspaces/examples/' + sourceFile,

public/assets/css.css

@@ -109,7 +109,7 @@ pre.json-display {
   opacity: unset;
 }
 
-form .form-group #error {
+form .form-group .validation-error {
   color: red !important;
 }
 

views/pages/workspaces-examples/eg002AddDocumentToWorkspace.ejs

@@ -3,7 +3,7 @@
 <%- include("../../partials/exampleInfo") %>
 
 <% if (workspaceIdOk) { %>
-  <form class="eg" action="" method="post" data-busy="form">
+  <form id="uploadForm" class="eg" action="" method="post" data-busy="form">
     <% if(example.Forms && example.Forms[0].FormName) { %>
       <%- example.Forms[0].FormName %>
     <% } %>
@@ -12,37 +12,55 @@
       <label for="documentName"><%= example.Forms[0].Inputs[0].InputName %></label>
       <input type="text" class="form-control" id="documentName" placeholder="<%= example.Forms[0].Inputs[0].InputPlaceholder %>" 
              name="documentName" required>
+      <small id="nameError" class="form-text text-muted validation-error"></small>
+      <small id="emailHelp" class="form-text text-muted"><%= locals.manifest.SupportingTexts.HelpingTexts.SpecifyNameWithExtension %></small>
     </div>
 
     <div class="form-group">
       <label for="documentPath"><%= example.Forms[0].Inputs[1].InputName %></label>
       <input type="file" accept=".pdf" class="form-control" id="documentPath" placeholder="<%= example.Forms[0].Inputs[1].InputPlaceholder %>" 
              name="documentPath" required>
-      <small id="error" class="form-text text-muted"></small>
+      <small id="pathError" class="form-text text-muted validation-error"></small>
+      <small id="emailHelp" class="form-text text-muted"><%= documentFolder %></small>
     </div>
 
     <input type="hidden" name="_csrf" value="<%- csrfToken %>">
     <%- include("../../partials/submitButton") %>
   </form>
 
   <script>
-    const fileInput = document.getElementById('documentPath');
-    const errorEl = document.getElementById('error');
+    const form = document.getElementById('uploadForm');
+    form.addEventListener('submit', function (event) {
+      const docNameInput = document.getElementById('documentName');
+      const fileInput = document.getElementById('documentPath');
+      const nameErrorEl = document.getElementById('nameError');
+      const pathErrorEl = document.getElementById('pathError');
 
-    fileInput.addEventListener('change', (e) => {
+      const documentName = docNameInput.value.trim();
       const file = fileInput.files[0];
 
+      // Validate documentName ends with .pdf
+      if (!documentName.toLowerCase().endsWith(".pdf")) {
+        nameErrorEl.textContent = 'Document name must contain .pdf extension';
+        event.preventDefault();
+        event.stopImmediatePropagation();
+      } else {
+        nameErrorEl.textContent = ''; // clear any previous errors
+      }
+
       // Check extension
       const isPdf = file.name.toLowerCase().endsWith('.pdf');
       const isPdfMime = file.type === 'application/pdf';
 
       if (!isPdf || !isPdfMime) {
         fileInput.value = ''; // reset file input
-        errorEl.textContent = 'Invalid file type. Please upload a PDF file.';
+        pathErrorEl.textContent = 'Invalid file type. Please upload a PDF file.';
+        event.preventDefault();
+        event.stopImmediatePropagation();
       } else {
-        errorEl.textContent = ''; // clear any previous errors
+        pathErrorEl.textContent = ''; // clear any previous errors
       }
-    });
+    }, true);
   </script>
 <% } else { %>
   <%- formatString(example.RedirectsToOtherCodeExamples[0].RedirectText, formatString('href="work00{0}"', example.RedirectsToOtherCodeExamples[0].CodeExampleToRedirectTo)) %>