hof 20.1.6 → 20.1.8

package/build/tasks/watch/index.js

@@ -116,7 +116,7 @@ module.exports = config => {
 
       if (process.env.HOF_SANDBOX === 'true') {
         const rootDir = require('path').resolve(__dirname, '../../../');
-        ignored.push(`${rootDir}/frontend/govuk-template/govuk_template.html`);
+        ignored.push(`${rootDir}/frontend/govuk-template/govuk_template_generated.html`);
         watchLocation = [rootDir, '.'];
       }
 

package/controller/controller.js

@@ -103,9 +103,11 @@ module.exports = class Controller extends BaseController {
     const locals = super.locals(req, res);
     const stepLocals = req.form.options.locals || {};
 
-    const fields = _.map(req.form.options.fields, (field, key) =>
+    let fields = _.map(req.form.options.fields, (field, key) =>
       Object.assign({}, field, { key })
     );
+    // only include fields that aren't dependents to mitigate duplicate fields on the page
+    fields = fields.filter(field => !req.form.options.fields[field.key].dependent);
 
     return _.extend({}, locals, {
       fields,

package/controller/formatting/formatters.js

@@ -53,6 +53,18 @@ module.exports = {
 
   base64decode(value) {
     return Buffer.from(value, 'base64').toString();
+  },
+
+  ukPostcode(value) {
+    if (typeof value !== 'string') {
+      return value;
+    }
+
+    const postcode = this.uppercase(this.removespaces(value));
+    const firstPart = postcode.slice(0, -3);
+    const secondPart = postcode.slice(-3);
+
+    return `${firstPart} ${secondPart}`;
   }
 
 };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "hof",
   "description": "A bootstrap for HOF projects",
-  "version": "20.1.6",
+  "version": "20.1.8",
   "license": "MIT",
   "main": "index.js",
   "author": "HomeOffice",
@@ -25,7 +25,7 @@
     "unit": "LOG_LEVEL=error nyc _mocha \"test/**/*.spec.js\" \"sandbox/test/**/*.spec.js\"",
     "unit:nocov": "LOG_LEVEL=error mocha \"test/**/*.spec.js\" \"sandbox/test/**/*.spec.js\"",
     "test:lint": "eslint . --config ./node_modules/eslint-config-hof/default.js",
-    "test:functional": "funkie mocha ./test/functional-tests --exit",
+    "test:functional": "funkie mocha ./test/functional-tests --timeout 20000 --exit",
     "test:client": "karma start test/frontend/toolkit/karma.conf.js",
     "test:cookie-banner": "jest test/frontend/jest",
     "test:acceptance": "TAGS=\"${TAGS:=@feature}\" yarn run test:cucumber",