hof 22.0.0-timeout-warning-sign-in-beta.5 → 22.0.0-timeout-warning-beta.14

package/.github/workflows/automate-publish.yml

@@ -8,15 +8,15 @@ on:
       - completed
 jobs:
   auto-publish:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     if: startsWith(github.ref, 'refs/heads/master')
     steps:
-      - uses: actions/checkout@v2.2.0
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 0
-      - uses: actions/setup-node@v1
+      - uses: actions/setup-node@v4
         with:
-          node-version: 14
+          node-version: 20
           registry-url: https://registry.npmjs.org/
       - name: 'Get Previous tag'
         id: previoustag

package/.github/workflows/automate-tag.yml

@@ -4,14 +4,14 @@ name: Automate_Tag
 on: [push]
 jobs:
   test:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     strategy:
       matrix:
-        node-version: [14.x]
+        node-version: [20.x]
         redis-version: [4, 5, 6]
     steps:
-      - uses: actions/checkout@v2.2.0
-      - uses: actions/setup-node@v1
+      - uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
         with:
           node-version: ${{ matrix.node-version }}
       - name: Start Redis
@@ -25,16 +25,16 @@ jobs:
 
   auto-tag-patch:
     needs: test
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     if: |
       startsWith(github.ref, 'refs/heads/master') &&
       !contains(github.event.head_commit.message, '[MAJOR]') &&
       !contains(github.event.head_commit.message, '[MINOR]')
     steps:
-      - uses: actions/checkout@v2.2.0
-      - uses: actions/setup-node@v1
+      - uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
         with:
-          node-version: 14
+          node-version: 20
           registry-url: https://registry.npmjs.org/
       - run: |
           git config --local user.email "$(git log --format='%ae' HEAD^!)"
@@ -43,16 +43,16 @@ jobs:
 
   auto-tag-minor:
     needs: test
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     if: |
       startsWith(github.ref, 'refs/heads/master') &&
       !contains(github.event.head_commit.message, '[MAJOR]') &&
       contains(github.event.head_commit.message, '[MINOR]')
     steps:
-      - uses: actions/checkout@v2.2.0
-      - uses: actions/setup-node@v1
+      - uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
         with:
-          node-version: 14
+          node-version: 20
           registry-url: https://registry.npmjs.org/
       - run: |
           git config --local user.email "$(git log --format='%ae' HEAD^!)"
@@ -61,16 +61,16 @@ jobs:
 
   auto-tag-major:
     needs: test
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     if: |
       startsWith(github.ref, 'refs/heads/master') &&
       contains(github.event.head_commit.message, '[MAJOR]') &&
       !contains(github.event.head_commit.message, '[MINOR]')
     steps:
-      - uses: actions/checkout@v2.2.0
-      - uses: actions/setup-node@v1
+      - uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
         with:
-          node-version: 14
+          node-version: 20
           registry-url: https://registry.npmjs.org/
       - run: |
           git config --local user.email "$(git log --format='%ae' HEAD^!)"

package/CHANGELOG.md

@@ -1,8 +1,8 @@
-## 2024, Version 22.0.0, @Rhodine-orleans-lindsay
+## 2024, Version 22.0.0 (Stable), @Rhodine-orleans-lindsay
 * Adds session timeout warning
   - user can stay on page or exit form
   - adds exit html
-  - user can stay signed in page or save and exit form if the form is a save and exit form
+  - user can stay signed in or save and exit the form if the form is a save and exit form
   - adds default save-and-exit html
   - updates confirmation html to a static page
   - allows for customisation of session timeout warning dialog content and exit page content

package/config/hof-defaults.js

@@ -33,6 +33,7 @@ const defaults = {
       return convertPage(page);
     }
   },
+  deIndexForm: process.env.DEINDEX_FORM || 'false',
   gaCrossDomainTrackingTagId: process.env.GDS_CROSS_DOMAIN_GA_TAG,
   loglevel: process.env.LOG_LEVEL || 'info',
   ignoreMiddlewareLogs: ['/healthz'],

package/frontend/template-partials/translations/src/en/save-and-exit.json

@@ -1,4 +1,4 @@
 {
-    "header": "You have been signed out",
-    "message": "Any answers you saved have not been affected. You can sign back in to your application by returning to the <a href='/' class='govuk-link'>start page</a>."
-  }
+  "header": "You have been signed out",
+  "message": "Any answers you saved have not been affected. You can sign back in to your application by returning to the <a href='/' class='govuk-link'>start page</a>."
+}

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

