govuk_publishing_components 35.15.1 → 35.15.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5edbe2c7a347d6bc8069704f3434dc4c41de45b3286f7640893f7ff8f62c25a8
-  data.tar.gz: d17f853fdf1a5598b808a69fdec621da35aa8662bc911d5c951715cc53bfb6a0
+  metadata.gz: f8533adba3392301001871fbe61ae994c04e20161bc629ba88e2388e76b696da
+  data.tar.gz: 1eec5780f166fab5b8ba18ffa62c093d1d4f570cccf0c901f466cbf136dcbcff
 SHA512:
-  metadata.gz: 0f5f8a3a9706d98e11ce756987eb9dc442dce2c3701eeb2dbfe8ff2ad48c6c48d27c0c8f056b9e3f851d53d4c6cfb1712c042f9699a658fad94618d679b6c974
-  data.tar.gz: fc1469502870ba2a479cde17f7d8edc652270a3ce98efd2aa6128797634e484bf6448cb54712f4c12c116a4f9275d345cb39ffdf13901bde137fc80321769657
+  metadata.gz: 80f9f867f5cea155dbc5fc158ef4fb32ded03123f8bcc4885e06e3f44fe94dc7169a941758aa96b88953d7f7eda678c9c882490a90cce05bd085762562dc178a
+  data.tar.gz: 8a93fabbfae63dcc902449ff97d2cfa6d741cdd971a6bac9bc1c70fc1f285e438af91c8a885647b5fbc11d1a6f922472c75c98cff07c075d239cbd679ffa6d0d

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
       }
     },
 
@@ -279,7 +290,8 @@ window.GOVUK.analyticsGa4 = window.GOVUK.analyticsGa4 || {};
 
         // In order to extract the number of results from resultCount (which is a string at this point (e.g. '12,345 results')), we remove the comma and
         // split string at the space character so it can be parsed as an integer
-        resultCount = resultCount.textContent.replace(',', '')
+        resultCount = window.GOVUK.analyticsGa4.core.trackFunctions.removeLinesAndExtraSpaces(resultCount.textContent)
+        resultCount = resultCount.replace(',', '')
         resultCount = resultCount.split(' ')[0]
 
         return parseInt(resultCount)

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/analytics-ga4/ga4-page-views.js

@@ -57,7 +57,8 @@ window.GOVUK.analyticsGa4.analyticsModules = window.GOVUK.analyticsGa4.analytics
             emergency_banner: document.querySelector('[data-ga4-emergency-banner]') ? 'true' : undefined,
             phase_banner: this.getElementAttribute('data-ga4-phase-banner') || undefined,
             devolved_nations_banner: this.getElementAttribute('data-ga4-devolved-nations-banner') || undefined,
-            cookie_banner: document.querySelector('[data-ga4-cookie-banner]') ? 'true' : undefined
+            cookie_banner: document.querySelector('[data-ga4-cookie-banner]') ? 'true' : undefined,
+            intervention: this.getInterventionPresence()
           }
         }
         window.GOVUK.analyticsGa4.core.sendData(data)
@@ -76,7 +77,7 @@ window.GOVUK.analyticsGa4.analyticsModules = window.GOVUK.analyticsGa4.analytics
     // remove GA parameters of the form _ga=2320.021-012302 or _gl=02.10320.01230-123
     stripGaParam: function (str) {
       str = str.replace(/(_ga=[0-9.-]+)/g, '_ga=[id]')
-      str = str.replace(/(_gl=[0-9.-]+)/g, '_gl=[id]')
+      str = str.replace(/(_gl=[a-zA-Z0-9._\-*]+)/g, '_gl=[id]')
       return str
     },
 
@@ -112,11 +113,12 @@ window.GOVUK.analyticsGa4.analyticsModules = window.GOVUK.analyticsGa4.analytics
 
     getLanguage: function () {
       var content = document.getElementById('content')
+      var html = document.querySelector('html')
       if (content) {
         return content.getAttribute('lang') || this.nullValue
-      } else {
-        return this.nullValue
       }
+      // html.getAttribute('lang') is untested - Jasmine would not allow lang to be set on <html>.
+      return html.getAttribute('lang') || this.nullValue
     },
 
     getHistory: function () {
@@ -129,6 +131,25 @@ window.GOVUK.analyticsGa4.analyticsModules = window.GOVUK.analyticsGa4.analytics
       return (withdrawn === 'withdrawn') ? 'true' : 'false'
     },
 
