govuk_publishing_components 21.56.0 → 21.56.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3773fbe78d9426cfe8fc0d8356057ac637399673ed546c07eb436a3500e4728a
-  data.tar.gz: dafffb370895b4a7d26cba3e3ebe5b0345d178f3e32e3c3a1e3c1f4370ce71a7
+  metadata.gz: 3ae35a18ee87f9f8bdbc0b7f05b1874d04f3bcfbebed8eb0fd21dfb178bf1118
+  data.tar.gz: e83b74f0187e3db2687dea59f3dc1f482b3400a7fe24f95d1ba5cb9b1377a94e
 SHA512:
-  metadata.gz: 25c2b1ec246ffc2315f37dd9cc929f42404ed1c338e5e80f927ae045785f501af00537463ca6d91e6559dab5f265bf2d482eaed337412c47bf361a7f213fe3db
-  data.tar.gz: 462df79e0ff9bf3dad96caf7d10f594ae6049c96b145b0c7f8788fedc75995f9f71689ca93d7bbb2eefd4f78e7f00aebf7cff77f60fe19b0a350c0ccbddede07
+  metadata.gz: 485ae5bca952be5d4bd237148436f7c165cf91aadafdc433cf1dec9a899cbcff4f78c9e9ede0509ffc79511902fcdeeff699ed73e918f2cbcbf08182e8d8da42
+  data.tar.gz: fde1485cf2b9b1849993aa71fee949f39c3f4d08c996c1d9a61de520f3c44d0c25d3fd047d176032fd0c4e7c4862a0b4fe00b926b43e5898424c3e459355ada3

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

@@ -1,16 +1,20 @@
 <% prioritise_taxon_breadcrumbs ||= false %>
-<% breadcrumb_selector = GovukPublishingComponents::Presenters::BreadcrumbSelector.call(content_item, request, prioritise_taxon_breadcrumbs) %>
+<% breadcrumb_selector = GovukPublishingComponents::Presenters::BreadcrumbSelector.new(content_item, request, prioritise_taxon_breadcrumbs) %>
 <% inverse ||= false %>
 <% collapse_on_mobile ||= true unless local_assigns[:collapse_on_mobile].eql?(false) %>
 
-<div class='gem-c-contextual-breadcrumbs'>
-  <% if breadcrumb_selector[:step_by_step] %>
-    <%= render 'govuk_publishing_components/components/step_by_step_nav_header',
-               breadcrumb_selector[:breadcrumbs] %>
-  <% elsif breadcrumb_selector[:breadcrumbs] %>
+<div class="gem-c-contextual-breadcrumbs">
+  <% if breadcrumb_selector.step_by_step %>
+    <%= render 'govuk_publishing_components/components/step_by_step_nav_header', breadcrumb_selector.breadcrumbs %>
+  <% elsif breadcrumb_selector.breadcrumbs %>
     <%= render 'govuk_publishing_components/components/breadcrumbs',
-               breadcrumbs: breadcrumb_selector[:breadcrumbs],
+               breadcrumbs: breadcrumb_selector.breadcrumbs,
                inverse: inverse,
                collapse_on_mobile: collapse_on_mobile %>
   <% end %>
+
+  <%= render(
+        'govuk_publishing_components/components/step_by_step_nav_header', breadcrumb_selector.priority_breadcrumbs
+      ) if breadcrumb_selector.priority_breadcrumbs
+  %>
 </div>

data/lib/govuk_publishing_components.rb

@@ -12,9 +12,10 @@ require "govuk_publishing_components/presenters/contextual_navigation"
 require "govuk_publishing_components/presenters/related_navigation_helper"
 require "govuk_publishing_components/presenters/step_by_step_nav_helper"
 require "govuk_publishing_components/presenters/page_with_step_by_step_navigation"
-require "govuk_publishing_components/presenters/content_breadcrumbs_based_on_parent"
+require "govuk_publishing_components/presenters/content_breadcrumbs_based_on_ancestors"
 require "govuk_publishing_components/presenters/content_breadcrumbs_based_on_priority"
 require "govuk_publishing_components/presenters/content_breadcrumbs_based_on_taxons"
+require "govuk_publishing_components/presenters/content_breadcrumbs_based_on_topic"
 require "govuk_publishing_components/presenters/checkboxes_helper"
 require "govuk_publishing_components/presenters/select"
 require "govuk_publishing_components/presenters/meta_tags"

data/lib/govuk_publishing_components/presenters/breadcrumb_selector.rb

@@ -1,10 +1,6 @@
 module GovukPublishingComponents
   module Presenters
     class BreadcrumbSelector
-      def self.call(*args)
-        new(*args).output
-      end
-
       attr_reader :content_item, :request, :prioritise_taxon_breadcrumbs
 
       def initialize(content_item, request, prioritise_taxon_breadcrumbs)
