hof 21.0.6-axios-beta → 21.0.6-notify-attachments-beta

package/.nyc_output/processinfo/ba61bb97-548e-44b6-b2f7-282f850cee4a.json

@@ -0,0 +1 @@
+{"parent":null,"pid":96815,"argv":["/usr/local/bin/node","/Users/mohameduwais/UKHomeOffice/hof/node_modules/.bin/_mocha","test/**/*.spec.js","sandbox/test/**/*.spec.js"],"execArgv":[],"cwd":"/Users/mohameduwais/UKHomeOffice/hof","time":1699519755908,"ppid":96812,"coverageFilename":"/Users/mohameduwais/UKHomeOffice/hof/.nyc_output/ba61bb97-548e-44b6-b2f7-282f850cee4a.json","externalId":"","uuid":"ba61bb97-548e-44b6-b2f7-282f850cee4a","files":["/Users/mohameduwais/UKHomeOffice/hof/model/index.js","/Users/mohameduwais/UKHomeOffice/hof/components/index.js","/Users/mohameduwais/UKHomeOffice/hof/components/address-lookup/index.js","/Users/mohameduwais/UKHomeOffice/hof/components/address-lookup/default-model.js","/Users/mohameduwais/UKHomeOffice/hof/components/address-lookup/defaults.js","/Users/mohameduwais/UKHomeOffice/hof/components/clear-session/index.js","/Users/mohameduwais/UKHomeOffice/hof/components/combine-and-loop-fields/index.js","/Users/mohameduwais/UKHomeOffice/hof/components/date/index.js","/Users/mohameduwais/UKHomeOffice/hof/components/date/fields.js","/Users/mohameduwais/UKHomeOffice/hof/components/emailer/index.js","/Users/mohameduwais/UKHomeOffice/hof/components/emailer/email-service.js","/Users/mohameduwais/UKHomeOffice/hof/components/emailer/emailer.js","/Users/mohameduwais/UKHomeOffice/hof/components/emailer/transports/index.js","/Users/mohameduwais/UKHomeOffice/hof/components/emailer/transports/smtp.js","/Users/mohameduwais/UKHomeOffice/hof/components/emailer/transports/ses.js","/Users/mohameduwais/UKHomeOffice/hof/components/emailer/transports/stub.js","/Users/mohameduwais/UKHomeOffice/hof/components/emailer/transports/debug.js","/Users/mohameduwais/UKHomeOffice/hof/components/homeoffice-countries/index.js","/Users/mohameduwais/UKHomeOffice/hof/config/component-defaults.js","/Users/mohameduwais/UKHomeOffice/hof/components/notify/index.js","/Users/mohameduwais/UKHomeOffice/hof/components/notify/notify.js"]}

package/.nyc_output/processinfo/index.json

