hof 20.3.7-timeout-beta → 20.3.7

package/README.md

@@ -311,7 +311,7 @@ my-application/translations/en/default.json
 }
 ```
 
-# HOF Controller
+#HOF Controller
 
 Implements a request pipeline for GET and POST of forms, with input cleaning/formatting and validation.
 
@@ -482,13 +482,13 @@ let error = new ErrorClass(this.missingDoB, {
 });
 ```
 
-## hof-behaviour-session
+##hof-behaviour-session
 
 HOF Behaviour for reading and writing to the session
 
-## Usage
+##Usage
 
-### With [mixwith.js](https://github.com/justinfagnani/mixwith.js)
+###With [mixwith.js](https://github.com/justinfagnani/mixwith.js)
 
 ```js
 const mix = require('mixwith').mix;
@@ -502,7 +502,7 @@ class MyController extends mix(BaseController).with(Session) {
 
 `MyController` now extends `hof-form-controller` and has `hof-behaviour-session` functionality mixed in.
 
-## Functionality
+##Functionality
 
 This mixin extends `hof-form-controller` by persisting the form data to the `sessionModel` - assuming the [session-model](https://github.com/UKHomeOfficeForms/hof-form-wizard/blob/master/lib/middleware/session-model.js) middleware has been applied.
 
@@ -516,13 +516,13 @@ The following form controller methods are used:
 - `missingPrereqHandler(req, res)` - Error handler called when a `MISSING_PREREQ` error is thrown from the [check-progress](https://github.com/UKHomeOfficeForms/hof-form-wizard/blob/master/lib/middleware/check-progress.js) middleware. This occurs if a step is visited out of sequence. This error handler causes the user to be redirected to the last completed step, or the first step if none have been completed.
 - `errorHandler(err, req, res, next)` - checks if `err.code` is `MISSING_PREREQ`, if so calls `missingPrereqHandler`, if not calls `super` to hand over to parent error handler.
 
-## Behaviour-hooks
+##behaviour-hooks
 
 HOF Behaviour enabling lifecycle hooks for extending functionality in main form pipeline.
 
-## Usage
+##Usage
 
-### With [mixwith.js](https://github.com/justinfagnani/mixwith.js)
+###With [mixwith.js](https://github.com/justinfagnani/mixwith.js)
 
 ```js
 const mix = require('mixwith').mix;
