govuk_publishing_components 35.1.0 → 35.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fd345b52485fb5fefdb529d929af976ca97fe31f8c9d73d5d8aa42868dbc55b0
-  data.tar.gz: 3a41640de2f4784004f724604bdc7dc1a9a9202f963e1304c2c4ae4d2db2dfa9
+  metadata.gz: 972ee046b894a4166b8098b0fd68443fe83c9dd3ca990dc53df66943719bc3f8
+  data.tar.gz: fe06a9efe47489b88fe35088fe043cbf404683516ba709d9ec8192412749e2e6
 SHA512:
-  metadata.gz: 0cfddee718886b034fcef934d97479726c0cf74257c268a8671f8ce2d88de9715416021dff81cc948d0791b70a115ba9545e6bde329ccf0fccaac1530687c915
-  data.tar.gz: 561a511659dd0a07ca6d6b8432bdddff207770cc6a782d54ddd769dfbfd17c30583b9e2585688ad1decb645bd4390ae17d61e5e52b97fc33859ef801e9c73c4d
+  metadata.gz: 788a0616987260f023d3c4b982e9ae7ca1150bdf996ed6001c7d999eb22116725b4a5ebaef2069ab23882fb4d1acbdb7c47d7f0686c1ef4bd171773de27da178
+  data.tar.gz: ee4d860cc7fcaa7e7f374edd761d4f513455b319efea4b1e115667ae8cef89c0fef815c46c00b9b0330eb511ce6d5822dea79877174dddc3e1c67cb9feac3182

data/app/assets/javascripts/govuk_publishing_components/analytics/page-content.js

@@ -17,8 +17,6 @@
         // if there are no accordion sections on the browse level 2 page
         // then it is a default page with one or two lists
         return document.querySelectorAll('[data-track-count="accordionSection"]').length || document.querySelectorAll('main .govuk-list').length
-      case isCostOfLivingHub():
-        return document.querySelectorAll('[data-track-count="accordionSection"]').length
       case isNewBrowsePage():
         return document.querySelectorAll('[data-track-count="cardList"]').length
       case isMainstreamBrowsePage():
@@ -53,7 +51,6 @@
       case isDocumentCollectionPage():
         return document.querySelectorAll('.document-collection .group-document-list li a').length
       case isNewBrowsePageLevelTwo():
-      case isCostOfLivingHub():
         return document.querySelectorAll('[data-track-count="contentLink"]').length
       case isNewBrowsePage():
         return document.querySelectorAll('[data-track-count="cardLink"]').length
@@ -111,11 +108,6 @@
       getMetaAttribute(metaNavigationTypeSelector) === 'browse level 2'
   }
 
-  function isCostOfLivingHub () {
-    return getMetaAttribute(metaApplicationSelector) === 'collections' &&
-      getMetaAttribute(metaNavigationTypeSelector) === 'cost of living hub'
-  }
-
   function isNewBrowsePage () {
     return getMetaAttribute(metaApplicationSelector) === 'collections' &&
       (getMetaAttribute(metaNavigationTypeSelector) === 'browse level 0' ||

data/app/assets/javascripts/govuk_publishing_components/analytics-ga4/ga4-core.js

@@ -230,13 +230,18 @@ window.GOVUK.analyticsGa4 = window.GOVUK.analyticsGa4 || {};
           // Only index links that are not search results
           if (!link.getAttribute('data-ga4-ecommerce-path')) {
             totalLinks++
-            link.setAttribute('data-ga4-index', totalLinks)
+            link.setAttribute('data-ga4-index', '{"index_link": "' + totalLinks + '"}')
           }
         }
 
-        var ga4LinkData = JSON.parse(module.getAttribute('data-ga4-link'))
-        ga4LinkData.index_total = totalLinks
-        module.setAttribute('data-ga4-link', JSON.stringify(ga4LinkData))
+        try {
+          var ga4LinkData = JSON.parse(module.getAttribute('data-ga4-link'))
+          ga4LinkData.index_total = totalLinks
+          module.setAttribute('data-ga4-link', JSON.stringify(ga4LinkData))
+        } catch (e) {
+          // if there's a problem with the config, don't start the tracker
+          console.error('Unable to JSON.parse or JSON.stringify index: ' + e.message, window.location)
+        }
       },
 
       // index is given as a string of the form 1.2.3 or 1.2

data/app/assets/javascripts/govuk_publishing_components/analytics-ga4/ga4-link-tracker.js

@@ -87,8 +87,7 @@ window.GOVUK.Modules = window.GOVUK.Modules || {};
       data.link_path_parts = window.GOVUK.analyticsGa4.core.trackFunctions.populateLinkPathParts(data.url)
       data.method = window.GOVUK.analyticsGa4.core.trackFunctions.getClickType(event)
       data.external = window.GOVUK.analyticsGa4.core.trackFunctions.isExternalLink(data.url) ? 'true' : 'false'
-      data.index = event.target.getAttribute('data-ga4-index') ? parseInt(event.target.getAttribute('data-ga4-index')) : data.index || undefined
-      data.index = window.GOVUK.analyticsGa4.core.trackFunctions.createIndexObject(data.index)
+      data.index = this.setIndex(data.index, event.target)
 
       if (data.type === 'smart answer' && data.action === 'change response') {
         data.section = PIIRemover.stripPIIWithOverride(data.section, true, true)
@@ -108,5 +107,22 @@ window.GOVUK.Modules = window.GOVUK.Modules || {};
     }
   }
 
+  Ga4LinkTracker.prototype.setIndex = function (indexData, target) {
+    var index
+
+    if (target.getAttribute('data-ga4-index')) {
+      try {
+        index = JSON.parse(target.getAttribute('data-ga4-index'))
+      } catch (e) {
+        console.error('Unable to parse index as JSON: ' + e.message, window.location)
+        return
+      }
+    } else {
+      index = indexData || undefined
+    }
+
+    return window.GOVUK.analyticsGa4.core.trackFunctions.createIndexObject(index)
+  }
+
   Modules.Ga4LinkTracker = Ga4LinkTracker
 })(window.GOVUK.Modules)

data/app/assets/javascripts/govuk_publishing_components/components/step-by-step-nav.js

@@ -196,8 +196,11 @@ window.GOVUK.Modules = window.GOVUK.Modules || {};
           event_name: 'select_content',
           type: 'step by step',
           text: titleText.trim(),
-          index: i + 1,
-          index_total: this.$module.totalSteps
+          index: {
+            index_section: i + 1,
+            index_section_count: this.$module.totalSteps
+          },
+          index_total: thisel.querySelectorAll('a').length
         }
 
         var button = thisel.querySelector('.js-step-title-button')