@@ -1 +1 @@
-{"processes":{"4fc007c9-d6c8-4614-89ce-04c7d6ce9fe5":{"parent":null,"children":[]}},"files":{"/Users/robertmccann/Projects/hof/model/index.js":["4fc007c9-d6c8-4614-89ce-04c7d6ce9fe5"],"/Users/robertmccann/Projects/hof/components/index.js":["4fc007c9-d6c8-4614-89ce-04c7d6ce9fe5"],"/Users/robertmccann/Projects/hof/components/address-lookup/index.js":["4fc007c9-d6c8-4614-89ce-04c7d6ce9fe5"],"/Users/robertmccann/Projects/hof/components/address-lookup/default-model.js":["4fc007c9-d6c8-4614-89ce-04c7d6ce9fe5"],"/Users/robertmccann/Projects/hof/components/address-lookup/defaults.js":["4fc007c9-d6c8-4614-89ce-04c7d6ce9fe5"],"/Users/robertmccann/Projects/hof/components/clear-session/index.js":["4fc007c9-d6c8-4614-89ce-04c7d6ce9fe5"],"/Users/robertmccann/Projects/hof/components/combine-and-loop-fields/index.js":["4fc007c9-d6c8-4614-89ce-04c7d6ce9fe5"],"/Users/robertmccann/Projects/hof/components/date/index.js":["4fc007c9-d6c8-4614-89ce-04c7d6ce9fe5"],"/Users/robertmccann/Projects/hof/components/date/fields.js":["4fc007c9-d6c8-4614-89ce-04c7d6ce9fe5"],"/Users/robertmccann/Projects/hof/components/emailer/index.js":["4fc007c9-d6c8-4614-89ce-04c7d6ce9fe5"],"/Users/robertmccann/Projects/hof/components/emailer/email-service.js":["4fc007c9-d6c8-4614-89ce-04c7d6ce9fe5"],"/Users/robertmccann/Projects/hof/components/emailer/emailer.js":["4fc007c9-d6c8-4614-89ce-04c7d6ce9fe5"],"/Users/robertmccann/Projects/hof/components/emailer/transports/index.js":["4fc007c9-d6c8-4614-89ce-04c7d6ce9fe5"],"/Users/robertmccann/Projects/hof/components/emailer/transports/smtp.js":["4fc007c9-d6c8-4614-89ce-04c7d6ce9fe5"],"/Users/robertmccann/Projects/hof/components/emailer/transports/ses.js":["4fc007c9-d6c8-4614-89ce-04c7d6ce9fe5"],"/Users/robertmccann/Projects/hof/components/emailer/transports/stub.js":["4fc007c9-d6c8-4614-89ce-04c7d6ce9fe5"],"/Users/robertmccann/Projects/hof/components/emailer/transports/debug.js":["4fc007c9-d6c8-4614-89ce-04c7d6ce9fe5"],"/Users/robertmccann/Projects/hof/components/homeoffice-countries/index.js":["4fc007c9-d6c8-4614-89ce-04c7d6ce9fe5"],"/Users/robertmccann/Projects/hof/config/component-defaults.js":["4fc007c9-d6c8-4614-89ce-04c7d6ce9fe5"],"/Users/robertmccann/Projects/hof/components/notify/index.js":["4fc007c9-d6c8-4614-89ce-04c7d6ce9fe5"],"/Users/robertmccann/Projects/hof/components/notify/notify.js":["4fc007c9-d6c8-4614-89ce-04c7d6ce9fe5"],"/Users/robertmccann/Projects/hof/components/summary/index.js":["4fc007c9-d6c8-4614-89ce-04c7d6ce9fe5"],"/Users/robertmccann/Projects/hof/config/rate-limits.js":["4fc007c9-d6c8-4614-89ce-04c7d6ce9fe5"],"/Users/robertmccann/Projects/hof/middleware/rate-limiter.js":["4fc007c9-d6c8-4614-89ce-04c7d6ce9fe5"],"/Users/robertmccann/Projects/hof/config/hof-defaults.js":["4fc007c9-d6c8-4614-89ce-04c7d6ce9fe5"],"/Users/robertmccann/Projects/hof/controller/base-controller.js":["4fc007c9-d6c8-4614-89ce-04c7d6ce9fe5"],"/Users/robertmccann/Projects/hof/controller/formatting/index.js":["4fc007c9-d6c8-4614-89ce-04c7d6ce9fe5"],"/Users/robertmccann/Projects/hof/controller/validation/index.js":["4fc007c9-d6c8-4614-89ce-04c7d6ce9fe5"],"/Users/robertmccann/Projects/hof/controller/validation/validators.js":["4fc007c9-d6c8-4614-89ce-04c7d6ce9fe5"],"/Users/robertmccann/Projects/hof/controller/validation/email.js":["4fc007c9-d6c8-4614-89ce-04c7d6ce9fe5"],"/Users/robertmccann/Projects/hof/controller/validation-error.js":["4fc007c9-d6c8-4614-89ce-04c7d6ce9fe5"],"/Users/robertmccann/Projects/hof/utilities/index.js":["4fc007c9-d6c8-4614-89ce-04c7d6ce9fe5"],"/Users/robertmccann/Projects/hof/utilities/autofill/index.js":["4fc007c9-d6c8-4614-89ce-04c7d6ce9fe5"],"/Users/robertmccann/Projects/hof/utilities/autofill/inputs.js":["4fc007c9-d6c8-4614-89ce-04c7d6ce9fe5"],"/Users/robertmccann/Projects/hof/utilities/test-data/index.js":["4fc007c9-d6c8-4614-89ce-04c7d6ce9fe5"],"/Users/robertmccann/Projects/hof/utilities/countries.js":["4fc007c9-d6c8-4614-89ce-04c7d6ce9fe5"],"/Users/robertmccann/Projects/hof/utilities/helpers/index.js":["4fc007c9-d6c8-4614-89ce-04c7d6ce9fe5"],"/Users/robertmccann/Projects/hof/utilities/reqres/index.js":["4fc007c9-d6c8-4614-89ce-04c7d6ce9fe5"],"/Users/robertmccann/Projects/hof/config/sanitisation-rules.js":["4fc007c9-d6c8-4614-89ce-04c7d6ce9fe5"],"/Users/robertmccann/Projects/hof/controller/formatting/formatters.js":["4fc007c9-d6c8-4614-89ce-04c7d6ce9fe5"],"/Users/robertmccann/Projects/hof/controller/index.js":["4fc007c9-d6c8-4614-89ce-04c7d6ce9fe5"],"/Users/robertmccann/Projects/hof/controller/behaviour-session.js":["4fc007c9-d6c8-4614-89ce-04c7d6ce9fe5"],"/Users/robertmccann/Projects/hof/controller/behaviour-hooks.js":["4fc007c9-d6c8-4614-89ce-04c7d6ce9fe5"],"/Users/robertmccann/Projects/hof/controller/controller.js":["4fc007c9-d6c8-4614-89ce-04c7d6ce9fe5"],"/Users/robertmccann/Projects/hof/sandbox/apps/sandbox/behaviours/country-select.js":["4fc007c9-d6c8-4614-89ce-04c7d6ce9fe5"],"/Users/robertmccann/Projects/hof/frontend/template-mixins/mixins/index.js":["4fc007c9-d6c8-4614-89ce-04c7d6ce9fe5"],"/Users/robertmccann/Projects/hof/frontend/template-mixins/mixins/template-mixins.js":["4fc007c9-d6c8-4614-89ce-04c7d6ce9fe5"],"/Users/robertmccann/Projects/hof/frontend/template-mixins/mixins/render.js":["4fc007c9-d6c8-4614-89ce-04c7d6ce9fe5"],"/Users/robertmccann/Projects/hof/frontend/template-mixins/mixins/helpers.js":["4fc007c9-d6c8-4614-89ce-04c7d6ce9fe5"],"/Users/robertmccann/Projects/hof/index.js":["4fc007c9-d6c8-4614-89ce-04c7d6ce9fe5"],"/Users/robertmccann/Projects/hof/frontend/index.js":["4fc007c9-d6c8-4614-89ce-04c7d6ce9fe5"],"/Users/robertmccann/Projects/hof/frontend/govuk-template/index.js":["4fc007c9-d6c8-4614-89ce-04c7d6ce9fe5"],"/Users/robertmccann/Projects/hof/frontend/govuk-template/build/index.js":["4fc007c9-d6c8-4614-89ce-04c7d6ce9fe5"],"/Users/robertmccann/Projects/hof/frontend/govuk-template/build/config.js":["4fc007c9-d6c8-4614-89ce-04c7d6ce9fe5"],"/Users/robertmccann/Projects/hof/frontend/template-partials/index.js":["4fc007c9-d6c8-4614-89ce-04c7d6ce9fe5"],"/Users/robertmccann/Projects/hof/frontend/template-partials/translations/index.js":["4fc007c9-d6c8-4614-89ce-04c7d6ce9fe5"],"/Users/robertmccann/Projects/hof/frontend/themes/index.js":["4fc007c9-d6c8-4614-89ce-04c7d6ce9fe5"],"/Users/robertmccann/Projects/hof/frontend/themes/gov-uk/index.js":["4fc007c9-d6c8-4614-89ce-04c7d6ce9fe5"],"/Users/robertmccann/Projects/hof/frontend/toolkit/index.js":["4fc007c9-d6c8-4614-89ce-04c7d6ce9fe5"],"/Users/robertmccann/Projects/hof/frontend/toolkit/assets/javascript/helpers.js":["4fc007c9-d6c8-4614-89ce-04c7d6ce9fe5"],"/Users/robertmccann/Projects/hof/frontend/toolkit/assets/javascript/form-focus.js":["4fc007c9-d6c8-4614-89ce-04c7d6ce9fe5"],"/Users/robertmccann/Projects/hof/frontend/toolkit/assets/javascript/progressive-reveal.js":["4fc007c9-d6c8-4614-89ce-04c7d6ce9fe5"],"/Users/robertmccann/Projects/hof/frontend/toolkit/assets/javascript/validation.js":["4fc007c9-d6c8-4614-89ce-04c7d6ce9fe5"],"/Users/robertmccann/Projects/hof/frontend/toolkit/assets/javascript/character-count.js":["4fc007c9-d6c8-4614-89ce-04c7d6ce9fe5"],"/Users/robertmccann/Projects/hof/middleware/index.js":["4fc007c9-d6c8-4614-89ce-04c7d6ce9fe5"],"/Users/robertmccann/Projects/hof/middleware/cookies.js":["4fc007c9-d6c8-4614-89ce-04c7d6ce9fe5"],"/Users/robertmccann/Projects/hof/middleware/errors.js":["4fc007c9-d6c8-4614-89ce-04c7d6ce9fe5"],"/Users/robertmccann/Projects/hof/middleware/not-found.js":["4fc007c9-d6c8-4614-89ce-04c7d6ce9fe5"],"/Users/robertmccann/Projects/hof/middleware/deep-translate.js":["4fc007c9-d6c8-4614-89ce-04c7d6ce9fe5"],"/Users/robertmccann/Projects/hof/lib/markdown.js":["4fc007c9-d6c8-4614-89ce-04c7d6ce9fe5"],"/Users/robertmccann/Projects/hof/lib/router.js":["4fc007c9-d6c8-4614-89ce-04c7d6ce9fe5"],"/Users/robertmccann/Projects/hof/wizard/index.js":["4fc007c9-d6c8-4614-89ce-04c7d6ce9fe5"],"/Users/robertmccann/Projects/hof/wizard/behaviours/index.js":["4fc007c9-d6c8-4614-89ce-04c7d6ce9fe5"],"/Users/robertmccann/Projects/hof/wizard/behaviours/complete.js":["4fc007c9-d6c8-4614-89ce-04c7d6ce9fe5"],"/Users/robertmccann/Projects/hof/wizard/util/constants.js":["4fc007c9-d6c8-4614-89ce-04c7d6ce9fe5"],"/Users/robertmccann/Projects/hof/lib/helpers.js":["4fc007c9-d6c8-4614-89ce-04c7d6ce9fe5"],"/Users/robertmccann/Projects/hof/lib/health.js":["4fc007c9-d6c8-4614-89ce-04c7d6ce9fe5"],"/Users/robertmccann/Projects/hof/lib/serve-static.js":["4fc007c9-d6c8-4614-89ce-04c7d6ce9fe5"],"/Users/robertmccann/Projects/hof/lib/ga-tag.js":["4fc007c9-d6c8-4614-89ce-04c7d6ce9fe5"],"/Users/robertmccann/Projects/hof/lib/sessions.js":["4fc007c9-d6c8-4614-89ce-04c7d6ce9fe5"],"/Users/robertmccann/Projects/hof/lib/settings.js":["4fc007c9-d6c8-4614-89ce-04c7d6ce9fe5"],"/Users/robertmccann/Projects/hof/lib/logger.js":["4fc007c9-d6c8-4614-89ce-04c7d6ce9fe5"],"/Users/robertmccann/Projects/hof/build/index.js":["4fc007c9-d6c8-4614-89ce-04c7d6ce9fe5"],"/Users/robertmccann/Projects/hof/config/builder-defaults.js":["4fc007c9-d6c8-4614-89ce-04c7d6ce9fe5"],"/Users/robertmccann/Projects/hof/transpiler/index.js":["4fc007c9-d6c8-4614-89ce-04c7d6ce9fe5"],"/Users/robertmccann/Projects/hof/transpiler/lib/compile.js":["4fc007c9-d6c8-4614-89ce-04c7d6ce9fe5"],"/Users/robertmccann/Projects/hof/transpiler/lib/build.js":["4fc007c9-d6c8-4614-89ce-04c7d6ce9fe5"],"/Users/robertmccann/Projects/hof/transpiler/lib/expand-dirs.js":["4fc007c9-d6c8-4614-89ce-04c7d6ce9fe5"],"/Users/robertmccann/Projects/hof/transpiler/lib/aggregate.js":["4fc007c9-d6c8-4614-89ce-04c7d6ce9fe5"],"/Users/robertmccann/Projects/hof/transpiler/lib/write-files.js":["4fc007c9-d6c8-4614-89ce-04c7d6ce9fe5"],"/Users/robertmccann/Projects/hof/model/apis/index.js":["4fc007c9-d6c8-4614-89ce-04c7d6ce9fe5"],"/Users/robertmccann/Projects/hof/model/apis/html-to-pdf-converter.js":["4fc007c9-d6c8-4614-89ce-04c7d6ce9fe5"],"/Users/robertmccann/Projects/hof/wizard/model.js":["4fc007c9-d6c8-4614-89ce-04c7d6ce9fe5"],"/Users/robertmccann/Projects/hof/wizard/middleware/back-links.js":["4fc007c9-d6c8-4614-89ce-04c7d6ce9fe5"],"/Users/robertmccann/Projects/hof/wizard/util/helpers.js":["4fc007c9-d6c8-4614-89ce-04c7d6ce9fe5"],"/Users/robertmccann/Projects/hof/wizard/middleware/check-complete.js":["4fc007c9-d6c8-4614-89ce-04c7d6ce9fe5"],"/Users/robertmccann/Projects/hof/wizard/middleware/check-progress.js":["4fc007c9-d6c8-4614-89ce-04c7d6ce9fe5"],"/Users/robertmccann/Projects/hof/wizard/middleware/check-session.js":["4fc007c9-d6c8-4614-89ce-04c7d6ce9fe5"],"/Users/robertmccann/Projects/hof/wizard/middleware/csrf.js":["4fc007c9-d6c8-4614-89ce-04c7d6ce9fe5"],"/Users/robertmccann/Projects/hof/sandbox/test/_unit/example_app/sections/summary-data-sections.spec.js":["4fc007c9-d6c8-4614-89ce-04c7d6ce9fe5"],"/Users/robertmccann/Projects/hof/sandbox/apps/sandbox/sections/summary-data-sections.js":["4fc007c9-d6c8-4614-89ce-04c7d6ce9fe5"],"/Users/robertmccann/Projects/hof/sandbox/apps/sandbox/lib/staticAppealStages.js":["4fc007c9-d6c8-4614-89ce-04c7d6ce9fe5"],"/Users/robertmccann/Projects/hof/sandbox/apps/sandbox/fields.js":["4fc007c9-d6c8-4614-89ce-04c7d6ce9fe5"],"/Users/robertmccann/Projects/hof/sandbox/test/helpers/utilities.js":["4fc007c9-d6c8-4614-89ce-04c7d6ce9fe5"],"/Users/robertmccann/Projects/hof/sandbox/apps/sandbox/behaviours/international-number.js":["4fc007c9-d6c8-4614-89ce-04c7d6ce9fe5"]},"externalIds":{}}
+{"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":{}}