+    getInterventionPresence: function () {
+      /* If the user hides the banner using JS, a cookie is set to hide it on future page loads.
+       * Therefore we need to start the intervention banner early so that it hides if this cookie exists.
+       * Without this, our pageview object will track the banner as visible before it gets hidden. */
+
+      var intervention = document.querySelector('[data-ga4-intervention-banner]')
+
+      if (intervention) {
+        window.GOVUK.modules.start(intervention)
+        var interventionHidden = intervention.getAttribute('hidden') === '' || intervention.getAttribute('hidden')
+
+        if (interventionHidden) {
+          return undefined
+        }
+        return 'true'
+      }
+      return undefined
+    },
+
     splitLongMetaContent: function (metatag) {
       var tag = this.getMetaContent(metatag)
       if (tag) {

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/app/assets/stylesheets/govuk_publishing_components/components/_cards.scss

@@ -13,11 +13,8 @@
   margin: 0 govuk-spacing(-3);
 
   display: grid;
-  grid-auto-flow: row;
-  // Use CSS grid to calculate the number of rows
-  grid-template-rows: auto;
-  // Use the tallest cell in the grid to set the height for all rows
-  grid-auto-rows: fractions(1);
+  grid-auto-flow: row;   // Use CSS grid to calculate the number of rows
+  grid-auto-rows: fractions(1); // Set all rows to same fractional height of the complete grid
   grid-template-columns: fractions(1);
 
   @include govuk-media-query($from: "tablet") {

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

@@ -11,6 +11,8 @@
 
   data_attributes ||= {}
   suggestion_data_attributes ||= {}
+  dismiss_data_attributes ||= {}
+  dismiss_link_data_attributes ||= {}
   data_attributes[:module] = "intervention"
   data_attributes["intervention-name"] = name
 
@@ -30,6 +32,11 @@
   intervention_helper = GovukPublishingComponents::Presenters::InterventionHelper.new(options)
   dismiss_href = intervention_helper.dismiss_link
 
+  ga4_tracking ||= false
+  suggestion_data_attributes[:module] = "#{suggestion_data_attributes[:module]} ga4-link-tracker".strip if ga4_tracking
+  suggestion_data_attributes[:ga4_link] = { event_name: "navigation", type: "intervention", section: suggestion_text, index: 1, index_total: 1 }.to_json if ga4_tracking
+  data_attributes[:ga4_intervention_banner] = "" if ga4_tracking # Added to the parent element for the GA4 pageview object to use
+
   suggestion_tag_options = {
     class: "govuk-link",
     href: suggestion_link_url,
@@ -51,6 +58,9 @@
     data: data_attributes,
   }
   section_options.merge!({ hidden: true }) if hide
+
+  dismiss_link_data_attributes[:module] = "#{dismiss_link_data_attributes[:module]} ga4-event-tracker".strip if ga4_tracking
+  dismiss_link_data_attributes[:ga4_event] = { event_name: "select_content", type: "intervention", section: suggestion_text, action: 'closed' }.to_json if ga4_tracking
 %>
 <% if intervention_helper.show? %>
   <%= tag.section **section_options do %>
@@ -62,8 +72,8 @@
     </p>
 
     <% if dismiss_text %>
-      <p class="govuk-body">
-        <%= tag.a class: "govuk-link js-dismiss-link", href: dismiss_href do %>
+      <%= tag.p class: "govuk-body", data: dismiss_data_attributes do %>
+        <%= tag.a class: "govuk-link js-dismiss-link", href: dismiss_href, data: dismiss_link_data_attributes do %>
           <svg class="gem-c-intervention__dismiss-icon"
             width="19" height="19" viewBox="0 0 19 19"
             aria-hidden="true"
@@ -74,7 +84,7 @@
           </svg>
           <%= dismiss_text %>
         <% end %>
-      </p>
+      <% end %>
     <% end %>
   <% end %>
 <% end %>

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

@@ -65,8 +65,8 @@ examples:
 
   with_data_attributes:
     description: |
-      This example shows the use of `suggestion_data_attributes` and
-      `dismiss_data_attributes` for click tracking.
+      This example shows the use of `suggestion_data_attributes`,
+      `dismiss_data_attributes` for click tracking on the dismiss section <p> tag, and `dismiss_link_data_attributes` for adding attributes to the dismiss link <a> tag.
 
       Other data attributes can also be applied as required. Note that the component does not include built in tracking. If this is required consider using the [track click script](https://github.com/alphagov/govuk_publishing_components/blob/main/docs/analytics/track-click.md).
     data:
@@ -87,3 +87,15 @@ examples:
         track-dimension: Hide this suggestion
         track-dimension-index: 29
         track-label: hide the intervention
+      dismiss_link_data_attributes:
+        track-category: example
+  with_ga4_tracking:
+    description: |
+      Enables GA4 tracking on the banner. This includes link tracking on the component itself, event tracking on the 'Hide' link, and allows pageviews to record the presence of the banner on page load.
+    data:
+      ga4_tracking: true
+      suggestion_text: Based on your browsing you might be interested in
+      suggestion_link_text: "Travel abroad: step by step"
+      suggestion_link_url: /travel-abroad
+      dismiss_text: Hide this suggestion
+      name: another-campaign-name

data/config/locales/en.yml

@@ -241,6 +241,8 @@ en:
         href: "/sign-in-universal-credit"
       - label: Check your National Insurance record
         href: "/check-national-insurance-record"
+      - label: 'Check MOT history of a vehicle'
+        href: /check-mot-history
       popular_links_heading: Popular on GOV.UK
       search_text: Search GOV.UK
     metadata:

data/lib/govuk_publishing_components/version.rb

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

data/node_modules/axe-core/axe.d.ts

@@ -164,9 +164,9 @@ declare namespace axe {
   interface NodeResult {
     html: string;
     impact?: ImpactValue;
-    target: string[];
+    target: UnlabelledFrameSelector;
     xpath?: string[];
-    ancestry?: string[];
+    ancestry?: UnlabelledFrameSelector;
     any: CheckResult[];
     all: CheckResult[];
     none: CheckResult[];
@@ -181,8 +181,11 @@ declare namespace axe {
     relatedNodes?: RelatedNode[];
   }
   interface RelatedNode {
-    target: string[];
     html: string;
+    target: UnlabelledFrameSelector;
+    xpath?: string[];
+    ancestry?: UnlabelledFrameSelector;
+    element?: HTMLElement;
   }
   interface RuleLocale {
     [key: string]: {
@@ -193,7 +196,7 @@ declare namespace axe {
   interface CheckMessages {
     pass: string | { [key: string]: string };
     fail: string | { [key: string]: string };
-    incomplete: string | { [key: string]: string };
+    incomplete?: string | { [key: string]: string };
   }
   interface CheckLocale {
     [key: string]: CheckMessages;
@@ -257,10 +260,31 @@ declare namespace axe {
     brand?: string;
     application?: string;
   }
+  interface CheckHelper {
+    async: () => (result: boolean | undefined | Error) => void;
+    data: (data: unknown) => void;
+    relatedNodes: (nodes: Element[]) => void;
+  }
+  interface AfterResult {
+    id: string;
+    data?: unknown;
+    relatedNodes: SerialDqElement[];
+    result: boolean | undefined;
+    node: SerialDqElement;
+  }
   interface Check {
     id: string;
-    evaluate?: Function | string;
-    after?: Function | string;
+    evaluate?:
+      | string
+      | ((
+          this: CheckHelper,
+          node: Element,
+          options: unknown,
+          virtualNode: VirtualNode
+        ) => boolean | undefined | void);
+    after?:
+      | string
+      | ((results: AfterResult[], options: unknown) => AfterResult[]);
     options?: any;
     matches?: string;
     enabled?: boolean;
@@ -280,9 +304,10 @@ declare namespace axe {
     all?: string[];
     none?: string[];
     tags?: string[];
-    matches?: string;
+    matches?: string | ((node: Element, virtualNode: VirtualNode) => boolean);
     reviewOnFail?: boolean;
-    metadata?: Omit<RuleMetadata, 'ruleId'>;
+    actIds?: string[];
+    metadata?: Omit<RuleMetadata, 'ruleId' | 'tags' | 'actIds'>;
   }
   interface AxePlugin {
     id: string;
@@ -346,7 +371,8 @@ declare namespace axe {
   type AxeReporter<T = unknown> = (
     rawResults: RawResult[],
     option: RunOptions,
-    callback: (report: T) => void
+    resolve: (report: T) => void,
+    reject: (error: Error) => void
   ) => void;
 
   interface VirtualNode {
@@ -367,6 +393,42 @@ declare namespace axe {
     shadowSelect: (selector: CrossTreeSelector) => Element | null;
     shadowSelectAll: (selector: CrossTreeSelector) => Element[];
     getStandards(): Required<Standards>;
+    DqElement: new (
+      elm: Element,
+      options?: { absolutePaths?: boolean }
+    ) => SerialDqElement;
+    uuid: (
+      options?: { random?: Uint8Array | Array<number> },
+      buf?: Uint8Array | Array<number>,
+      offset?: number
+    ) => string | Uint8Array | Array<number>;
+  }
+
+  interface Aria {
+    getRoleType: (role: string | Element | VirtualNode | null) => string | null;
+  }
+
+  interface Dom {
+    isFocusable: (node: Element | VirtualNode) => boolean;
+    isNativelyFocusable: (node: Element | VirtualNode) => boolean;
+  }
+
+  type AccessibleTextOptions = {
+    inControlContext?: boolean;
+    inLabelledByContext?: boolean;
+  };
+
+  interface Text {
+    accessibleText: (
+      element: Element,
+      options?: AccessibleTextOptions
+    ) => string;
+  }
+
+  interface Commons {
+    aria: Aria;
+    dom: Dom;
+    text: Text;
   }
 
   interface EnvironmentData {
@@ -380,6 +442,7 @@ declare namespace axe {
   let version: string;
   let plugins: any;
   let utils: Utils;
+  let commons: Commons;
 
   /**
    * Source string to use as an injected script in Selenium