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

package/README.md

@@ -1740,6 +1740,7 @@ The validation rules for each element are defined in the `"validations` array fo
     - `date`: Date input (DD/MM/YYYY)
     - `dateISO`: ISO date input `YYYY-M-D`
     - `dateDMY`: European/Common Format date input `D/M/YYYY`
+    - `maxCurrentYear`: Maximum current year input
 - `required`: Checks if the value is not null, undefined, or an empty string (after trimming).
 - `length`: Checks if the value has a maximum length passed in the `checkValue` parameter.
 - `regCheck`: Checks if the value matches the specified regular expression passed in the `checkValue` parameter.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gov-cy/govcy-express-services",
-  "version": "1.2.0",
+  "version": "1.3.0-alpha.1",
   "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",
@@ -52,7 +52,7 @@
   },
   "dependencies": {
     "@gov-cy/dsf-email-templates": "^2.1.0",
-    "@gov-cy/govcy-frontend-renderer": "^1.24.0",
+    "@gov-cy/govcy-frontend-renderer": "^1.26.0",
     "axios": "^1.9.0",
     "cookie-parser": "^1.4.7",
     "dotenv": "^16.3.1",
@@ -60,6 +60,7 @@
     "express-session": "^1.17.3",
     "form-data": "^4.0.4",
     "multer": "^2.0.2",
+    "nunjucks": "^3.2.4",
     "openid-client": "^6.3.4",
     "puppeteer": "^24.6.0"
   },
@@ -76,5 +77,8 @@
   },
   "engines": {
     "node": ">=18.0.0"
+  },
+  "overrides": {
+    "tar-fs": "^3.1.1"
   }
 }

package/src/index.mjs

@@ -18,7 +18,7 @@ import { govcyCsrfMiddleware } from './middleware/govcyCsrf.mjs';
 import { govcySessionData } from './middleware/govcySessionData.mjs';
 import { govcyHttpErrorHandler } from './middleware/govcyHttpErrorHandler.mjs';
 import { govcyLanguageMiddleware } from './middleware/govcyLanguageMiddleware.mjs';
-import { requireAuth, naturalPersonPolicy,handleLoginRoute, handleSigninOidc, handleLogout } from './middleware/cyLoginAuth.mjs';
+import { requireAuth, naturalPersonPolicy, handleLoginRoute, handleSigninOidc, handleLogout } from './middleware/cyLoginAuth.mjs';
 import { serviceConfigDataMiddleware } from './middleware/govcyConfigSiteData.mjs';
 import { govcyManifestHandler } from './middleware/govcyManifestHandler.mjs';
 import { govcyRoutePageHandler } from './middleware/govcyRoutePageHandler.mjs';
@@ -27,32 +27,34 @@ import { govcyLoadSubmissionData } from './middleware/govcyLoadSubmissionData.mj
 import { govcyFileUpload } from './middleware/govcyFileUpload.mjs';
 import { govcyFileDeletePageHandler, govcyFileDeletePostHandler } from './middleware/govcyFileDeleteHandler.mjs';
 import { govcyFileViewHandler } from './middleware/govcyFileViewHandler.mjs';
-import { isProdOrStaging , getEnvVariable, whatsIsMyEnvironment } from './utils/govcyEnvVariables.mjs';
+import { govcyMultipleThingsAddHandler, govcyMultipleThingsEditHandler, govcyMultipleThingsAddPostHandler, govcyMultipleThingsEditPostHandler } from './middleware/govcyMultipleThingsItemPage.mjs';
+import { govcyMultipleThingsDeletePageHandler, govcyMultipleThingsDeletePostHandler } from './middleware/govcyMultipleThingsDeleteHandler.mjs';
+import { isProdOrStaging, getEnvVariable, whatsIsMyEnvironment } from './utils/govcyEnvVariables.mjs';
 import { logger } from "./utils/govcyLogger.mjs";
 
 import fs from 'fs';
 
