govuk_publishing_components 27.3.1 → 27.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c72a238dfe33bedb2354586acae39ae707af2543e1147ad399697b7e943161a5
-  data.tar.gz: ebe2c25dfbdc7bbd61962a32a4dad734cefb8a9868e232ab7686137a539fa3ad
+  metadata.gz: 15c7bcc4d82cf3b301b7b7ba021e1bb3de52fcd8834526953c559ec6dee2c50e
+  data.tar.gz: 46ed67c901b6561008e808d60b42d67c5c0ff6555d47ea25eb94dfb5e89e0543
 SHA512:
-  metadata.gz: 25b19ea4edc8469f447c053bdeb90cbec595ddab3be836b9ba9c2c7a46d223b1537a19d81aa94313b46f046d8f9f592c55fdc219225d328907abdeb15a48afbc
-  data.tar.gz: bf129ecb95da51adabbb82dadef58fca37606b40ea43998f24c1005d30e9ffba6c1c530c866ab1ceb1d5af6b6ba4fccc196f44573b4044a402efd58b1d5505bb
+  metadata.gz: f8b1714ed5784b5e37882f50855cb5ebe51c9fa334ed3214a7b3a8703efc5dfa97cabc62c5a69f5cda8ff8047ad09eb6e8869cc525d8fb782099c2b376d20ab4
+  data.tar.gz: ff89e8308d97f9a46ca3246e6978ea3fe24fca5852b3dac2f11f5b5822b1ac3bb7d116afe40cde48341e420347075ff52517cfd97cdb845c044a03ace9b18194

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

@@ -0,0 +1,3 @@
+<svg width="23" height="23" viewBox="0 0 23 23" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M11.4893 23C17.8406 23 22.9893 17.8513 22.9893 11.5C22.9893 5.14873 17.8406 0 11.4893 0C5.64643 0 0.821276 4.35747 0.0862655 10H12.7633L8.98933 5.67277L10.4482 4L16.9893 11.5L10.4482 19L8.98933 17.3272L13.6354 12H0C0.261778 18.1193 5.30558 23 11.4893 23ZM13.9893 11.5942L14.0715 11.5L13.9893 11.4057V11.5942Z" fill="#366FB3"/>
+</svg>

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/analytics/init.js

@@ -8,6 +8,25 @@ var analyticsInit = function () {
     var linkedDomains = window.GOVUK.analyticsVars.linkedDomains || false
   }
 
