govuk_publishing_components 27.5.0 → 27.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5eeb1e46730d1f7b1bc3eceb3be65497a4c4f0e2d68695b21cca5ce55f617126
-  data.tar.gz: 44aeca5c635114770a59d61dc92806bc6bb2b50c582566760fec95967fe65391
+  metadata.gz: 826abb0589e48d2525ea4581c2822e8c924143fd8fe1291723d8daeb9ea27aed
+  data.tar.gz: 3609b9bc4dd4431663e8d8a9424a366c1e62259f305eb89deea5cbd730c47459
 SHA512:
-  metadata.gz: 548b6ce397891440ccbb4b5cce2c23f8ad5d4097d8b7fc4f4a3ff4c82f6203dcac21416e86c37321bf4c51d555bbd5eb001b5094726e47e1d36f8b0df1380c01
-  data.tar.gz: adb5135492b5b1f4db2dcc2157ad0de43d50b367676f64c161209bb91762c4d448c7055fb04acaf6415ddf10f32db900c76629805c80be06537b99287419045d
+  metadata.gz: fc3b285ebf4bb142daad075031fd004e6be838ee306d4efc21e77c887f46ce8a35a91fc7d4b8a5496941e6be16b365c778b2c2a58f3e7b32c8a2863ccb1f2e92
+  data.tar.gz: 35d279033c32850de9356d00d89a3752203f31495b475f3810b7449ad0cb05db681d037b4f0a3b1852d635c1c9c1fb1cd5d6afb6d231341942ff742b3377e0b6

data/app/assets/javascripts/govuk_publishing_components/analytics/explicit-cross-domain-links.js

@@ -8,6 +8,24 @@
     this.start = function ($module) {
       var element = $module[0]
 
+      var cookieBannerEngaged = GOVUK.cookie('cookies_preferences_set')
+
+      // If not engaged, append only ?cookie-consent=not-engaged
+      // If engaged and rejected, append only ?cookie-consent=reject
+      // If engaged and accepted usage, append ?_ga=clientid if available and cookie-consent=accept
+
+      if (cookieBannerEngaged === 'false') {
+        this.decorate(element, 'cookie_consent=not-engaged')
+        return
+      }
+      var cookieConsent = GOVUK.getConsentCookie()
+      if (cookieConsent.usage === false) {
+        this.decorate(element, 'cookie_consent=reject')
+        return
+      }
+
+      this.decorate(element, 'cookie_consent=accept')
+
       if (!global.ga) { return }
 
       global.ga(function () {
@@ -28,6 +46,26 @@
         }
       })
     }
+
+    this.decorate = function (element, param) {
+      var attribute = 'href'
+      var attributeValue = element.getAttribute(attribute)
+
+      if (!attributeValue) {
+        attribute = 'action'
+        attributeValue = element.getAttribute(attribute)
+      }
+
+      if (!attributeValue) { return }
+
+      if (attributeValue.includes('?')) {
+        attributeValue += '&' + param
+        element.setAttribute(attribute, attributeValue)
+      } else {
+        attributeValue += '?' + param
+        element.setAttribute(attribute, attributeValue)
+      }
+    }
   }
 
   global.GOVUK = GOVUK

data/app/assets/javascripts/govuk_publishing_components/lib/primary-links.js

