@gov-cy/govcy-express-services 1.6.13 → 1.7.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gov-cy/govcy-express-services",
-  "version": "1.6.13",
+  "version": "1.7.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",
@@ -78,7 +78,7 @@
     "mochawesome": "^7.1.4",
     "nodemon": "^3.0.2",
     "pa11y": "^8.0.0",
-    "sinon": "^20.0.0"
+    "sinon": "^21.0.1"
   },
   "engines": {
     "node": ">=18.0.0"

package/src/middleware/govcyUpdateMyDetails.mjs

@@ -16,7 +16,7 @@ import * as dataLayer from "../utils/govcyDataLayer.mjs";
 import { logger } from '../utils/govcyLogger.mjs';
 import { handleMiddlewareError, dateStringISOtoDMY } from "../utils/govcyUtils.mjs";
 import { govcyApiRequest } from "../utils/govcyApiRequest.mjs";
-import { isUnder18, isValidCypriotCitizen, validateFormElements } from "../utils/govcyValidator.mjs";
+import { isAgeUnder, isValidCypriotCitizen, validateFormElements } from "../utils/govcyValidator.mjs";
 import { populateFormData, getFormData } from "../utils/govcyFormHandling.mjs";
 import { evaluatePageConditions } from "../utils/govcyExpressions.mjs";
 import { tempSaveIfConfigured } from "../utils/govcyTempSave.mjs";
@@ -107,8 +107,8 @@ export async function govcyUpdateMyDetailsHandler(req, res, next, page, serviceC
                 return handleMiddlewareError(`updateMyDetailsAPIEndpoint - Missing response data`, 500, next);
             }
 
-            // calculate if person in under 18 based on date of birth
-            if (isUnder18(response.Data.dob)) {
+            // calculate if person in under 16 based on date of birth
+            if (isAgeUnder(response.Data.dob, 16)) {
                 // --------------- Not eligible for Update my details ---------------
                 // --------------- Page variant 1
                 pageVariant = 1;
@@ -368,8 +368,8 @@ export function govcyUpdateMyDetailsPostHandler() {
                     return handleMiddlewareError(`updateMyDetailsAPIEndpoint - Missing response data`, 500, next);
                 }
 
-                // calculate if person in under 18 based on date of birth
-                if (isUnder18(response.Data.dob)) {
+                // calculate if person in under 16 based on date of birth
+                if (isAgeUnder(response.Data.dob, 16)) {
                     // --------------- Not eligible for Update my details ---------------
                     // --------------- Page variant 1:Manual form for non-eligible users
                     pageVariant = 1;

package/src/public/js/govcyForms.js

@@ -1,20 +1,42 @@
 document.addEventListener("DOMContentLoaded", function () {
-    // --- Show conditionals for checked radios ---
-    // 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);
+    function updateConditionalRadios() {
+        // 1. Close ALL conditional blocks
+        Array.prototype.forEach.call(
+            document.querySelectorAll('.govcy-radio__conditional'),
+            function (el) {
+                el.classList.add('govcy-radio__conditional--hidden');
+            }
+        );
+
+        // 2. Re-open conditionals for CHECKED radios
+        // --- Show conditionals for checked radios ---
+        // 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');
+                }
             }
+        );
+    }
+
+    // Attach to *all* radios to repair DS behaviour
+    Array.prototype.forEach.call(
+        document.querySelectorAll('.govcy-radio-input'),
+        function (radio) {
+            radio.addEventListener('change', updateConditionalRadios);
         }
     );
 
+    // Apply once on page load
+    updateConditionalRadios();
+
     // --- Disable submit button after form submission ---
     // CHANGED: NodeList.forEach → Array.prototype.forEach.call
     Array.prototype.forEach.call(document.querySelectorAll('form'), function (form) { // CHANGED

package/src/utils/govcyValidator.mjs

@@ -460,6 +460,18 @@ export function isValidForeignResident(user = {}) {
  * @throws {Error} If the date of birth is missing or invalid.
  * */
 export function isUnder18(dobString) {
+  return isAgeUnder(dobString, 18);
+}
+
+
+/**
+ * Checks if the user is under a specified minimum age based on their date of birth.
+ * @param {string} dobString - The date of birth in the format "YYYY-MM-DD".
+ * @param {number} minimumAge - The minimum age to check against (default is 16).
+ * @returns {boolean} True if the user is under the specified minimum age, otherwise false.
+ * @throws {Error} If the date of birth is missing or invalid.
+ * */
+export function isAgeUnder(dobString, minimumAge = 16) {
   if (!dobString) throw new Error("DOB is missing");
   const dob = new Date(dobString);
   if (isNaN(dob)) throw new Error("Invalid DOB format");
@@ -470,7 +482,7 @@ export function isUnder18(dobString) {
     today.getMonth() > dob.getMonth() ||
     (today.getMonth() === dob.getMonth() && today.getDate() >= dob.getDate());
 
-  return (hasHadBirthday ? ageDiff : ageDiff - 1) < 18;
+  return (hasHadBirthday ? ageDiff : ageDiff - 1) < minimumAge;
 }