@@ -13,47 +9,28 @@ module GovukPublishingComponents
         @prioritise_taxon_breadcrumbs = prioritise_taxon_breadcrumbs
       end
 
-      def content_item_navigation
-        @content_item_navigation ||= ContextualNavigation.new(content_item, request)
+      def breadcrumbs
+        best_match_option[:breadcrumbs]
       end
 
-      def parent_item_navigation
-        @parent_item_navigation ||= ContextualNavigation.new(parent_item, request)
+      def step_by_step
+        best_match_option[:step_by_step]
       end
 
-      def parent_item
-        @parent_item ||= Services.content_store.content_item(content_item_navigation.parent_api_path)
-      rescue GdsApi::ContentStore::ItemNotFound
-        # Do nothing
-      end
+      def priority_breadcrumbs
+        return parent_item_navigation.priority_breadcrumbs if content_item_navigation.html_publication_with_parent?
 
-      def parent_item_options
-        @parent_item_options ||= options(parent_item_navigation)
+        content_item_navigation.priority_breadcrumbs
       end
 
-      def content_item_options
-        @content_item_options ||= options(content_item_navigation)
-      end
+    private
 
-      def parent_breadcrumbs
-        breadcrumbs = [parent_item_options[:breadcrumbs]].flatten # to ensure breadcrumbs always an array
-        breadcrumbs.last[:is_page_parent] = false
-        breadcrumbs << {
-          title: parent_item["title"],
-          url: parent_item["base_path"],
-          is_page_parent: true,
-        }
-      end
-
-      def output
+      def best_match_option
         return content_item_options unless content_item_navigation.html_publication_with_parent?
-        return parent_item_options if parent_item_navigation.priority_breadcrumbs
-
-        step_by_step_header = parent_item_options[:step_by_step]
 
         {
-          step_by_step: step_by_step_header,
-          breadcrumbs: step_by_step_header ? parent_breadcrumbs.first : parent_breadcrumbs,
+          step_by_step: parent_is_step_by_step?,
+          breadcrumbs: parent_is_step_by_step? ? parent_breadcrumbs.first : parent_breadcrumbs,
         }
       end
 
@@ -61,18 +38,13 @@ module GovukPublishingComponents
         if navigation.content_tagged_to_a_finder?
           {
             step_by_step: false,
-            breadcrumbs: navigation.breadcrumbs,
+            breadcrumbs: navigation.finder_breadcrumbs,
           }
         elsif navigation.content_tagged_to_current_step_by_step?
           {
             step_by_step: true,
             breadcrumbs: navigation.step_nav_helper.header,
           }
-        elsif navigation.priority_breadcrumbs
-          {
-            step_by_step: true,
-            breadcrumbs: navigation.priority_breadcrumbs,
-          }
         elsif navigation.content_is_tagged_to_a_live_taxon? && prioritise_taxon_breadcrumbs
           {
             step_by_step: false,
@@ -83,10 +55,10 @@ module GovukPublishingComponents
             step_by_step: false,
             breadcrumbs: navigation.breadcrumbs,
           }
-        elsif navigation.content_has_curated_related_items?
+        elsif navigation.content_has_a_topic?
           {
             step_by_step: false,
-            breadcrumbs: navigation.breadcrumbs,
+            breadcrumbs: navigation.topic_breadcrumbs,
           }
         elsif navigation.use_taxon_breadcrumbs?
           {
@@ -102,6 +74,42 @@ module GovukPublishingComponents
           {}
         end
       end
+
+      def content_item_navigation
+        @content_item_navigation ||= ContextualNavigation.new(content_item, request)
+      end
+
+      def parent_item_navigation
+        @parent_item_navigation ||= ContextualNavigation.new(parent_item, request)
+      end
+
+      def parent_item
+        @parent_item ||= Services.content_store.content_item(content_item_navigation.parent_api_path)
+      rescue GdsApi::ContentStore::ItemNotFound
+        # Do nothing
+      end
+
+      def parent_item_options
+        @parent_item_options ||= options(parent_item_navigation)
+      end
+
+      def content_item_options
+        @content_item_options ||= options(content_item_navigation)
+      end
+
+      def parent_breadcrumbs
+        breadcrumbs = [parent_item_options[:breadcrumbs]].flatten # to ensure breadcrumbs always an array
+        breadcrumbs.last[:is_page_parent] = false
+        breadcrumbs << {
+          title: parent_item["title"],
+          url: parent_item["base_path"],
+          is_page_parent: true,
+        }
+      end
+
+      def parent_is_step_by_step?
+        parent_item_options[:step_by_step]
+      end
     end
   end
 end

data/lib/govuk_publishing_components/presenters/content_breadcrumbs_based_on_ancestors.rb

@@ -0,0 +1,41 @@
+module GovukPublishingComponents
+  module Presenters
+    # @private
+    class ContentBreadcrumbsBasedOnAncestors
+      def self.call(content_item)
+        new(content_item).breadcrumbs
+      end
+
+      def initialize(content_item)
+        @content_item = ContentItem.new(content_item)
+      end
+
+      def breadcrumbs
+        ordered_ancestors = all_ancestors.map do |ancestor|
+          { title: ancestor.title, url: ancestor.base_path }
+        end
+
+        ordered_ancestors << { title: "Home", url: "/" }
+        ordered_ancestors.reverse!
+        ordered_ancestors
+      end
+
+    private
+
+      attr_reader :content_item
+
+      def all_ancestors
+        ancestors = []
+
+        parent = content_item.parent
+        while parent
+          ancestors << parent
+
+          parent = parent.parent
+        end
+
+        ancestors
+      end
+    end
+  end
+end

data/lib/govuk_publishing_components/presenters/content_breadcrumbs_based_on_priority.rb

@@ -6,6 +6,7 @@ module GovukPublishingComponents
       #   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",
       }.freeze
 

