govuk_publishing_components 36.0.1 → 36.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d41ddf9d28242ee496fbf50b88e10bbf1785c27ed809bb8ee40a9cb099092068
-  data.tar.gz: 72d8c532895124b04ffedc228c0baffaa180828f1765d75a7cc792b4969f6ceb
+  metadata.gz: fca7a5f4a2f77be1b86157531a3f2884b70ebde62cea12c194bad2b29886d121
+  data.tar.gz: 9e59cd6485f898e8f86f1b2f21022bca130c5d471d2a87afd498be029811a265
 SHA512:
-  metadata.gz: ddd6e3b7b2dcb71844e37cb5065aea4c331c0a4e0bbf7daa38e52a9b4161bde2edea212ac24553e74df5d5b599346a8f4e72b853a1a3eb99413fec316519497b
-  data.tar.gz: bd76e4fbb84e10bd6d20b55bd46e499431d52b9dd794b1b152065f63798d922587b9ef22d8fca9a9b3fe6d5e77d5387ddfbd52e0dcde86b7a1bfe5948ecfcd84
+  metadata.gz: 00cb71df653b04a54fd700ab26efedde9852421def70e5e4c5e40b8ac3b90828e926aa9311dd526a0c2f2e417ed6dff0d70cd6197beaad702ffd311ac2e05a31
+  data.tar.gz: e34e2387ad6ef7903892a12090be73aa46c1307749fde8b38338afb7bcda5cd0f987eb675737012dc6f72b715643f14a16d2795a3593ea8671d04a81761eb8a3

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

@@ -275,6 +275,19 @@ window.GOVUK.analyticsGa4 = window.GOVUK.analyticsGa4 || {};
           return url
         }
         return this.getPathname() + url
+      },
+
+      standardiseSearchTerm: function (searchTerm) {
+        if (!searchTerm) {
+          return undefined // Prevents conversion of undefined to a string by this function.
+        }
+
+        var PIIRemover = new window.GOVUK.analyticsGa4.PIIRemover()
+        searchTerm = searchTerm.replace(/\++|(%2B)+/gm, ' ') // Turn + characters or unicode + characters (%2B) into a space.
+        searchTerm = window.GOVUK.analyticsGa4.core.trackFunctions.removeLinesAndExtraSpaces(searchTerm)
+        searchTerm = PIIRemover.stripPIIWithOverride(searchTerm, true, true)
+        searchTerm = searchTerm.toLowerCase()
+        return searchTerm
       }
     },
 
@@ -313,12 +326,11 @@ window.GOVUK.analyticsGa4 = window.GOVUK.analyticsGa4 || {};
         var isSearchResult = element.getAttribute('data-ga4-search-query')
 
         var ecommerceSchema = new window.GOVUK.analyticsGa4.Schemas().ecommerceSchema()
-        var PIIRemover = new window.GOVUK.analyticsGa4.PIIRemover()
         var DEFAULT_LIST_TITLE = 'Smart answer results'
 
         if (isSearchResult) {
           // Limiting to 100 characters to avoid noise from extra long search queries and to stop the size of the payload going over 8k limit.
-          var searchQuery = PIIRemover.stripPII(element.getAttribute('data-ga4-search-query')).substring(0, 100).toLowerCase()
+          var searchQuery = window.GOVUK.analyticsGa4.core.trackFunctions.standardiseSearchTerm(element.getAttribute('data-ga4-search-query')).substring(0, 100)
           var variant = element.getAttribute('data-ga4-ecommerce-variant')
           DEFAULT_LIST_TITLE = 'Site search results'
         }

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

@@ -47,8 +47,7 @@ window.GOVUK.Modules = window.GOVUK.Modules || {};
       data.text = data.text || this.combineGivenAnswers(formData) || this.useFallbackValue
 
       if (data.action === 'search' && data.text) {
-        data.text = data.text.toLowerCase()
-        data.text = window.GOVUK.analyticsGa4.core.trackFunctions.removeLinesAndExtraSpaces(data.text)
+        data.text = window.GOVUK.analyticsGa4.core.trackFunctions.standardiseSearchTerm(data.text)
       }
       window.GOVUK.analyticsGa4.core.applySchemaAndSendData(data, 'event_data')
     }

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

