hof 20.3.3 → 20.3.4-redis-beta

Sign up to get free protection for your applications and to get access to all the features.
Files changed (29) hide show
  1. package/.nyc_output/9651d42a-59d8-48e6-949c-655d9fa6db21.json +1 -0
  2. package/.nyc_output/processinfo/9651d42a-59d8-48e6-949c-655d9fa6db21.json +1 -0
  3. package/.nyc_output/processinfo/index.json +1 -1
  4. package/config/hof-defaults.js +13 -3
  5. package/frontend/govuk-template/build/govuk_template.html +0 -3
  6. package/frontend/govuk-template/govuk_template_generated.html +100 -0
  7. package/frontend/template-mixins/partials/forms/checkbox-group.html +1 -1
  8. package/frontend/template-partials/views/layout.html +1 -1
  9. package/frontend/template-partials/views/partials/cookie-banner.html +2 -2
  10. package/frontend/template-partials/views/partials/head.html +5 -10
  11. package/lib/ga-tag.js +22 -13
  12. package/lib/health.js +1 -1
  13. package/lib/sessions.js +2 -0
  14. package/middleware/rate-limiter.js +3 -1
  15. package/package.json +2 -2
  16. package/sandbox/apps/sandbox/fields.js +7 -0
  17. package/sandbox/apps/sandbox/translations/en/default.json +220 -0
  18. package/sandbox/apps/sandbox/translations/src/en/fields.json +6 -6
  19. package/sandbox/apps/sandbox/translations/src/en/pages.json +1 -1
  20. package/sandbox/config.js +2 -1
  21. package/sandbox/public/css/app.css +9387 -0
  22. package/sandbox/public/images/icons/icon-caret-left.png +0 -0
  23. package/sandbox/public/images/icons/icon-complete.png +0 -0
  24. package/sandbox/public/images/icons/icon-cross-remove-sign.png +0 -0
  25. package/sandbox/public/js/bundle.js +35664 -0
  26. package/sandbox/server.js +4 -1
  27. package/sandbox/yarn.lock +3 -3
  28. package/.nyc_output/ba61bb97-548e-44b6-b2f7-282f850cee4a.json +0 -1
  29. package/.nyc_output/processinfo/ba61bb97-548e-44b6-b2f7-282f850cee4a.json +0 -1