package/CHANGELOG.md

@@ -1,3 +1,24 @@
+## 2024-07-22, Version 21.0.0 (Stable), @Rhodine-orleans-lindsay
+* Replaces deprecated request module with axios
+  - refactors the hof model and apis to use axios instead of request
+*  Updates patch and minor dependency versions
+
+## 2024-04-24, Version 20.5.0 (Stable), @mislam987
+* Add hint property to checkboxes to align with govuk design guidelines
+
+## 2024-02-29, Version 20.4.0 (Stable), @sulthan-ahmed
+* Update version of govuk-frontend to 3.15
+- this adds the new crown for the King
+- this supports a lot of changes from the govuk design system
+* Adds support for Google tag manager
+* Fixes accessibility issues
+* Sandbox area for testing hof changes
+* Updates patch and minor versions including
+- libphonenumber to 1.9.44
+- nodemailer to 6.9.9
+- ip to 1.1.9
+- es5-ext to 0.10.63
+
 ## 2020-06-02, Version 16.0.0 (Stable), @andymoody
 * Update version of helmet to 3.22.0
 * Update version of i18n-future to 2.0.0

package/codeReviewChecklist.md

@@ -0,0 +1,22 @@
+# HOF code review checklist v1.0
+
+This is a general guide on what you should check for when reviewing another team member's code.
+ 
+## Fundamental checks
+- [ ] Check for code format
+- [ ] Check for duplicate code
+- [ ] Check for if there are existing components in the framework already
+- [ ] Check for copy and paste
+- [ ] Check code readability (if the class, function and variable names are making sense, avoid using acronyms, check for simplicity, avoid complexity)
+- [ ] Check if user inputs are sanitized
+- [ ] Check if errors are handled
+- [ ] Check if null / undefined values are checked before actions are performed on a variable (May not always be necessary)
+- [ ] Check for performance (are there logic in loops that doesn't have to be executed each time? Could some tasks be added to a queue and performed later? etc)
+
+## Advanced (optional if the ticket is low / medium impact) checks
+- [ ] Check if the code is following SOLID principle, code maintainability 
+- [ ] Check if none functional requirements are needed (for example, should an audit log be stored for an action performed)
+- [ ] Check the performance and efficiency of the tests
+- [ ] Check to avoid the use of operations that only work in javascript (e.g. using && to return the object on the right if the statement on the left is true)
+
+

package/components/notify/index.js

@@ -38,12 +38,14 @@ module.exports = config => {
           if (typeof settings.recipient !== 'string' || !settings.recipient.includes('@')) {
             throw new Error('hof-behaviour-emailer: invalid recipient');
           }
-
           if (typeof config.subject === 'function') {
             settings.subject = config.subject(req.sessionModel.toJSON(), req.translate);
           } else {
             settings.subject = config.subject;
           }
+          if (config.attachment && config.attachment !== undefined) {
+            settings.attachment = config.attachment(req.sessionModel.toJSON(), req.translate);
+          }
 
           return settings;
         })

