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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gov-cy/govcy-express-services",
-  "version": "1.3.0-alpha.1",
+  "version": "1.3.0-alpha.3",
   "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",
@@ -51,7 +51,7 @@
     "coverage:badge": "coverage-badges --output ./coverage-badges.svg && npm run coverage:copy"
   },
   "dependencies": {
-    "@gov-cy/dsf-email-templates": "^2.1.0",
+    "@gov-cy/dsf-email-templates": "^2.1.1",
     "@gov-cy/govcy-frontend-renderer": "^1.26.0",
     "axios": "^1.9.0",
     "cookie-parser": "^1.4.7",

package/src/index.mjs

@@ -29,6 +29,7 @@ import { govcyFileDeletePageHandler, govcyFileDeletePostHandler } from './middle
 import { govcyFileViewHandler } from './middleware/govcyFileViewHandler.mjs';
 import { govcyMultipleThingsAddHandler, govcyMultipleThingsEditHandler, govcyMultipleThingsAddPostHandler, govcyMultipleThingsEditPostHandler } from './middleware/govcyMultipleThingsItemPage.mjs';
 import { govcyMultipleThingsDeletePageHandler, govcyMultipleThingsDeletePostHandler } from './middleware/govcyMultipleThingsDeleteHandler.mjs';
+import { govcyUpdateMyDetailsPostHandler } from './middleware/govcyUpdateMyDetails.mjs';
 import { isProdOrStaging, getEnvVariable, whatsIsMyEnvironment } from './utils/govcyEnvVariables.mjs';
 import { logger } from "./utils/govcyLogger.mjs";
 
@@ -230,7 +231,6 @@ export default function initializeGovCyExpressService() {
   // ✅ -- ROUTE: Add Success Page Route (BEFORE the dynamic route)
   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());
 
@@ -298,6 +298,16 @@ export default function initializeGovCyExpressService() {
     govcyMultipleThingsDeletePostHandler()
   );
 
+  // ----- `updateMyDetails` handling
+  
+  // 🔀➡️ -- ROUTE coming from incoming update my details /:siteId/:pageUrl/update-my-details-response
+  app.post('/:siteId/:pageUrl/update-my-details-response', 
+    serviceConfigDataMiddleware, 
+    requireAuth, 
+    naturalPersonPolicy, 
+    govcyServiceEligibilityHandler(true), 
+    govcyUpdateMyDetailsPostHandler());
+  // ----- `updateMyDetails` handling
 
   // 📝 -- 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());

package/src/middleware/govcyFileDeleteHandler.mjs

@@ -132,6 +132,10 @@ export function govcyFileDeletePageHandler() {
             } else {
                 // normal page
                 actionPath = `${pageUrl}/delete-file/${elementName}`;
+                // if normal page but has multipleThings, block it
+                if (page?.multipleThings) {
+                    return handleMiddlewareError(`Single mode delete file not allowed on multipleThings pages`, 404, next)
+                }
             }
             // Construct submit button
             const formElement = {
@@ -243,6 +247,10 @@ export function govcyFileDeletePostHandler() {
             } else {
                 // normal page
                 actionPath = `${pageUrl}`;
+                // if normal page but has multipleThings, block it
+                if (page?.multipleThings) {
+                    return handleMiddlewareError(`Single mode delete file not allowed on multipleThings pages`, 404, next)
+                }
             }
 
             // the page base return url

package/src/middleware/govcyFileViewHandler.mjs

@@ -62,6 +62,11 @@ export function govcyFileViewHandler() {
             //     return handleMiddlewareError(`Page condition evaluated to true on POST — skipping form save and redirecting`, 404, next);
             // }
 
+
+            // If mode is `single` make sure it has no multipleThings
+            if (mode === "single" && page?.multipleThings) {
+                return handleMiddlewareError(`Single mode file view not allowed on multipleThings pages`, 404, next)
+            }
             // Validate the field: Only allow delete if the page contains a fileInput with the given name
             const fileInputElement = pageContainsFileInput(pageTemplateCopy, elementName);
             if (!fileInputElement) {

package/src/middleware/govcyMultipleThingsDeleteHandler.mjs

@@ -81,8 +81,8 @@ export function govcyMultipleThingsDeletePageHandler() {
                     isPageHeading: true,
                     classes: "govcy-mb-6",
                     items: [
-                        { value: "yes", text: govcyResources.staticResources.text.deleteYesOption },
-                        { value: "no", text: govcyResources.staticResources.text.deleteNoOption }
+                        { value: "yes", text: govcyResources.staticResources.text.multipleThingsDeleteYesOption },
+                        { value: "no", text: govcyResources.staticResources.text.multipleThingsDeleteNoOption }
                     ]
                 }
             };

package/src/middleware/govcyMultipleThingsHubHandler.mjs

@@ -48,7 +48,6 @@ export function govcyMultipleThingsHubHandler(req, res, next, page, serviceCopy)
                 {
                     name: "main",
                     elements: [
-                        // TODO: Add form element here
                         {
                             element: "form",
                             params: {

package/src/middleware/govcyPageHandler.mjs

@@ -5,6 +5,7 @@ import * as dataLayer from "../utils/govcyDataLayer.mjs";
 import { logger } from "../utils/govcyLogger.mjs";
 import { evaluatePageConditions } from "../utils/govcyExpressions.mjs";
 import { govcyMultipleThingsHubHandler } from "./govcyMultipleThingsHubHandler.mjs";
+import { govcyUpdateMyDetailsHandler } from "./govcyUpdateMyDetails.mjs";
 // import {flattenContext, evaluateExpressionWithFlattening, evaluatePageConditions } from "../utils/govcyExpressions.mjs";
 
 /**
@@ -12,7 +13,7 @@ import { govcyMultipleThingsHubHandler } from "./govcyMultipleThingsHubHandler.m
  * This middleware processes the page template, populates form data, and shows validation errors.
  */
 export function govcyPageHandler() {
-  return (req, res, next) => {
+  return async (req, res, next) => {
     try {
       // Extract siteId and pageUrl from request
       let { siteId, pageUrl } = req.params; 
@@ -30,9 +31,6 @@ export function govcyPageHandler() {
       // 🔍 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 result = evaluatePageConditions(page, req.session, req.params.siteId, req);
@@ -40,11 +38,20 @@ export function govcyPageHandler() {
         return res.redirect(`/${req.params.siteId}/${result.redirect}`);
       }
 
+      // ----- `updateMyDetails` handling
+      if (page.updateMyDetails) {
+        return await govcyUpdateMyDetailsHandler(req, res, next, page, serviceCopy);
+      }
+      // ----- `updateMyDetails` handling
+
       // ----- MultipleThings hub handling
       if (page.multipleThings) {
         logger.debug(`Rendering multipleThings hub for pageUrl: ${pageUrl}`, req);
         return govcyMultipleThingsHubHandler(req, res, next, page, serviceCopy);
       }
+
+      // Deep copy pageTemplate to avoid modifying the original
+      const pageTemplateCopy = JSON.parse(JSON.stringify(page.pageTemplate));
       
       //⚙️ Process forms before rendering
       pageTemplateCopy.sections.forEach(section => {

package/src/middleware/govcyReviewPostHandler.mjs

@@ -8,6 +8,7 @@ import { getEnvVariable, getEnvVariableBool } from "../utils/govcyEnvVariables.m
 import { handleMiddlewareError } from "../utils/govcyUtils.mjs";
 import { sendEmail } from "../utils/govcyNotification.mjs"
 import { evaluatePageConditions } from "../utils/govcyExpressions.mjs";
+import { createUmdManualPageTemplate } from "./govcyUpdateMyDetails.mjs"
 import { validateMultipleThings } from "../utils/govcyMultipleThingsValidation.mjs";
 
 /**
@@ -38,9 +39,29 @@ export function govcyReviewPostHandler() {
 
                 // Find the form definition inside `pageTemplate.sections`
                 let formElement = null;
-                for (const section of page.pageTemplate.sections) {
-                    formElement = section.elements.find(el => el.element === "form");
-                    if (formElement) break;
+
+                // ----- `updateMyDetails` handling
+                if (page.updateMyDetails) {
+                    logger.debug("Validating UpdateMyDetails page during review POST", { siteId, pageUrl });
+                    // Build the manual UMD page template
+                    const umdTemplate  = createUmdManualPageTemplate(siteId, service.site.lang, page, req);
+                    
+                    // Extract the form element
+                    formElement = umdTemplate .sections
+                        .flatMap(section => section.elements)
+                        .find(el => el.element === "form");
+                    
+                    if (!formElement) {
+                        logger.error("🚨 UMD form element not found during review validation", { siteId, pageUrl });
+                        return handleMiddlewareError("🚨 UMD form element not found during review validation", 500, next);
+                    }
+                    // ----- `updateMyDetails` handling
+                } else {
+                    // Normal flow 
+                    for (const section of page.pageTemplate.sections) {
+                        formElement = section.elements.find(el => el.element === "form");
+                        if (formElement) break;
+                    }
                 }
 
                 if (!formElement) continue; // Skip pages without forms