@@ -536,25 +536,25 @@ class MyController extends mix(BaseController).with(Hooks) {
 
 `MyController` now extends `hof-form-controller` and has `hof-behaviour-hooks` functionality mixed in.
 
-## Functionality
+##Functionality
 
 The following hooks are currently supported, the methods are GET/POST pipeline methods from `hof-form-controller`:
 
-#### GET
+####GET
 
 - `_getErrors` - `'pre-getErrors', 'post-getErrors'`
 - `_getValues` - `'pre-getValues', 'post-getValues'`
 - `_locals` - `'pre-locals', 'post-locals'`
 - `render` - `'pre-render', 'post-render'`
 
-#### POST
+####POST
 
 - `_process` - `'pre-process', 'post-process'`
 - `_validate` - `'pre-validate', 'post-validate'`
 - `saveValues` - `'pre-saveValues', 'post-saveValues'`
 - `successHandler` - `'pre-successHandler', 'post-successHandler'`
 
-### In field config
+###In field config
 
 fields.js
 

package/frontend/govuk-template/build/govuk_template.html

@@ -41,13 +41,12 @@
             <a href="{{{ homepageUrl }}}" title="{{ logoLinkTitle }}" id="logo" class="govuk-header__link govuk-header__link--homepage" target="_blank" data-module="track-click" data-track-category="homeLinkClicked" data-track-action="homeHeader">
 			<span class="govuk-header__logotype">
 				<!--[if gt IE 8]><!-->
-          <svg aria-hidden="true" focusable="false" class="govuk-header__logotype-crown" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 132 97" height="30" width="36">
-            <path fill="currentColor" fill-rule="evenodd" d="M25 30.2c3.5 1.5 7.7-.2 9.1-3.7 1.5-3.6-.2-7.8-3.9-9.2-3.6-1.4-7.6.3-9.1 3.9-1.4 3.5.3 7.5 3.9 9zM9 39.5c3.6 1.5 7.8-.2 9.2-3.7 1.5-3.6-.2-7.8-3.9-9.1-3.6-1.5-7.6.2-9.1 3.8-1.4 3.5.3 7.5 3.8 9zM4.4 57.2c3.5 1.5 7.7-.2 9.1-3.8 1.5-3.6-.2-7.7-3.9-9.1-3.5-1.5-7.6.3-9.1 3.8-1.4 3.5.3 7.6 3.9 9.1zm38.3-21.4c3.5 1.5 7.7-.2 9.1-3.8 1.5-3.6-.2-7.7-3.9-9.1-3.6-1.5-7.6.3-9.1 3.8-1.3 3.6.4 7.7 3.9 9.1zm64.4-5.6c-3.6 1.5-7.8-.2-9.1-3.7-1.5-3.6.2-7.8 3.8-9.2 3.6-1.4 7.7.3 9.2 3.9 1.3 3.5-.4 7.5-3.9 9zm15.9 9.3c-3.6 1.5-7.7-.2-9.1-3.7-1.5-3.6.2-7.8 3.7-9.1 3.6-1.5 7.7.2 9.2 3.8 1.5 3.5-.3 7.5-3.8 9zm4.7 17.7c-3.6 1.5-7.8-.2-9.2-3.8-1.5-3.6.2-7.7 3.9-9.1 3.6-1.5 7.7.3 9.2 3.8 1.3 3.5-.4 7.6-3.9 9.1zM89.3 35.8c-3.6 1.5-7.8-.2-9.2-3.8-1.4-3.6.2-7.7 3.9-9.1 3.6-1.5 7.7.3 9.2 3.8 1.4 3.6-.3 7.7-3.9 9.1zM69.7 17.7l8.9 4.7V9.3l-8.9 2.8c-.2-.3-.5-.6-.9-.9L72.4 0H59.6l3.5 11.2c-.3.3-.6.5-.9.9l-8.8-2.8v13.1l8.8-4.7c.3.3.6.7.9.9l-5 15.4v.1c-.2.8-.4 1.6-.4 2.4 0 4.1 3.1 7.5 7 8.1h.2c.3 0 .7.1 1 .1.4 0 .7 0 1-.1h.2c4-.6 7.1-4.1 7.1-8.1 0-.8-.1-1.7-.4-2.4V34l-5.1-15.4c.4-.2.7-.6 1-.9zM66 92.8c16.9 0 32.8 1.1 47.1 3.2 4-16.9 8.9-26.7 14-33.5l-9.6-3.4c1 4.9 1.1 7.2 0 10.2-1.5-1.4-3-4.3-4.2-8.7L108.6 76c2.8-2 5-3.2 7.5-3.3-4.4 9.4-10 11.9-13.6 11.2-4.3-.8-6.3-4.6-5.6-7.9 1-4.7 5.7-5.9 8-.5 4.3-8.7-3-11.4-7.6-8.8 7.1-7.2 7.9-13.5 2.1-21.1-8 6.1-8.1 12.3-4.5 20.8-4.7-5.4-12.1-2.5-9.5 6.2 3.4-5.2 7.9-2 7.2 3.1-.6 4.3-6.4 7.8-13.5 7.2-10.3-.9-10.9-8-11.2-13.8 2.5-.5 7.1 1.8 11 7.3L80.2 60c-4.1 4.4-8 5.3-12.3 5.4 1.4-4.4 8-11.6 8-11.6H55.5s6.4 7.2 7.9 11.6c-4.2-.1-8-1-12.3-5.4l1.4 16.4c3.9-5.5 8.5-7.7 10.9-7.3-.3 5.8-.9 12.8-11.1 13.8-7.2.6-12.9-2.9-13.5-7.2-.7-5 3.8-8.3 7.1-3.1 2.7-8.7-4.6-11.6-9.4-6.2 3.7-8.5 3.6-14.7-4.6-20.8-5.8 7.6-5 13.9 2.2 21.1-4.7-2.6-11.9.1-7.7 8.8 2.3-5.5 7.1-4.2 8.1.5.7 3.3-1.3 7.1-5.7 7.9-3.5.7-9-1.8-13.5-11.2 2.5.1 4.7 1.3 7.5 3.3l-4.7-15.4c-1.2 4.4-2.7 7.2-4.3 8.7-1.1-3-.9-5.3 0-10.2l-9.5 3.4c5 6.9 9.9 16.7 14 33.5 14.8-2.1 30.8-3.2 47.7-3.2z"></path>
+          <svg aria-hidden="true" focusable="false" class="govuk-header__logotype-crown" xmlns="http://www.w3.org/2000/svg\" viewBox="0 0 32 30" height="30" width="32">
+            <path fill="currentColor" fill-rule="evenodd"    d="M22.6 10.4c-1 .4-2-.1-2.4-1-.4-.9.1-2 1-2.4.9-.4 2 .1 2.4 1s-.1 2-1 2.4m-5.9 6.7c-.9.4-2-.1-2.4-1-.4-.9.1-2 1-2.4.9-.4 2 .1 2.4 1s-.1 2-1 2.4m10.8-3.7c-1 .4-2-.1-2.4-1-.4-.9.1-2 1-2.4.9-.4 2 .1 2.4 1s0 2-1 2.4m3.3 4.8c-1 .4-2-.1-2.4-1-.4-.9.1-2 1-2.4.9-.4 2 .1 2.4 1s-.1 2-1 2.4M17 4.7l2.3 1.2V2.5l-2.3.7-.2-.2.9-3h-3.4l.9 3-.2.2c-.1.1-2.3-.7-2.3-.7v3.4L15 4.7c.1.1.1.2.2.2l-1.3 4c-.1.2-.1.4-.1.6 0 1.1.8 2 1.9 2.2h.7c1-.2 1.9-1.1 1.9-2.1 0-.2 0-.4-.1-.6l-1.3-4c-.1-.2 0-.2.1-.3m-7.6 5.7c.9.4 2-.1 2.4-1 .4-.9-.1-2-1-2.4-.9-.4-2 .1-2.4 1s0 2 1 2.4m-5 3c.9.4 2-.1 2.4-1 .4-.9-.1-2-1-2.4-.9-.4-2 .1-2.4 1s.1 2 1 2.4m-3.2 4.8c.9.4 2-.1 2.4-1 .4-.9-.1-2-1-2.4-.9-.4-2 .1-2.4 1s0 2 1 2.4m14.8 11c4.4 0 8.6.3 12.3.8 1.1-4.5 2.4-7 3.7-8.8l-2.5-.9c.2 1.3.3 1.9 0 2.7-.4-.4-.8-1.1-1.1-2.3l-1.2 4c.7-.5 1.3-.8 2-.9-1.1 2.5-2.6 3.1-3.5 3-1.1-.2-1.7-1.2-1.5-2.1.3-1.2 1.5-1.5 2.1-.1 1.1-2.3-.8-3-2-2.3 1.9-1.9 2.1-3.5.6-5.6-2.1 1.6-2.1 3.2-1.2 5.5-1.2-1.4-3.2-.6-2.5 1.6.9-1.4 2.1-.5 1.9.8-.2 1.1-1.7 2.1-3.5 1.9-2.7-.2-2.9-2.1-2.9-3.6.7-.1 1.9.5 2.9 1.9l.4-4.3c-1.1 1.1-2.1 1.4-3.2 1.4.4-1.2 2.1-3 2.1-3h-5.4s1.7 1.9 2.1 3c-1.1 0-2.1-.2-3.2-1.4l.4 4.3c1-1.4 2.2-2 2.9-1.9-.1 1.5-.2 3.4-2.9 3.6-1.9.2-3.4-.8-3.5-1.9-.2-1.3 1-2.2 1.9-.8.7-2.3-1.2-3-2.5-1.6.9-2.2.9-3.9-1.2-5.5-1.5 2-1.3 3.7.6 5.6-1.2-.7-3.1 0-2 2.3.6-1.4 1.8-1.1 2.1.1.2.9-.3 1.9-1.5 2.1-.9.2-2.4-.5-3.5-3 .6 0 1.2.3 2 .9l-1.2-4c-.3 1.1-.7 1.9-1.1 2.3-.3-.8-.2-1.4 0-2.7l-2.9.9C1.3 23 2.6 25.5 3.7 30c3.7-.5 7.9-.8 12.3-.8\"></path>
           </svg>
           <!--<![endif]-->
-         <!--<![endif]-->
           <!--[if IE 8]>
-          <img src="{{ assetPath }}images/govuk-logotype-crown.png" class="govuk-header__logotype-crown-fallback-image" width="36" height="32">
+          <img src="{{ assetPath }}images/govuk-logotype-tudor-crown.png" class="govuk-header__logotype-crown-fallback-image" width="32" height="30" alt="">
           <![endif]-->
 			</span>
 				<span class="govuk-header__logotype-text">

package/frontend/template-partials/translations/src/en/buttons.json

@@ -1,6 +1,5 @@
 {
   "continue": "Continue",
-  "stay-on-page": "Stay on this page",
   "send": "Send",
   "change": "Change",
   "close": "Close",

package/frontend/template-partials/translations/src/en/errors.json

@@ -3,10 +3,6 @@
     "title": "Sorry, something went wrong",
     "message": "A server exception occurred. Please try again."
   },
-  "session-warning": {
-    "title": "Your page will time out soon",
-    "message": "To protect your information, this page will time out in 5 minutes.\n\nIf that happens, your progress will not be saved."
-  },
   "session": {
     "title": "Sorry, you'll have to start again",
     "message": "You haven't entered any details for 30 minutes, so we have cleared your information to keep it secure."

package/frontend/template-partials/views/layout.html

@@ -19,7 +19,7 @@
 				<span  class="govuk-phase-banner__text">This is a new service – your <a href="{{feedbackUrl}}{{^feedbackUrl}}https://eforms.homeoffice.gov.uk/outreach/feedback.ofml{{/feedbackUrl}}" class="govuk-link" id="feedback-link" target="_blank">feedback</a> will help us to improve it.</span>
 				</p>
 			</div>
-		{{/feedbackUrl}}
+		{{/feedbackUrl}}      
       <span id="step">
         {{> partials-back}} <span>{{$step}}{{/step}}</span>
       </span>
@@ -29,7 +29,6 @@
 		  </div>
 	  </main>
       {{> partials-continue}}
-      {{> partials-session-timeout-warning}}
       <script type="text/javascript" src="{{assetPath}}/js/bundle.js"></script>
 	  </div>
   {{/main}}

package/frontend/template-partials/views/partials/warn.html

@@ -0,0 +1,7 @@
+<div class="govuk-warning-text">
+    <span class="govuk-warning-text__icon" aria-hidden="true">!</span>
+    <strong class="govuk-warning-text__text">
+    <span class="govuk-warning-text__assistive">Warning</span>
+        {{warning}}
+    </strong>
+</div>

package/frontend/themes/gov-uk/client-js/index.js

@@ -11,7 +11,6 @@ var validation = toolkit.validation;
 var GOVUK = require('govuk-frontend');
 GOVUK.initAll();
 window.GOVUK = GOVUK;
-var dialog = require('./dialog');
 var skipToMain = require('./skip-to-main');
 var cookie = require('./govuk-cookies');
 var cookieSettings = require('./cookieSettings');

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "hof",
   "description": "A bootstrap for HOF projects",
-  "version": "20.3.7-timeout-beta",
+  "version": "20.3.7",
   "license": "MIT",
   "main": "index.js",
   "author": "HomeOffice",
@@ -57,7 +57,7 @@
     "findup": "^0.1.5",
     "glob": "^7.2.0",
     "govuk-elements-sass": "^3.1.3",
-    "govuk-frontend": "3.14",
+    "govuk-frontend": "3.15",
     "govuk_template_mustache": "^0.26.0",
     "helmet": "^3.22.0",
     "hogan-express-strict": "^0.5.4",

package/sandbox/assets/scss/app.scss

@@ -7,7 +7,7 @@
     border: 1px solid #ccc;
     width: 65%;
   }
-
+  
 .tt-suggestion {
   padding: 0.5em;
 
@@ -25,117 +25,3 @@
 .twitter-typeahead {
   width: 100%;
 }
-
-.hidden {
-  display: none;
-}
-
-[role="dialog"] {
-  box-sizing: border-box;
-  padding: 15px;
-  border: 1px solid #000;
-  background-color: #fff;
-  min-height: 100vh;
-}
-
-@media screen and (min-width: 640px) {
-  [role="dialog"] {
-    position: absolute;
-    top: 25vh;
-    left: 50vw; /* move to the middle of the screen (assumes relative parent is the body/viewport) */
-    transform: translateX(
-        -50%
-    ); /* move backwards 50% of this element's width */
-    min-width: calc(640px - (15px * 2)); /* == breakpoint - left+right margin */
-    min-height: auto;
-    box-shadow: 0 19px 38px rgb(0 0 0 / 12%), 0 15px 12px rgb(0 0 0 / 22%);
-  }
-}
-
-.dialog_form {
-  margin: 15px;
-}
-
-.dialog_form .label_text {
-  box-sizing: border-box;
-  padding-right: 0.5em;
-  display: inline-block;
-  font-size: 16px;
-  font-weight: bold;
-  width: 30%;
-  text-align: right;
-}
-
-.dialog_form .label_info {
-  box-sizing: border-box;
-  padding-right: 0.5em;
-  font-size: 12px;
-  width: 30%;
-  text-align: right;
-  display: inline-block;
-}
-
-.dialog_form_item {
-  margin: 10px 0;
-  font-size: 0;
-}
-
-.dialog_form_item .wide_input {
-  box-sizing: border-box;
-  max-width: 70%;
-  width: 27em;
-}
-
-.dialog_form_actions {
-  text-align: right;
-  padding: 0 20px 20px;
-}
-
-.dialog_close_button {
-  float: right;
-  position: absolute;
-  top: 10px;
-  left: 92%;
-  height: 25px;
-}
-
-.dialog_close_button img {
-  border: 0;
-}
-
-.dialog_desc {
-  padding: 10px 20px;
-}
-
-/* native <dialog> element uses the ::backdrop pseudo-element */
-
-/* dialog::backdrop, */
-.dialog-backdrop {
-  display: none;
-  position: fixed;
-  overflow-y: auto;
-  top: 0;
-  right: 0;
-  bottom: 0;
-  left: 0;
-  z-index: 1;
-}
-
-@media screen and (min-width: 640px) {
-  .dialog-backdrop {
-    background: rgb(0 0 0 / 30%);
-  }
-}
-
-.dialog-backdrop.active {
-  display: block;
-}
-
-.no-scroll {
-  overflow-y: auto !important;
-}
-
-/* this is added to the body when a dialog is open */
-.has-dialog {
-  overflow: hidden;
-}

package/sandbox/package.json

@@ -16,7 +16,7 @@
   "author": "",
   "dependencies": {
     "govuk-frontend": "3.14",
-    "jquery": "^3.6.1",
+    "jquery": "^3.6.0",
     "sass": "^1.53.0",
     "typeahead-aria": "^1.0.4"
   },

package/sandbox/yarn.lock

@@ -130,16 +130,11 @@ is-number@^7.0.0:
   resolved "https://registry.yarnpkg.com/is-number/-/is-number-7.0.0.tgz#7535345b896734d5f80c4d06c50955527a14f12b"
   integrity sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==
 
-jquery@>=1.11:
+jquery@>=1.11, jquery@^3.6.0:
   version "3.6.0"
   resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.6.0.tgz#c72a09f15c1bdce142f49dbf1170bdf8adac2470"
   integrity sha512-JVzAR/AjBvVt2BmYhxRCSYysDsPcssdmTFnzyLEts9qNwmjmu4JTAMYubEfwVOSwpQ1I1sKKFcxhZCI2buerfw==
 
-jquery@^3.6.1:
-  version "3.7.1"
-  resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.7.1.tgz#083ef98927c9a6a74d05a6af02806566d16274de"
-  integrity sha512-m4avr8yL8kmFN8psrbFFFmB/If14iN5o9nw/NgnnM+kybDJpRsAynV2BsfpTYrTRysYUdADVD7CkUUizgkpLfg==
-
 minimatch@^3.0.4:
   version "3.1.2"
   resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.1.2.tgz#19cd194bfd3e428f049a70817c038d89ab4be35b"