hof 20.0.0-beta.2 → 20.0.0-beta.20

package/sandbox/public/js/bundle.js

@@ -146,9 +146,10 @@ module.exports = {
 };
 
 },{}],2:[function(require,module,exports){
+/* eslint-disable no-undef, no-param-reassign, no-unused-vars */
 (function () {
-  "use strict"
-  var root = this;
+  'use strict';
+  const root = this;
   if(typeof root.GOVUK === 'undefined') { root.GOVUK = {}; }
 
   /*
@@ -167,37 +168,35 @@ module.exports = {
       GOVUK.cookie('hobnob', null);
   */
   GOVUK.cookie = function (name, value, options) {
-    if(typeof value !== 'undefined'){
+    if(typeof value !== 'undefined') {
       if(value === false || value === null) {
         return GOVUK.setCookie(name, '', { days: -1 });
-      } else {
-        return GOVUK.setCookie(name, value, options);
       }
-    } else {
-      return GOVUK.getCookie(name);
+      return GOVUK.setCookie(name, value, options);
     }
+    return GOVUK.getCookie(name);
   };
   GOVUK.setCookie = function (name, value, options) {
     if(typeof options === 'undefined') {
       options = {};
     }
-    var cookieString = name + "=" + value + "; path=/";
+    let cookieString = name + '=' + value + '; path=/';
     if (options.days) {
-      var date = new Date();
+      const date = new Date();
       date.setTime(date.getTime() + (options.days * 24 * 60 * 60 * 1000));
-      cookieString = cookieString + "; expires=" + date.toGMTString();
+      cookieString = cookieString + '; expires=' + date.toGMTString();
     }
-    if (document.location.protocol == 'https:'){
-      cookieString = cookieString + "; Secure";
+    if (document.location.protocol === 'https:') {
+      cookieString = cookieString + '; Secure';
     }
     document.cookie = cookieString;
   };
   GOVUK.getCookie = function (name) {
-    var nameEQ = name + "=";
-    var cookies = document.cookie.split(';');
-    for(var i = 0, len = cookies.length; i < len; i++) {
-      var cookie = cookies[i];
-      while (cookie.charAt(0) == ' ') {
+    const nameEQ = name + '=';
+    const cookies = document.cookie.split(';');
+    for(let i = 0, len = cookies.length; i < len; i++) {
+      let cookie = cookies[i];
+      while (cookie.charAt(0) === ' ') {
         cookie = cookie.substring(1, cookie.length);
       }
       if (cookie.indexOf(nameEQ) === 0) {
@@ -208,33 +207,33 @@ module.exports = {
   };
 }).call(this);
 (function () {
-  'use strict'
-  var root = this
-  if (typeof root.GOVUK === 'undefined') { root.GOVUK = {} }
+  'use strict';
+  const root = this;
+  if (typeof root.GOVUK === 'undefined') { root.GOVUK = {}; }
 
   GOVUK.addCookieMessage = function () {
-    var message = document.getElementById('global-cookie-message')
+    const message = document.getElementById('global-cookie-message');
 
-    var hasCookieMessage = (message && GOVUK.cookie('seen_cookie_message') === null)
+    const hasCookieMessage = (message && GOVUK.cookie('seen_cookie_message') === null);
 
     if (hasCookieMessage) {
-      message.style.display = 'block'
-      GOVUK.cookie('seen_cookie_message', 'yes', { days: 28 })
+      message.style.display = 'block';
+      GOVUK.cookie('seen_cookie_message', 'yes', { days: 28 });
 
       document.addEventListener('DOMContentLoaded', function (event) {
         if (GOVUK.analytics && typeof GOVUK.analytics.trackEvent === 'function') {
           GOVUK.analytics.trackEvent('cookieBanner', 'Cookie banner shown', {
             value: 1,
             nonInteraction: true
-          })
+          });
         }
-      })
-    };
-  }
+      });
+    }
+  };
 }).call(this)
 ;
-(function() {
-  "use strict"
+(function () {
+  'use strict';
 
   // add cookie message
   if (window.GOVUK && GOVUK.addCookieMessage) {
@@ -242,35 +241,35 @@ module.exports = {
   }
 
   // header navigation toggle
-  if (document.querySelectorAll && document.addEventListener){
-    var els = document.querySelectorAll('.js-header-toggle'),
-        i, _i;
-    for(i=0,_i=els.length; i<_i; i++){
-      els[i].addEventListener('click', function(e){
+  if (document.querySelectorAll && document.addEventListener) {
+    const els = document.querySelectorAll('.js-header-toggle');
+    let i; let _i;
+    for(i = 0, _i = els.length; i < _i; i++) {
+      els[i].addEventListener('click', function (e) {
         e.preventDefault();
-        var target = document.getElementById(this.getAttribute('href').substr(1)),
-            targetClass = target.getAttribute('class') || '',
-            sourceClass = this.getAttribute('class') || '';
+        const target = document.getElementById(this.getAttribute('href').substr(1));
+        const targetClass = target.getAttribute('class') || '';
+        const sourceClass = this.getAttribute('class') || '';
 
-        if(targetClass.indexOf('js-visible') !== -1){
+        if(targetClass.indexOf('js-visible') !== -1) {
           target.setAttribute('class', targetClass.replace(/(^|\s)js-visible(\s|$)/, ''));
         } else {
-          target.setAttribute('class', targetClass + " js-visible");
+          target.setAttribute('class', targetClass + ' js-visible');
         }
-        if(sourceClass.indexOf('js-visible') !== -1){
+        if(sourceClass.indexOf('js-visible') !== -1) {
           this.setAttribute('class', sourceClass.replace(/(^|\s)js-visible(\s|$)/, ''));
         } else {
-          this.setAttribute('class', sourceClass + " js-visible");
+          this.setAttribute('class', sourceClass + ' js-visible');
         }
-        this.setAttribute('aria-expanded', this.getAttribute('aria-expanded') !== "true");
-        target.setAttribute('aria-hidden', target.getAttribute('aria-hidden') === "false");
+        this.setAttribute('aria-expanded', this.getAttribute('aria-expanded') !== 'true');
+        target.setAttribute('aria-hidden', target.getAttribute('aria-hidden') === 'false');
       });
     }
   }
 }).call(this);
 
 },{}],3:[function(require,module,exports){
-/* eslint-disable no-var */
+/* eslint-disable no-var, vars-on-top, no-unused-vars */
 'use strict';
 
 var toolkit = require('../../../toolkit');
@@ -280,7 +279,7 @@ var formFocus = toolkit.formFocus;
 var characterCount = toolkit.characterCount;
 var validation = toolkit.validation;
 
-var GOVUK = require('govuk-frontend')
+var GOVUK = require('govuk-frontend');
 GOVUK.initAll();
 window.GOVUK = GOVUK;
 var skipToMain = require('./skip-to-main');
@@ -299,23 +298,24 @@ helpers.documentReady(validation);
 
 },{"../../../toolkit":11,"./cookieSettings":1,"./govuk-cookies":2,"./skip-to-main":4,"govuk-frontend":12}],4:[function(require,module,exports){
 const skipToMain = function () {
-    const skipToMainLink = document.getElementById("skip-to-main");
-    const firstControlId = skipToMainLink.hash.split('#')[1] ? skipToMainLink.hash.split('#')[1] : "main-content";
-    if(firstControlId === "main-content"){
-      skipToMainLink.setAttribute("href", "#main-content");
-    }
-    if(firstControlId) {
-      skipToMainLink.onclick = function(e) {
-        //here timeout added just to make this functionality asynchronous 
-        //to focus on form as well as non form contents
-        setTimeout(() => {
-          const firstControl = document.getElementById(firstControlId);
-          firstControl.focus();
-        }, 10);      
-      }
-    }
-  };
-  skipToMain();
+  const skipToMainLink = document.getElementById('skip-to-main');
+  const firstControlId = skipToMainLink.hash.split('#')[1] ? skipToMainLink.hash.split('#')[1] : 'main-content';
+  if(firstControlId === 'main-content') {
+    skipToMainLink.setAttribute('href', '#main-content');
+  }
+  if(firstControlId) {
+    // eslint-disable-next-line no-unused-vars
+    skipToMainLink.onclick = function (e) {
+      // here timeout added just to make this functionality asynchronous
+      // to focus on form as well as non form contents
+      setTimeout(() => {
+        const firstControl = document.getElementById(firstControlId);
+        firstControl.focus();
+      }, 10);
+    };
+  }
+};
+skipToMain();
 
 },{}],5:[function(require,module,exports){
 /* eslint-disable max-len, no-var, no-use-before-define, no-param-reassign, vars-on-top, radix */
@@ -492,11 +492,20 @@ function formFocus() {
   var labels;
   var summaries;
 
-  if (getElementFromSummaryLink && getEditPath === 'edit') {
+  var editMode = getElementFromSummaryLink && getEditPath === 'edit';
+
+  if (getElementFromSummaryLink && document.getElementById(getElementFromSummaryLink) && editMode) {
     document.getElementById(getElementFromSummaryLink).focus();
+  }
+
+  if (getElementFromSummaryLink && document.getElementById(getElementFromSummaryLink + '-group') && editMode) {
     document.getElementById(getElementFromSummaryLink + '-group').scrollIntoView();
   }
 
+  if (document.getElementById(getElementFromSummaryLink + '-day') && forms.length === 1 && editMode) {
+    document.getElementById(getElementFromSummaryLink + '-day').focus();
+  }
+
   if (forms.length > 0) {
     labels = document.getElementsByTagName('label');
     if (labels) {
@@ -790,7 +799,12 @@ function clicked(e) {
     }
 
     if (inputs) {
-      inputs[0].focus();
+      if (inputs[0].getAttribute('type') === 'hidden') {
+        var getVisibleElements = group.querySelectorAll('input[type=text]');
+        getVisibleElements[0].focus();
+      } else {
+        inputs[0].focus();
+      }
     }
   }
 }

package/sandbox/server.js

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

package/sandbox/yarn.lock

@@ -111,7 +111,7 @@ chalk@^4.1.0:
     ansi-styles "^4.1.0"
     supports-color "^7.1.0"
 
-chokidar@^3.5.2:
+"chokidar@>=3.0.0 <4.0.0", chokidar@^3.5.2:
   version "3.5.3"
   resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.5.3.tgz#1cf37c8707b932bd1af1ae22c0432e2acd1903bd"
   integrity sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw==
@@ -287,6 +287,11 @@ got@^9.6.0:
     to-readable-stream "^1.0.0"
     url-parse-lax "^3.0.0"
 
+govuk-frontend@3.14:
+  version "3.14.0"
+  resolved "https://registry.yarnpkg.com/govuk-frontend/-/govuk-frontend-3.14.0.tgz#d3a9c54437c08f5188f87b1f4480ba60e95c8eb6"
+  integrity sha512-y7FTuihCSA8Hty+e9h0uPhCoNanCAN+CLioNFlPmlbeHXpbi09VMyxTcH+XfnMPY4Cp++7096v0rLwwdapTXnA==
+
 graceful-fs@^4.1.2:
   version "4.2.10"
   resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.10.tgz#147d3a006da4ca3ce14728c7aefc287c367d7a6c"
@@ -317,6 +322,11 @@ ignore-by-default@^1.0.1:
   resolved "https://registry.yarnpkg.com/ignore-by-default/-/ignore-by-default-1.0.1.tgz#48ca6d72f6c6a3af00a9ad4ae6876be3889e2b09"
   integrity sha1-SMptcvbGo68Aqa1K5odr44ieKwk=
 
+immutable@^4.0.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/immutable/-/immutable-4.1.0.tgz#f795787f0db780183307b9eb2091fcac1f6fafef"
+  integrity sha512-oNkuqVTA8jqG1Q6c+UglTOD1xhC1BtjKI7XkCXRkZHrN5m18/XsnUp8Q89GkQO/z+0WjonSvl0FLhDYftp46nQ==
+
 import-lazy@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/import-lazy/-/import-lazy-2.1.0.tgz#05698e3d45c88e8d7e9d92cb0584e77f096f3e43"
@@ -599,6 +609,15 @@ responselike@^1.0.2:
   dependencies:
     lowercase-keys "^1.0.0"
 
+sass@^1.53.0:
+  version "1.53.0"
+  resolved "https://registry.yarnpkg.com/sass/-/sass-1.53.0.tgz#eab73a7baac045cc57ddc1d1ff501ad2659952eb"
+  integrity sha512-zb/oMirbKhUgRQ0/GFz8TSAwRq2IlR29vOUJZOx0l8sV+CkHUfHa4u5nqrG+1VceZp7Jfj59SVW9ogdhTvJDcQ==
+  dependencies:
+    chokidar ">=3.0.0 <4.0.0"
+    immutable "^4.0.0"
+    source-map-js ">=0.6.2 <2.0.0"
+
 semver-diff@^3.1.1:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/semver-diff/-/semver-diff-3.1.1.tgz#05f77ce59f325e00e2706afd67bb506ddb1ca32b"
@@ -628,6 +647,11 @@ signal-exit@^3.0.2:
   resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.7.tgz#a9a1767f8af84155114eaabd73f99273c8f59ad9"
   integrity sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==
 
+"source-map-js@>=0.6.2 <2.0.0":
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/source-map-js/-/source-map-js-1.0.2.tgz#adbc361d9c62df380125e7f161f71c826f1e490c"
+  integrity sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==
+
 string-width@^4.0.0, string-width@^4.1.0, string-width@^4.2.2:
   version "4.2.3"
   resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"

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);