govuk_publishing_components 35.23.0 → 36.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e557b51d72b7858a00cdad6c54582292ea879bc1946dfd8270c6b511bfad6733
-  data.tar.gz: 83254be91d64c54e216e34d56a4412014e6e89865decb03ac3e67dfec7a6d7a9
+  metadata.gz: 773208000d7b04127bf634415ed17bbfd977ba73ab9a45e2eca5742f19eacbc6
+  data.tar.gz: c2b77952558ca4fd34c22e87088721dffe9d55346cc1cd9a5ac8ee3f64ff2087
 SHA512:
-  metadata.gz: 587ee2f4ef4387524b0343c1f0f08b8157a5c7820eb36d7fbfe89567708e2e1d7f9626a63a88eb88c6bf35b4e32a705bcf7f979ad8a2b7cfd9d569dd7dc72110
-  data.tar.gz: 5e2ce07e04779116ad682cd59139abbc04c4a8cc46832dedc66b5b7937bd5db0dd5949a0c89ceacbdacc29a17ce9ec24b688652a796175754124bbee6ab10fe7
+  metadata.gz: 5d2efbb677bc763e54375000098c7419ccec70d70d4ad49093e6fda016788ec22ef989d8c7a480e5e9fa00d4dba4c6ac10672bb683baa67d129a3a49da80e460
+  data.tar.gz: 5e34040e64f3863838db6c24a5d8e2c0f0d423d62f24f6841adb204e0071899699796c07740130b6ec06205a87cffdcfed80814a177f7eb6aa93cd7112e55e1a

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

@@ -35,12 +35,8 @@ window.GOVUK.Modules = window.GOVUK.Modules || {};
         console.error('GA4 configuration error: ' + e.message, window.location)
         return
       }
-
       data.text = this.PIIRemover.stripPIIWithOverride(data.text, true, true)
-      var schemas = new window.GOVUK.analyticsGa4.Schemas()
-      var schema = schemas.mergeProperties(data, 'event_data')
-
-      window.GOVUK.analyticsGa4.core.sendData(schema)
+      window.GOVUK.analyticsGa4.core.applySchemaAndSendData(data, 'event_data')
     }
   }
 

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

@@ -35,20 +35,35 @@ window.GOVUK.analyticsGa4 = window.GOVUK.analyticsGa4 || {};
     },
 
     sendData: function (data) {
-      // Prevent any GA4 data being sent during Smokey tests
-      if (this.getUserAgent() === 'Smokey Test / Ruby') {
-        return
-      }
-
       data.govuk_gem_version = this.getGemVersion()
       // set this in the console as a debugging aid
       if (window.GOVUK.analyticsGa4.showDebug) {
-        data.event_data = this.sortEventData(data.event_data)
+        if (data.event_data) {
+          data.event_data = this.sortEventData(data.event_data)
+        } else if (data.page_view) {
+          data.page_view = this.sortEventData(data.page_view)
+        } else if (data.search_results) {
+          data.search_results = this.sortEventData(data.search_results)
+        }
         console.info(JSON.stringify(data, null, ' '))
       }
+
+      // Send GA4 data to a fake dataLayer if smokey_cachebust or disable_ga4 is in the query string. Used to prevent Smokey/other tests from spamming our analytics.
+      if (this.trackFunctions.getSearch().match(/[?&](disable_ga4|smokey_cachebust){1}/)) {
+        window.fakeDataLayer = window.fakeDataLayer || []
+        window.fakeDataLayer.push(data)
+        return
+      }
+
       window.dataLayer.push(data)
     },
 
+    applySchemaAndSendData: function (data, name) {
+      var schemas = new window.GOVUK.analyticsGa4.Schemas()
+      var schema = schemas.mergeProperties(data, name)
+      this.sendData(schema)
+    },
+
     getGemVersion: function () {
       return window.GOVUK.analyticsGa4.vars.gem_version || 'not found'
     },
@@ -74,6 +89,10 @@ window.GOVUK.analyticsGa4 = window.GOVUK.analyticsGa4 || {};
         return /^(http:||https:)?(\/\/)([^\/]*)/ // eslint-disable-line no-useless-escape
       },
 
+      getSearch: function () {
+        return window.location.search
+      },
+
       findTrackingAttributes: function (clicked, trackingTrigger) {
         if (clicked.hasAttribute('[' + trackingTrigger + ']')) {
           return clicked
@@ -82,39 +101,6 @@ window.GOVUK.analyticsGa4 = window.GOVUK.analyticsGa4 || {};
         }
       },
 