package/components/notify/notify.js

@@ -1,4 +1,5 @@
 'use strict';
+/* eslint-disable no-console */
 const NotifyClient = require('notifications-node-client').NotifyClient;
 const { v4: uuidv4 } = require('uuid');
 
@@ -10,15 +11,30 @@ module.exports = class Notify {
     this.notifyTemplate = options.notifyTemplate;
   }
 
-  send(email) {
+  async sendEmail(templateId, recipient, personalisation) {
     const reference = uuidv4();
 
-    return this.notifyClient.sendEmail(this.notifyTemplate, email.recipient, {
-      personalisation: {
-        'email-subject': email.subject,
-        'email-body': email.body
-      },
-      reference });
+    try {
+      await this.notifyClient.sendEmail(templateId, recipient, {
+        personalisation: personalisation,
+        reference });
+    } catch (error) {
+      console.error('Error sending email:', error.response ? error.response.data : error.message);
+    }
+  }
+
+  send(email) {
+    let personalisation = {
+      'email-subject': email.subject,
+      'email-body': email.body
+    };
+
+    if (email.attachment) {
+      personalisation = Object.assign({'email-attachment':
+        this.notifyClient.prepareUpload(email.attachment)}, personalisation);
+    }
+
+    this.sendEmail(this.notifyTemplate, email.recipient, personalisation);
   }
 };
 

