hof 20.0.0-beta.6 → 20.0.0-beta.9

package/sandbox/apps/sandbox/fields.js

@@ -8,7 +8,7 @@ module.exports = {
   'landing-page-radio': {
     mixin: 'radio-group',
     validate: ['required'],
-    noHeading: true,
+    isPageHeading: true,
     // Design system says to avoid in-line unless it's two options,
     // so just added as an example below but by default it isn't
     className: ['govuk-radios--inline'],
@@ -16,12 +16,12 @@ module.exports = {
   },
   name: {
     validate: ['required', 'notUrl', { type: 'maxlength', arguments: 200 }],
+    // need to remove this for the heading to go
     labelClassName: ['govuk-label--l'],
-    // noHeading: 'true'
+    isPageHeading: 'true'
   },
   'dateOfBirth': dateComponent('dateOfBirth', {
-    // noHeading: 'true',
-    controlType: 'date-input',
+    isPageHeading: 'true',
     validate: [
       'required',
       'date',
@@ -29,28 +29,24 @@ module.exports = {
     ]
   }),
   building: {
-    noHeading: 'true',
     validate: ['required', 'notUrl', { type: 'maxlength', arguments: 100 }]
   },
   street: {
-    noHeading: 'true',
     validate: ['notUrl', { type: 'maxlength', arguments: 50 }],
     labelClassName: 'visuallyhidden'
   },
   townOrCity: {
-    noHeading: 'true',
     validate: ['required', 'notUrl',
       { type: 'regex', arguments: /^([^0-9]*)$/ },
       { type: 'maxlength', arguments: 100 }
     ]
   },
   postcode: {
-    noHeading: 'true',
     validate: ['required', 'postcode'],
     formatter: ['removespaces', 'uppercase']
   },
   incomeTypes: {
-    // noHeading: 'true',
+    isPageHeading: 'true',
     mixin: 'checkbox-group',
     labelClassName: 'visuallyhidden',
     validate: ['required'],
@@ -63,7 +59,7 @@ module.exports = {
     ]
   },
   countryOfHearing: {
-    // noHeading: 'true',
+    isPageHeading: 'true',
     mixin: 'radio-group',
     validate: ['required'],
     options: [
@@ -73,7 +69,7 @@ module.exports = {
     ]
   },
   email: {
-    // noHeading: 'true',
+    isPageHeading: 'true',
     labelClassName: ['govuk-label--l'],
     validate: ['required', 'email']
   },
@@ -86,6 +82,7 @@ module.exports = {
   },
   countrySelect: {
     mixin: 'select',
+    isPageHeading: 'true',
     className: ['typeahead'],
     options:[''].concat(require('homeoffice-countries').allCountries),
     legend: {
@@ -97,12 +94,13 @@ module.exports = {
     mixin: 'textarea',
     // we want to ignore default formatters as we want
     // to preserve white space
+    isPageHeading: 'true',
     'ignore-defaults': true,
     // apply the other default formatters
     formatter: ['trim', 'hyphens'],
     labelClassName: ['govuk-label--l'],
     // attributes here are passed to the field element
-    validate: ['required', { type: 'maxlength', arguments: 100 }],
+    validate: ['required', { type: 'maxlength', arguments: 10 }],
     attributes: [{
       attribute: 'rows',
       value: 8
@@ -110,6 +108,7 @@ module.exports = {
   },
   appealStages: {
     mixin: 'select',
+    isPageHeading: 'true',
     validate: ['required'],
     options: [{
       value: '',

package/sandbox/server.js

@@ -8,5 +8,10 @@ bootstrap({
   routes: [
     require('./apps/sandbox')
   ],
+  rateLimits: {
+    requests: {
+      active: true
+    }
+  },
   getAccessibility: true
 });

package/transpiler/lib/write-files.js

@@ -2,7 +2,6 @@
 
 const fs = require('fs');
 const path = require('path');
-const mkdir = require('mkdirp').sync;
 const rm = require('rimraf').sync;
 
 const debug = require('debug')('hof:transpiler');
@@ -16,7 +15,7 @@ module.exports = (dir, data) => {
     const outputDir = path.resolve(dir, '..', lang);
     rm(outputDir);
     debug(`Emptied directory ${outputDir}`);
-    mkdir(outputDir);
+    fs.mkdirSync(outputDir);
     debug(`Made directory ${outputDir}`);
     Object.keys(data[lang]).forEach(namespace => {
       fs.writeFileSync(path.resolve(outputDir, `${namespace}.json`), JSON.stringify(data[lang][namespace], null, '  '));

package/utilities/helpers/index.js

@@ -94,7 +94,7 @@ module.exports = class Helpers {
   /**
    * utility function which returns undefined on
    * failed translations instead of returning the key
-   * @param {Function} translate - the translate funtion
+   * @param {Function} translate - the translate function
    * @param {String} key - the key to translate
    * @returns {String|undefined} the string result if successful, undefined if not
    */
@@ -131,4 +131,19 @@ module.exports = class Helpers {
       `pages.${key}.header`
     ]) || key;
   }
+  /**
+   * utility function which returns true or false on
+   * forks depending on whether a value exists on the page
+   * @param {Object} req - an http request object
+   * @param {Object} res - an http response object
+   * @param {Function|Object} condition - a field condition that is either a function or object
+   * @returns {Boolean} the boolean result of whether a field value is set on the page or session for a fork
+   */
+  static isFieldValueInPageOrSessionValid(req, res, condition) {
+    return _.isFunction(condition) ?
+      condition(req, res) :
+      condition.value === (req.form.values[condition.field] ||
+      (!Object.keys(req.form.values).includes(condition.field) &&
+      _.get(req, `form.historicalValues[${condition.field}]`)));
+  }
 };

package/wizard/index.js

@@ -69,6 +69,7 @@ const Wizard = (steps, fields, setts) => {
     options.confirmStep = settings.confirmStep;
     options.clearSession = options.clearSession || false;
     options.fieldsConfig = _.cloneDeep(fields);
+    options.sanitiseInputs = settings.sanitiseInputs;
 
     options.defaultFormatters = [].concat(settings.formatters);