-export default function initializeGovCyExpressService(){
+export default function initializeGovCyExpressService() {
   const app = express();
 
   // Add this line before session middleware
   app.set('trust proxy', 1);
-  
+
   // Get the directory name of the current module
   const __dirname = dirname(fileURLToPath(import.meta.url));
   // Construct the absolute path to local certificate files
   logger.debug('Current directory:', __dirname);
   logger.debug('Current working directory:', process.cwd());
-  const  certPath = join(process.cwd(),'server');
-  
+  const certPath = join(process.cwd(), 'server');
+
   // Determine environment settings
   const ENV = whatsIsMyEnvironment();
   // Set port
   const PORT = getEnvVariable('PORT') || 44319;
   // Use HTTPS if isProdOrStaging or certificate files exist
   const USE_HTTPS = isProdOrStaging() || (fs.existsSync(certPath + '.cert') && fs.existsSync(certPath + '.key'));
-  
-  
+
+
   // Middleware
   // Enable parsing of URL-encoded data (data from HTML form submissions with application/x-www-form-urlencoded encoding)
   app.use(express.urlencoded({ extended: true }));
@@ -64,39 +66,39 @@ export default function initializeGovCyExpressService(){
       secret: getEnvVariable('SESSION_SECRET'), // Use environment variable or fallback for dev. To generate a secret, run: `node -e "console.log(require('crypto').randomBytes(32).toString('hex'));"`
       resave: false,  // Prevents unnecessary session updates
       saveUninitialized: false, // Don't save empty sessions
-      cookie: { 
+      cookie: {
         secure: false, // Secure cookies only if HTTPS is used
         httpOnly: true,   // Prevents XSS attacks
         maxAge: 1800000,  // Session expires after 30 mins
-        sameSite:  'lax' // Prevents CSRF by default
-      } 
+        sameSite: 'lax' // Prevents CSRF by default
+      }
     })
   );
   // Enable cookie parsing
-  app.use(cookieParser()); 
+  app.use(cookieParser());
   // Apply language middleware
-  app.use(govcyLanguageMiddleware); 
+  app.use(govcyLanguageMiddleware);
   // Add request timing middleware
   app.use(requestTimer);
   // add csrf middleware
   app.use(govcyCsrfMiddleware);
   // Enable security headers
   app.use(noCacheAndSecurityHeaders);
-  
+
   // 🔒 cyLogin ----------------------------------------
-  
+
   // 🔒 -- ROUTE: Redirect to Login
-  app.get('/login', handleLoginRoute() );
-  
+  app.get('/login', handleLoginRoute());
+
   // 🔒 -- ROUTE: Handle login Callback
-  app.get('/signin-oidc', handleSigninOidc() );
-  
+  app.get('/signin-oidc', handleSigninOidc());
+
   // 🔒 -- ROUTE: Handle Logout
-  app.get('/logout', handleLogout() );
-  
+  app.get('/logout', handleLogout());
+
   //----------------------------------------------------------------------
-  
-  
+
+
   // 🛠️ Debugging routes -----------------------------------------------------
   // 🙍🏻‍♂️ -- ROUTE: Debugging route Protected Route
   // if (!isProdOrStaging()) {