@@ -2,15 +2,14 @@
 ;(function (global) {
   'use strict'
 
-  var $ = global.jQuery
   var GOVUK = global.GOVUK || {}
 
   // Only show the first {n} items in a list, documentation is in the README.md
   var PrimaryList = function (el, selector) {
-    this.$el = $(el)
-    this.$extraLinks = this.$el.find('li:not(' + selector + ')')
+    this.el = el
+    this.extraLinks = this.el.querySelectorAll('li:not(' + selector + ')')
     // only hide more than one extra link
-    if (this.$extraLinks.length > 1) {
+    if (this.extraLinks.length > 1) {
       this.addToggleLink()
       this.hideExtraLinks()
     }
@@ -18,29 +17,35 @@
 
   PrimaryList.prototype = {
     toggleText: function () {
-      if (this.$extraLinks.length > 1) {
-        return '+' + this.$extraLinks.length + ' others'
+      if (this.extraLinks.length > 1) {
+        return '+' + this.extraLinks.length + ' others'
       } else {
-        return '+' + this.$extraLinks.length + ' other'
+        return '+' + this.extraLinks.length + ' other'
       }
     },
     addToggleLink: function () {
-      this.$toggleLink = $('<a href="#">' + this.toggleText() + '</a>')
-      this.$toggleLink.click($.proxy(this.toggleLinks, this))
-      this.$toggleLink.insertAfter(this.$el)
+      this.toggleLink = document.createElement('a')
+      this.toggleLink.href = '#'
+      this.toggleLink.setAttribute('aria-expanded', 'false')
+      this.toggleLink.innerText = this.toggleText()
+
+      this.el.parentNode.insertBefore(this.toggleLink, this.el.nextSibling)
+      this.toggleLink.addEventListener('click', this.toggleLinks.bind(this))
     },
     toggleLinks: function (e) {
       e.preventDefault()
-      this.$toggleLink.remove()
+      this.toggleLink.remove()
       this.showExtraLinks()
     },
     hideExtraLinks: function () {
-      this.$extraLinks.addClass('visuallyhidden')
-      $(window).trigger('govuk.pageSizeChanged')
+      for (var i = 0; i < this.extraLinks.length; i++) {
+        this.extraLinks[i].className = 'primary-links--display-none'
+      }
     },
     showExtraLinks: function () {
-      this.$extraLinks.removeClass('visuallyhidden')
-      $(window).trigger('govuk.pageSizeChanged')
+      for (var i = 0; i < this.extraLinks.length; i++) {
+        this.extraLinks[i].className = ''
+      }
     }
   }
 
@@ -48,7 +53,18 @@
 
   GOVUK.primaryLinks = {
     init: function (selector) {
-      $(selector).parent().each(function (i, el) {
+      var allListItems = document.querySelectorAll(selector)
+      var AllLists = []
+
+      for (var i = 0; i < allListItems.length; i++) {
+        var parent = allListItems[i].parentNode
+
+        if (AllLists.indexOf(parent) < 0) {
+          AllLists.push(parent)
+        }
+      }
+
+      AllLists.forEach(function (el, i) {
         new GOVUK.PrimaryList(el, selector) // eslint-disable-line no-new
       })
     }

data/app/assets/stylesheets/govuk_publishing_components/components/govspeak/_typography.scss

@@ -108,3 +108,11 @@
     @include govuk-link-style-inverse;
   }
 }
+
+// This helper class is for use by the primary links js module
+// We have this custom helper here with a single rule over using the design system helper class govuk-!-display-none
+// because jasmine tests don't like the "!" in the distributed helper class
+
+.primary-links--display-none {
+  display: none;
+}

data/app/views/govuk_publishing_components/components/layout_for_public/_account-navigation.html.erb

@@ -16,6 +16,7 @@
         GovukPersonalisation::Urls.manage,
         class: 'gem-c-layout-for-public-account-menu__link govuk-link govuk-link--no-visited-state',
         'aria-current': page_is == "manage" ? "page" : nil,
+        data: { module: "explicit-cross-domain-links" },
       ) %>
     </li>
     <li class="gem-c-layout-for-public-account-menu__item <%= "gem-c-layout-for-public-account-menu__item--current" if page_is == "security" %>">
@@ -24,6 +25,7 @@
         GovukPersonalisation::Urls.security,
         class: 'gem-c-layout-for-public-account-menu__link govuk-link govuk-link--no-visited-state',
         'aria-current': page_is == "security" ? "page" : nil,
+        data: { module: "explicit-cross-domain-links" },
       ) %>
     </li>
   </ul>

data/lib/govuk_publishing_components/version.rb

@@ -1,3 +1,3 @@
 module GovukPublishingComponents
-  VERSION = "27.5.0".freeze
+  VERSION = "27.6.0".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: govuk_publishing_components
 version: !ruby/object:Gem::Version
-  version: 27.5.0
+  version: 27.6.0
 platform: ruby
 authors:
 - GOV.UK Dev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-10-11 00:00:00.000000000 Z
+date: 2021-10-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: govuk_app_config