govuk_publishing_components 24.20.0 → 24.21.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 50a7296ca62da87133989dc55c692649132efeee4d4a2eedbb253291ea489459
-  data.tar.gz: 026f82dfb2d8b86abd040d5a69ccae280190e345247404e7621aeea89f30eca2
+  metadata.gz: e658a82fdcc66d27c4e76f3fcfc8743612d80ca4f4b98493db30bc650ba5175c
+  data.tar.gz: 65fa6a0bd681467c70a64a106b39933c4275cf716c1e961e6397912d43f32a50
 SHA512:
-  metadata.gz: 45190fd0137cd36e04523ce5d97783cda446256a4089646b317404a410be28f7e6c96798ec9d5a56fdd130cbfa0f47630ade875dfe8af61a2b9c52f0111f4abb
-  data.tar.gz: bc733b83f05ba2520729a23ecb56788bc8552ef082babc9b0743317cf0808fefc7baab2199dfa1fb77e168b4c38cf72d8b9068e38e67889682b088b2b707641f
+  metadata.gz: cd7c02f1d17a3a72a5e74d70e1cad6b66d9ed2b48c8ab3d123a2397bb8062024084ffc650030a24742d556285f7e21b0474814e233a90554e29b5163a3cbd9c3
+  data.tar.gz: '0890b578800c9eb7649ad5450b0f8cc94c1d2838947f3ce151932ee129c501599eb2072df826c63cbfdfc16fefa4c21e4712c719d8f1187b397c64d66cc3b0b5'

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

@@ -5,21 +5,17 @@
 
   window.GOVUK = window.GOVUK || {}
 
+  var percentages = [
+    ['Percent', 20],
+    ['Percent', 40],
+    ['Percent', 60],
+    ['Percent', 80],
+    ['Percent', 100]
+  ]
+
   var CONFIG = {
-    '/brexit': [
-      ['Percent', 20],
-      ['Percent', 40],
-      ['Percent', 60],
-      ['Percent', 80],
-      ['Percent', 100]
-    ],
-    '/guidance/coronavirus-covid-19-information-for-the-public': [
-      ['Percent', 20],
-      ['Percent', 40],
-      ['Percent', 60],
-      ['Percent', 80],
-      ['Percent', 100]
-    ],
+    '/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'],
@@ -151,89 +147,61 @@
     '/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': [
-      ['Percent', 20],
-      ['Percent', 40],
-      ['Percent', 60],
-      ['Percent', 80],
-      ['Percent', 100]
-    ],
-    '/coronavirus': [
-      ['Percent', 20],
-      ['Percent', 40],
-      ['Percent', 60],
-      ['Percent', 80],
-      ['Percent', 100]
-    ],
-    '/coronavirus/education-and-childcare': [
-      ['Percent', 20],
-      ['Percent', 40],
-      ['Percent', 60],
-      ['Percent', 80],
-      ['Percent', 100]
-    ],
-    '/coronavirus/worker-support': [
-      ['Percent', 20],
-      ['Percent', 40],
-      ['Percent', 60],
-      ['Percent', 80],
-      ['Percent', 100]
-    ],
-    '/coronavirus/business-support': [
-      ['Percent', 20],
-      ['Percent', 40],
-      ['Percent', 60],
-      ['Percent', 80],
-      ['Percent', 100]
-    ],
-    '/get-coronavirus-test': [
-      ['Percent', 20],
-      ['Percent', 40],
-      ['Percent', 60],
-      ['Percent', 80],
-      ['Percent', 100]
-    ],
+    '/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,
+    '/coronavirus/business-support': percentages,
+    '/get-coronavirus-test': percentages,
     '/next-steps-for-your-business/results': [
       ['Heading', 'Things you need to do next'],
       ['Heading', 'Rules to follow'],
       ['Heading', 'Good to know'],
       ['Heading', 'Change your answers']
     ],