+  window.GOVUK.Analytics.checkDigitalIdentityConsent = function (location) {
+    if (!location || !location.search) return
+    // this checks for the presence of the Digital Identity cookie consent query parameter and updates our consent cookie accordingly
+    // This is so that users don't see multiple cookie banners when they move between the different account management pages, as some will be on GOV.UK and others will be on the DI domain.
+    var digitalIdentityConsent = /([?&]cookie_consent=)(accept|reject)/.exec(location.search)
+    if (digitalIdentityConsent) {
+      if (digitalIdentityConsent[2] === 'accept') {
+        window.GOVUK.setConsentCookie({ usage: true })
+        // set cookies_preferences_set to true to prevent cookie banner showing
+        window.GOVUK.cookie('cookies_preferences_set', 'true')
+      } else if (digitalIdentityConsent[2] === 'reject') {
+        window.GOVUK.setConsentCookie({ usage: false })
+        window.GOVUK.cookie('cookies_preferences_set', 'true')
+      }
+    }
+  }
+
+  window.GOVUK.Analytics.checkDigitalIdentityConsent(window.location)
+
   var consentCookie = window.GOVUK.getConsentCookie()
   var dummyAnalytics = {
     addLinkedTrackerDomain: function () {},

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

@@ -15,7 +15,6 @@
 
   var CONFIG = {
     '/brexit': percentages,
-    '/guidance/coronavirus-covid-19-information-for-the-public': percentages,
     '/government/publications/the-essential-trustee-what-you-need-to-know-cc3/the-essential-trustee-what-you-need-to-know-what-you-need-to-do': [
       ['Heading', '1. About this guidance'],
       ['Heading', '2. Trustees’ duties at a glance'],
@@ -147,7 +146,6 @@
     '/wood-packaging-import-export': [
       ['Heading', 'Export solid wood packaging']
     ],
-    '/guidance/answers-to-the-most-common-topics-asked-about-by-the-public-for-the-coronavirus-press-conference': percentages,
     '/coronavirus': percentages,
     '/coronavirus/education-and-childcare': percentages,
     '/coronavirus/worker-support': percentages,
@@ -164,21 +162,6 @@
     '/guidance/brexit-guidance-for-individuals-and-families': percentages,
     '/guidance/brexit-guidance-for-individuals-and-families.cy': percentages,
     '/guidance/import-and-export-goods-using-preference-agreements': percentages,
-    '/guidance/red-amber-and-green-list-rules-for-entering-england': [
-      ['Heading', 'Stay up-to-date'],
-      ['Heading', 'Red list of countries and territories'],
-      ['Heading', 'Amber list of countries and territories'],
-      ['Heading', 'Amber list rules if you are fully UK vaccinated'],
-      ['Heading', 'Amber list rules if you are not fully UK vaccinated'],
-      ['Heading', 'Green list countries and territories'],
-      ['Heading', 'Green list rules'],
-      ['Heading', 'Ireland, the UK, the Channel Islands and the Isle of Man'],
-      ['Heading', 'Transit stops in amber or red list countries'],
-      ['Heading', 'Job and medical exemptions'],
-      ['Heading', 'Travelling abroad from England'],
-      ['Heading', 'Demonstrating your COVID-19 vaccination status when travelling abroad'],
-      ['Heading', 'Foreign, Commonwealth & Development Office travel advice']
-    ],
     '/guidance/travel-abroad-from-england-during-coronavirus-covid-19': [
       ['Heading', 'Before you travel abroad'],
       ['Heading', '1. Check the rules for the country you’re going to'],

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/_action-link.scss

@@ -92,6 +92,18 @@
   }
 }
 
+.gem-c-action-link--blue-arrow {
+  &:before {
+    width: 45px;
+    height: 35px;
+    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: 35px auto;
+    background-position: 0 0;
+  }
+}
+
 .gem-c-action-link--simple {
   &:before {
     width: 30px;

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/_action_link.html.erb

@@ -9,6 +9,7 @@
   subtext_href ||= false
   mobile_subtext ||= false
   light_text ||= false
+  blue_arrow ||= false
   simple ||= false
   simple_light ||= false
   dark_icon ||= false
@@ -27,6 +28,7 @@
   css_classes << "gem-c-action-link--transparent-icon" if transparent_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--simple" if simple
   css_classes << "gem-c-action-link--simple-light" if simple_light
   css_classes << "gem-c-action-link--with-subtext" if subtext

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

@@ -2,7 +2,7 @@
   shared_helper = GovukPublishingComponents::Presenters::SharedHelper.new(local_assigns)
   devolved_nations_helper = GovukPublishingComponents::Presenters::DevolvedNationsHelper.new(local_assigns)
 
-  applies_to ||= t('components.devolved_nations.applies_to')
+  applies_to ||= t("components.devolved_nations.applies_to")
   heading_level ||= 2
 %>
 
@@ -15,7 +15,7 @@
     <% if devolved_nations_helper.nations_with_urls.any? %>
       <%= content_tag :ul, class: "govuk-list govuk-!-margin-top-1 govuk-!-margin-bottom-0" do -%>
         <% devolved_nations_helper.nations_with_urls.each do |k, v| %>
-          <%= content_tag(:li, link_to("Guidance for #{t("components.devolved_nations.#{k}")}", v[:alternative_url], class: "govuk-link")) %>
+          <%= content_tag(:li, link_to(devolved_nations_helper.alternative_content_text(k), v[:alternative_url], class: "govuk-link")) %>
         <% end %>
       <% end %>
     <% end %>

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

@@ -78,6 +78,11 @@ examples:
       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

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

@@ -1,18 +1,18 @@
 name: Devolved Nations (experimental)
-description: A banner for linking to guidance for other nations.
+description: A banner for linking to alternative content for other nations.
 body: |
-  The component replaces uses of the important metadata component for guidance for other nations.
+  The component replaces uses of the important metadata component for alternative content for other nations.
 
   The component can display:
 
-  * nations that the guidance relates to
+  * nations that the alternative content relates to
   * a list of alternative URLs where applicable
 shared_accessibility_criteria:
   - link
 accessibility_criteria: |
   The component must:
 
-  - Provide context for link text to highlight guidance is available.
+  - Provide context for link text to highlight alternative content is available.
 examples:
   default:
     data:
@@ -35,18 +35,22 @@ examples:
           applicable: true
         wales:
           applicable: true
-  applies_to_one_nation_individual_guidance_available:
+  applies_to_one_nation_individual_publication_available:
+    description: If no content type, or an invalid type, is specified then the default alternative content type is displayed as "Publication" e.g. "Publication for Northern Ireland"
     data:
       national_applicability:
         england:
           applicable: true
+        northern_ireland:
+          applicable: false
+          alternative_url: /
         scotland:
           applicable: false
           alternative_url: /
         wales:
           applicable: false
           alternative_url: /
-  applies_to_one_nation_individual_guidance_available:
+  applies_to_three_nations_individual_publication_available:
     data:
       national_applicability:
         england:
@@ -55,12 +59,21 @@ examples:
           applicable: false
           alternative_url: /
         scotland:
-          applicable: false
-          alternative_url: /
+          applicable: true
         wales:
+          applicable: true
+  applies_to_one_nation_individual_consultation_available:
+    description: Specify alternative type for the content e.g. Consultation
+    data:
+      national_applicability:
+        england:
+          applicable: true
+        northern_ireland:
           applicable: false
           alternative_url: /
-  applies_to_three_nations_individual_guidance_available:
+      type: consultation
+  applies_to_one_nation_individual_guidance_available:
+    description: Specify alternative type for the content e.g. Guidance
     data:
       national_applicability:
         england:
@@ -68,12 +81,9 @@ examples:
         northern_ireland:
           applicable: false
           alternative_url: /
-        scotland:
-          applicable: true
-        wales:
-          applicable: true
+      type: detailed_guide
   specific_heading level:
-    description: Use a different heading level for the main link title. Defaults to H2 if not passed.
+    description: Use a different heading level for the main link title. Defaults to `H2` if not passed.
     data:
       heading_level: 3
       national_applicability:

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/config/locales/en.yml

@@ -51,6 +51,11 @@ en:
       connectors:
         last_word: " and "
         two_words: " and "
+      type:
+        consultation: Consultation for %{nation}
+        detailed_guide: Guidance for %{nation} 
+        guidance: Guidance for %{nation}
+        publication: Publication for %{nation}
       england: England
       northern_ireland: Northern Ireland
       scotland: Scotland

data/lib/govuk_publishing_components/presenters/devolved_nations_helper.rb

@@ -1,10 +1,11 @@
 module GovukPublishingComponents
   module Presenters
     class DevolvedNationsHelper
-      attr_reader :national_applicability
+      attr_reader :national_applicability, :type
 
       def initialize(local_assigns)
         @national_applicability = local_assigns[:national_applicability]
+        @type = local_assigns[:type] || "publication"
       end
 
       def applicable_nations_title_text
@@ -25,6 +26,16 @@ module GovukPublishingComponents
             .present?
           end
       end
+
+      def alternative_content_text(name)
+        nation = I18n.t("components.devolved_nations.#{name}")
+
+        if I18n.exists?("components.devolved_nations.type.#{@type}")
+          I18n.t("components.devolved_nations.type.#{@type}", nation: nation)
+        else
+          I18n.t("components.devolved_nations.type.publication", nation: nation)
+        end
+      end
     end
   end
 end

data/lib/govuk_publishing_components/version.rb

@@ -1,3 +1,3 @@
 module GovukPublishingComponents
-  VERSION = "27.3.1".freeze
+  VERSION = "27.7.0".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: govuk_publishing_components
 version: !ruby/object:Gem::Version
-  version: 27.3.1
+  version: 27.7.0
 platform: ruby
 authors:
 - GOV.UK Dev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-09-29 00:00:00.000000000 Z
+date: 2021-10-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: govuk_app_config
@@ -378,6 +378,8 @@ files:
 - 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