@@ -0,0 +1 @@
1
+ {"parent":null,"pid":97956,"argv":["/Users/robertmccann/.nvm/versions/node/v18.12.1/bin/node","/Users/robertmccann/Projects/hof/node_modules/.bin/_mocha","test/**/*.spec.js","sandbox/test/**/*.spec.js"],"execArgv":[],"cwd":"/Users/robertmccann/Projects/hof","time":1702570177942,"ppid":97951,"coverageFilename":"/Users/robertmccann/Projects/hof/.nyc_output/9651d42a-59d8-48e6-949c-655d9fa6db21.json","externalId":"","uuid":"9651d42a-59d8-48e6-949c-655d9fa6db21","files":["/Users/robertmccann/Projects/hof/model/index.js","/Users/robertmccann/Projects/hof/components/index.js","/Users/robertmccann/Projects/hof/components/address-lookup/index.js","/Users/robertmccann/Projects/hof/components/address-lookup/default-model.js","/Users/robertmccann/Projects/hof/components/address-lookup/defaults.js","/Users/robertmccann/Projects/hof/components/clear-session/index.js","/Users/robertmccann/Projects/hof/components/combine-and-loop-fields/index.js","/Users/robertmccann/Projects/hof/components/date/index.js","/Users/robertmccann/Projects/hof/components/date/fields.js","/Users/robertmccann/Projects/hof/components/emailer/index.js","/Users/robertmccann/Projects/hof/components/emailer/email-service.js","/Users/robertmccann/Projects/hof/components/emailer/emailer.js","/Users/robertmccann/Projects/hof/components/emailer/transports/index.js","/Users/robertmccann/Projects/hof/components/emailer/transports/smtp.js","/Users/robertmccann/Projects/hof/components/emailer/transports/ses.js","/Users/robertmccann/Projects/hof/components/emailer/transports/stub.js","/Users/robertmccann/Projects/hof/components/emailer/transports/debug.js","/Users/robertmccann/Projects/hof/components/homeoffice-countries/index.js","/Users/robertmccann/Projects/hof/config/component-defaults.js","/Users/robertmccann/Projects/hof/components/notify/index.js","/Users/robertmccann/Projects/hof/components/notify/notify.js","/Users/robertmccann/Projects/hof/components/summary/index.js","/Users/robertmccann/Projects/hof/config/rate-limits.js","/Users/robertmccann/Projects/hof/middleware/rate-limiter.js","/Users/robertmccann/Projects/hof/config/hof-defaults.js","/Users/robertmccann/Projects/hof/controller/base-controller.js","/Users/robertmccann/Projects/hof/controller/formatting/index.js","/Users/robertmccann/Projects/hof/controller/validation/index.js","/Users/robertmccann/Projects/hof/controller/validation/validators.js","/Users/robertmccann/Projects/hof/controller/validation/email.js","/Users/robertmccann/Projects/hof/controller/validation-error.js","/Users/robertmccann/Projects/hof/utilities/index.js","/Users/robertmccann/Projects/hof/utilities/autofill/index.js","/Users/robertmccann/Projects/hof/utilities/autofill/inputs.js","/Users/robertmccann/Projects/hof/utilities/test-data/index.js","/Users/robertmccann/Projects/hof/utilities/countries.js","/Users/robertmccann/Projects/hof/utilities/helpers/index.js","/Users/robertmccann/Projects/hof/utilities/reqres/index.js","/Users/robertmccann/Projects/hof/config/sanitisation-rules.js","/Users/robertmccann/Projects/hof/controller/formatting/formatters.js","/Users/robertmccann/Projects/hof/controller/index.js","/Users/robertmccann/Projects/hof/controller/behaviour-session.js","/Users/robertmccann/Projects/hof/controller/behaviour-hooks.js","/Users/robertmccann/Projects/hof/controller/controller.js","/Users/robertmccann/Projects/hof/sandbox/apps/sandbox/behaviours/country-select.js","/Users/robertmccann/Projects/hof/frontend/template-mixins/mixins/index.js","/Users/robertmccann/Projects/hof/frontend/template-mixins/mixins/template-mixins.js","/Users/robertmccann/Projects/hof/frontend/template-mixins/mixins/render.js","/Users/robertmccann/Projects/hof/frontend/template-mixins/mixins/helpers.js","/Users/robertmccann/Projects/hof/index.js","/Users/robertmccann/Projects/hof/frontend/index.js","/Users/robertmccann/Projects/hof/frontend/govuk-template/index.js","/Users/robertmccann/Projects/hof/frontend/govuk-template/build/index.js","/Users/robertmccann/Projects/hof/frontend/govuk-template/build/config.js","/Users/robertmccann/Projects/hof/frontend/template-partials/index.js","/Users/robertmccann/Projects/hof/frontend/template-partials/translations/index.js","/Users/robertmccann/Projects/hof/frontend/themes/index.js","/Users/robertmccann/Projects/hof/frontend/themes/gov-uk/index.js","/Users/robertmccann/Projects/hof/frontend/toolkit/index.js","/Users/robertmccann/Projects/hof/frontend/toolkit/assets/javascript/helpers.js","/Users/robertmccann/Projects/hof/frontend/toolkit/assets/javascript/form-focus.js","/Users/robertmccann/Projects/hof/frontend/toolkit/assets/javascript/progressive-reveal.js","/Users/robertmccann/Projects/hof/frontend/toolkit/assets/javascript/validation.js","/Users/robertmccann/Projects/hof/frontend/toolkit/assets/javascript/character-count.js","/Users/robertmccann/Projects/hof/middleware/index.js","/Users/robertmccann/Projects/hof/middleware/cookies.js","/Users/robertmccann/Projects/hof/middleware/errors.js","/Users/robertmccann/Projects/hof/middleware/not-found.js","/Users/robertmccann/Projects/hof/middleware/deep-translate.js","/Users/robertmccann/Projects/hof/lib/markdown.js","/Users/robertmccann/Projects/hof/lib/router.js","/Users/robertmccann/Projects/hof/wizard/index.js","/Users/robertmccann/Projects/hof/wizard/behaviours/index.js","/Users/robertmccann/Projects/hof/wizard/behaviours/complete.js","/Users/robertmccann/Projects/hof/wizard/util/constants.js","/Users/robertmccann/Projects/hof/lib/helpers.js","/Users/robertmccann/Projects/hof/lib/health.js","/Users/robertmccann/Projects/hof/lib/serve-static.js","/Users/robertmccann/Projects/hof/lib/ga-tag.js","/Users/robertmccann/Projects/hof/lib/sessions.js","/Users/robertmccann/Projects/hof/lib/settings.js","/Users/robertmccann/Projects/hof/lib/logger.js","/Users/robertmccann/Projects/hof/build/index.js","/Users/robertmccann/Projects/hof/config/builder-defaults.js","/Users/robertmccann/Projects/hof/transpiler/index.js","/Users/robertmccann/Projects/hof/transpiler/lib/compile.js","/Users/robertmccann/Projects/hof/transpiler/lib/build.js","/Users/robertmccann/Projects/hof/transpiler/lib/expand-dirs.js","/Users/robertmccann/Projects/hof/transpiler/lib/aggregate.js","/Users/robertmccann/Projects/hof/transpiler/lib/write-files.js","/Users/robertmccann/Projects/hof/model/apis/index.js","/Users/robertmccann/Projects/hof/model/apis/html-to-pdf-converter.js","/Users/robertmccann/Projects/hof/wizard/model.js","/Users/robertmccann/Projects/hof/wizard/middleware/back-links.js","/Users/robertmccann/Projects/hof/wizard/util/helpers.js","/Users/robertmccann/Projects/hof/wizard/middleware/check-complete.js","/Users/robertmccann/Projects/hof/wizard/middleware/check-progress.js","/Users/robertmccann/Projects/hof/wizard/middleware/check-session.js","/Users/robertmccann/Projects/hof/wizard/middleware/csrf.js","/Users/robertmccann/Projects/hof/sandbox/test/_unit/example_app/sections/summary-data-sections.spec.js","/Users/robertmccann/Projects/hof/sandbox/apps/sandbox/sections/summary-data-sections.js","/Users/robertmccann/Projects/hof/sandbox/apps/sandbox/lib/staticAppealStages.js","/Users/robertmccann/Projects/hof/sandbox/apps/sandbox/fields.js","/Users/robertmccann/Projects/hof/sandbox/test/helpers/utilities.js","/Users/robertmccann/Projects/hof/sandbox/apps/sandbox/behaviours/international-number.js","/Users/robertmccann/Projects/hof/lib/encryption.js","/Users/robertmccann/Projects/hof/wizard/middleware/session.js","/Users/robertmccann/Projects/hof/wizard/middleware/session-model.js"]}
@@ -1 +1 @@
1
- {"processes":{"ba61bb97-548e-44b6-b2f7-282f850cee4a":{"parent":null,"children":[]}},"files":{"/Users/mohameduwais/UKHomeOffice/hof/model/index.js":["ba61bb97-548e-44b6-b2f7-282f850cee4a"],"/Users/mohameduwais/UKHomeOffice/hof/components/index.js":["ba61bb97-548e-44b6-b2f7-282f850cee4a"],"/Users/mohameduwais/UKHomeOffice/hof/components/address-lookup/index.js":["ba61bb97-548e-44b6-b2f7-282f850cee4a"],"/Users/mohameduwais/UKHomeOffice/hof/components/address-lookup/default-model.js":["ba61bb97-548e-44b6-b2f7-282f850cee4a"],"/Users/mohameduwais/UKHomeOffice/hof/components/address-lookup/defaults.js":["ba61bb97-548e-44b6-b2f7-282f850cee4a"],"/Users/mohameduwais/UKHomeOffice/hof/components/clear-session/index.js":["ba61bb97-548e-44b6-b2f7-282f850cee4a"],"/Users/mohameduwais/UKHomeOffice/hof/components/combine-and-loop-fields/index.js":["ba61bb97-548e-44b6-b2f7-282f850cee4a"],"/Users/mohameduwais/UKHomeOffice/hof/components/date/index.js":["ba61bb97-548e-44b6-b2f7-282f850cee4a"],"/Users/mohameduwais/UKHomeOffice/hof/components/date/fields.js":["ba61bb97-548e-44b6-b2f7-282f850cee4a"],"/Users/mohameduwais/UKHomeOffice/hof/components/emailer/index.js":["ba61bb97-548e-44b6-b2f7-282f850cee4a"],"/Users/mohameduwais/UKHomeOffice/hof/components/emailer/email-service.js":["ba61bb97-548e-44b6-b2f7-282f850cee4a"],"/Users/mohameduwais/UKHomeOffice/hof/components/emailer/emailer.js":["ba61bb97-548e-44b6-b2f7-282f850cee4a"],"/Users/mohameduwais/UKHomeOffice/hof/components/emailer/transports/index.js":["ba61bb97-548e-44b6-b2f7-282f850cee4a"],"/Users/mohameduwais/UKHomeOffice/hof/components/emailer/transports/smtp.js":["ba61bb97-548e-44b6-b2f7-282f850cee4a"],"/Users/mohameduwais/UKHomeOffice/hof/components/emailer/transports/ses.js":["ba61bb97-548e-44b6-b2f7-282f850cee4a"],"/Users/mohameduwais/UKHomeOffice/hof/components/emailer/transports/stub.js":["ba61bb97-548e-44b6-b2f7-282f850cee4a"],"/Users/mohameduwais/UKHomeOffice/hof/components/emailer/transports/debug.js":["ba61bb97-548e-44b6-b2f7-282f850cee4a"],"/Users/mohameduwais/UKHomeOffice/hof/components/homeoffice-countries/index.js":["ba61bb97-548e-44b6-b2f7-282f850cee4a"],"/Users/mohameduwais/UKHomeOffice/hof/config/component-defaults.js":["ba61bb97-548e-44b6-b2f7-282f850cee4a"],"/Users/mohameduwais/UKHomeOffice/hof/components/notify/index.js":["ba61bb97-548e-44b6-b2f7-282f850cee4a"],"/Users/mohameduwais/UKHomeOffice/hof/components/notify/notify.js":["ba61bb97-548e-44b6-b2f7-282f850cee4a"]},"externalIds":{}}
1
+ {"processes":{"9651d42a-59d8-48e6-949c-655d9fa6db21":{"parent":null,"children":[]}},"files":{"/Users/robertmccann/Projects/hof/model/index.js":["9651d42a-59d8-48e6-949c-655d9fa6db21"],"/Users/robertmccann/Projects/hof/components/index.js":["9651d42a-59d8-48e6-949c-655d9fa6db21"],"/Users/robertmccann/Projects/hof/components/address-lookup/index.js":["9651d42a-59d8-48e6-949c-655d9fa6db21"],"/Users/robertmccann/Projects/hof/components/address-lookup/default-model.js":["9651d42a-59d8-48e6-949c-655d9fa6db21"],"/Users/robertmccann/Projects/hof/components/address-lookup/defaults.js":["9651d42a-59d8-48e6-949c-655d9fa6db21"],"/Users/robertmccann/Projects/hof/components/clear-session/index.js":["9651d42a-59d8-48e6-949c-655d9fa6db21"],"/Users/robertmccann/Projects/hof/components/combine-and-loop-fields/index.js":["9651d42a-59d8-48e6-949c-655d9fa6db21"],"/Users/robertmccann/Projects/hof/components/date/index.js":["9651d42a-59d8-48e6-949c-655d9fa6db21"],"/Users/robertmccann/Projects/hof/components/date/fields.js":["9651d42a-59d8-48e6-949c-655d9fa6db21"],"/Users/robertmccann/Projects/hof/components/emailer/index.js":["9651d42a-59d8-48e6-949c-655d9fa6db21"],"/Users/robertmccann/Projects/hof/components/emailer/email-service.js":["9651d42a-59d8-48e6-949c-655d9fa6db21"],"/Users/robertmccann/Projects/hof/components/emailer/emailer.js":["9651d42a-59d8-48e6-949c-655d9fa6db21"],"/Users/robertmccann/Projects/hof/components/emailer/transports/index.js":["9651d42a-59d8-48e6-949c-655d9fa6db21"],"/Users/robertmccann/Projects/hof/components/emailer/transports/smtp.js":["9651d42a-59d8-48e6-949c-655d9fa6db21"],"/Users/robertmccann/Projects/hof/components/emailer/transports/ses.js":["9651d42a-59d8-48e6-949c-655d9fa6db21"],"/Users/robertmccann/Projects/hof/components/emailer/transports/stub.js":["9651d42a-59d8-48e6-949c-655d9fa6db21"],"/Users/robertmccann/Projects/hof/components/emailer/transports/debug.js":["9651d42a-59d8-48e6-949c-655d9fa6db21"],"/Users/robertmccann/Projects/hof/components/homeoffice-countries/index.js":["9651d42a-59d8-48e6-949c-655d9fa6db21"],"/Users/robertmccann/Projects/hof/config/component-defaults.js":["9651d42a-59d8-48e6-949c-655d9fa6db21"],"/Users/robertmccann/Projects/hof/components/notify/index.js":["9651d42a-59d8-48e6-949c-655d9fa6db21"],"/Users/robertmccann/Projects/hof/components/notify/notify.js":["9651d42a-59d8-48e6-949c-655d9fa6db21"],"/Users/robertmccann/Projects/hof/components/summary/index.js":["9651d42a-59d8-48e6-949c-655d9fa6db21"],"/Users/robertmccann/Projects/hof/config/rate-limits.js":["9651d42a-59d8-48e6-949c-655d9fa6db21"],"/Users/robertmccann/Projects/hof/middleware/rate-limiter.js":["9651d42a-59d8-48e6-949c-655d9fa6db21"],"/Users/robertmccann/Projects/hof/config/hof-defaults.js":["9651d42a-59d8-48e6-949c-655d9fa6db21"],"/Users/robertmccann/Projects/hof/controller/base-controller.js":["9651d42a-59d8-48e6-949c-655d9fa6db21"],"/Users/robertmccann/Projects/hof/controller/formatting/index.js":["9651d42a-59d8-48e6-949c-655d9fa6db21"],"/Users/robertmccann/Projects/hof/controller/validation/index.js":["9651d42a-59d8-48e6-949c-655d9fa6db21"],"/Users/robertmccann/Projects/hof/controller/validation/validators.js":["9651d42a-59d8-48e6-949c-655d9fa6db21"],"/Users/robertmccann/Projects/hof/controller/validation/email.js":["9651d42a-59d8-48e6-949c-655d9fa6db21"],"/Users/robertmccann/Projects/hof/controller/validation-error.js":["9651d42a-59d8-48e6-949c-655d9fa6db21"],"/Users/robertmccann/Projects/hof/utilities/index.js":["9651d42a-59d8-48e6-949c-655d9fa6db21"],"/Users/robertmccann/Projects/hof/utilities/autofill/index.js":["9651d42a-59d8-48e6-949c-655d9fa6db21"],"/Users/robertmccann/Projects/hof/utilities/autofill/inputs.js":["9651d42a-59d8-48e6-949c-655d9fa6db21"],"/Users/robertmccann/Projects/hof/utilities/test-data/index.js":["9651d42a-59d8-48e6-949c-655d9fa6db21"],"/Users/robertmccann/Projects/hof/utilities/countries.js":["9651d42a-59d8-48e6-949c-655d9fa6db21"],"/Users/robertmccann/Projects/hof/utilities/helpers/index.js":["9651d42a-59d8-48e6-949c-655d9fa6db21"],"/Users/robertmccann/Projects/hof/utilities/reqres/index.js":["9651d42a-59d8-48e6-949c-655d9fa6db21"],"/Users/robertmccann/Projects/hof/config/sanitisation-rules.js":["9651d42a-59d8-48e6-949c-655d9fa6db21"],"/Users/robertmccann/Projects/hof/controller/formatting/formatters.js":["9651d42a-59d8-48e6-949c-655d9fa6db21"],"/Users/robertmccann/Projects/hof/controller/index.js":["9651d42a-59d8-48e6-949c-655d9fa6db21"],"/Users/robertmccann/Projects/hof/controller/behaviour-session.js":["9651d42a-59d8-48e6-949c-655d9fa6db21"],"/Users/robertmccann/Projects/hof/controller/behaviour-hooks.js":["9651d42a-59d8-48e6-949c-655d9fa6db21"],"/Users/robertmccann/Projects/hof/controller/controller.js":["9651d42a-59d8-48e6-949c-655d9fa6db21"],"/Users/robertmccann/Projects/hof/sandbox/apps/sandbox/behaviours/country-select.js":["9651d42a-59d8-48e6-949c-655d9fa6db21"],"/Users/robertmccann/Projects/hof/frontend/template-mixins/mixins/index.js":["9651d42a-59d8-48e6-949c-655d9fa6db21"],"/Users/robertmccann/Projects/hof/frontend/template-mixins/mixins/template-mixins.js":["9651d42a-59d8-48e6-949c-655d9fa6db21"],"/Users/robertmccann/Projects/hof/frontend/template-mixins/mixins/render.js":["9651d42a-59d8-48e6-949c-655d9fa6db21"],"/Users/robertmccann/Projects/hof/frontend/template-mixins/mixins/helpers.js":["9651d42a-59d8-48e6-949c-655d9fa6db21"],"/Users/robertmccann/Projects/hof/index.js":["9651d42a-59d8-48e6-949c-655d9fa6db21"],"/Users/robertmccann/Projects/hof/frontend/index.js":["9651d42a-59d8-48e6-949c-655d9fa6db21"],"/Users/robertmccann/Projects/hof/frontend/govuk-template/index.js":["9651d42a-59d8-48e6-949c-655d9fa6db21"],"/Users/robertmccann/Projects/hof/frontend/govuk-template/build/index.js":["9651d42a-59d8-48e6-949c-655d9fa6db21"],"/Users/robertmccann/Projects/hof/frontend/govuk-template/build/config.js":["9651d42a-59d8-48e6-949c-655d9fa6db21"],"/Users/robertmccann/Projects/hof/frontend/template-partials/index.js":["9651d42a-59d8-48e6-949c-655d9fa6db21"],"/Users/robertmccann/Projects/hof/frontend/template-partials/translations/index.js":["9651d42a-59d8-48e6-949c-655d9fa6db21"],"/Users/robertmccann/Projects/hof/frontend/themes/index.js":["9651d42a-59d8-48e6-949c-655d9fa6db21"],"/Users/robertmccann/Projects/hof/frontend/themes/gov-uk/index.js":["9651d42a-59d8-48e6-949c-655d9fa6db21"],"/Users/robertmccann/Projects/hof/frontend/toolkit/index.js":["9651d42a-59d8-48e6-949c-655d9fa6db21"],"/Users/robertmccann/Projects/hof/frontend/toolkit/assets/javascript/helpers.js":["9651d42a-59d8-48e6-949c-655d9fa6db21"],"/Users/robertmccann/Projects/hof/frontend/toolkit/assets/javascript/form-focus.js":["9651d42a-59d8-48e6-949c-655d9fa6db21"],"/Users/robertmccann/Projects/hof/frontend/toolkit/assets/javascript/progressive-reveal.js":["9651d42a-59d8-48e6-949c-655d9fa6db21"],"/Users/robertmccann/Projects/hof/frontend/toolkit/assets/javascript/validation.js":["9651d42a-59d8-48e6-949c-655d9fa6db21"],"/Users/robertmccann/Projects/hof/frontend/toolkit/assets/javascript/character-count.js":["9651d42a-59d8-48e6-949c-655d9fa6db21"],"/Users/robertmccann/Projects/hof/middleware/index.js":["9651d42a-59d8-48e6-949c-655d9fa6db21"],"/Users/robertmccann/Projects/hof/middleware/cookies.js":["9651d42a-59d8-48e6-949c-655d9fa6db21"],"/Users/robertmccann/Projects/hof/middleware/errors.js":["9651d42a-59d8-48e6-949c-655d9fa6db21"],"/Users/robertmccann/Projects/hof/middleware/not-found.js":["9651d42a-59d8-48e6-949c-655d9fa6db21"],"/Users/robertmccann/Projects/hof/middleware/deep-translate.js":["9651d42a-59d8-48e6-949c-655d9fa6db21"],"/Users/robertmccann/Projects/hof/lib/markdown.js":["9651d42a-59d8-48e6-949c-655d9fa6db21"],"/Users/robertmccann/Projects/hof/lib/router.js":["9651d42a-59d8-48e6-949c-655d9fa6db21"],"/Users/robertmccann/Projects/hof/wizard/index.js":["9651d42a-59d8-48e6-949c-655d9fa6db21"],"/Users/robertmccann/Projects/hof/wizard/behaviours/index.js":["9651d42a-59d8-48e6-949c-655d9fa6db21"],"/Users/robertmccann/Projects/hof/wizard/behaviours/complete.js":["9651d42a-59d8-48e6-949c-655d9fa6db21"],"/Users/robertmccann/Projects/hof/wizard/util/constants.js":["9651d42a-59d8-48e6-949c-655d9fa6db21"],"/Users/robertmccann/Projects/hof/lib/helpers.js":["9651d42a-59d8-48e6-949c-655d9fa6db21"],"/Users/robertmccann/Projects/hof/lib/health.js":["9651d42a-59d8-48e6-949c-655d9fa6db21"],"/Users/robertmccann/Projects/hof/lib/serve-static.js":["9651d42a-59d8-48e6-949c-655d9fa6db21"],"/Users/robertmccann/Projects/hof/lib/ga-tag.js":["9651d42a-59d8-48e6-949c-655d9fa6db21"],"/Users/robertmccann/Projects/hof/lib/sessions.js":["9651d42a-59d8-48e6-949c-655d9fa6db21"],"/Users/robertmccann/Projects/hof/lib/settings.js":["9651d42a-59d8-48e6-949c-655d9fa6db21"],"/Users/robertmccann/Projects/hof/lib/logger.js":["9651d42a-59d8-48e6-949c-655d9fa6db21"],"/Users/robertmccann/Projects/hof/build/index.js":["9651d42a-59d8-48e6-949c-655d9fa6db21"],"/Users/robertmccann/Projects/hof/config/builder-defaults.js":["9651d42a-59d8-48e6-949c-655d9fa6db21"],"/Users/robertmccann/Projects/hof/transpiler/index.js":["9651d42a-59d8-48e6-949c-655d9fa6db21"],"/Users/robertmccann/Projects/hof/transpiler/lib/compile.js":["9651d42a-59d8-48e6-949c-655d9fa6db21"],"/Users/robertmccann/Projects/hof/transpiler/lib/build.js":["9651d42a-59d8-48e6-949c-655d9fa6db21"],"/Users/robertmccann/Projects/hof/transpiler/lib/expand-dirs.js":["9651d42a-59d8-48e6-949c-655d9fa6db21"],"/Users/robertmccann/Projects/hof/transpiler/lib/aggregate.js":["9651d42a-59d8-48e6-949c-655d9fa6db21"],"/Users/robertmccann/Projects/hof/transpiler/lib/write-files.js":["9651d42a-59d8-48e6-949c-655d9fa6db21"],"/Users/robertmccann/Projects/hof/model/apis/index.js":["9651d42a-59d8-48e6-949c-655d9fa6db21"],"/Users/robertmccann/Projects/hof/model/apis/html-to-pdf-converter.js":["9651d42a-59d8-48e6-949c-655d9fa6db21"],"/Users/robertmccann/Projects/hof/wizard/model.js":["9651d42a-59d8-48e6-949c-655d9fa6db21"],"/Users/robertmccann/Projects/hof/wizard/middleware/back-links.js":["9651d42a-59d8-48e6-949c-655d9fa6db21"],"/Users/robertmccann/Projects/hof/wizard/util/helpers.js":["9651d42a-59d8-48e6-949c-655d9fa6db21"],"/Users/robertmccann/Projects/hof/wizard/middleware/check-complete.js":["9651d42a-59d8-48e6-949c-655d9fa6db21"],"/Users/robertmccann/Projects/hof/wizard/middleware/check-progress.js":["9651d42a-59d8-48e6-949c-655d9fa6db21"],"/Users/robertmccann/Projects/hof/wizard/middleware/check-session.js":["9651d42a-59d8-48e6-949c-655d9fa6db21"],"/Users/robertmccann/Projects/hof/wizard/middleware/csrf.js":["9651d42a-59d8-48e6-949c-655d9fa6db21"],"/Users/robertmccann/Projects/hof/sandbox/test/_unit/example_app/sections/summary-data-sections.spec.js":["9651d42a-59d8-48e6-949c-655d9fa6db21"],"/Users/robertmccann/Projects/hof/sandbox/apps/sandbox/sections/summary-data-sections.js":["9651d42a-59d8-48e6-949c-655d9fa6db21"],"/Users/robertmccann/Projects/hof/sandbox/apps/sandbox/lib/staticAppealStages.js":["9651d42a-59d8-48e6-949c-655d9fa6db21"],"/Users/robertmccann/Projects/hof/sandbox/apps/sandbox/fields.js":["9651d42a-59d8-48e6-949c-655d9fa6db21"],"/Users/robertmccann/Projects/hof/sandbox/test/helpers/utilities.js":["9651d42a-59d8-48e6-949c-655d9fa6db21"],"/Users/robertmccann/Projects/hof/sandbox/apps/sandbox/behaviours/international-number.js":["9651d42a-59d8-48e6-949c-655d9fa6db21"],"/Users/robertmccann/Projects/hof/lib/encryption.js":["9651d42a-59d8-48e6-949c-655d9fa6db21"],"/Users/robertmccann/Projects/hof/wizard/middleware/session.js":["9651d42a-59d8-48e6-949c-655d9fa6db21"],"/Users/robertmccann/Projects/hof/wizard/middleware/session-model.js":["9651d42a-59d8-48e6-949c-655d9fa6db21"]},"externalIds":{}}
@@ -22,13 +22,23 @@ const defaults = {
22
22
  env: process.env.NODE_ENV || 'development',
23
23
  gaTagId: process.env.GA_TAG || 'Test-GA-Tag',
24
24
  ga4TagId: process.env.GA_4_TAG,
25
- gtmTagId: process.env.GTM_TAG || false,
25
+ // added to allow support for multiple HOF forms using GTM to customize how they track page views
26
+ gtm: {
27
+ tagId: process.env.GTM_TAG || false,
28
+ config: {},
29
+ composePageName: function (page, convertPage) {
30
+ return convertPage(page);
31
+ }
32
+ },
26
33
  gaCrossDomainTrackingTagId: process.env.GDS_CROSS_DOMAIN_GA_TAG,
27
34
  loglevel: process.env.LOG_LEVEL || 'info',
28
35
  ignoreMiddlewareLogs: ['/healthz'],
29
36
  redis: {
30
- port: process.env.REDIS_PORT || '6379',
31
- host: process.env.REDIS_HOST || '127.0.0.1'
37
+ socket: {
38
+ port: process.env.REDIS_PORT || '6379',
39
+ host: process.env.REDIS_HOST || '127.0.0.1'
40
+ },
41
+ legacyMode: true
32
42
  },
33
43
  session: {
34
44
  ttl: process.env.SESSION_TTL || 1800,
@@ -19,7 +19,6 @@
19
19
 
20
20
  <meta name="viewport" content="width=device-width, initial-scale=1">
21
21
 
22
-
23
22
  <meta property="og:image" content="{{assetPath}}images/opengraph-image.png">
24
23
  </head>
25
24
 
@@ -27,7 +26,6 @@
27
26
  <script>document.body.className = ((document.body.className) ? document.body.className + ' js-enabled' : 'js-enabled');</script>
28
27
 
29
28
 
30
-
31
29
  <div id="global-cookie-message" class="gem-c-cookie-banner govuk-clearfix" data-module="cookie-banner" role="region" aria-label="cookie banner" data-nosnippet="">
32
30
  {{{ cookieMessage }}}
33
31
  </div>
@@ -80,7 +78,6 @@
80
78
  <svg aria-hidden="true" focusable="false" class="govuk-footer__licence-logo" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 483.2 195.7" height="17" width="41">
81
79
  <path fill="currentColor" d="M421.5 142.8V.1l-50.7 32.3v161.1h112.4v-50.7zm-122.3-9.6A47.12 47.12 0 0 1 221 97.8c0-26 21.1-47.1 47.1-47.1 16.7 0 31.4 8.7 39.7 21.8l42.7-27.2A97.63 97.63 0 0 0 268.1 0c-36.5 0-68.3 20.1-85.1 49.7A98 98 0 0 0 97.8 0C43.9 0 0 43.9 0 97.8s43.9 97.8 97.8 97.8c36.5 0 68.3-20.1 85.1-49.7a97.76 97.76 0 0 0 149.6 25.4l19.4 22.2h3v-87.8h-80l24.3 27.5zM97.8 145c-26 0-47.1-21.1-47.1-47.1s21.1-47.1 47.1-47.1 47.2 21 47.2 47S123.8 145 97.8 145"></path>
82
80
  </svg>
83
-
84
81
  <span class="govuk-footer__licence-description">{{{ licenceMessage }}}</span>
85
82
  </div>
86
83
 
@@ -0,0 +1,100 @@
1
+
2
+ <!DOCTYPE html>
3
+ <!--[if lt IE 9]><html class="lte-ie8" lang="{{htmlLang}}"><![endif]-->
4
+ <!--[if gt IE 8]><!--><html lang="{{htmlLang}}" class="govuk-template"><!--<![endif]-->
5
+ <head>
6
+ <meta charset="utf-8" />
7
+ <title>{{$pageTitle}}{{/pageTitle}}</title>
8
+ {{$head}}{{/head}}
9
+
10
+ <link rel="shortcut icon" sizes="16x16 32x32 48x48" href="{{govukAssetPath}}images/favicon.ico" type="image/x-icon">
11
+ <link rel="mask-icon" href="{{govukAssetPath}}images/govuk-mask-icon.svg" color="#0b0c0c">
12
+ <link rel="apple-touch-icon" sizes="180x180" href="{{govukAssetPath}}images/govuk-apple-touch-icon-180x180.png">
13
+ <link rel="apple-touch-icon" sizes="167x167" href="{{govukAssetPath}}images/govuk-apple-touch-icon-167x167.png">
14
+ <link rel="apple-touch-icon" sizes="152x152" href="{{govukAssetPath}}images/govuk-apple-touch-icon-152x152.png">
15
+ <link rel="apple-touch-icon" href="{{govukAssetPath}}images/govuk-apple-touch-icon.png">
16
+
17
+
18
+ <meta name="theme-color" content="#0b0c0c" />
19
+
20
+ <meta name="viewport" content="width=device-width, initial-scale=1">
21
+
22
+ <meta property="og:image" content="{{govukAssetPath}}images/opengraph-image.png">
23
+ </head>
24
+
25
+ <body class="{{$bodyClasses}}{{/bodyClasses}} govuk-template__body js-enabled" >
26
+ <script {{#nonce}}nonce="{{nonce}}"{{/nonce}}>document.body.className = ((document.body.className) ? document.body.className + ' js-enabled' : 'js-enabled');</script>
27
+
28
+
29
+ <div id="global-cookie-message" class="gem-c-cookie-banner govuk-clearfix" data-module="cookie-banner" role="region" aria-label="cookie banner" data-nosnippet="">
30
+ {{$cookieMessage}}{{/cookieMessage}}
31
+ </div>
32
+
33
+ {{$bodyStart}}{{/bodyStart}}
34
+
35
+ <header role="banner" id="govuk-header" class="{{$headerClass}}{{/headerClass}}">
36
+ <div class="govuk-header__container govuk-width-container">
37
+
38
+ <div class="govuk-header__logo">
39
+ <a href="{{$homepageUrl}}https://www.gov.uk{{/homepageUrl}}" title="{{$logoLinkTitle}}Go to the GOV.UK homepage{{/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">
40
+ <span class="govuk-header__logotype">
41
+ <!--[if gt IE 8]><!-->
42
+ <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">
43
+ <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>
44
+ </svg>
45
+ <!--<![endif]-->
46
+ <!--<![endif]-->
47
+ <!--[if IE 8]>
48
+ <img src="{{govukAssetPath}}images/govuk-logotype-crown.png" class="govuk-header__logotype-crown-fallback-image" width="36" height="32">
49
+ <![endif]-->
50
+ </span>
51
+ <span class="govuk-header__logotype-text">
52
+ {{$globalHeaderText}}GOV.UK{{/globalHeaderText}}
53
+ </span>
54
+ </a>
55
+ </div>
56
+ {{$insideHeader}}{{/insideHeader}}
57
+
58
+ {{$propositionHeader}}{{/propositionHeader}}
59
+ </div>
60
+ </header>
61
+
62
+
63
+ {{$afterHeader}}{{/afterHeader}}
64
+
65
+
66
+ {{$main}}{{/main}}
67
+
68
+ <footer class="govuk-footer" id="footer" role="contentinfo">
69
+
70
+ <div class="govuk-width-container">
71
+ {{$footerTop}}{{/footerTop}}
72
+
73
+ <div class="govuk-footer__meta">
74
+ <div class="govuk-footer__meta-item govuk-footer__meta-item--grow">
75
+ <h2 class="govuk-visually-hidden">Support links</h2>
76
+ {{$footerSupportLinks}}{{/footerSupportLinks}}
77
+
78
+ <svg aria-hidden="true" focusable="false" class="govuk-footer__licence-logo" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 483.2 195.7" height="17" width="41">
79
+ <path fill="currentColor" d="M421.5 142.8V.1l-50.7 32.3v161.1h112.4v-50.7zm-122.3-9.6A47.12 47.12 0 0 1 221 97.8c0-26 21.1-47.1 47.1-47.1 16.7 0 31.4 8.7 39.7 21.8l42.7-27.2A97.63 97.63 0 0 0 268.1 0c-36.5 0-68.3 20.1-85.1 49.7A98 98 0 0 0 97.8 0C43.9 0 0 43.9 0 97.8s43.9 97.8 97.8 97.8c36.5 0 68.3-20.1 85.1-49.7a97.76 97.76 0 0 0 149.6 25.4l19.4 22.2h3v-87.8h-80l24.3 27.5zM97.8 145c-26 0-47.1-21.1-47.1-47.1s21.1-47.1 47.1-47.1 47.2 21 47.2 47S123.8 145 97.8 145"></path>
80
+ </svg>
81
+ <span class="govuk-footer__licence-description">{{$licenceMessage}}All content is available under the <a href="https://www.nationalarchives.gov.uk/doc/open-government-licence/version/3/" id="open-government-licence" class="govuk-footer__link" target="_blank" rel="license">Open Government Licence v3.0</a>, except where otherwise stated{{/licenceMessage}}</span>
82
+ </div>
83
+
84
+ <div class="govuk-footer__meta-item">
85
+ <a class="govuk-footer__link govuk-footer__copyright-logo" id="copyright-logo" target="_blank" href="https://www.nationalarchives.gov.uk/information-management/re-using-public-sector-information/uk-government-licensing-framework/crown-copyright/">{{$crownCopyrightMessage}}© Crown copyright{{/crownCopyrightMessage}}</a>
86
+ </div>
87
+ </div>
88
+ </div>
89
+ </footer>
90
+
91
+ <div id="global-app-error" class="app-error hidden"></div>
92
+
93
+
94
+ {{$bodyEnd}}{{/bodyEnd}}
95
+
96
+
97
+ <script {{#nonce}}nonce="{{nonce}}"{{/nonce}}>if (typeof window.GOVUK === 'undefined') document.body.className = document.body.className.replace('js-enabled', '');</script>
98
+
99
+ </body>
100
+ </html>
@@ -29,7 +29,7 @@
29
29
  type="{{type}}"
30
30
  name="{{key}}"
31
31
  id="{{key}}-{{value}}"
32
- value="{{value}}"
32
+ value="{{value}}"
33
33
  {{#toggle}} data-toggle="{{toggle}}"{{/toggle}}
34
34
  {{#selected}} checked="checked"{{/selected}}
35
35
  {{^error}}{{#optionHint}} aria-describedby="{{key}}-{{value}}-hint"{{/optionHint}}{{^optionHint}}{{#hint}} aria-describedby="{{key}}-hint"{{/hint}}{{/optionHint}}{{/error}}
@@ -19,7 +19,7 @@
19
19
  <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>
20
20
  </p>
21
21
  </div>
22
- {{/feedbackUrl}}
22
+ {{/feedbackUrl}}
23
23
  <span id="step">
24
24
  {{> partials-back}} <span>{{$step}}{{/step}}</span>
25
25
  </span>
@@ -10,9 +10,9 @@
10
10
  </div>
11
11
  </div>
12
12
  </div>
13
- <div id="cookie-banner-actions" class="govuk-button-group">
13
+ <div id="cookie-banner-actions" class="govuk-button-group">
14
14
  <button id="accept-cookies-button" class="gem-c-button govuk-button" type="submit" data-module="gem-track-click" data-accept-cookies="true" data-track-category="cookieBanner" data-track-action="Cookie banner accepted" data-cookie-types="all">Accept additional cookies</button>
15
-
15
+
16
16
  <button id="reject-cookies-button" class="gem-c-button govuk-button" type="submit" data-module="gem-track-click" data-reject-cookies="true" data-track-category="cookieBanner" data-track-action="Cookie banner rejected">Reject additional cookies</button>
17
17
 
18
18
  <a class="govuk-link" href="/cookies">View cookies</a>
@@ -1,18 +1,13 @@
1
1
  {{#gtmTagId}}
2
2
  {{#cookiesAccepted}}
3
- {{#isETA}}
4
- <!-- Google Tag Manager Data Layer for ETA -->
3
+ <!-- Google Tag Manager Data Layer -->
5
4
  <script {{#nonce}}nonce="{{nonce}}"{{/nonce}}>
6
5
  var dataLayer = window.dataLayer || [];
7
- dataLayer.push({
8
- 'event': 'pageLoad',
9
- 'pageName': 'ETA | Customer Contact Webform | {{gtm-page}}',
10
- 'applicationType': 'ETA | Customer Contact',
11
- 'environmentType': '{{environmentType}}'
12
- });
6
+ dataLayer.push(
7
+ {{{gtmConfig}}}
8
+ );
13
9
  </script>
14
- <!-- End Google Tag Manager Data Layer for ETA -->
15
- {{/isETA}}
10
+ <!-- End Google Tag Manager Data Layer -->
16
11
 
17
12
  <!-- Google Tag Manager -->
18
13
  <script {{#nonce}}nonce="{{nonce}}"{{/nonce}}>
package/lib/ga-tag.js CHANGED
@@ -52,26 +52,35 @@ const setupPageMap = routes => {
52
52
  module.exports = (app, config) => {
53
53
  const gaTagId = config.gaTagId;
54
54
  const ga4TagId = config.ga4TagId;
55
- const gtmTagId = config.gtmTagId;
56
- const environmentType = config.environmentType ? config.environmentType : 'dev';
55
+ const gtm = config.gtm;
57
56
  const gaCrossDomainTrackingTagId = config.gaCrossDomainTrackingTagId;
58
57
  const routes = config.routes;
59
58
 
60
- if (gaTagId || ga4TagId) {
59
+ if (gaTagId || ga4TagId || gtm.tagId) {
61
60
  const pageMap = setupPageMap(routes);
62
61
 
63
62
  app.use((req, res, next) => {
64
63
  const page = pageView(req.path, pageMap);
65
- res.locals.gaAllowDebug = config.env === 'development';
66
- res.locals.isETA = config.appName === 'ETA';
67
- res.locals.gaTagId = gaTagId;
68
- res.locals.ga4TagId = ga4TagId;
69
- res.locals.gtmTagId = gtmTagId;
70
- res.locals.environmentType = environmentType;
71
- res.locals.gaCrossDomainTrackingTagId = gaCrossDomainTrackingTagId;
72
- res.locals['ga-id'] = gaTagId;
73
- res.locals['ga-page'] = page;
74
- res.locals['gtm-page'] = convertToGTMPage(page);
64
+
65
+ // Preparing common res.locals properties
66
+ const properties = {
67
+ gaAllowDebug: config.env === 'development',
68
+ gaTagId: gaTagId,
69
+ ga4TagId: ga4TagId,
70
+ gaCrossDomainTrackingTagId: gaCrossDomainTrackingTagId,
71
+ 'ga-id': gaTagId,
72
+ 'ga-page': page
73
+ };
74
+
75
+ // Adding extra properties if a GTM TAG is available
76
+ if (gtm.tagId) {
77
+ gtm.config.pageName = gtm.composePageName(page, convertToGTMPage);
78
+ Object.assign(properties, {
79
+ gtmConfig: JSON.stringify(gtm.config),
80
+ gtmTagId: gtm.tagId
81
+ });
82
+ }
83
+ res.locals = Object.assign(res.locals, properties);
75
84
  next();
76
85
  });
77
86
  }
package/lib/health.js CHANGED
@@ -15,7 +15,7 @@ module.exports = redis => {
15
15
 
16
16
  router.get('/readiness', healthCheck({
17
17
  test: () => {
18
- if (!redis.connected && !redis.ready) {
18
+ if (!redis.isOpen && !redis.isReady) {
19
19
  return new Error('Session store unhealthy');
20
20
  }
21
21
  return 0;
package/lib/sessions.js CHANGED
@@ -51,6 +51,8 @@ module.exports = (app, config) => {
51
51
  });
52
52
  }
53
53
 
54
+ client.connect();
55
+
54
56
  const store = new RedisStore({
55
57
  client: client,
56
58
  ttl: config.session.ttl,
@@ -25,9 +25,11 @@ module.exports = (options, rateLimitType) => {
25
25
  }
26
26
 
27
27
  const closeConnection = async err => {
28
- await redisClient.quit();
28
+ await redisClient.v4.QUIT();
29
29
  return next(err);
30
30
  };
31
+ redisClient.on('error', err => logger.log('error', err));
32
+ await redisClient.connect();
31
33
 
32
34
  try {
33
35
  // fetch records of current user using IP address, returns null when no record is found
package/package.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "name": "hof",
3
3
  "description": "A bootstrap for HOF projects",
4
- "version": "20.3.3",
4
+ "version": "20.3.4-redis-beta",
5
5
  "license": "MIT",
6
6
  "main": "index.js",
7
7
  "author": "HomeOffice",
@@ -80,7 +80,7 @@
80
80
  "nodemailer-smtp-transport": "^2.7.4",
81
81
  "nodemailer-stub-transport": "^1.1.0",
82
82
  "notifications-node-client": "^6.0.0",
83
- "redis": "^3.1.2",
83
+ "redis": "^4.6.6",
84
84
  "reqres": "^3.0.1",
85
85
  "request": "^2.79.0",
86
86
  "rimraf": "^3.0.2",
@@ -16,6 +16,9 @@ module.exports = {
16
16
  },
17
17
  name: {
18
18
  validate: ['required', 'notUrl', { type: 'maxlength', arguments: 200 }],
19
+ // need to remove this for the heading to go
20
+ labelClassName: ['govuk-label--l'],
21
+ isPageHeading: 'true'
19
22
  },
20
23
  'dateOfBirth': dateComponent('dateOfBirth', {
21
24
  mixin: 'input-date',
@@ -67,6 +70,8 @@ module.exports = {
67
70
  ]
68
71
  },
69
72
  email: {
73
+ isPageHeading: 'true',
74
+ labelClassName: ['govuk-label--l'],
70
75
  validate: ['required', 'email']
71
76
  },
72
77
  phone: {
@@ -90,6 +95,7 @@ module.exports = {
90
95
  mixin: 'textarea',
91
96
  // we want to ignore default formatters as we want
92
97
  // to preserve white space
98
+ isPageHeading: 'true',
93
99
  'ignore-defaults': true,
94
100
  // apply the other default formatters
95
101
  formatter: ['trim', 'hyphens'],
@@ -109,6 +115,7 @@ module.exports = {
109
115
  // apply the other default formatters
110
116
  formatter: ['trim', 'hyphens'],
111
117
  isPageHeading: 'true',
118
+ labelClassName: ['govuk-label--l'],
112
119
  // attributes here are passed to the field element
113
120
  validate: ['required', { type: 'maxword', arguments: 10 }],
114
121
  attributes: [{