@@ -114,72 +116,211 @@ export default function initializeGovCyExpressService(){
   //   });
   // }
   //----------------------------------------------------------------------
-  
-  
+
+
   // ✅ Ensures session structure exists
-  app.use(govcySessionData);  
+  app.use(govcySessionData);
   // add logger middleware
   app.use(requestLogger);
-  
+
   // Construct the absolute path to the public directory
   const publicPath = join(__dirname, 'public');
   // 🌐 -- ROUTE: Serve static files in the public directory. Route for `/js/`
   app.use(express.static(publicPath));
-  
+
   // 🏡 -- ROUTE: handle the route `/`
-   app.get('/', govcyRoutePageHandler);
+  app.get('/', govcyRoutePageHandler);
 
   // 📝 -- ROUTE: Serve manifest.json dynamically for each site
   app.get('/:siteId/manifest.json', serviceConfigDataMiddleware, govcyManifestHandler());
 
   // 🗃️ -- ROUTE: Handle POST requests for file uploads for a page. 
-  app.post('/apis/:siteId/:pageUrl/upload', 
-    serviceConfigDataMiddleware, 
+  app.post('/apis/:siteId/:pageUrl/upload',
+    serviceConfigDataMiddleware,
     requireAuth, // UNCOMMENT 
     naturalPersonPolicy, // UNCOMMENT 
     govcyServiceEligibilityHandler(true), // UNCOMMENT 
     govcyFileUpload);
-  
+
+  // 🗃️ -- ROUTE: Handle POST requests for file uploads inside multipleThings (add)
+  app.post('/apis/:siteId/:pageUrl/multiple/add/upload',
+    serviceConfigDataMiddleware,
+    requireAuth, // UNCOMMENT
+    naturalPersonPolicy, // UNCOMMENT
+    govcyServiceEligibilityHandler(true), // UNCOMMENT
+    govcyFileUpload
+  );
+
+  // 🗃️ -- ROUTE: Handle POST requests for file uploads inside multipleThings (edit)
+  app.post('/apis/:siteId/:pageUrl/multiple/edit/:index/upload',
+    serviceConfigDataMiddleware,
+    requireAuth, // UNCOMMENT
+    naturalPersonPolicy, // UNCOMMENT
+    govcyServiceEligibilityHandler(true), // UNCOMMENT
+    govcyFileUpload
+  );
+
+  // View (multipleThings draft)
+  app.get('/:siteId/:pageUrl/multiple/add/view-file/:elementName',
+    serviceConfigDataMiddleware,
+    requireAuth,
+    naturalPersonPolicy,
+    govcyServiceEligibilityHandler(true),
+    govcyFileViewHandler());
+
+  // ❌🗃️ -- ROUTE: Delete file during multipleThings ADD (before dynamic route)
+  app.get('/:siteId/:pageUrl/multiple/add/delete-file/:elementName',
+    serviceConfigDataMiddleware,
+    requireAuth,
+    naturalPersonPolicy,
+    govcyServiceEligibilityHandler(),
+    govcyLoadSubmissionData(),
+    govcyFileDeletePageHandler(),
+    renderGovcyPage()
+  );
+
+  // ❌🗃️ -- ROUTE: Delete file during multipleThings EDIT (before dynamic route)
+  app.get('/:siteId/:pageUrl/multiple/edit/:index/delete-file/:elementName',
+    serviceConfigDataMiddleware,
+    requireAuth,
+    naturalPersonPolicy,
+    govcyServiceEligibilityHandler(),
+    govcyLoadSubmissionData(),
+    govcyFileDeletePageHandler(),
+    renderGovcyPage()
+  );
+
+
+  // ❌🗃️📥 -- ROUTE: Handle POST requests for delete file in multipleThings ADD
+  app.post('/:siteId/:pageUrl/multiple/add/delete-file/:elementName',
+    serviceConfigDataMiddleware,
+    requireAuth,
+    naturalPersonPolicy,
+    govcyServiceEligibilityHandler(true),
+    govcyFileDeletePostHandler()
+  );
+
+  // ❌🗃️📥 -- ROUTE: Handle POST requests for delete file in multipleThings EDIT
+  app.post('/:siteId/:pageUrl/multiple/edit/:index/delete-file/:elementName',
+    serviceConfigDataMiddleware,
+    requireAuth,
+    naturalPersonPolicy,
+    govcyServiceEligibilityHandler(true),
+    govcyFileDeletePostHandler()
+  );
+
+
+  // View (multipleThings edit)
+  app.get('/:siteId/:pageUrl/multiple/edit/:index/view-file/:elementName',
+    serviceConfigDataMiddleware,
+    requireAuth,
+    naturalPersonPolicy,
+    govcyServiceEligibilityHandler(true),
+    govcyFileViewHandler());
+
   // 🏠 -- ROUTE: Handle route with only siteId (/:siteId or /:siteId/)
-  app.get('/:siteId', serviceConfigDataMiddleware, requireAuth, naturalPersonPolicy, govcyServiceEligibilityHandler(true),govcyLoadSubmissionData(),govcyPageHandler(), renderGovcyPage());
-  
+  app.get('/:siteId', serviceConfigDataMiddleware, requireAuth, naturalPersonPolicy, govcyServiceEligibilityHandler(true), govcyLoadSubmissionData(), govcyPageHandler(), renderGovcyPage());
+
   // 👀 -- ROUTE: Add Review Page Route (BEFORE the dynamic route)
-  app.get('/:siteId/review',serviceConfigDataMiddleware, requireAuth, naturalPersonPolicy, govcyServiceEligibilityHandler(),govcyLoadSubmissionData(), govcyReviewPageHandler(), renderGovcyPage());
-  
+  app.get('/:siteId/review', serviceConfigDataMiddleware, requireAuth, naturalPersonPolicy, govcyServiceEligibilityHandler(), govcyLoadSubmissionData(), govcyReviewPageHandler(), renderGovcyPage());
+
   // ✅📄 -- ROUTE: Add Success PDF Route (BEFORE the dynamic route)
-  app.get('/:siteId/success/pdf',serviceConfigDataMiddleware, requireAuth, naturalPersonPolicy, govcyServiceEligibilityHandler(), govcySuccessPageHandler(true), govcyPDFRender());
-  
+  app.get('/:siteId/success/pdf', serviceConfigDataMiddleware, requireAuth, naturalPersonPolicy, govcyServiceEligibilityHandler(), govcySuccessPageHandler(true), govcyPDFRender());
+
   // ✅ -- ROUTE: Add Success Page Route (BEFORE the dynamic route)
-  app.get('/:siteId/success',serviceConfigDataMiddleware, requireAuth, naturalPersonPolicy, govcyServiceEligibilityHandler(), govcySuccessPageHandler(), renderGovcyPage());
-  
+  app.get('/:siteId/success', serviceConfigDataMiddleware, requireAuth, naturalPersonPolicy, govcyServiceEligibilityHandler(), govcySuccessPageHandler(), renderGovcyPage());
+
+
   // 👀🗃️ -- ROUTE: View file (BEFORE the dynamic route)
   app.get('/:siteId/:pageUrl/view-file/:elementName', serviceConfigDataMiddleware, requireAuth, naturalPersonPolicy, govcyServiceEligibilityHandler(), govcyLoadSubmissionData(), govcyFileViewHandler());
 
   // ❌🗃️ -- ROUTE: Delete file (BEFORE the dynamic route)
   app.get('/:siteId/:pageUrl/delete-file/:elementName', serviceConfigDataMiddleware, requireAuth, naturalPersonPolicy, govcyServiceEligibilityHandler(), govcyLoadSubmissionData(), govcyFileDeletePageHandler(), renderGovcyPage());
-  
+
+  // ➕ -- ROUTE: Add item page (BEFORE the generic dynamic route)
+  app.get('/:siteId/:pageUrl/multiple/add',
+    serviceConfigDataMiddleware,
+    requireAuth,
+    naturalPersonPolicy,
+    govcyServiceEligibilityHandler(true),
+    govcyLoadSubmissionData(),
+    govcyMultipleThingsAddHandler(),
+    renderGovcyPage()
+  );
+
+
+  // ➕ -- ROUTE: Add item POST (BEFORE the generic POST)
+  app.post('/:siteId/:pageUrl/multiple/add',
+    serviceConfigDataMiddleware,
+    requireAuth,
+    naturalPersonPolicy,
+    govcyServiceEligibilityHandler(true),
+    govcyMultipleThingsAddPostHandler()
+  );
+
+  // ✏️ -- ROUTE: Edit item page (BEFORE the generic dynamic route)
+  app.get('/:siteId/:pageUrl/multiple/edit/:index',
+    serviceConfigDataMiddleware,
+    requireAuth,
+    naturalPersonPolicy,
+    govcyServiceEligibilityHandler(true),
+    govcyLoadSubmissionData(),
+    govcyMultipleThingsEditHandler(),
+    renderGovcyPage()
+  );
+
+  // 🗃️ -- ROUTE: Handle POST requests for multipleThings EDIT item
+  app.post('/:siteId/:pageUrl/multiple/edit/:index',
+    serviceConfigDataMiddleware,
+    requireAuth,
+    naturalPersonPolicy,
+    govcyServiceEligibilityHandler(true),
+    govcyMultipleThingsEditPostHandler()
+  );
+
+  // ❌🗃️ -- ROUTE: Delete multipleThings item (BEFORE the dynamic route)
+  app.get('/:siteId/:pageUrl/multiple/delete/:index',
+    serviceConfigDataMiddleware,
+    requireAuth,
+    naturalPersonPolicy,
+    govcyServiceEligibilityHandler(),
+    govcyLoadSubmissionData(),
+    govcyMultipleThingsDeletePageHandler(),
+    renderGovcyPage()
+  );
+
+  // ❌🗃️📥 -- ROUTE: Handle POST requests for delete multipleThings item
+  app.post('/:siteId/:pageUrl/multiple/delete/:index',
+    serviceConfigDataMiddleware,
+    requireAuth,
+    naturalPersonPolicy,
+    govcyServiceEligibilityHandler(true),
+    govcyMultipleThingsDeletePostHandler()
+  );
+
+
   // 📝 -- 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/delete-file/:elementName', serviceConfigDataMiddleware, requireAuth, naturalPersonPolicy, govcyServiceEligibilityHandler(true), govcyFileDeletePostHandler());
-  
+
   // 📥 -- ROUTE: Handle POST requests for review page. The `submit` action
   app.post('/:siteId/review', serviceConfigDataMiddleware, requireAuth, naturalPersonPolicy, govcyServiceEligibilityHandler(), govcyReviewPostHandler());
-  
+
   // 👀📥 -- ROUTE: Handle POST requests (Form Submissions) based on siteId and pageUrl, using govcyFormsPostHandler middleware
   app.post('/:siteId/:pageUrl', serviceConfigDataMiddleware, requireAuth, naturalPersonPolicy, govcyServiceEligibilityHandler(true), govcyFormsPostHandler());
-  
+
   // post for /:siteId/review
-  
+
   // 🔹 Catch 404 errors (must be after all routes)
   app.use((req, res, next) => {
     next({ status: 404, message: "Page not found" });
   });
-  
+
   // 🔹 Centralized error handling (must be the LAST middleware)
   app.use(govcyHttpErrorHandler);
-  
+
   let server = null;
 
   return {
@@ -199,7 +340,7 @@ export default function initializeGovCyExpressService(){
           logger.info(`⚡ Server running at http://localhost:${PORT} (${ENV})`);
         });
       }
-    }, 
+    },
     stopServer: () => {
       if (server) {
         server.close(() => {

package/src/middleware/govcyConfigSiteData.mjs

@@ -30,6 +30,10 @@ export async function serviceConfigDataMiddleware(req, res, next) {
             });
         }
 
+        //replace the globalLang with the site.lang
+        req.globalLang = req.serviceData.site.lang;
+    
+
         next();
     } catch (error) {
         return next(error)

package/src/middleware/govcyFileDeleteHandler.mjs

@@ -47,14 +47,16 @@ export function govcyFileDeletePageHandler() {
                 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 || !elementData?.sha256 || !elementData?.fileId) {
+            // --- Resolve file element data (normal + multipleThings add/edit) ---
+            const { index } = req.params;
+            const elementData = dataLayer.getFormDataValue(req.session, siteId, pageUrl, elementName, index);
+        
+            // Guard if still nothing found
+            if (!elementData || !elementData.fileId || !elementData.sha256) {
                 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));
 
@@ -92,7 +94,7 @@ export function govcyFileDeletePageHandler() {
             const showSameFileWarning = dataLayer.isFileUsedInSiteInputDataAgain(
                 req.session,
                 siteId,
-                elementData 
+                elementData
             );
 
             // Construct page title
@@ -119,12 +121,23 @@ export function govcyFileDeletePageHandler() {
                 }
             };
             //-------------
-
+            // Build proper action based on context (normal / multiple add / multiple edit)
+            let actionPath;
+            if (typeof req.params.index !== "undefined") {
+                // multiple edit
+                actionPath = `${pageUrl}/multiple/edit/${req.params.index}/delete-file/${elementName}`;
+            } else if (req.originalUrl.includes("/multiple/add")) {
+                // multiple add
+                actionPath = `${pageUrl}/multiple/add/delete-file/${elementName}`;
+            } else {
+                // normal page
+                actionPath = `${pageUrl}/delete-file/${elementName}`;
+            }
             // Construct submit button
             const formElement = {
                 element: "form",
                 params: {
-                    action: govcyResources.constructPageUrl(siteId, `${pageUrl}/delete-file/${elementName}`, (req.query.route === "review" ? "review" : "")),
+                    action: govcyResources.constructPageUrl(siteId, actionPath, (req.query.route === "review" ? "review" : "")),
                     method: "POST",
                     elements: [
                         pageRadios,
@@ -159,11 +172,6 @@ export function govcyFileDeletePageHandler() {
             // 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;
@@ -215,16 +223,30 @@ export function govcyFileDeletePostHandler() {
                 return handleMiddlewareError(`File input [${elementName}] not allowed on this page`, 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 || !elementData?.sha256 || !elementData?.fileId) {
+            // --- Resolve file element data (normal + multipleThings add/edit) ---
+            const { index } = req.params;
+            const elementData = dataLayer.getFormDataValue(req.session, siteId, pageUrl, elementName, index);
+        
+            // Guard if still nothing found
+            if (!elementData || !elementData.fileId || !elementData.sha256) {
                 return handleMiddlewareError(`File input [${elementName}] data not found on this page`, 404, next);
             }
 
+            // Build proper action based on context (normal / multiple add / multiple edit)
+            let actionPath;
+            if (typeof req.params.index !== "undefined") {
+                // multiple edit
+                actionPath = `${pageUrl}/multiple/edit/${req.params.index}`;
+            } else if (req.originalUrl.includes("/multiple/add")) {
+                // multiple add
+                actionPath = `${pageUrl}/multiple/add`;
+            } else {
+                // normal page
+                actionPath = `${pageUrl}`;
+            }
+
             // the page base return url
-            const pageBaseReturnUrl = `http://localhost:3000/${siteId}/${pageUrl}`;
+            const pageBaseReturnUrl = `http://localhost:3000/${siteId}/${actionPath}`;
 
             //check if input `deleteFile` has a value
             if (!req?.body?.deleteFile ||

package/src/middleware/govcyFileUpload.mjs

@@ -17,13 +17,26 @@ export const govcyFileUpload = [
     upload.single('file'), // multer parses the uploaded file and stores it in req.file
 
     async function govcyUploadHandler(req, res) {
+        let mode = "single";
+        let index = null;
+
+        // Detect MultipleThings modes based on URL
+        if (req.originalUrl.includes("/multiple/add")) {
+            mode = "multipleThingsDraft";
+        } else if (req.originalUrl.includes("/multiple/edit/")) {
+            mode = "multipleThingsEdit";
+            index = parseInt(req.params.index, 10);
+        }
+
         const result = await handleFileUpload({
             service: req.serviceData,
             store: req.session,
             siteId: req.params.siteId,
             pageUrl: req.params.pageUrl,
             elementName: req.body?.elementName,
-            file: req.file
+            file: req.file,
+            mode,
+            index
         });
 
         if (result.status !== 200) {

package/src/middleware/govcyFileViewHandler.mjs

@@ -13,6 +13,17 @@ export function govcyFileViewHandler() {
         try {
             const { siteId, pageUrl, elementName } = req.params;
 
+            // Detect MultipleThings modes based on URL
+            let mode = "single";
+            let index = null;
+
+            if (req.originalUrl.includes("/multiple/add")) {
+                mode = "multipleThingsDraft";
+            } else if (req.originalUrl.includes("/multiple/edit/")) {
+                mode = "multipleThingsEdit";
+                index = parseInt(req.params.index, 10);
+            }
+
             // Create a deep copy of the service to avoid modifying the original
             let serviceCopy = req.serviceData;
 
@@ -64,7 +75,15 @@ export function govcyFileViewHandler() {
             }
 
             //get element data 
-            const elementData = dataLayer.getFormDataValue(req.session, siteId, pageUrl, elementName)
+            let elementData;
+            if (mode === "single") {
+                elementData = dataLayer.getFormDataValue(req.session, siteId, pageUrl, elementName);
+            } else if (mode === "multipleThingsDraft") {
+                elementData = dataLayer.getMultipleDraft(req.session, siteId, pageUrl)?.[elementName];
+            } else if (mode === "multipleThingsEdit") {
+                const items = dataLayer.getPageData(req.session, siteId, pageUrl) || [];
+                elementData = items[index]?.[elementName];
+            }
 
             // If the element data is not found, return an error response
             if (!elementData || !elementData?.sha256 || !elementData?.fileId) {