data/lib/govuk_publishing_components/presenters/content_breadcrumbs_based_on_taxons.rb

@@ -2,6 +2,10 @@ module GovukPublishingComponents
   module Presenters
     # @private
     class ContentBreadcrumbsBasedOnTaxons
+      def self.call(content_item)
+        new(content_item).breadcrumbs
+      end
+
       def initialize(content_item)
         @content_item = ContentItem.new(content_item)
       end

data/lib/govuk_publishing_components/presenters/content_breadcrumbs_based_on_topic.rb

@@ -0,0 +1,38 @@
+module GovukPublishingComponents
+  module Presenters
+    class ContentBreadcrumbsBasedOnTopic
+      def self.call(content_item)
+        new(content_item).breadcrumbs
+      end
+
+      attr_reader :content_item
+
+      def initialize(content_item)
+        @content_item = content_item
+      end
+
+      def breadcrumbs
+        breadcrumbs = [{ title: "Home", url: "/" }]
+        return breadcrumbs unless topics.present?
+
+        breadcrumbs << topic_breadcrumb
+        breadcrumbs
+      end
+
+      def topic_breadcrumb
+        {
+          title: first_topic["title"],
+          url: first_topic["base_path"],
+        }
+      end
+
+      def first_topic
+        topics.first
+      end
+
+      def topics
+        @topics ||= content_item.dig("links", "topics")
+      end
+    end
+  end
+end

data/lib/govuk_publishing_components/presenters/contextual_navigation.rb

@@ -26,15 +26,22 @@ module GovukPublishingComponents
       end
 
       def taxon_breadcrumbs
-        @taxon_breadcrumbs ||= ContentBreadcrumbsBasedOnTaxons.new(content_item).breadcrumbs
+        @taxon_breadcrumbs ||= ContentBreadcrumbsBasedOnTaxons.call(content_item)
       end
 
       def priority_breadcrumbs
         @priority_breadcrumbs ||= ContentBreadcrumbsBasedOnPriority.call(content_item)
       end
 
+      def topic_breadcrumbs
+        @topic_breadcrumbs ||= ContentBreadcrumbsBasedOnTopic.call(content_item)
+      end
+
       def breadcrumbs