-      // create an object to split up long URLs and get around the 100 character limit on GTM data
-      // this gets reassembled in GA4
-      populateLinkPathParts: function (href) {
-        var path = ''
-        if (this.hrefIsRelative(href) || this.isMailToLink(href)) {
-          path = href
-        } else {
-          // This regex matches a protocol and domain name at the start of a string such as https://www.gov.uk, http://gov.uk, //gov.uk
-          path = href.replace(/^(http:||https:)?(\/\/)([^\/]*)/, '') // eslint-disable-line no-useless-escape
-        }
-
-        if (path === '/' || path.length === 0) {
-          return
-        }
-
-        return this.splitStringIntoParts(path)
-      },
-
-      splitStringIntoParts: function (string) {
-        /*
-        This will create an object with 5 keys that are indexes ("1", "2", etc.)
-        The values will be each part of the string split every 100 characters, or undefined.
-        For example: {"1": "/hello/world/etc...", "2": "/more/path/text...", "3": undefined, "4": undefined, "5": undefined}
-        Undefined values are needed to override the persistent object in GTM so that any values from old pushes are overwritten.
-        */
-        var parts = string.match(/.{1,100}/g)
-        var obj = {}
-        for (var i = 0; i < 5; i++) {
-          obj[(i + 1).toString()] = parts[i]
-        }
-        return obj
-      },
-
       hrefIsRelative: function (href) {
         // Checks that a href is relative by the lack of http:, https:// or // at the start of the href.
         var domain = this.getDomainRegex().exec(href)
@@ -261,8 +247,8 @@ window.GOVUK.analyticsGa4 = window.GOVUK.analyticsGa4 || {};
         var totalLinks = 0
         for (var i = 0; i < links.length; i++) {
           var link = links[i]
-          // Only index links that are not search results or do not have a data-ga4-do-not-index attribute
-          if (link.getAttribute('data-ga4-ecommerce-path') || link.getAttribute('data-ga4-do-not-index') !== null) {
+          // Ignore links that don't have a href, have a data-ga4-do-not-index attribute on them, or are search result links.
+          if (!link.getAttribute('href') || link.getAttribute('data-ga4-ecommerce-path') || link.getAttribute('data-ga4-do-not-index') !== null) {
             continue
           }
           totalLinks++

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

@@ -43,9 +43,6 @@ window.GOVUK.Modules = window.GOVUK.Modules || {};
       var text = data.text || event.target.textContent
       data.text = window.GOVUK.analyticsGa4.core.trackFunctions.removeLinesAndExtraSpaces(text)
 
-      var schemas = new window.GOVUK.analyticsGa4.Schemas()
-      var schema = schemas.mergeProperties(data, 'event_data')
-
       /* Ensure it only tracks aria-expanded in an element with data-ga4-expandable on it. */
       if (target.closest('[data-ga4-expandable]')) {
         var ariaExpanded = this.getClosestAttribute(target, 'aria-expanded')
@@ -59,12 +56,12 @@ window.GOVUK.Modules = window.GOVUK.Modules || {};
       var detailsElement = target.closest('details')
 
       if (ariaExpanded) {
-        schema.event_data.text = data.text || target.innerText
-        schema.event_data.action = (ariaExpanded === 'false') ? 'opened' : 'closed'
+        data.text = data.text || target.innerText
+        data.action = (ariaExpanded === 'false') ? 'opened' : 'closed'
       } else if (detailsElement) {
-        schema.event_data.text = data.text || detailsElement.textContent
+        data.text = data.text || detailsElement.textContent
         var openAttribute = detailsElement.getAttribute('open')
-        schema.event_data.action = (openAttribute == null) ? 'opened' : 'closed'
+        data.action = (openAttribute == null) ? 'opened' : 'closed'
       }
 
       /* If a tab was clicked, grab the href of the clicked tab (usually an anchor # link) */
@@ -74,12 +71,11 @@ window.GOVUK.Modules = window.GOVUK.Modules || {};
         if (aTag) {
           var href = aTag.getAttribute('href')
           if (href) {
-            schema.event_data.url = window.GOVUK.analyticsGa4.core.trackFunctions.appendPathToAnchorLinks(href)
+            data.url = window.GOVUK.analyticsGa4.core.trackFunctions.appendPathToAnchorLinks(href)
           }
         }
       }
-
-      window.GOVUK.analyticsGa4.core.sendData(schema)
+      window.GOVUK.analyticsGa4.core.applySchemaAndSendData(data, 'event_data')
     }
   }
 

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

@@ -50,10 +50,7 @@ window.GOVUK.Modules = window.GOVUK.Modules || {};
         data.text = data.text.toLowerCase()
         data.text = window.GOVUK.analyticsGa4.core.trackFunctions.removeLinesAndExtraSpaces(data.text)
       }
-
-      var schemas = new window.GOVUK.analyticsGa4.Schemas()
-      var schema = schemas.mergeProperties(data, 'event_data')
-      window.GOVUK.analyticsGa4.core.sendData(schema)
+      window.GOVUK.analyticsGa4.core.applySchemaAndSendData(data, 'event_data')
     }
   }
 

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

@@ -90,7 +90,6 @@ window.GOVUK.Modules = window.GOVUK.Modules || {};
       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)
@@ -106,10 +105,7 @@ window.GOVUK.Modules = window.GOVUK.Modules || {};
       if (data.type === 'smart answer' && data.action === 'change response') {
         data.section = this.PIIRemover.stripPIIWithOverride(data.section, true, true)
       }
-
-      var schemas = new window.GOVUK.analyticsGa4.Schemas()
-      var schema = schemas.mergeProperties(data, 'event_data')
-      window.GOVUK.analyticsGa4.core.sendData(schema)
+      window.GOVUK.analyticsGa4.core.applySchemaAndSendData(data, 'event_data')
     }
   }
 

data/app/assets/javascripts/govuk_publishing_components/analytics-ga4/ga4-page-views.js

@@ -36,8 +36,8 @@ window.GOVUK.analyticsGa4.analyticsModules = window.GOVUK.analyticsGa4.analytics
             taxonomy_level1: this.getMetaContent('themes'),
             taxonomy_main: this.getMetaContent('taxon-slug'),
             taxonomy_main_id: this.getMetaContent('taxon-id'),
-            taxonomy_all: this.splitLongMetaContent('taxon-slugs'),
-            taxonomy_all_ids: this.splitLongMetaContent('taxon-ids'),
+            taxonomy_all: this.getMetaContent('taxon-slugs'),
+            taxonomy_all_ids: this.getMetaContent('taxon-ids'),
 
             language: this.getLanguage(),
             history: this.getHistory(),
@@ -45,8 +45,8 @@ window.GOVUK.analyticsGa4.analyticsModules = window.GOVUK.analyticsGa4.analytics
             first_published_at: this.stripTimeFrom(this.getMetaContent('first-published-at')),
             updated_at: this.stripTimeFrom(this.getMetaContent('updated-at')),
             public_updated_at: this.stripTimeFrom(this.getMetaContent('public-updated-at')),
-            publishing_government: this.getMetaContent('publishing-government'),
-            political_status: this.getMetaContent('political-status'),
+            publishing_government: this.getMetaContent('publishing-government') || this.getMetaContent('ga4-publishing-government'),
+            political_status: this.getMetaContent('political-status') || this.getMetaContent('ga4-political-status'),
             primary_publishing_organisation: this.getMetaContent('primary-publishing-organisation'),
             organisations: this.getMetaContent('analytics:organisations'),
             world_locations: this.getMetaContent('analytics:world-locations'),
