hof 19.13.4-betav7 → 19.13.6

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

@@ -66,9 +66,16 @@ function setupLabels(labels) {
 
 function formFocus() {
   var forms = document.getElementsByTagName('form');
+  var getElementFromSummaryLink = window.location.hash.replace(/^#/, '');
+  var getEditPath = window.location.pathname.split('/').pop();
   var labels;
   var summaries;
 
+  if (getElementFromSummaryLink && getEditPath === 'edit') {
+    document.getElementById(getElementFromSummaryLink).focus();
+    document.getElementById(getElementFromSummaryLink + '-group').scrollIntoView();
+  }
+
   if (forms.length > 0) {
     labels = document.getElementsByTagName('label');
     if (labels) {

package/frontend/toolkit/assets/javascript/validation.js

@@ -11,7 +11,7 @@ function clicked(e) {
   var elem = helpers.target(e);
 
   var groupId = elem.getAttribute('href').replace(/^#/, '');
-  var group = document.getElementById(groupId);
+  var group = document.getElementById(groupId + '-group') || document.getElementById(groupId);
   var inputs;
 
   if (group) {

package/model/index.js

@@ -2,6 +2,7 @@
 'use strict';
 
 const _ = require('lodash');
+const request = require('request');
 const url = require('url');
 const EventEmitter = require('events').EventEmitter;
 
@@ -16,59 +17,6 @@ function timeDiff(from, to, d) {
   return +ms.toFixed(digits);
 }
 
-/*
-async function fetchRequest(settings, callback) {
-  //Fetch doesn't like undefined headers
-  settings.headers = settings.headers || [];
-  var response = await fetch(settings.uri, settings);
-  var responseText = await response.text();
-  var responseObj = { status: response.status, statusCode: response.status, statusText: response.statusText, body: responseText };
-  if(response.ok) {
-    callback(null,responseObj);
-  } else {
-    callback({ status: response.status, code: response.status, message: response.statusText },responseObj);  
-  }
-}
-*/
-
-/*
-function fetchRequest(settings, callback) {
-  //Fetch doesn't like undefined headers
-  settings.headers = settings.headers || [];
-  settings.uri = settings.uri || settings.url || url.format(settings);
-  fetch(settings.uri, settings).then(async function(response) {
-    var responseText = await response.text();
-    var responseObj = { status: response.status, statusCode: response.status, statusText: response.statusText, body: responseText };
-    if(response.ok) {
-      callback(null,responseObj);
-    } else {
-      callback({ status: response.status, code: response.status, message: response.statusText },responseObj);  
-      //callback({ status: response.status, code: response.status, message: response.statusText },responseObj);  
-    }
-    //return { status: response.status, statusCode: response.status, statusText: response.statusText, body: responseText };
-  })
-*/
-
-function fetchRequest(settings, callback) {
-  //Fetch doesn't like undefined headers
-  settings.headers = settings.headers || [];
-  settings.uri = settings.uri || settings.url || url.format(settings);
-  let response;
-  console.log(settings);
-  fetch(settings.uri, settings).then((gottenResponse) => {
-    response = gottenResponse;
-  })
-  .then(() => response.text())
-  .then((responseText) => {
-    var result = { status: response.status, statusCode: response.status, statusText: response.statusText, body: responseText };
-    if(response.ok) {
-      callback(null,result);
-    } else {
-      callback({ status: response.status, code: response.status, message: response.statusText }, result);  
-    }
-  });
-}
-
 const urlKeys = Object.keys(url.parse(''));
 
 module.exports = class Model extends EventEmitter {
@@ -79,7 +27,7 @@ module.exports = class Model extends EventEmitter {
     this.set(attributes, {
       silent: true
     });
-    this._request = fetchRequest;
+    this._request = request;
   }
 
   save(options, callback) {
@@ -137,23 +85,8 @@ module.exports = class Model extends EventEmitter {
       headers: options.headers || reqConf.headers || this.options.headers
     });
   }
-  
-  request(originalSettings, body, callback) {
-    /*
-    async function fetchRequest(settings, callback) {
-      //Fetch doesn't like undefined headers
-      settings.headers = settings.headers || [];
-      var response = await fetch(settings.uri, settings);
-      var responseText = await response.text();
-      var responseObj = { status: response.status, statusCode: response.status, statusText: response.statusText, body: responseText };
-      if(response.ok) {
-        callback(null,responseObj);
-      } else {
-        callback({ status: response.status, code: response.status, message: response.statusText },responseObj);  
-      }
-    }
-    */
 
+  request(originalSettings, body, callback) {
     if (typeof body === 'function' && arguments.length === 2) {
       callback = body;
       body = undefined;
@@ -204,13 +137,13 @@ module.exports = class Model extends EventEmitter {
             }
           };
 
-          fetchRequest(settings, (err, response) => {
+          this._request(settings, (err, response) => {
             if (err) {
-              if (err.status === 408) {
+              if (err.code === 'ETIMEDOUT' || err.code === 'ESOCKETTIMEDOUT') {
                 err.message = 'Connection timed out';
                 err.status = 504;
               }
-              err.status = err.status || (response && response.status) || 503;
+              err.status = err.status || (response && response.statusCode) || 503;
               return _callback(err, null, err.status);
             }
             return this.handleResponse(response, (error, data, status) => {

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "hof",
   "description": "A bootstrap for HOF projects",
-  "version": "19.13.4-betav7",
+  "version": "19.13.6",
   "license": "MIT",
   "main": "index.js",
   "author": "HomeOffice",
   "engines": {
-    "node": ">=17.6.0",
+    "node": ">=10.22.1",
     "npm": ">=6.14.0"
   },
   "bin": {
@@ -137,6 +137,8 @@
     "exit": "true"
   },
   "resolutions": {
-    "underscore": "^1.12.1"
+    "underscore": "^1.12.1",
+    "cached-path-relative": "^1.1.0",
+    "shell-quote": "^1.7.3"
   }
 }