-        return breadcrumbs_based_on_parent unless content_tagged_to_a_finder?
+        breadcrumbs_based_on_ancestors
+      end
+
+      def finder_breadcrumbs
         return [] unless parent_finder
 
         [
@@ -77,6 +84,10 @@ module GovukPublishingComponents
         content_item["document_type"] == "html_publication"
       end
 
+      def content_has_a_topic?
+        content_item.dig("links", "topics").present?
+      end
+
       def tagged_to_brexit?
         taxons = content_item.dig("links", "taxons").to_a
         brexit_taxon = "d6c2de5d-ef90-45d1-82d4-5f2438369eea"
@@ -119,8 +130,8 @@ module GovukPublishingComponents
         step_nav_helper.show_also_part_of_step_nav?
       end
 
-      def breadcrumbs_based_on_parent
-        ContentBreadcrumbsBasedOnParent.new(content_item).breadcrumbs[:breadcrumbs]
+      def breadcrumbs_based_on_ancestors
+        ContentBreadcrumbsBasedOnAncestors.call(content_item)
       end
 
       def step_nav_helper

data/lib/govuk_publishing_components/presenters/page_with_step_by_step_navigation.rb

@@ -3,6 +3,8 @@ module GovukPublishingComponents
     # @private
     # Only used by the step by step component
     class PageWithStepByStepNavigation
+      MAX_SECTION_LENGTH = RelatedNavigationHelper::MAX_SECTION_LENGTH
+
       def initialize(content_store_response, current_path, query_parameters = {})
         @content_item = content_store_response.to_h.deep_symbolize_keys
         @current_path = current_path
@@ -48,7 +50,7 @@ module GovukPublishingComponents
       end
 
       def show_also_part_of_step_nav?
-        active_step_by_step? && also_part_of_step_nav.any? && step_navs_combined_list.count < 5
+        active_step_by_step? && also_part_of_step_nav.any? && step_navs_combined_list.count < MAX_SECTION_LENGTH
       end
 
       def related_links

data/lib/govuk_publishing_components/presenters/related_navigation_helper.rb

@@ -31,7 +31,7 @@ module GovukPublishingComponents
           }
         when :footer
           {
-            "topics" => related_topics,
+            "topics" => related_topics_or_taxons,
             "topical_events" => related_topical_events,
             "world_locations" => related_world_locations,
             "statistical_data_sets" => related_statistical_data_sets,
@@ -43,7 +43,7 @@ module GovukPublishingComponents
             "related_items" => related_items,
             "related_guides" => related_guides,
             "collections" => related_document_collections,
-            "topics" => related_topics,
+            "topics" => related_topics_or_taxons,
             "topical_events" => related_topical_events,
             "world_locations" => related_world_locations,
             "statistical_data_sets" => related_statistical_data_sets,
@@ -162,26 +162,27 @@ module GovukPublishingComponents
       end
 
       def related_taxons
-        content_item_links_for("taxons", only: "taxon")
+        @related_taxons ||= content_item_links_for("taxons", only: "taxon")
       end
 
-      def related_topics
-        if related_legacy_topics.any?
-          related_legacy_topics
-        elsif related_taxons.any?
-          related_taxons
-        else
-          []
-        end
+      def related_topics_or_taxons
+        return related_topics if related_topics.any?
+        return related_taxons if related_taxons.any?
+
+        []
       end
 
-      def related_legacy_topics
-        mainstream_browse_page_links = content_item_links_for("mainstream_browse_pages", only: "mainstream_browse_page")
-        topic_links = content_item_links_for("topics", only: "topic")
+      def related_topics
+        @related_topics ||= begin
+          mainstream_browse_page_links = content_item_links_for("mainstream_browse_pages", only: "mainstream_browse_page")
+          topic_links = content_item_links_for("topics", only: "topic")
+
+          return topic_links if topic_links.present? && mainstream_browse_page_links.empty?
 
-        mainstream_browse_page_links + topic_links.find_all do |topic_link|
-          mainstream_browse_page_links.none? do |mainstream_browse_page_link|
-            mainstream_browse_page_link[:text] == topic_link[:text]
+          mainstream_browse_page_links + topic_links.find_all do |topic_link|
+            mainstream_browse_page_links.none? do |mainstream_browse_page_link|
+              mainstream_browse_page_link[:text] == topic_link[:text]
+            end
           end
         end
       end

data/lib/govuk_publishing_components/version.rb

@@ -1,3 +1,3 @@
 module GovukPublishingComponents
-  VERSION = "21.56.0".freeze
+  VERSION = "21.56.1".freeze
 end

data/node_modules/axe-core/CHANGELOG.md

@@ -2,6 +2,17 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+### [3.5.5](https://github.com/dequelabs/axe-core/compare/v3.5.4...v3.5.5) (2020-06-16)
+
+### Bug Fixes
+
+- **aria-input-field-name:** add the missing word must to help metadata ([b0f5562](https://github.com/dequelabs/axe-core/commit/b0f5562ac2a746e8ac78f6e483e39162680f3a22))
+- **color-contrast:** fix font-weight calculation for safari ([205b587](https://github.com/dequelabs/axe-core/commit/205b58709c280f00100bf24a7b6bf15da50ed0ed))
+- **configure:** validate rules and checks properties ([8c91ead](https://github.com/dequelabs/axe-core/commit/8c91ead900fd3cab58f77af45cce54d02e734a8e))
+- **is-visible:** return false for opacity: 0 and 0 height scrollable regions ([86ada3f](https://github.com/dequelabs/axe-core/commit/86ada3f7cef5b1fbcaad37b8acfaee93566ba8bf))
+- **listitem:** do not fail for parent with role=presentation|none ([a3ddc6e](https://github.com/dequelabs/axe-core/commit/a3ddc6e1e43716b761e8bb42fba4842d88f813dc))
+- **meta-viewport:** don't throw error if viewport property doesn't have a value ([2176794](https://github.com/dequelabs/axe-core/commit/2176794f8a831c8303984039e4a07b99d368b111))
+
 ### [3.5.4](https://github.com/dequelabs/axe-core/compare/v3.5.3...v3.5.4) (2020-05-22)
 
 ### Bug Fixes