package/config/hof-defaults.js

@@ -22,6 +22,14 @@ const defaults = {
   env: process.env.NODE_ENV || 'development',
   gaTagId: process.env.GA_TAG || 'Test-GA-Tag',
   ga4TagId: process.env.GA_4_TAG,
+  // added to allow support for multiple HOF forms using GTM to customize how they track page views
+  gtm: {
+    tagId: process.env.GTM_TAG || false,
+    config: {},
+    composePageName: function (page, convertPage) {
+      return convertPage(page);
+    }
+  },
   gaCrossDomainTrackingTagId: process.env.GDS_CROSS_DOMAIN_GA_TAG,
   loglevel: process.env.LOG_LEVEL || 'info',
   ignoreMiddlewareLogs: ['/healthz'],

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

@@ -5,50 +5,48 @@
   <head>
     <meta charset="utf-8" />
     <title>{{ pageTitle }}</title>
+    {{{ head }}}
 
     <link rel="shortcut icon" sizes="16x16 32x32 48x48" href="{{assetPath}}images/favicon.ico" type="image/x-icon">
-      <link rel="mask-icon" href="{{assetPath}}images/govuk-mask-icon.svg" color="#0b0c0c"> 
+      <link rel="mask-icon" href="{{assetPath}}images/govuk-mask-icon.svg" color="#0b0c0c">
       <link rel="apple-touch-icon" sizes="180x180" href="{{assetPath}}images/govuk-apple-touch-icon-180x180.png">
       <link rel="apple-touch-icon" sizes="167x167" href="{{assetPath}}images/govuk-apple-touch-icon-167x167.png">
       <link rel="apple-touch-icon" sizes="152x152" href="{{assetPath}}images/govuk-apple-touch-icon-152x152.png">
       <link rel="apple-touch-icon" href="{{assetPath}}images/govuk-apple-touch-icon.png">
-    
-    
+
+
     <meta name="theme-color" content="#0b0c0c" />
 
     <meta name="viewport" content="width=device-width, initial-scale=1">
 
-    {{{ head }}}
-    
-    
+
     <meta property="og:image" content="{{assetPath}}images/opengraph-image.png">
   </head>
 
   <body class="{{ bodyClasses }} govuk-template__body  js-enabled" >
     <script>document.body.className = ((document.body.className) ? document.body.className + ' js-enabled' : 'js-enabled');</script>
 
-    
+
 
     <div id="global-cookie-message" class="gem-c-cookie-banner govuk-clearfix" data-module="cookie-banner" role="region" aria-label="cookie banner" data-nosnippet="">
        {{{ cookieMessage }}}
     </div>
-	
-	{{{ bodyStart }}}  
-	
+
+	{{{ bodyStart }}}
+
     <header role="banner" id="govuk-header" class="{{{ headerClass }}}">
       <div class="govuk-header__container govuk-width-container">
-        
+
           <div class="govuk-header__logo">
             <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">
@@ -57,11 +55,11 @@
             </a>
           </div>
           {{{ insideHeader }}}
-        
+
         {{{ propositionHeader }}}
       </div>
     </header>
-    
+
 
     {{{ afterHeader }}}
 
@@ -81,7 +79,7 @@
 			      <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">
                 <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>
             </svg>
-            
+
 			      <span class="govuk-footer__licence-description">{{{ licenceMessage }}}</span>
           </div>
 
@@ -93,12 +91,12 @@
     </footer>
 
     <div id="global-app-error" class="app-error hidden"></div>
-	
+
 
     {{{ bodyEnd }}}
-	
-	
+
+
     <script {{#nonce}}nonce="{{nonce}}"{{/nonce}}>if (typeof window.GOVUK === 'undefined') document.body.className = document.body.className.replace('js-enabled', '');</script>
-	
+
   </body>
 </html>

package/frontend/template-mixins/mixins/template-mixins.js

@@ -319,6 +319,7 @@ module.exports = function (options) {
         error: this.errors && this.errors[key],
         invalid: this.errors && this.errors[key] && opts.required,
         label: t(fieldLabel || 'fields.' + key + '.label'),
+        hint: conditionalTranslate(getTranslationKey(field, key, 'hint')),
         selected: selected,
         className: classNames(field) || 'govuk-label govuk-checkboxes__label',
         child: field.child,

package/frontend/template-mixins/partials/forms/checkbox.html

@@ -6,6 +6,11 @@
             {{{label}}}
             {{#error}}<span class="visuallyhidden">{{error.message}}</span>{{/error}}
         </label>
+        {{#hint}}
+        <div id="{{key}}-hint" class="govuk-hint govuk-checkboxes__hint">
+          {{hint}}
+        </div>
+        {{/hint}}
     </div>
     {{#renderChild}}{{/renderChild}}
 </div>

package/frontend/template-mixins/partials/forms/input-text-group.html

@@ -1,5 +1,5 @@
 <div id="{{id}}-group" class="{{#compound}} form-group-compound{{/compound}}{{#formGroupClassName}}{{formGroupClassName}}{{/formGroupClassName}}{{#error}} govuk-form-group--error{{/error}}">
-    {{#isPageHeading}}<h1 class="govuk-label-wrapper">{{/isPageHeading}}<label for="{{id}}" class="{{labelClassName}}{{#isPageHeading}}govuk-label--l{{/isPageHeading}}">
+    {{#isPageHeading}}<h1 class="govuk-label-wrapper">{{/isPageHeading}}<label for="{{id}}" class="{{labelClassName}} {{#isPageHeading}}govuk-label--l{{/isPageHeading}}">
         {{{label}}}
       </label>
     {{#isPageHeading}}</h1>{{/isPageHeading}}

package/frontend/template-mixins/partials/forms/select.html

@@ -1,14 +1,14 @@
 <div id="{{id}}-group" class="{{#compound}} form-group-compound{{/compound}}{{#formGroupClassName}} {{formGroupClassName}}{{/formGroupClassName}}{{#error}} govuk-form-group--error{{/error}}">
     {{#isPageHeading}}<h1 class="govuk-label-wrapper">{{/isPageHeading}}<label for="{{id}}" class="{{labelClassName}}{{#isPageHeading}}govuk-label--l{{/isPageHeading}}">
         {{{label}}}
-        {{#hint}}<span {{$hintId}}id="{{hintId}}" {{/hintId}}class="govuk-hint">{{hint}}</span>{{/hint}}
-        {{#error}}
-          <p class="govuk-error-message">
-            <span class="govuk-visually-hidden">Error:</span> {{error.message}}
-          </p>
-        {{/error}}
     </label>
     {{#isPageHeading}}</h1>{{/isPageHeading}}
+    {{#hint}}<div {{$hintId}}id="{{hintId}}" {{/hintId}}class="govuk-hint">{{hint}}</div>{{/hint}}
+    {{#error}}
+      <p class="govuk-error-message">
+        <span class="govuk-visually-hidden">Error:</span> {{error.message}}
+      </p>
+     {{/error}}
     <select id="{{id}}" class="govuk-select{{#className}} {{className}}{{/className}}{{#error}} govuk-select--error{{/error}}" name="{{id}}" aria-required="{{required}}">
     {{#options}}
         <option value="{{value}}" {{#selected}}selected{{/selected}}>{{label}}</option>

package/frontend/template-mixins/partials/forms/textarea-group.html

@@ -4,7 +4,7 @@
     <div id="{{id}}-group" class="govuk-form-group {{#formGroupClassName}}{{formGroupClassName}}{{/formGroupClassName}}{{#error}} govuk-form-group--error{{/error}}">
         {{#isPageHeading}}<h1 class="govuk-label-wrapper">{{/isPageHeading}}
             <label for="{{id}}"
-                class="{{labelClassName}}{{#isPageHeading}}govuk-label--l{{/isPageHeading}}">
+                class="{{labelClassName}} {{#isPageHeading}}govuk-label--l{{/isPageHeading}}">
                 {{{label}}}
                 {{#error}}
                 <p id="{{id}}-error" class="govuk-error-message">
@@ -18,10 +18,10 @@
         <textarea name="{{id}}" id="{{id}}"
             class="govuk-textarea {{#isMaxlengthOrMaxword}}govuk-js-character-count{{/isMaxlengthOrMaxword}} {{#className}}{{className}}{{/className}} {{#error}}govuk-input--error{{/error}}"
             {{#isMaxlengthOrMaxword}}
-            aria-describedby="{{id}}-info"
+            aria-describedby="{{id}}-hint {{id}}-info"
             {{/isMaxlengthOrMaxword}}
-            {{#attributes}} 
-                {{attribute}}="{{value}}" 
+            {{#attributes}}
+                {{attribute}}="{{value}}"
             {{/attributes}}
             {{^error}}{{#hintId}}{{#maxlength}} aria-describedby="{{id}}-maxlength-hint {{hintId}}"{{/maxlength}}{{/hintId}}{{/error}}
             {{^error}}{{#hintId}}{{^maxlength}} aria-describedby="{{hintId}}"{{/maxlength}}{{/hintId}}{{/error}}

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

@@ -34,7 +34,6 @@
           ga('govuk_shared.send', 'pageview')
         {{/gaCrossDomainTrackingTagId}}
       }
-
     </script>
 {{/gaTagId}}
 

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

@@ -1,2 +1,25 @@
+{{#gtmTagId}}
+{{#cookiesAccepted}}
+<!-- Google Tag Manager Data Layer  -->
+<script {{#nonce}}nonce="{{nonce}}"{{/nonce}}>
+  var dataLayer = window.dataLayer || [];
+  dataLayer.push(
+    {{{gtmConfig}}}
+  );
+</script>
+<!-- End Google Tag Manager Data Layer  -->
+
+<!-- Google Tag Manager -->
+<script {{#nonce}}nonce="{{nonce}}"{{/nonce}}>
+  (function(w,d,s,l,i){w[l]=w[l]||[];w[l].push({'gtm.start':
+  new Date().getTime(),event:'gtm.js'});var f=d.getElementsByTagName(s)[0],
+  j=d.createElement(s),dl=l!='dataLayer'?'&l='+l:'';j.async=true;j.src=
+  'https://www.googletagmanager.com/gtm.js?id='+i+dl;f.parentNode.insertBefore(j,f);
+  })(window,document,'script','dataLayer','{{gtmTagId}}');
+</script>
+<!-- End Google Tag Manager -->
+{{/cookiesAccepted}}
+{{/gtmTagId}}
+
 <meta name="format-detection" content="telephone=no">
 <link rel="stylesheet" href="{{assetPath}}/css/app.css">

package/lib/ga-tag.js

@@ -2,6 +2,16 @@
 
 const _ = require('lodash');
 
+const convertToGTMPage = text => {
+  // Remove leading and trailing slashes
+  let str = text.replace(/^\/|\/$/g, '');
+  // Replace hyphens with spaces and capitalize each word
+  str = str.replace(/-+/g, ' ').replace(/(^|\s)\S/g, function (match) {
+    return match.toUpperCase();
+  });
+  return str;
+};
+
 const pageView = (path, pageMap) => pageMap.get(path) || path;
 
 const createUris = routes => {
@@ -42,19 +52,35 @@ const setupPageMap = routes => {
 module.exports = (app, config) => {
   const gaTagId = config.gaTagId;
   const ga4TagId = config.ga4TagId;
+  const gtm = config.gtm;
   const gaCrossDomainTrackingTagId = config.gaCrossDomainTrackingTagId;
   const routes = config.routes;
 
-  if (gaTagId || ga4TagId) {
+  if (gaTagId || ga4TagId || gtm.tagId) {
     const pageMap = setupPageMap(routes);
 
     app.use((req, res, next) => {
-      res.locals.gaAllowDebug = config.env === 'development';
-      res.locals.gaTagId = gaTagId;
-      res.locals.ga4TagId = ga4TagId;
-      res.locals.gaCrossDomainTrackingTagId = gaCrossDomainTrackingTagId;
-      res.locals['ga-id'] = gaTagId;
-      res.locals['ga-page'] = pageView(req.path, pageMap);
+      const page = pageView(req.path, pageMap);
+
+      // Preparing common res.locals properties
+      const properties = {
+        gaAllowDebug: config.env === 'development',
+        gaTagId: gaTagId,
+        ga4TagId: ga4TagId,
+        gaCrossDomainTrackingTagId: gaCrossDomainTrackingTagId,
+        'ga-id': gaTagId,
+        'ga-page': page
+      };
+
+      // Adding extra properties if a GTM TAG is available
+      if (gtm.tagId) {
+        gtm.config.pageName = gtm.composePageName(page, convertToGTMPage);
+        Object.assign(properties, {
+          gtmConfig: JSON.stringify(gtm.config),
+          gtmTagId: gtm.tagId
+        });
+      }
+      res.locals = Object.assign(res.locals, properties);
       next();
     });
   }

package/middleware/cookies.js

@@ -22,6 +22,8 @@ module.exports = options => {
     const reqIsCookieCheckRedirect = req.query[paramName] !== undefined;
 
     if (reqIncludesCookies || isHealthcheckUrl(req.path, healthcheckUrls)) {
+      const prefs = 'cookie_preferences' in req.cookies ? JSON.parse(req.cookies.cookie_preferences) : {};
+      res.locals.cookiesAccepted = Boolean(prefs.usage);
       next();
     } else if (req.cookies === undefined || (!Object.keys(req.cookies).length && reqIsCookieCheckRedirect)) {
       const err = new Error('Cookies required');

package/model/apis/axios-settings.js

@@ -1,9 +1,21 @@
 'use strict';
-const url = require('url');
+const { format } = require('url'); // Destructure 'format' from 'url' module
 
-module.exports = (settings, body) => {
-    return Object.assign({}, settings, {    
-    'url' : settings.uri || settings.url || url.format(settings),
-    'data': settings.body || body || settings.data
+module.exports = (settings = {}, body = null) => {
+  if (typeof settings !== 'object' || settings === null) {
+    throw new TypeError('settings must be a non-null object');
+  }
+
+  const {
+    uri,
+    url,
+    body: settingsBody,
+    data: settingsData,
+    ...restSettings
+  } = settings;
+
+  return Object.assign({}, restSettings, {
+    url: uri || url || format(settings),
+    data: settingsBody || body || settingsData
   });
-}
+};

package/model/apis/html-to-pdf-converter.js

@@ -10,7 +10,6 @@ module.exports = class PDFModel extends Model {
     settings.encoding = null;
     settings.rejectUnauthorized = false;
     settings.responseType = 'arraybuffer';
-    console.log("settings------+_+_+_+_---------: ", settings);
     return settings;
   }