-    '/guidance/brexit-guidance-for-businesses': [
-      ['Percent', 20],
-      ['Percent', 40],
-      ['Percent', 60],
-      ['Percent', 80],
-      ['Percent', 100]
-    ],
-    '/guidance/brexit-guidance-for-businesses.cy': [
-      ['Percent', 20],
-      ['Percent', 40],
-      ['Percent', 60],
-      ['Percent', 80],
-      ['Percent', 100]
-    ],
-    '/guidance/brexit-guidance-for-individuals-and-families': [
-      ['Percent', 20],
-      ['Percent', 40],
-      ['Percent', 60],
-      ['Percent', 80],
-      ['Percent', 100]
-    ],
-    '/guidance/brexit-guidance-for-individuals-and-families.cy': [
-      ['Percent', 20],
-      ['Percent', 40],
-      ['Percent', 60],
-      ['Percent', 80],
-      ['Percent', 100]
-    ],
-    '/guidance/import-and-export-goods-using-preference-agreements': [
-      ['Percent', 20],
-      ['Percent', 40],
-      ['Percent', 60],
-      ['Percent', 80],
-      ['Percent', 100]
-    ]
+    '/guidance/brexit-guidance-for-businesses': percentages,
+    '/guidance/brexit-guidance-for-businesses.cy': percentages,
+    '/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'],
+      ['Heading', '2. Find out what you need to do when you return'],
+      ['Heading', '3. Book any COVID-19 tests or quarantine hotel packages you need for your return'],
+      ['Heading', 'Before you return'],
+      ['Heading', 'After you return'],
+      ['Heading', 'Travelling with children'],
+      ['Heading', 'Ireland, the UK, the Channel Islands and the Isle of Man'],
+      ['Heading', 'Exemptions for work, medical or compassionate reasons']
+    ],
+    '/guidance/travel-to-england-from-another-country-during-coronavirus-covid-19': [
+      ['Heading', 'Before you travel'],
+      ['Heading', '1. Check the rules for the country you’re coming from or have travelled through'],
+      ['Heading', '2. Book any COVID-19 tests or quarantine hotel packages you need for your arrival'],
+      ['Heading', '3. Get tested and complete documents'],
+      ['Heading', 'When you arrive in England'],
+      ['Heading', 'Leaving England'],
+      ['Heading', 'Travelling with children'],
+      ['Heading', 'Ireland, the UK, the Channel Islands and the Isle of Man'],
+      ['Heading', 'Exemptions for work, medical or compassionate reasons']
+    ],
+    '/find-travel-test-provider': percentages
   }
 
   function ScrollTracker (sitewideConfig) {

data/app/assets/stylesheets/govuk_publishing_components/components/_document-list.scss

@@ -6,7 +6,6 @@
 }
 
 .gem-c-document-list__item {
-  overflow: hidden;
   margin-bottom: govuk-spacing(5);
   padding-top: govuk-spacing(2);
   border-top: 1px solid $govuk-border-colour;
@@ -18,11 +17,6 @@
   display: inline-block;
 }
 
