hof 20.2.21 → 20.2.22

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

@@ -62,11 +62,11 @@
 
 {{#gtmTagId}}
   <!-- Data Layer -->
-  <script {{#nonce}} nonce="{{nonce}}"{{/nonce}}>
-      dataLayer.push({window.dataLayer = window.dataLayer || [];
-      window.dataLayer.push({
+  <script {{#nonce}}nonce="{{nonce}}"{{/nonce}}>
+      window.dataLayer = window.dataLayer || [];
+      dataLayer.push({
         'event': 'pageLoad',
-        'pageName': 'ETA | Customer Contact Webform | {{ga-page}}'
+        'pageName': 'ETA | Customer Contact Webform | {{gtm-page}}',
         'applicationType': 'ETA | Customer Contact',
         'environmentType': {{^gaAllowDebug}}'dev'{{/gaAllowDebug}}{{#gaAllowDebug}}'prod'{{/gaAllowDebug}}
       });
@@ -74,7 +74,7 @@
   <!-- End Data Layer -->
 
   <!-- Google Tag Manager for ETA -->
-  <script {{#nonce}} nonce="{{nonce}}"{{/nonce}}>(function(w,d,s,l,i){w[l]=w[l]||[];w[l].push({'gtm.start':
+  <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);

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 => {
@@ -51,6 +61,7 @@ const setupPageMap = routes => {
     const pageMap = setupPageMap(routes);
 
     app.use((req, res, next) => {
+      const page = pageView(req.path, pageMap);
       res.locals.gaAllowDebug = config.env === 'development';
       res.locals.gaTagId = gaTagId;
       res.locals.ga4TagId = ga4TagId;
@@ -58,7 +69,8 @@ const setupPageMap = routes => {
       res.locals.appName = appName
       res.locals.gaCrossDomainTrackingTagId = gaCrossDomainTrackingTagId;
       res.locals['ga-id'] = gaTagId;
-      res.locals['ga-page'] = pageView(req.path, pageMap);
+      res.locals['ga-page'] = page
+      res.locals['gtm-page'] = convertToGTMPage(page)
       next();
     });
   }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "hof",
   "description": "A bootstrap for HOF projects",
-  "version": "20.2.21",
+  "version": "20.2.22",
   "license": "MIT",
   "main": "index.js",
   "author": "HomeOffice",