govuk_publishing_components 35.15.1 → 35.15.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5edbe2c7a347d6bc8069704f3434dc4c41de45b3286f7640893f7ff8f62c25a8
-  data.tar.gz: d17f853fdf1a5598b808a69fdec621da35aa8662bc911d5c951715cc53bfb6a0
+  metadata.gz: e84a39ca858aeb5f82b99db7e36787fcb9de0789d216a01ae705edc8b6412e50
+  data.tar.gz: cd621c972ba4b393cd8ca2921a43e45101dcdd1330c5d1dc80eee74b11ac1556
 SHA512:
-  metadata.gz: 0f5f8a3a9706d98e11ce756987eb9dc442dce2c3701eeb2dbfe8ff2ad48c6c48d27c0c8f056b9e3f851d53d4c6cfb1712c042f9699a658fad94618d679b6c974
-  data.tar.gz: fc1469502870ba2a479cde17f7d8edc652270a3ce98efd2aa6128797634e484bf6448cb54712f4c12c116a4f9275d345cb39ffdf13901bde137fc80321769657
+  metadata.gz: ac457ab2307e9a0c5e38b494b54268c34113521a93e25d1d0bc99378b075b8ae8a9a3ba4477a6dc7249fc58e1d42be51600f3746019109eff8b31460d3ae8a6d
+  data.tar.gz: 8369bcf1d142762cd85e4c5e9a483560b1e904071dd73e500407c8abfffa692cc7f60745debae002861850a08a170a1fbc90c5b0ae7f72abe972e5ba089de898

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

@@ -205,6 +205,10 @@ window.GOVUK.analyticsGa4 = window.GOVUK.analyticsGa4 || {};
         }
       },
 
+      getPathname: function () {
+        return window.location.pathname
+      },
+
       getProtocol: function () {
         return window.location.protocol
       },
@@ -252,6 +256,13 @@ window.GOVUK.analyticsGa4 = window.GOVUK.analyticsGa4 || {};
 
       applyRedactionIfRequired: function (PIIRemover, element, data) {
         return element.closest('[data-ga4-do-not-redact]') ? data : PIIRemover.stripPIIWithOverride(data, true, true)
+      },
+
+      appendPathToAnchorLinks: function (url) {
+        if (!this.stringStartsWith(url, '#') || this.getPathname() === '/') {
+          return url
+        }
+        return this.getPathname() + url
       }
     },
 

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

@@ -74,7 +74,7 @@ window.GOVUK.Modules = window.GOVUK.Modules || {};
         if (aTag) {
           var href = aTag.getAttribute('href')
           if (href) {
-            schema.event_data.url = href
+            schema.event_data.url = window.GOVUK.analyticsGa4.core.trackFunctions.appendPathToAnchorLinks(href)
           }
         }
       }

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

@@ -62,13 +62,13 @@ window.GOVUK.Modules = window.GOVUK.Modules || {};
 
   Ga4LinkTracker.prototype.trackClick = function (event) {
     var element = event.target
-
+    var trackFunctions = window.GOVUK.analyticsGa4.core.trackFunctions
     // don't track this link if it's already being tracked by the ecommerce tracker
     if (element.closest('[data-ga4-ecommerce-path]')) {
       return
     }
 
-    var target = window.GOVUK.analyticsGa4.core.trackFunctions.findTrackingAttributes(event.target, this.trackingTrigger)
+    var target = trackFunctions.findTrackingAttributes(event.target, this.trackingTrigger)
     if (target) {
       try {
         var data = target.getAttribute(this.trackingTrigger)
@@ -80,17 +80,19 @@ window.GOVUK.Modules = window.GOVUK.Modules || {};
       }
 
       var text = data.text || event.target.textContent
-      data.text = window.GOVUK.analyticsGa4.core.trackFunctions.removeLinesAndExtraSpaces(text)
-      data.text = window.GOVUK.analyticsGa4.core.trackFunctions.applyRedactionIfRequired(this.PIIRemover, element, data.text)
+      data.text = trackFunctions.removeLinesAndExtraSpaces(text)
+      data.text = trackFunctions.applyRedactionIfRequired(this.PIIRemover, element, data.text)
       if (!data.text && (element.querySelector('img') || element.querySelector('svg') || element.tagName === 'IMG' || element.closest('svg'))) {
         data.text = 'image'
       }
       var url = data.url || this.findLink(event.target).getAttribute('href')
-      data.url = window.GOVUK.analyticsGa4.core.trackFunctions.applyRedactionIfRequired(this.PIIRemover, element, window.GOVUK.analyticsGa4.core.trackFunctions.removeCrossDomainParams(url))
-      data.link_domain = window.GOVUK.analyticsGa4.core.trackFunctions.populateLinkDomain(data.url)
-      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.url = trackFunctions.removeCrossDomainParams(url)
+      data.url = trackFunctions.applyRedactionIfRequired(this.PIIRemover, element, data.url)
+      data.url = trackFunctions.appendPathToAnchorLinks(data.url)
+      data.link_domain = trackFunctions.populateLinkDomain(data.url)
+      data.link_path_parts = trackFunctions.populateLinkPathParts(data.url)
+      data.method = trackFunctions.getClickType(event)
+      data.external = trackFunctions.isExternalLink(data.url) ? 'true' : 'false'
       data.index = this.setIndex(data.index, event.target)
 
       if (data.type === 'smart answer' && data.action === 'change response') {

data/app/assets/javascripts/govuk_publishing_components/vendor/lux/lux-reporter.js

@@ -538,6 +538,10 @@
     // -------------------------------------------------------------------------
     // Settings
     // -------------------------------------------------------------------------
+    // This ID usually appended to the end of the lux.js as a query string when
+    // using the SpeedCurve hosted version - but we have to include it here as
+    // this is self hosted.
+    LUX.customerid = 47044334;
     // Set the sample rate to 1% to avoid all events being sent.
     LUX.samplerate = 1;
     // -------------------------------------------------------------------------
@@ -1494,10 +1498,9 @@
       }
       return getHighPercentileINP();
     }
+    // function simplified for our use, original would get the customerid from the script src URL
+    // but we set it inside the code in this file, so this function just returns that
     function getCustomerId() {
-      if (!LUX.customerid) {
-        LUX.customerid = thisScript.src.match(/id=(\d+)/).pop();
-      }
       return LUX.customerid || "";
     }
     function avgDomDepth() {
@@ -2200,11 +2203,6 @@
   // More settings
   // ---------------------------------------------------------------------------
   //
-  // This ID usually appended to the end of the lux.js as a query string when
-  // using the SpeedCurve hosted version - but we have to include it here as
-  // this is self hosted.
-  LUX.customerid = 47044334;
-
   // Setting debug to `true` shows what happening as it happens. Running
   // `LUX.getDebug()` in the browser's console will show the history of what's
   // happened.

data/lib/govuk_publishing_components/version.rb

@@ -1,3 +1,3 @@
 module GovukPublishingComponents
-  VERSION = "35.15.1".freeze
+  VERSION = "35.15.2".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: govuk_publishing_components
 version: !ruby/object:Gem::Version
-  version: 35.15.1
+  version: 35.15.2
 platform: ruby
 authors:
 - GOV.UK Dev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-09-05 00:00:00.000000000 Z
+date: 2023-09-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: govuk_app_config