-.gem-c-document-list__item-link {
-  @include govuk-link-common;
-  @include govuk-link-style-default;
-}
-
 .gem-c-document-list--no-underline {
   .gem-c-document-list__item-title {
     text-decoration: none;
@@ -156,18 +150,22 @@
 }
 
 .gem-c-document-list-child__link {
-  @include govuk-link-common;
-  @include govuk-link-style-default;
   text-decoration: none;
 
   &:hover {
     text-decoration: underline;
+    text-underline-offset: .1em;
+    @include govuk-link-hover-decoration;
+  }
+
+  &:focus {
+    text-decoration: none;
   }
 }
 
 .gem-c-document-list-child__description {
   @include govuk-text-colour;
-  margin-top: 0;
+  margin-top: govuk-spacing(1);
   margin-bottom: govuk-spacing(1);
 
   @include govuk-media-query($until: tablet) {

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

@@ -41,7 +41,7 @@
               item[:link][:text],
               item[:link][:path],
               data: item[:link][:data_attributes],
-              class: "#{item_classes} gem-c-document-list__item-link",
+              class: "#{item_classes} govuk-link",
               lang: item[:link][:locale].presence,
               rel: rel,
             )
@@ -65,7 +65,7 @@
 
         <% if item[:metadata] %>
           <ul class="gem-c-document-list__item-metadata">
-            <% item[:metadata].compact.each do |item_metadata_key, item_metadata_value| %> 
+            <% item[:metadata].compact.each do |item_metadata_key, item_metadata_value| %>
               <% if !item_metadata_key.to_s.eql?("locale") %>
                 <% lang = item[:metadata][:locale].present? && item[:metadata][:locale][item_metadata_key].present? ? item[:metadata][:locale][item_metadata_key] : nil %>
 
@@ -101,7 +101,7 @@
                       part[:link][:text],
                       part[:link][:path],
                       data: part[:link][:data_attributes],
-                      class: "gem-c-document-list-child__heading #{brand_helper.color_class} gem-c-document-list-child__link",
+                      class: "gem-c-document-list-child__heading #{brand_helper.color_class} govuk-link gem-c-document-list-child__link",
                     )
                   else
                     content_tag(

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

@@ -7,6 +7,7 @@
   logo_link ||= "/"
   navigation_items ||= []
   omit_feedback_form ||= false
+  omit_footer_navigation ||= false
   omit_header ||= false
   product_name ||= nil
   show_explore_header ||= false
@@ -122,7 +123,7 @@
     <% unless local_assigns[:hide_footer_links] %>
       <%= render "govuk_publishing_components/components/layout_footer", {
         with_border: true,
-        navigation: layout_helper.footer_navigation,
+        navigation: omit_footer_navigation ? nil : layout_helper.footer_navigation,
         meta: layout_helper.footer_meta,
       } %>
     <% end %>

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

@@ -31,6 +31,10 @@ examples:
     description: This allows the feedback form to be omitted
     data:
       omit_feedback_form: true
+  omit_footer_navigation:
+    description: This allows the footer navigation to be omitted
+    data:
+      omit_footer_navigation: true
   navigation:
     description: Passes the navigation through to the [header component](/component-guide/layout_header/).
     data:

data/config/initializers/assets.rb

@@ -5,7 +5,6 @@ Rails.application.config.assets.precompile += %w[
   component_guide/accessibility-test.js
   component_guide/application.js
   component_guide/filter-components.js
-  component_guide/visual-regression.js
   component_guide/print.css
   govuk_publishing_components/rum-loader.js
   govuk_publishing_components/vendor/lux/lux-reporter.js

data/lib/govuk_publishing_components/presenters/content_breadcrumbs_based_on_priority.rb

@@ -4,15 +4,18 @@ module GovukPublishingComponents
       # keys are labels, values are the content_ids for the matching taxons
       # Where multiple matching taxons are present, the top most one is the highest priority
       #   and the bottom one the lowest priority
-      PRIORITY_TAXONS = {
-        education_coronavirus: "272308f4-05c8-4d0d-abc7-b7c2e3ccd249",
-        worker_coronavirus: "b7f57213-4b16-446d-8ded-81955d782680",
-        business_coronavirus: "65666cdf-b177-4d79-9687-b9c32805e450",
+      BREXIT_TAXONS = {
         brexit_business: "634fd193-8039-4a70-a059-919c34ff4bfc",
         brexit_individuals: "614b2e65-56ac-4f8d-bb9c-d1a14167ba25",
         brexit_taxon: "d6c2de5d-ef90-45d1-82d4-5f2438369eea",
       }.freeze
 
+      PRIORITY_TAXONS = {
+        education_coronavirus: "272308f4-05c8-4d0d-abc7-b7c2e3ccd249",
+        worker_coronavirus: "b7f57213-4b16-446d-8ded-81955d782680",
+        business_coronavirus: "65666cdf-b177-4d79-9687-b9c32805e450",
+      }.merge(BREXIT_TAXONS).freeze
+
       # Returns the highest priority taxon that has a content_id matching those in PRIORITY_TAXONS
       def self.call(content_item, query_parameters = nil)
         new(content_item, query_parameters).breadcrumbs
@@ -25,16 +28,24 @@ module GovukPublishingComponents
         @query_parameters = query_parameters
       end
 
-      def taxon
-        @taxon ||= begin
+      def priority_taxon
+        @priority_taxon ||= begin
           default_taxon = priority_taxons.min_by { |t| PRIORITY_TAXONS.values.index(t["content_id"]) }
           preferred_taxon || default_taxon
         end
       end
 
+      def priority_brexit_taxon
+        if tagged_to_both_brexit_child_taxons?
+          priority_brexit_taxons.find { |t| t["content_id"] == BREXIT_TAXONS[:brexit_taxon] }
+        else
+          priority_brexit_taxons.min_by { |t| BREXIT_TAXONS.values.index(t["content_id"]) }
+        end
+      end
+
       def breadcrumbs
-        taxon && {
-          title: taxon["title"],
+        priority_taxon && {
+          title: priority_taxon["title"],
           path: breadcrumb_path,
           tracking_category: "breadcrumbClicked",
           tracking_action: tracking_action,
@@ -43,7 +54,7 @@ module GovukPublishingComponents
         }
       end
 
-      def brexit_audience
+      def brexit_audience(taxon)
         {
           PRIORITY_TAXONS[:brexit_business] => "Brexitbusiness",
           PRIORITY_TAXONS[:brexit_individuals] => "Brexitcitizen",
@@ -70,6 +81,10 @@ module GovukPublishingComponents
         end
       end
 
+      def priority_brexit_taxons
+        priority_taxons.select { |t| priority_brexit_taxon?(t) }
+      end
+
       def taxon_tree(taxons)
         return [] if taxons.blank?
 
@@ -80,6 +95,10 @@ module GovukPublishingComponents
         PRIORITY_TAXONS.values.include?(taxon["content_id"])
       end
 
+      def priority_brexit_taxon?(taxon)
+        BREXIT_TAXONS.values.include?(taxon["content_id"])
+      end
+
       def brexit_child_taxon?(taxon)
         brexit_child_taxons.include?(taxon["content_id"])
       end
@@ -94,7 +113,7 @@ module GovukPublishingComponents
 
       def tracking_action
         action = %w[superBreadcrumb]
-        action << brexit_audience
+        action << brexit_audience(priority_taxon)
         action.compact.join(" ")
       end
 
@@ -104,7 +123,7 @@ module GovukPublishingComponents
       end
 
       def breadcrumb_path
-        taxon.dig("details", "url_override").present? ? taxon.dig("details", "url_override") : taxon["base_path"]
+        priority_taxon.dig("details", "url_override").present? ? priority_taxon.dig("details", "url_override") : priority_taxon["base_path"]
       end
     end
   end

data/lib/govuk_publishing_components/presenters/meta_tags.rb

@@ -123,21 +123,28 @@ module GovukPublishingComponents
         return meta_tags if taxons.blank?
         return meta_tags unless tagged_to_priority_taxon?
 
-        meta_tags[tag_key] = brexit_audience if brexit_audience.present?
+        taxon =
+          tag_key == "govuk:brexit-audience" ? priority_brexit_taxon : priority_taxon
 
+        brexit_audience = priority_taxon_helper.brexit_audience(taxon)
+        meta_tags[tag_key] = brexit_audience if brexit_audience.present?
         meta_tags
       end
 
       def tagged_to_priority_taxon?
-        priority_taxon_helper.taxon.present?
+        priority_taxon_helper.priority_taxon.present?
       end
 
       def priority_taxon_helper
         @priority_taxon_helper ||= ContentBreadcrumbsBasedOnPriority.new(content_item.deep_stringify_keys, request.query_parameters)
       end
 
-      def brexit_audience
-        priority_taxon_helper.brexit_audience
+      def priority_taxon
+        priority_taxon_helper.priority_taxon
+      end
+
+      def priority_brexit_taxon
+        priority_taxon_helper.priority_brexit_taxon
       end
 
       def has_content_history?

data/lib/govuk_publishing_components/version.rb

@@ -1,3 +1,3 @@
 module GovukPublishingComponents
-  VERSION = "24.20.0".freeze
+  VERSION = "24.21.0".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: govuk_publishing_components
 version: !ruby/object:Gem::Version
-  version: 24.20.0
+  version: 24.21.0
 platform: ruby
 authors:
 - GOV.UK Dev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-07-13 00:00:00.000000000 Z
+date: 2021-07-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: govuk_app_config