hof 22.2.0-time-mixin-beta → 22.2.2

package/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 2025-03-07, Version 22.2.0 (Stable), @Rhodine-orleans-lindsay
+### Changed
+- Amends cookie config to allow limited changes to sameSite property during safe cross-origin navigations.
+### Security
+- Updates patch and minor dependencies
+  
 ## 2025-01-24, Version 22.1.0 (Stable), @sulthan-ahmed
 * ⛓️‍💥 **BREAKING CHANGE** : removed `nodemailer-smtp-transport` replaced with `nodemailer`. 
   - The nodemailer-smtp-transport package has been removed due to a critical vulnerability, and its functionality has been consolidated under nodemailer.

package/components/index.js

@@ -5,7 +5,6 @@ module.exports = {
   clearSession: require('./clear-session'),
   combineAndLoopFields: require('./combine-and-loop-fields'),
   date: require('./date'),
-  time: require('./time'),
   emailer: require('./emailer'),
   homeOfficeCountries: require('./homeoffice-countries'),
   notify: require('./notify'),

package/controller/controller.js

@@ -192,11 +192,6 @@ module.exports = class Controller extends BaseController {
             }
           // eslint-disable-next-line brace-style
           }
-          // get first field for time input control
-          else if (field && field.mixin === 'input-time') {
-            req.form.errors[key].errorLinkId = key + '-hour';
-          // eslint-disable-next-line brace-style
-          }
           // get first field for date input control
           else if (field && field.mixin === 'input-date') {
             req.form.errors[key].errorLinkId = key + '-day';

package/controller/validation/validators.js

@@ -9,7 +9,6 @@ const emailValidator = require('./email');
 // validator methods should return false (or falsy value) for *invalid* input
 // and true (or truthy value) for *valid* input.
 const dateFormat = 'YYYY-MM-DD';
-const timeFormat = 'kk:mm';
 let Validators;
 
 module.exports = Validators = {
@@ -129,18 +128,6 @@ module.exports = Validators = {
     return Validators.regex(value, /^\d{2}$/) && parseInt(value, 10) > 0 && parseInt(value, 10) < 32;
   },
 
-  time(value) {
-    return value === '' || Validators.regex(value, /\d{2}\:\d{2}/) && moment(value, timeFormat).isValid();
-  },
-
-  'time-hour'(value) {
-    return Validators.regex(value, /^\d{2}$/) && parseInt(value, 10) >= 0 && parseInt(value, 10) < 24;
-  },
-
-  'time-minute'(value) {
-    return Validators.regex(value, /^\d{2}$/) && parseInt(value, 10) >= 0 && parseInt(value, 10) < 59;
-  },
-
   // eslint-disable-next-line no-inline-comments, spaced-comment
   before(value, date) {
     // validator can also do before(value, [diff, unit][, diff, unit])

package/frontend/template-mixins/mixins/template-mixins.js

@@ -13,7 +13,6 @@ const PANELMIXIN = 'partials/mixins/panel';
 const PARTIALS = [
   'partials/forms/input-text-group',
   'partials/forms/input-text-date',
-  'partials/forms/input-text-time',
   'partials/forms/input-submit',
   'partials/forms/select',
   'partials/forms/checkbox',
@@ -214,7 +213,6 @@ module.exports = function (options) {
         label: t(lKey),
         labelClassName: labelClassName ? `govuk-label ${labelClassName}` : 'govuk-label',
         formGroupClassName: classNames(field, 'formGroupClassName') || extension.formGroupClassName || 'govuk-form-group',
-        timeInputItemClassName: 'time-input__item',
         hint: hint,
         hintId: extension.hintId || (hint ? key + '-hint' : null),
         error: this.errors && this.errors[key],
@@ -223,12 +221,11 @@ module.exports = function (options) {
         required: required,
         pattern: extension.pattern,
         date: extension.date,
-        time: extension.time,
         autocomplete: autocomplete,
         child: field.child,
         isPageHeading: field.isPageHeading,
         attributes: field.attributes,
-        isPrefixOrSuffix: _.map(field.attributes, item => { if (item.prefix || item.suffix !== undefined) return true; }),
+        isPrefixOrSuffix: _.map(field.attributes, item => {if (item.prefix || item.suffix !== undefined) return true;}),
         isMaxlengthOrMaxword: maxlength(field) || extension.maxlength || maxword(field) || extension.maxword,
         renderChild: renderChild.bind(this)
       });
@@ -471,47 +468,6 @@ module.exports = function (options) {
             return parts.concat(monthPart, yearPart).join('\n');
           };
         }
-      },
-      'input-time': {
-        handler: function () {
-          /**
-          * props: '[value] [id]'
-          */
-          return function (key) {
-            const field = Object.assign({}, this.options.fields[key] || options.fields[key]);
-            key = hoganRender(key, this);
-            // Exact unless there is a inexact property against the fields key.
-            const isExact = field.inexact !== true;
-
-            let autocomplete = field.autocomplete || {};
-            if (autocomplete === 'off') {
-              autocomplete = {
-                hour: 'off',
-                minute: 'off'
-              };
-            } else if (typeof autocomplete === 'string') {
-              autocomplete = {
-                hour: autocomplete + '-hour',
-                minute: autocomplete + '-minute'
-              };
-            }
-            const isThisRequired = field.validate ? field.validate.indexOf('required') > -1 : false;
-            const formGroupClassName = (field.formGroup && field.formGroup.className) ? field.formGroup.className : '';
-            const classNameHour = (field.controlsClass && field.controlsClass.hour) ? field.controlsClass.hour : 'govuk-input--width-2';
-            const classNameMinute = (field.controlsClass && field.controlsClass.minute) ? field.controlsClass.minute : 'govuk-input--width-2';
-
-            const parts = [];
-
-            if (isExact) {
-              const hourPart = compiled['partials/forms/input-text-time'].render(inputText.call(this, key + '-hour', { pattern: '[0-9]*', min: 1, max: 24, maxlength: 2, hintId: key + '-hint', time: true, autocomplete: autocomplete.hour, formGroupClassName, className: classNameHour, isThisRequired }));
-              parts.push(hourPart);
-            }
-
-            const minutePart = compiled['partials/forms/input-text-time'].render(inputText.call(this, key + '-minute', { pattern: '[0-9]*', min: 0, max: 59, maxlength: 2, hintId: key + '-hint', time: true, autocomplete: autocomplete.minute, formGroupClassName, className: classNameMinute, isThisRequired }));
-
-            return parts.concat(minutePart).join('\n');
-          };
-        }
       }
     };
 

package/frontend/themes/gov-uk/styles/govuk.scss

@@ -27,7 +27,6 @@ $path: "/public/images/" !default;
 @import "check_your_answers";
 @import "pdf";
 @import "session-timeout-dialog";
-@import "time-input";
 
 // Modules
 @import "modules/validation";

package/frontend/toolkit/assets/javascript/form-focus.js

@@ -85,10 +85,6 @@ function formFocus() {
     document.getElementById(getElementFromSummaryLink + '-day').focus();
   }
 
-  if (document.getElementById(getElementFromSummaryLink + '-hour') && forms.length === 1 && editMode) {
-    document.getElementById(getElementFromSummaryLink + '-hour').focus();
-  }
-
   if (forms.length > 0) {
     labels = document.getElementsByTagName('label');
     if (labels) {

package/lib/sessions.js

@@ -68,7 +68,7 @@ module.exports = (app, config) => {
     name: config.session.name,
     cookie: {
       secure: secureHttps(config),
-      sameSite: 'strict',
+      sameSite: config.cookie?.sameSite === 'lax' ? config.cookie?.sameSite : 'strict',
       httpOnly: true
     },
     secret: config.session.secret,

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "hof",
   "description": "A bootstrap for HOF projects",
-  "version": "22.2.0-time-mixin-beta",
+  "version": "22.2.2",
   "license": "MIT",
   "main": "index.js",
   "author": "HomeOffice",
@@ -36,7 +36,7 @@
   },
   "dependencies": {
     "aliasify": "^2.1.0",
-    "axios": "^1.5.1",
+    "axios": "^1.8.2",
     "bluebird": "^3.7.2",
     "body-parser": "^1.15.1",
     "browserify": "^17.0.0",
@@ -68,6 +68,7 @@
     "i18n-future": "^2.0.0",
     "i18n-lookup": "^0.1.0",
     "is-pdf": "^1.0.0",
+    "jquery": "^3.6.0",
     "libphonenumber-js": "^1.9.44",
     "lodash": "^4.17.21",
     "markdown-it": "^12.3.2",

package/sandbox/apps/sandbox/fields.js

@@ -3,7 +3,6 @@
 
 const dateComponent = require('../../../').components.date;
 const staticAppealStages = require('./lib/staticAppealStages');
-const timeComponent = require('../../../').components.time;
 
 module.exports = {
   'landing-page-radio': {
@@ -27,14 +26,6 @@ module.exports = {
       { type: 'after', arguments: ['1900'] }
     ]
   }),
-  time: timeComponent('time', {
-    mixin: 'input-time',
-    isPageHeading: 'true',
-    validate: [
-      'required',
-      'time'
-    ]
-  }),
   building: {
     validate: ['required', 'notUrl', { type: 'maxlength', arguments: 100 }]
   },

package/sandbox/apps/sandbox/index.js

@@ -31,10 +31,6 @@ module.exports = {
     '/dob': {
       fields: ['dateOfBirth'],
       locals: { showSaveAndExit: true },
-      next: '/time'
-    },
-    '/time': {
-      fields: ['time'],
       next: '/address'
     },
     '/address': {

package/sandbox/apps/sandbox/sections/summary-data-sections.js

@@ -1,6 +1,5 @@
 const moment = require('moment');
 const PRETTY_DATE_FORMAT = 'Do MMMM YYYY';
-const PRETTY_TIME_FORMAT = 'k:mma';
 const APPEAL_STAGES = require('../lib/staticAppealStages').getstaticAppealStages();
 const _ = require('lodash');
 
@@ -12,12 +11,6 @@ module.exports = {
       parse: d => d && moment(d).format(PRETTY_DATE_FORMAT)
     }
   ],
-  time: [
-    {
-      field: 'time',
-      parse: t => t && moment(t, 'kk:mm').format(PRETTY_TIME_FORMAT)
-    }
-  ],
   address: [
     'building',
     'street',

package/sandbox/apps/sandbox/translations/src/en/fields.json

@@ -21,10 +21,6 @@
     "legend": "What is your date of birth?",
     "hint": "For example, 31 10 1990"
   },
-  "time": {
-    "legend": "What is the current time?",
-    "hint": "For example, 12 40 "
-  },
   "building": {
     "label": "Building and street"
   },

package/sandbox/apps/sandbox/translations/src/en/pages.json

@@ -25,9 +25,6 @@
       "applicantsDetails": {
         "header": "Applicant's details"
       },
-      "time": {
-        "header": "Time"
-      },
       "address": {
         "header": "Address"
       },

package/sandbox/apps/sandbox/translations/src/en/validation.json

@@ -10,9 +10,6 @@
     "after": "Enter a date after 1 1 1900",
     "before": "Enter a date that is in the past"
   },
-  "time": {
-    "default": "Enter a time in the correct format; for example, 12 40"
-  },
   "building": {
     "default": "Enter details of your building and street"
   },

package/utilities/autofill/inputs.js

@@ -34,12 +34,7 @@ module.exports = i => {
     if (name.indexOf('year') > -1) {
       return Data.number(1950, 1990).toString();
     }
-    if (name.indexOf('hour') > -1) {
-      return Data.number(1, 24).toString();
-    }
-    if (name.indexOf('minute') > -1) {
-      return Data.number(0, 59).toString();
-    }
+
     if (name.indexOf('email') > -1) {
       return Data.email;
     }