@@ -85,7 +85,13 @@ window.GOVUK.Modules = window.GOVUK.Modules || {};
       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')
+      try {
+        var url = data.url || this.findLink(event.target).getAttribute('href')
+      } catch (e) {
+        // no href found, so abort
+        return
+      }
+
       data.url = trackFunctions.removeCrossDomainParams(url)
       data.url = trackFunctions.applyRedactionIfRequired(this.PIIRemover, element, data.url)
       data.url = trackFunctions.appendPathToAnchorLinks(data.url)

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

@@ -86,9 +86,8 @@ window.GOVUK.analyticsGa4.analyticsModules = window.GOVUK.analyticsGa4.analytics
       }
 
       searchTerm = searchTerm[0].replace('keywords=', '')
-      searchTerm = searchTerm.replace(/\++/g, ' ')
-      searchTerm = window.GOVUK.analyticsGa4.core.trackFunctions.removeLinesAndExtraSpaces(searchTerm)
-      searchTerm = this.PIIRemover.stripPIIWithOverride(searchTerm, true, true)
+      searchTerm = window.GOVUK.analyticsGa4.core.trackFunctions.standardiseSearchTerm(searchTerm)
+
       return searchTerm
     },
 

data/app/assets/javascripts/govuk_publishing_components/lib/govspeak/youtube-link-enhancement.js

@@ -116,7 +116,7 @@
             // https://github.com/alphagov/govuk_publishing_components/pull/908#discussion_r302913995
             var videoTitle = options.title
             event.target.getIframe().title = videoTitle + ' (video)'
-            if (window.GOVUK.analyticsGa4.analyticsModules.VideoTracker) {
+            if (window.GOVUK.analyticsGa4.analyticsModules && window.GOVUK.analyticsGa4.analyticsModules.VideoTracker) {
               window.GOVUK.analyticsGa4.analyticsModules.VideoTracker.configureVideo(event)
             }
           },

data/lib/govuk_publishing_components/presenters/attachment_helper.rb

@@ -105,6 +105,7 @@ module GovukPublishingComponents
           { content_type: "application/vnd.openxmlformats-officedocument.presentationml.presentation", name: "MS PowerPoint Presentation" }.freeze, # pptx
           { content_type: "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet", name: "MS Excel Spreadsheet", spreadsheet: true }.freeze, # xlsx
           { content_type: "application/vnd.openxmlformats-officedocument.wordprocessingml.document", name: "MS Word Document", document: true }.freeze, # docx
+          { content_type: "application/zip", abbr: "ZIP", name: "Zip archive" }.freeze,
           { content_type: "application/xml", abbr: "XML", name: "XML Document" }.freeze,
           { content_type: "image/gif", abbr: "GIF", name: "Graphics Interchange Format" }.freeze,
           { content_type: "image/jpeg", name: "JPEG" }.freeze,

data/lib/govuk_publishing_components/presenters/meta_tags.rb

@@ -92,13 +92,12 @@ module GovukPublishingComponents
       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]'
+        # political: true/false is in a different place to current: true/false, which is why we have 'details' and 'government.dig(: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
+          current_government = government.dig(:details, :current)
+          unless current_government
+            meta_tags["govuk:ga4-political-status"] = "historic"
+            meta_tags["govuk:ga4-publishing-government"] = government[:title] if government[:title]
           end
         end
 

data/lib/govuk_publishing_components/version.rb

@@ -1,3 +1,3 @@
 module GovukPublishingComponents
-  VERSION = "36.0.1".freeze
+  VERSION = "36.0.3".freeze
 end

data/node_modules/sortablejs/README.md

@@ -54,12 +54,12 @@ Demo: http://sortablejs.github.io/Sortable/
 
 Install with NPM:
 ```bash
-$ npm install sortablejs --save
+npm install sortablejs --save
 ```
 
 Install with Bower:
 ```bash
-$ bower install --save sortablejs
+bower install --save sortablejs
 ```
 
 Import into your project: