govuk_publishing_components 57.3.0 → 57.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ffe0c2fbfcd53a9c25e9ab76f80625ebae91d098a528892118b658c9142a7641
-  data.tar.gz: f69ad84e0d5cc39772ddb557f50771e229db6a09c5a0e384adadfcc8630ccd7f
+  metadata.gz: 41a446b912bf0ceb75ba5700eeff0f6d91b976039d175fe9262e44ed75fbd420
+  data.tar.gz: 18c75d217261b9b6793f251cc2020fa785da20f31aa47ada9721dbb642a4ccb8
 SHA512:
-  metadata.gz: 6fb6267d1fb31f6f7e557ee3259a1808739e9ad9a9803102790729b139cd9d96683983136105588b3b576e57e41f8884315a041fe89a06a7231f5cf641e041e2
-  data.tar.gz: d349cc3c24e05d6af50dc4eb6dfe528a3954ce7f535b8deb255682125c03f9d943f98d58c2867a9b1716000eff05c40f40d7e8d01a79c31e00e028b7838e748c
+  metadata.gz: d3ee818d7df8773727db46921ba33a905de236ed76b4a3c00d5aad2394cf26513fbc6a1039926e7ac29466ec98d1e25b98701d49cfcd10e7c663abb1f23aaaf9
+  data.tar.gz: 46bb83df7af008ed114877f485b4888789c1e72b7876692c10a025e631df2391a99ee4c631e5d5ec3325c3a517d8cda520e20fd4c2832d6dc0d900e75577afcd

data/app/assets/javascripts/govuk_publishing_components/components/reorderable-list.js

@@ -25,8 +25,9 @@ window.GOVUK.Modules = window.GOVUK.Modules || {};
 
           if (eventData) {
             item.dataset.ga4Event = eventData.dataset.ga4Event
+            item.dataset.indexSection = event.oldIndex
             item.dataset.action = 'drag and drop'
-            item.dataset.text = event.newIndex > event.oldIndex ? 'Up' : 'Down'
+            item.dataset.text = event.newIndex > event.oldIndex ? 'Down' : 'Up'
             this.triggerEvent(item, 'click')
             delete item.dataset.ga4Event
           }

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

@@ -20,7 +20,7 @@
   }
 
   YoutubeLinkEnhancement.prototype.paragraphHasOtherContent = function (paragraph, link) {
-    return paragraph.innerHTML.replaceAll(this.punctuationRegex, '') !== link.outerHTML.replaceAll(this.punctuationRegex, '')
+    return paragraph.innerHTML.replaceAll(this.punctuationRegex, '').trim() !== link.outerHTML.replaceAll(this.punctuationRegex, '').trim()
   }
 
   YoutubeLinkEnhancement.prototype.decorateLink = function () {
@@ -222,6 +222,17 @@
     }
   }
 
+  YoutubeLinkEnhancement.sanitiseVideoId = function (pathname) {
+    // YouTube links can now contain an ?si= param in the URL.
+    // This usually only appears on youtu.be links but it's appearing for us on youtube.com URLs due to some Whitehall regex being outdated.
+    // Therefore we need to use regex to remove it from the path.
+    // E.g. youtube.com/watch?v=[video-id]?si=ABCzJtVWBAZ2o_l3
+    // ?=si in this case isn't a valid query parameter as it isn't using an &, so we can't use JS' native URL API to filter it out.
+    if (pathname) {
+      return pathname.replace(/(\?|&)(.+)=.+/g, '')
+    }
+  }
+
   // This is a public class method so it can be used outside of this embed to
   // check that user input for videos will be supported in govspeak
   YoutubeLinkEnhancement.parseVideoId = function (url) {
@@ -232,9 +243,10 @@
     } catch (e) { return undefined }
 
     if (u.host === 'www.youtube.com' || u.host === 'youtube.com') {
-      return u.searchParams.get('v') || undefined
+      return this.sanitiseVideoId(u.searchParams.get('v')) || undefined
     } else if (u.host === 'youtu.be') {
-      return u.pathname.slice(1) // Trim the leading /
+      var pathName = u.pathname.slice(1) // Trim the leading /
+      return this.sanitiseVideoId(pathName)
     }
   }
 

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

@@ -150,7 +150,7 @@ examples:
         url: '/government/organisations/hm-prison-service'
         brand: 'ministry-of-justice'
         image:
-          url: 'https://assets.publishing.service.gov.uk/government/uploads/system/uploads/organisation/logo/321/HMPS.jpg'
+          url: 'https://assets.publishing.service.gov.uk/media/6850134301d3b0e7b62da740/hmps_25_gov_240x188.png'
           alt_text: 'HM Prison Service'
   without_a_link:
     data:

data/lib/govuk_publishing_components/version.rb

@@ -1,3 +1,3 @@
 module GovukPublishingComponents
-  VERSION = "57.3.0".freeze
+  VERSION = "57.3.1".freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: govuk_publishing_components
 version: !ruby/object:Gem::Version
-  version: 57.3.0
+  version: 57.3.1
 platform: ruby
 authors:
 - GOV.UK Dev