@@ -21,6 +21,9 @@
 {{/cookiesAccepted}}
 {{/gtmTagId}}
 
+{{#deIndex}}
+  <meta name="robots" content="noindex">
+{{/deIndex}}
 <meta name="format-detection" content="telephone=no">
 <noscript>
   <meta http-equiv="refresh" content="{{sessionTimeOut}};url='{{baseUrl}}/session-timeout'"/>

package/frontend/template-partials/views/partials/session-timeout-warning.html

@@ -8,7 +8,7 @@
 data-url-redirect="/session-timeout" class="modal-dialog dialog" role="dialog"
   aria-live="polite" aria-labelledby="dialog-title" aria-describedby="at-timer">
   <div class="modal-dialog__inner">
-    {{^showSaveAndExit}}
+  {{^showSaveAndExit}}
     <h2 id="dialog-title" class="govuk-heading-l">
       {{#dialogTitle}}{{#t}}pages.session-timeout-warning.dialog-title{{/t}}{{/dialogTitle}}{{^dialogTitle}}Your page will time out soon{{/dialogTitle}}
     </h2>
@@ -20,8 +20,8 @@ data-url-redirect="/session-timeout" class="modal-dialog dialog" role="dialog"
     </div>
       <button class="govuk-button dialog-button js-dialog-close" id="timeout-continue-button" data-module="govuk-button">{{#timeoutContinueButton}}{{#t}}pages.session-timeout-warning.timeout-continue-button{{/t}}{{/timeoutContinueButton}}{{^timeoutContinueButton}}Stay on this page{{/timeoutContinueButton}}</button>
       <a href="{{baseUrl}}/exit" class="govuk-link dialog-exit-link" role="button">{{#dialogExitLink}}{{#t}}pages.session-timeout-warning.dialog-exit-link{{/t}}{{/dialogExitLink}}{{^dialogExitLink}}Exit this form{{/dialogExitLink}}</a>
-    {{/showSaveAndExit}}
-    {{#showSaveAndExit}}
+  {{/showSaveAndExit}}
+  {{#showSaveAndExit}}
     <h2 id="dialog-title" class="govuk-heading-l">
       {{#dialogTitle}}{{#t}}pages.session-timeout-warning.dialog-title{{/t}}{{/dialogTitle}}{{^dialogTitle}}You will be signed out soon{{/dialogTitle}}
     </h2>
@@ -33,6 +33,6 @@ data-url-redirect="/session-timeout" class="modal-dialog dialog" role="dialog"
     </div>
       <button class="govuk-button dialog-button js-dialog-close" id="timeout-continue-button" data-module="govuk-button">{{#timeoutContinueButton}}{{#t}}pages.session-timeout-warning.timeout-continue-button{{/t}}{{/timeoutContinueButton}}{{^timeoutContinueButton}}Stay signed in{{/timeoutContinueButton}}</button>
       <a href="{{baseUrl}}/save-and-exit" class="govuk-link dialog-exit-link" role="button">{{#dialogExitLink}}{{#t}}pages.session-timeout-warning.dialog-exit-link{{/t}}{{/dialogExitLink}}{{^dialogExitLink}}Sign out{{/dialogExitLink}}</a>
-    {{/showSaveAndExit}}
+  {{/showSaveAndExit}}
   </div>
 </dialog>

package/index.js

@@ -14,6 +14,7 @@ const router = require('./lib/router');
 const health = require('./lib/health');
 const serveStatic = require('./lib/serve-static');
 const gaTagSetup = require('./lib/ga-tag');
+const deIndexer = require('./lib/deindex');
 const sessionStore = require('./lib/sessions');
 const settings = require('./lib/settings');
 const defaults = require('./config/hof-defaults');
@@ -205,6 +206,7 @@ function bootstrap(options) {
   serveStatic(app, config);
   settings(app, config);
   gaTagSetup(app, config);
+  deIndexer(app, config);
 
   const sessions = sessionStore(app, config);
   app.use('/healthz', health(sessions));

package/lib/deindex.js

@@ -0,0 +1,18 @@
+'use strict';
+
+module.exports = (app, config) => {
+  // Ensure the value of deIndex is evaluated as a boolean regardless of if single quotes are used
+  // to have the expected conditional behaviour in the Mustache template
+  const deIndex = (config.deIndexForm === 'true' || config.deIndexForm === true);
+
+  app.use((req, res, next) => {
+    // Preparing common res.locals properties
+    const properties = {
+      deIndex: deIndex
+    };
+    res.locals = Object.assign(res.locals, properties);
+    next();
+  });
+
+  return app;
+};

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "hof",
   "description": "A bootstrap for HOF projects",
-  "version": "22.0.0-timeout-warning-sign-in-beta.5",
+  "version": "22.0.0-timeout-warning-beta.14",
   "license": "MIT",
   "main": "index.js",
   "author": "HomeOffice",

package/{pull-request-template.md → pull_request_template.md}

@@ -12,5 +12,5 @@
 - [ ] I have created a JIRA number for my commit
 - [ ] I have followed the chris beams method for my commit https://cbea.ms/git-commit/
 here is an [example commit](https://github.com/UKHomeOfficeForms/hof/commit/810959f391187c7c4af6db262bcd143b50093a6e)
-- [ ] Ensure drone builds are green especially tests
+- [ ] Ensure workflow jobs are passing especially tests
 - [ ] I will squash the commits before merging

package/sandbox/apps/sandbox/translations/en/default.json

@@ -170,14 +170,10 @@
       "message": "We have cleared your information to keep it secure. Your information has not been saved."
     },
     "session-timeout-warning": {
-      "dialog-title": "{{^showSaveAndExit}}Your application will close soon{{/showSaveAndExit}}{{#showSaveAndExit}}You will be signed out soon{{/showSaveAndExit}}",
-      "dialog-text": "{{^showSaveAndExit}}If that happens, your progress will not be saved.{{/showSaveAndExit}}{{#showSaveAndExit}}Any answers you have saved will not be affected, but your progress on this page will not be saved.{{/showSaveAndExit}}",
-      "timeout-continue-button": "{{^showSaveAndExit}}Stay on this page{{/showSaveAndExit}}{{#showSaveAndExit}}Stay signed in{{/showSaveAndExit}}",
-      "dialog-exit-link": "{{^showSaveAndExit}}Exit this form{{/showSaveAndExit}}{{#showSaveAndExit}}Sign out{{/showSaveAndExit}}"
-    },
-    "save-and-exit": {
-      "header": "You have been signed out",
-      "message": "Any answers you saved have not been affected. You can sign back in to your application at any time by returning to the <a href='/' class='govuk-link'>start page</a>."
+      "dialog-title": "Your application will close soon",
+      "dialog-text": "If that happens, your progress will not be saved.",
+      "timeout-continue-button": "Stay on this page",
+      "dialog-exit-link": "Exit this form"
     }
   },
   "validation": {

package/sandbox/apps/sandbox/translations/src/en/pages.json

@@ -65,6 +65,8 @@
   },
   "save-and-exit": {
     "header": "You have been signed out",
-    "message": "Any answers you saved have not been affected. You can sign back in to your application at any time by returning to the <a href='/' class='govuk-link'>start page</a>."
+    "paragraph-1": "Your form doesn't appear to have been worked on for 30 minutes so we closed it for security.",
+    "paragraph-2": "Any answers you saved have not been affected.",
+    "paragraph-3": "You can sign back in to your application at any time by returning to the <a href='/' class='govuk-link'>start page</a>."
   }
 }

package/sandbox/apps/sandbox/views/save-and-exit.html

@@ -0,0 +1,19 @@
+{{<layout}}
+  {{$journeyHeader}}
+  {{#t}}journey.header{{/t}}
+  {{/journeyHeader}}
+
+  {{$propositionHeader}}
+  {{> partials-navigation}}
+  {{/propositionHeader}}
+
+  {{$header}}
+    {{header}}
+  {{/header}}
+
+  {{$content}}
+   <p>{{#t}}pages.save-and-exit.paragraph-1{{/t}}</p>
+   <p>{{#t}}pages.save-and-exit.paragraph-2{{/t}}</p>
+   <p>{{#t}}pages.save-and-exit.paragraph-3{{/t}}</p>
+  {{/content}}
+{{/layout}}

package/sandbox/public/js/bundle.js

@@ -313,7 +313,7 @@ window.GOVUK.sessionDialog = {
   $fallBackElement: $('.govuk-timeout-warning-fallback'),
   dialogIsOpenClass: 'dialog-is-open',
   timers: [],
-  warningTextPrefix: $('.dialog-text-prefix').text(),
+  warningTextPrefix: 'To protect your information, this page will time out in ',
   warningTextSuffix: '.',
   warningText: $('.dialog-text').text(),
   warningTextExtra: '',