@@ -73,12 +73,8 @@ window.GOVUK.analyticsGa4.analyticsModules = window.GOVUK.analyticsGa4.analytics
       return this.PIIRemover.stripPIIWithOverride(this.stripGaParam(document.location.href), true, true)
     },
 
-    getSearch: function () {
-      return window.location.search
-    },
-
     getSearchTerm: function () {
-      var queryString = this.getSearch()
+      var queryString = window.GOVUK.analyticsGa4.core.trackFunctions.getSearch()
 
       if (!queryString) {
         return undefined
@@ -97,7 +93,7 @@ window.GOVUK.analyticsGa4.analyticsModules = window.GOVUK.analyticsGa4.analytics
     },
 
     getQueryString: function () {
-      var queryString = this.getSearch()
+      var queryString = window.GOVUK.analyticsGa4.core.trackFunctions.getSearch()
       if (queryString) {
         queryString = this.stripGaParam(queryString)
         queryString = this.PIIRemover.stripPIIWithOverride(queryString, true, true)
@@ -200,13 +196,6 @@ window.GOVUK.analyticsGa4.analyticsModules = window.GOVUK.analyticsGa4.analytics
       return undefined
     },
 
-    splitLongMetaContent: function (metatag) {
-      var tag = this.getMetaContent(metatag)
-      if (tag) {
-        return window.GOVUK.analyticsGa4.core.trackFunctions.splitStringIntoParts(tag)
-      }
-    },
-
     // return only the date from given timestamps of the form
     // 2022-03-28T19:11:00.000+00:00
     stripTimeFrom: function (value) {

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

@@ -13,9 +13,7 @@ window.GOVUK.analyticsGa4.analyticsModules = window.GOVUK.analyticsGa4.analytics
           type: 'print page',
           method: 'browser print'
         }
-        var schema = new window.GOVUK.analyticsGa4.Schemas()
-        schema = schema.mergeProperties(data, 'event_data')
-        window.GOVUK.analyticsGa4.core.sendData(schema)
+        window.GOVUK.analyticsGa4.core.applySchemaAndSendData(data, 'event_data')
       })
     }
   }

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

@@ -27,7 +27,6 @@
         external: this.undefined,
         method: this.undefined,
         link_domain: this.undefined,
-        link_path_parts: this.undefined,
         tool_name: this.undefined,
         percent_scrolled: this.undefined,
         video_current_time: this.undefined,
@@ -53,48 +52,33 @@
     }
   }
 
-  // merge data attributes data into the event schema
-  // only allow it if it already exists in the schema
+  // merge allowed data attributes into the event schema
   Schemas.prototype.mergeProperties = function (data, eventAttribute) {
     var schema = this.eventSchema()
     schema.event = eventAttribute
-    // exceptions should be inserted without checking for sub parameters
-    // exceptions should only come from code, not directly from data attributes
-    // e.g. link_path_parts is generated by JS and contains potentially non-unique
-    // sub parameter names i.e. '1', '2'
-    var exceptions = ['link_path_parts']
 
     for (var property in data) {
       // some passed data might be undefined, don't want it to overwrite e.g. the index sub parameters
       if (data[property] !== undefined) {
-        if (exceptions.indexOf(property) >= 0 || !this.isAnObject(data[property])) {
-          schema.event_data = this.addToObject(schema.event_data, property, data[property])
-        } else {
-          // we check for one level of nesting in the data attributes data
-          // this check can be removed once nesting is removed from all data attributes
-          for (var subproperty in data[property]) {
-            schema.event_data = this.addToObject(schema.event_data, subproperty, data[property][subproperty])
-          }
-        }
+        schema.event_data = this.addToObject(schema.event_data, property, data[property])
       }
     }
     return schema
   }
 
-  // might be easier to check if it's not a string or a number?
   Schemas.prototype.isAnObject = function (item) {
     if (typeof item === 'object' && !Array.isArray(item) && item !== null) {
       return true
     }
   }
 
-  // given an object and a key, insert a value into that object for that key
-  // we check for one level of nesting in the object
+  // given an object and a key, insert a value into object[key] if it exists
   Schemas.prototype.addToObject = function (obj, key, value) {
     if (key in obj) {
       obj[key] = value
       return obj
     } else {
+      // check for one level of nesting in the object
       for (var property in obj) {
         if (this.isAnObject(obj[property])) {
           if (key in obj[property]) {

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

@@ -123,9 +123,7 @@ window.GOVUK.Modules = window.GOVUK.Modules || {};
         // following will be undefined if tracking headings
         data.percent_scrolled = node.eventData.percent_scrolled
 
-        var schemas = new window.GOVUK.analyticsGa4.Schemas()
-        var schema = schemas.mergeProperties(data, 'event_data')
-        window.GOVUK.analyticsGa4.core.sendData(schema)
+        window.GOVUK.analyticsGa4.core.applySchemaAndSendData(data, 'event_data')
       }
     }
   }

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

@@ -72,7 +72,6 @@ window.GOVUK.analyticsGa4.analyticsModules = window.GOVUK.analyticsGa4.analytics
         if (data.url) {
           data.url = window.GOVUK.analyticsGa4.core.trackFunctions.removeCrossDomainParams(data.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.text = window.GOVUK.analyticsGa4.core.trackFunctions.removeLinesAndExtraSpaces(element.textContent)
@@ -81,10 +80,7 @@ window.GOVUK.analyticsGa4.analyticsModules = window.GOVUK.analyticsGa4.analytics
           data.text = 'image'
         }
         data.method = window.GOVUK.analyticsGa4.core.trackFunctions.getClickType(event)
-
-        var schemas = new window.GOVUK.analyticsGa4.Schemas()
-        var schema = schemas.mergeProperties(data, 'event_data')
-        window.GOVUK.analyticsGa4.core.sendData(schema)
+        window.GOVUK.analyticsGa4.core.applySchemaAndSendData(data, 'event_data')
       }
     },
 

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

@@ -81,10 +81,7 @@ window.GOVUK.analyticsGa4.analyticsModules = window.GOVUK.analyticsGa4.analytics
       data.video_duration = this.handlers['video-' + player.id + '-duration']
       data.video_percent = position
 
-      var schemas = new window.GOVUK.analyticsGa4.Schemas()
-      var schema = schemas.mergeProperties(data, 'event_data')
-
-      window.GOVUK.analyticsGa4.core.sendData(schema)
+      window.GOVUK.analyticsGa4.core.applySchemaAndSendData(data, 'event_data')
     },
 
     cleanVideoUrl: function (url) {

data/app/assets/javascripts/govuk_publishing_components/analytics-ga4/pii-remover.js

@@ -4,8 +4,22 @@
   var GOVUK = global.GOVUK || {}
   var EMAIL_PATTERN = /[^\s=/?&#+]+(?:@|%40)[^\s=/?&+]+/g
   var POSTCODE_PATTERN = /\b[A-PR-UWYZ][A-HJ-Z]?[0-9][0-9A-HJKMNPR-Y]?(?:[\s+]|%20)*[0-9](?!refund)[ABD-HJLNPQ-Z]{2,3}\b/gi
-  var DATE_PATTERN_NUMERIC = /\d{4}(-?)\d{2}(-?)\d{2}/g
-  var DATE_PATTERN_STRING = /\d{1,2}\s(January|February|March|April|May|June|July|August|September|October|November|December)\s\d{4}/g
+
+  // e.g. 01/01/1990 or 01-01-1990 or 1-1-1990 or 1/1/1990 or 01\01\1990 or 1\1\1990
+  var DATE_PATTERN_NUMERIC_1 = /\d{1,2}([-\/\\])\d{1,2}([-\/\\])\d{4}/g // eslint-disable-line no-useless-escape
+
+  // e.g. 1990/01/01 or 1990-01-01 or 1990-1-1 or 1990/1/1 or 1990\1\1 or 1990\01\01
+  var DATE_PATTERN_NUMERIC_2 = /\d{4}([-\/\\])\d{1,2}([-\/\\])\d{1,2}/g // eslint-disable-line no-useless-escape
+
+  // e.g. 12345678 (This originated from the UA PII Remover)
+  var DATE_PATTERN_NUMERIC_3 = /[0-9]{8}/g
+
+  // e.g. 1(st) (of) Jan(uary) 1990 (or 90 or '90) - where the bracketed characters are optional parts that can be matched
+  var DATE_PATTERN_STRING_1 = /\d{1,2}(?:st|nd|rd|th)?\s(?:of\s)?(Jan(?:uary)?|Feb(?:ruary)?|Mar(?:ch)?|Apr(?:il)?|May|Jun(?:e)?|Jul(?:y)?|Aug(?:ust)?|Sep(?:t)?(?:ember)?|Oct(?:ober)?|Nov(?:ember)?|Dec(?:ember)?)\s(?:')?(\d{4}|\d{2})/gi
+
+  // e.g. Jan(uary) 1(st) 1990 (or 90 or '90) - where the bracketed characters are optional parts that can be matched
+  var DATE_PATTERN_STRING_2 = /(Jan(?:uary)?|Feb(?:ruary)?|Mar(?:ch)?|Apr(?:il)?|May|Jun(?:e)?|Jul(?:y)?|Aug(?:ust)?|Sep(?:t)?(?:ember)?|Oct(?:ober)?|Nov(?:ember)?|Dec(?:ember)?)\s\d{1,2}?(?:st|nd|rd|th)?\s(?:')?(\d{4}|\d{2})/gi
+
   var ESCAPE_REGEX_PATTERN = /[|\\{}()[\]^$+*?.]/g
 
   // specific URL parameters to be redacted from accounts URLs
@@ -86,8 +100,12 @@
     stripped = this.stripQueryStringParameters(stripped)
 
     if (this.stripDatePII === true) {
-      stripped = stripped.replace(DATE_PATTERN_NUMERIC, '[date]')
-      stripped = stripped.replace(DATE_PATTERN_STRING, '[date]')
+      var DATE_REDACTION_STRING = '[date]'
+      stripped = stripped.replace(DATE_PATTERN_NUMERIC_1, DATE_REDACTION_STRING)
+      stripped = stripped.replace(DATE_PATTERN_NUMERIC_2, DATE_REDACTION_STRING)
+      stripped = stripped.replace(DATE_PATTERN_NUMERIC_3, DATE_REDACTION_STRING)
+      stripped = stripped.replace(DATE_PATTERN_STRING_1, DATE_REDACTION_STRING)
+      stripped = stripped.replace(DATE_PATTERN_STRING_2, DATE_REDACTION_STRING)
     }
     if (this.stripPostcodePII === true) {
       stripped = stripped.replace(POSTCODE_PATTERN, '[postcode]')

data/app/assets/stylesheets/govuk_publishing_components/components/_action-link.scss

@@ -94,31 +94,6 @@
   }
 }
 
-.gem-c-action-link--white-arrow {
-  &::before {
-    background-image: image-url("govuk_publishing_components/action-link-arrow--white.png");
-    background-image: image-url("govuk_publishing_components/action-link-arrow--white.svg"), linear-gradient(transparent, transparent);
-  }
-}
-
-.gem-c-action-link--blue-arrow {
-  &::before {
-    width: 36px;
-    height: 28px;
-    background: image-url("govuk_publishing_components/action-link-arrow--blue.png");
-    background: image-url("govuk_publishing_components/action-link-arrow--blue.svg"), linear-gradient(transparent, transparent);
-    background-repeat: no-repeat;
-    background-size: 28px auto;
-    background-position: 0 0;
-
-    @include govuk-media-query($from: tablet) {
-      width: 45px;
-      height: 35px;
-      background-size: 35px auto;
-    }
-  }
-}
-
 .gem-c-action-link--simple {
   &::before {
     width: 30px;
@@ -143,13 +118,6 @@
   }
 }
 
-.gem-c-action-link--dark-icon {
-  &::before {
-    background: image-url("govuk_publishing_components/action-link-arrow--dark.png");
-    background: image-url("govuk_publishing_components/action-link-arrow--dark.svg"), linear-gradient(transparent, transparent);
-  }
-}
-
 .gem-c-action-link--dark-large-icon {
   &::before {
     background: image-url("govuk_publishing_components/action-link-arrow--dark.png");
@@ -184,8 +152,7 @@
   }
 }
 
-.gem-c-action-link--dark-icon,
-.gem-c-action-link--small-icon {
+.gem-c-action-link--dark-icon {
   max-width: none;
 
   @include govuk-media-query($until: tablet) {
@@ -195,57 +162,14 @@
   &::before {
     height: 30px;
     width: 35px;
+    background: image-url("govuk_publishing_components/action-link-arrow--dark.png");
+    background: image-url("govuk_publishing_components/action-link-arrow--dark.svg"), linear-gradient(transparent, transparent);
     background-repeat: no-repeat;
     background-size: 25px auto;
     background-position: 0 2px;
   }
 }
 
-.gem-c-action-link--transparent-icon {
-  &::before {
-    background-image: image-url("govuk_publishing_components/action-link-arrow--transparent.svg");
-  }
-}
-
-.gem-c-action-link--brexit {
-  max-width: none;
-
-  &::before {
-    height: 30px;
-    width: 30px;
-    background-image: image-url("govuk_publishing_components/action-link-arrow--brexit.svg");
-    background-repeat: no-repeat;
-    background-size: 18px auto;
-    background-position: 0 2px;
-  }
-
-  @include govuk-media-query($until: tablet) {
-    margin-bottom: govuk-spacing(2);
-  }
-
-  @include govuk-media-query($from: tablet) {
-    margin-bottom: govuk-spacing(2);
-
-    &::before {
-      width: 35px;
-      background-position: 0 4px;
-      background-size: 25px auto;
-    }
-  }
-}
-
-.gem-c-action-link--nhs {
-  &::before {
-    width: 80px;
-    height: 70px;
-    background: image-url("govuk_publishing_components/action-link--nhs.png");
-    background: image-url("govuk_publishing_components/action-link--nhs.svg"), linear-gradient(transparent, transparent);
-    background-repeat: no-repeat;
-    background-size: 85% auto;
-    background-position: 0 50%;
-  }
-}
-
 .gem-c-action-link--light-text {
   color: govuk-colour("white");
 

data/app/views/govuk_publishing_components/components/_action_link.html.erb

@@ -11,32 +11,17 @@
   subtext_href ||= false
   mobile_subtext ||= false
   light_text ||= false
-  blue_arrow ||= false
-  white_arrow ||= false
   simple ||= false
   simple_light ||= false
   dark_icon ||= false
   dark_large_icon ||= false
   light_icon ||= false
-  small_icon ||= false
-  nhs_icon ||= false
-  brexit_icon ||= false
-  transparent_icon ||= false
-  data ||= nil
-  classes ||= nil
-  font_size ||= nil
 
   css_classes = %w(gem-c-action-link)
   css_classes << "gem-c-action-link--light-text" if light_text
   css_classes << "gem-c-action-link--dark-icon" if dark_icon
   css_classes << "gem-c-action-link--dark-large-icon" if dark_large_icon
-  css_classes << "gem-c-action-link--small-icon" if small_icon
-  css_classes << "gem-c-action-link--transparent-icon" if transparent_icon
   css_classes << "gem-c-action-link--light-icon" if light_icon
-  css_classes << "gem-c-action-link--nhs" if nhs_icon
-  css_classes << "gem-c-action-link--brexit" if brexit_icon
-  css_classes << "gem-c-action-link--blue-arrow" if blue_arrow
-  css_classes << "gem-c-action-link--white-arrow" if white_arrow
   css_classes << "gem-c-action-link--simple" if simple
   css_classes << "gem-c-action-link--simple-light" if simple_light
   css_classes << "gem-c-action-link--with-subtext" if subtext
@@ -44,9 +29,7 @@
   css_classes << shared_helper.get_margin_bottom
 
   link_classes = %w(govuk-link gem-c-action-link__link)
-  link_classes << shared_helper.classes if classes
   link_classes << "govuk-link--inverse" if light_text
-  link_classes << shared_helper.get_heading_size(font_size, 'm') if font_size
 
   component_helper = GovukPublishingComponents::Presenters::ComponentWrapperHelper.new(local_assigns)
   component_helper.add_class(css_classes.join(" "))
@@ -61,7 +44,7 @@
         <% end %>
 
         <% if href.present? %>
-          <%= link_to href, class: link_classes, data: data do %>
+          <%= link_to href, class: link_classes do %>
             <%= main_text %>
           <% end %>
         <% else %>
@@ -73,7 +56,7 @@
         <span class="gem-c-action-link__subtext-wrapper">
           <% if subtext_href %>
             <%= content_tag(:span, subtext, class: "gem-c-action-link__subtext") do %>
-              <%= link_to subtext, subtext_href, class: link_classes, data: data %>
+              <%= link_to subtext, subtext_href, class: link_classes %>
             <% end %>
           <% else %>
             <%= content_tag(:span, subtext, class: "gem-c-action-link__subtext") %>

data/app/views/govuk_publishing_components/components/docs/action_link.yml

@@ -13,18 +13,6 @@ examples:
       text: Look at this margin
       href: "/page"
       margin_bottom: 9
-  with_data_attributes:
-    data:
-      text: "Coronavirus (COVID-19)"
-      href: "/page"
-      data:
-        attr_test: "hasDataAttribute"
-  with_js_classes:
-    description: Use `js-` prefixed classes only as interaction hooks – to query and operate on elements via JavaScript. Classes are added to the link itself.
-    data:
-      text: "Coronavirus (COVID-19)"
-      href: "/page"
-      classes: 'js-hook'
   with_no_wrapping_text:
     data:
       text: "Coronavirus (COVID-19):"
@@ -37,14 +25,6 @@ examples:
       light_text: true
     context:
       dark_background: true
-  with_transparent_svg:
-    data:
-      text: Find out what you need to do
-      href: "/page"
-      light_text: true
-      transparent_icon: true
-    context:
-      dark_background: true
   with_subtext:
     data:
       text: Emergency something
@@ -79,19 +59,6 @@ examples:
       light_text: true
     context:
       dark_background: true
-  white_arrow:
-    data:
-      text: Find out how to stay safe and help prevent the spread
-      href: "/something"
-      white_arrow: true
-      light_text: true
-    context:
-      dark_background: true
-  blue_arrow:
-    data:
-      text: Find out how to stay safe and help prevent the spread
-      href: "/something"
-      blue_arrow: true
   simple_arrow:
     data:
       text: Getting financial help and keeping your business safe
@@ -105,11 +72,6 @@ examples:
       simple_light: true
     context:
       dark_background: true
-  with_small_icon:
-    data:
-      text: Coronavirus (COVID-19)
-      href: "/my-test-page"
-      small_icon: true
   with_dark_icon:
     data:
       text: Coronavirus (COVID-19)
@@ -124,17 +86,4 @@ examples:
     data:
       text: Coronavirus (COVID-19)
       href: "/my-test-page"
-      light_icon: true      
-  with_brexit_icon_and_custom_font_size:
-    data:
-      text: Guidance for businesses
-      href: "/guidance-for-businesses"
-      brexit_icon: true
-      font_size: m
-  with_nhs_icon:
-    data:
-      text: Something about the NHS
-      subtext: Perhaps you'd like to click here
-      subtext_href: "/page"
-      mobile_subtext: true
-      nhs_icon: true
+      light_icon: true

data/lib/govuk_publishing_components/presenters/component_wrapper_helper.rb

@@ -76,7 +76,7 @@ module GovukPublishingComponents
         return if classes.blank?
 
         class_array = classes.split(" ")
-        unless class_array.all? { |c| c.start_with?("js-", "gem-c-", "govuk-", "brand--", "brand__") }
+        unless class_array.all? { |c| c.start_with?("js-", "gem-c-", "govuk-", "app-c-", "brand--", "brand__") }
           raise(ArgumentError, "Classes (#{classes}) must be prefixed with `js-`")
         end
       end

data/lib/govuk_publishing_components/presenters/meta_tags.rb

@@ -19,6 +19,7 @@ module GovukPublishingComponents
       def meta_tags
         meta_tags = {}
         meta_tags = add_core_tags(meta_tags)
+        meta_tags = add_ga4_political_tags(meta_tags)
         meta_tags = add_organisation_tags(meta_tags)
         meta_tags = add_political_tags(meta_tags)
         meta_tags = add_taxonomy_tags(meta_tags)
@@ -48,6 +49,8 @@ module GovukPublishingComponents
         primary_publisher = content_item.dig(:links, :primary_publishing_organisation)
         primary_publisher = primary_publisher.first[:title] unless primary_publisher.blank?
         meta_tags["govuk:primary-publishing-organisation"] = primary_publisher unless primary_publisher.blank?
+
+        # Some browse topics are nested in the content item, we want to grab these for GA4 tracking.
         ga4_browse_topic = content_item.dig(:links, :ordered_related_items, 0, :links, :mainstream_browse_pages, 0, :links, :parent, 0, :title)
         ga4_browse_topic = ga4_browse_topic.downcase if ga4_browse_topic
         meta_tags["govuk:ga4-browse-topic"] = ga4_browse_topic if ga4_browse_topic
@@ -84,6 +87,24 @@ module GovukPublishingComponents
         meta_tags
       end
 
+      # Some 'government' objects are nested in the content item on some pages. We want to grab these for GA4 tracking.
+      # We only add the publishing government if 'political' is true, otherwise some content items get incorrectly linked to a government
+      def add_ga4_political_tags(meta_tags)
+        government = content_item.dig(:links, :government, 0)
+
+        # political: true/false is in a different place to current: true/false, which is why we have 'details' and 'government[:details]'
+        if government && details[:political]
+          meta_tags["govuk:ga4-political-status"] = government[:details][:current] ? "political" : "historic"
+
+          government_title = government[:title]
+          if government_title && !government[:details][:current]
+            meta_tags["govuk:ga4-publishing-government"] = government_title
+          end
+        end
+
+        meta_tags
+      end
+
       def add_taxonomy_tags(meta_tags)
         themes = root_taxon_slugs(content_item)
         meta_tags["govuk:themes"] = themes.to_a.sort.join(", ") unless themes.empty?

data/lib/govuk_publishing_components/version.rb

@@ -1,3 +1,3 @@
 module GovukPublishingComponents
-  VERSION = "35.23.0".freeze
+  VERSION = "36.0.0".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: govuk_publishing_components
 version: !ruby/object:Gem::Version
-  version: 35.23.0
+  version: 36.0.0
 platform: ruby
 authors:
 - GOV.UK Dev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-11-20 00:00:00.000000000 Z
+date: 2023-11-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: govuk_app_config
@@ -342,11 +342,6 @@ files:
 - LICENCE.md
 - README.md
 - app/assets/config/govuk_publishing_components_manifest.js
-- app/assets/images/govuk_publishing_components/action-link--nhs.png
-- app/assets/images/govuk_publishing_components/action-link--nhs.svg
-- app/assets/images/govuk_publishing_components/action-link-arrow--blue.png
-- app/assets/images/govuk_publishing_components/action-link-arrow--blue.svg
-- app/assets/images/govuk_publishing_components/action-link-arrow--brexit.svg
 - app/assets/images/govuk_publishing_components/action-link-arrow--dark.png
 - app/assets/images/govuk_publishing_components/action-link-arrow--dark.svg
 - app/assets/images/govuk_publishing_components/action-link-arrow--light.png
@@ -355,9 +350,6 @@ files:
 - app/assets/images/govuk_publishing_components/action-link-arrow--simple-light.svg
 - app/assets/images/govuk_publishing_components/action-link-arrow--simple.png
 - app/assets/images/govuk_publishing_components/action-link-arrow--simple.svg
-- app/assets/images/govuk_publishing_components/action-link-arrow--transparent.svg
-- app/assets/images/govuk_publishing_components/action-link-arrow--white.png
-- app/assets/images/govuk_publishing_components/action-link-arrow--white.svg
 - app/assets/images/govuk_publishing_components/action-link-arrow.png
 - app/assets/images/govuk_publishing_components/action-link-arrow.svg
 - app/assets/images/govuk_publishing_components/crests/bis_crest_13px.png

data/app/assets/images/govuk_publishing_components/action-link--nhs.svg

@@ -1 +0,0 @@
-<svg fill="none" height="227" viewBox="0 0 227 227" width="227" xmlns="http://www.w3.org/2000/svg"><path d="m55.7 226.5c-30.4 0-55.2-24.8-55.2-55.2v-115.6c0-30.4 24.8-55.2 55.2-55.2h115.6c30.4 0 55.2 24.8 55.2 55.2v115.6c0 30.4-24.8 55.2-55.2 55.2z" fill="#0ba23b"/><path d="m171.3 1c30.2 0 54.7 24.5 54.7 54.7v115.6c0 30.2-24.5 54.7-54.7 54.7h-115.6c-30.2 0-54.7-24.5-54.7-54.7v-115.6c0-30.2 24.5-54.7 54.7-54.7zm0-1h-115.6c-30.7 0-55.7 25-55.7 55.7v115.6c0 30.7 25 55.7 55.7 55.7h115.6c30.7 0 55.7-25 55.7-55.7v-115.6c0-30.7-25-55.7-55.7-55.7z" fill="#0ba23b"/><path d="m113.5 52.7-.5-.3-112 112v6.9c0 7.3 1.5 14.3 4.1 20.7l107.9-107.9.5.3 108.2 108.2c2.8-6.5 4.3-13.8 4.3-21.3v-6.1z" fill="#fcf411"/><path d="m171.3 1h-3l57.7 57.7v-3c0-30.2-24.5-54.7-54.7-54.7z" fill="#fcf411"/><path d="m57.8 1h-2.1c-30.2 0-54.7 24.5-54.7 54.7v2.1z" fill="#fcf411"/><path d="m226 94.5-93.5-93.5h-38.8l-92.7 92.7v31.7l112-112 .5.3 112.5 112.5z" fill="#fcf411"/><path d="m205.8 213.8-92.3-92.3-.5-.3-92.2002 92.2c6 5 13.1 8.7 20.9 10.8l71.3002-71.3.5.3 71.1 71.1c7.9-1.9 15.1-5.6 21.2-10.5z" fill="#fcf411"/><path d="m112.1 188.3 1 1 .8-.8z" fill="#fcf411"/><path d="m149.8 226-36.7-36.7-36.7001 36.7z" fill="#fcf411"/><path d="m166.5 213.1h-106.0001c-25.7 0-46.6-20.9-46.6-46.6v-106c0-25.7 20.9-46.6 46.6-46.6h106.0001c25.7 0 46.6 20.9 46.6 46.6v106c0 25.7-20.9 46.6-46.6 46.6z" fill="#0071b9"/><g fill="#fff"><path d="m56.2998 56.7v48.5h119.7002v-48.5zm26.9 43.7-8.2-27h-.1l-5.4 27h-9.8l8.3-39h13l8 27.1h.1l5.5-27.1h9.8002l-8.3002 39zm39.7002 0 3.5-16.7h-12.3l-3.5 16.7h-10.4l8.1-39h10.5l-3.1 14.9h12.3l3.1-14.9h10.5l-8.1 39zm46.1-30.2c-2.7-1.2-5.6-1.8-8.6-1.8-4.1 0-7.5.6-7.5 3.7 0 5.5 15.1 3.5 15.1 15.3 0 10.8-10 13.6-19.1 13.6-4.1-.1-8.2-.8-12.1-2l2.4-7.9c2.1 1.3 6.2 2.2 9.6 2.2s8.3-.6 8.3-4.6c0-6.3-15.1-3.9-15.1-14.9 0-10.1 8.8-13.1 17.4-13.1 4.8 0 9.3.5 12 1.7z"/><path d="m50.5001 156.8c-.6.4-1.6.6-3 .9-1.3.2-2.8.3-4.3.3-2.6 0-4.9-.4-6.8-1.3s-3.6-2.1-4.9-3.7-2.3-3.4-2.9-5.5c-.7-2.1-1-4.4-1-6.9s.3-4.8 1-6.9 1.6-4 2.9-5.5c1.3-1.6 2.9-2.8 4.8-3.7s4.2-1.3 6.7-1.3c1.7 0 3.3.2 4.6.5s2.3.6 2.9.9l-.3 5.6c-.6-.3-1.5-.7-2.5-1.2s-2.3-.7-3.9-.7c-1.3 0-2.5.2-3.7.7-1.1.5-2.2 1.2-3 2.2-.9 1-1.6 2.3-2.1 3.8-.5 1.6-.8 3.4-.8 5.6s.3 4.1.8 5.6c.5 1.6 1.2 2.8 2.1 3.8s1.9 1.7 3 2.2 2.4.7 3.7.7c1.5 0 2.8-.2 3.8-.5s1.9-.7 2.6-1.3z"/><path d="m52.6001 140.6c0-3 .4-5.7 1.1-7.9s1.7-4 3-5.4c1.2-1.4 2.7-2.5 4.3-3.1 1.6-.7 3.3-1 5.1-1s3.4.3 5.1 1c1.6.7 3.1 1.7 4.3 3.1s2.2 3.2 3 5.4c.7 2.2 1.1 4.8 1.1 7.9 0 3-.4 5.7-1.1 7.9s-1.7 4-3 5.4c-1.2 1.4-2.7 2.5-4.3 3.1-1.6.7-3.3 1-5.1 1s-3.4-.3-5.1-1c-1.6-.7-3.1-1.7-4.3-3.1s-2.2-3.2-3-5.4c-.7-2.3-1.1-4.9-1.1-7.9zm6.4 0c0 2.3.2 4.3.6 5.9s.9 2.9 1.5 3.9 1.4 1.7 2.3 2.2 1.8.7 2.8.7 1.9-.2 2.8-.7 1.6-1.2 2.3-2.2c.6-1 1.1-2.3 1.5-3.9s.6-3.6.6-5.9-.2-4.3-.6-5.9-.9-2.9-1.5-3.9-1.4-1.7-2.3-2.2-1.8-.7-2.8-.7-1.9.2-2.8.7-1.6 1.2-2.3 2.2c-.6 1-1.1 2.3-1.5 3.9s-.6 3.5-.6 5.9z"/><path d="m80.3003 123.6h6.7l6.8 26.1h.1l6.9997-26.1h6.4l-10.2997 33.9h-6.6z"/><path d="m110.4 123.6h6.2v33.9h-6.2z"/><path d="m122.6 123.6h8.8c5.3 0 9.4 1.4 12.1 4.2s4.1 7.1 4.1 12.7c0 2.8-.4 5.3-1.2 7.5-.8 2.1-1.9 3.9-3.4 5.3-1.4 1.4-3.1 2.5-5.1 3.2s-4.1 1-6.5 1h-8.8zm6.2 29.2h2.1c1.7 0 3.3-.3 4.5-.9 1.3-.6 2.3-1.4 3.2-2.5s1.4-2.4 1.8-3.9.6-3.2.6-5-.2-3.5-.6-5-1-2.8-1.8-3.9-1.9-1.9-3.2-2.5-2.8-.8-4.5-.8h-2.1z"/><path d="m152 141.2h11.2v5h-11.2z"/><path d="m170.7 130.8-4.5 4.2-2.9-4.2 8.3-7.2h5.1v33.9h-6z"/><path d="m183.8 151.8c.6.3 1.3.6 2.2.9.9.4 2 .5 3.4.5 1.7 0 3-.4 4-1.2s1.8-1.8 2.3-2.9.9-2.4 1.1-3.7.3-2.5.4-3.5l-.1-.1c-.6.9-1.4 1.7-2.3 2.4-1 .7-2.3 1-3.9 1-1.2 0-2.3-.2-3.4-.7s-2-1.1-2.9-2.1-1.5-2.1-2-3.4c-.5-1.4-.8-3-.8-4.8 0-1.7.2-3.2.7-4.6.4-1.4 1.1-2.5 1.9-3.5s1.9-1.7 3.1-2.2 2.7-.8 4.3-.8c2.2 0 4 .4 5.4 1.2s2.5 2 3.4 3.4c.8 1.4 1.4 3.1 1.8 5.1.3 1.9.5 4 .5 6.1 0 2.5-.2 4.9-.6 7.2s-1.1 4.3-2.1 6.1c-1 1.7-2.3 3.1-4 4.2s-3.8 1.6-6.4 1.6c-1.6 0-2.8-.1-3.9-.4-1-.3-1.8-.5-2.4-.8zm4.1-17.7c0 1.8.3 3.4 1 4.6s1.8 1.8 3.4 1.8c1.5 0 2.5-.6 3.3-1.7.7-1.1 1.1-2.7 1.1-4.6 0-2-.3-3.6-1-4.7s-1.8-1.7-3.3-1.7c-1.6 0-2.7.6-3.4 1.7-.7 1-1.1 2.6-1.1 4.6z"/></g></svg>

data/app/assets/images/govuk_publishing_components/action-link-arrow--blue.svg

@@ -1,9 +0,0 @@
-<svg width="39" height="39" viewBox="0 0 39 39" fill="none" xmlns="http://www.w3.org/2000/svg">
-<circle cx="19.5" cy="19.5" r="19.5" fill="#366FB3" mask="url(#mask)"/>
-
-<mask id="mask">
-	<rect width="100%" height="100%" fill="white"/>
-	<path fill-rule="evenodd" clip-rule="evenodd" d="M24.0343 20L14.1812 10.1469L17.0096 7.31848L29.6912 20L17.0096 32.6815L14.1812 29.8531L24.0343 20Z" fill="black"/>
-	<path fill-rule="evenodd" clip-rule="evenodd" d="M0.000423781 18L25.1328 18L25.1328 22L0.000423431 22L0.000423781 18Z" fill="black"/>
-</mask>
-</svg>

data/app/assets/images/govuk_publishing_components/action-link-arrow--brexit.svg

@@ -1,3 +0,0 @@
-<svg width="38" height="36" viewBox="0 0 38 36" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M38 35.8461C34.8518 35.8299 31.701 35.8136 28.5528 35.7974C28.5447 29.2599 28.5366 22.7252 28.5284 16.1878C21.8989 22.7252 15.2721 29.2599 8.64252 35.7974C5.8547 35.792 3.06417 35.7838 0.276344 35.7784C0.262798 34.1366 0.249251 32.4948 0.232996 30.8503C7.36917 23.7195 14.5026 16.5833 21.6388 9.44717C14.4268 9.47697 7.21204 9.50406 0 9.53387C3.17254 6.35862 6.34778 3.18608 9.52032 0.010837C19.0135 0.00812776 28.5068 0.00270925 38 0C38 11.9234 38 23.8577 38 35.8461Z" fill="#FF003B"/>
-</svg>

data/app/assets/images/govuk_publishing_components/action-link-arrow--transparent.svg

@@ -1 +0,0 @@
-<svg width="39" height="39" fill="none" xmlns="http://www.w3.org/2000/svg"><path d="M17.01 6.818l-2.828 2.828 7.853 7.854-22 .066L0 21.5h22.035l-7.853 7.854 2.828 2.828L29.69 19.5zM39 19.5C39 30.27 30.27 39 19.5 39 9.373 39 1.05 31.28.092 21.405A19.737 19.737 0 010 19.5C0 8.73 8.73 0 19.5 0S39 8.73 39 19.5z" fill="#fff500"/></svg>

data/app/assets/images/govuk_publishing_components/action-link-arrow--white.svg

@@ -1 +0,0 @@
-<svg width="39" height="39" fill="none" xmlns="http://www.w3.org/2000/svg"><path d="M17.01 6.818l-2.828 2.828 7.853 7.854-22 .066L0 21.5h22.035l-7.853 7.854 2.828 2.828L29.69 19.5zM39 19.5C39 30.27 30.27 39 19.5 39 9.373 39 1.05 31.28.092 21.405A19.737 19.737 0 010 19.5C0 8.73 8.73 0 19.5 0S39 8.73 39 19.5z" fill="#fff"/></svg>