govuk_publishing_components 21.48.0 → 21.49.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 41bce645d4da9c9c6fd2b1ab5e91fb4ecea8d1b76060fde43f56141fa3101570
-  data.tar.gz: 3ae1030faab5c0cd05487dda793de110743831147d5fe145c9cc69b8d92231b5
+  metadata.gz: 7256d35290379a3b50da4ec0a841472d56209f7780442eef0f15b8c4ca91a4f4
+  data.tar.gz: a25616924f8557b5530a9db3aa0db62ca6856165b9e74bd323841080dd6bf433
 SHA512:
-  metadata.gz: 2402cf261528736c5326f7687e70af627469ce970dd74800825a2a0cd7f3fdb97a0a4b56178a331579733ca98a3ee03987fafd192159f1ece14c29a4a9848076
-  data.tar.gz: a84744cc1ae7d7805aab08a6144b277f3e304ef23ad40b05396f47ed68fe04ebf103b9f51234cb223e9e3ecbf5215d7aa58d9ef86748a701f13cd44b8e1d9cc9
+  metadata.gz: 5317e25d449fcdd3c7453ed45bebe434991a4c7f8e1058c5b344830580b8e9146b41dc2ac9d342e458fdd189930bcf3b2ed4848330a308ec6d318cdff0c34d57
+  data.tar.gz: b80b58ec4481c8dd2db13b939461bcfbcaa844f81d4a8f01d3255e991791d81a0dacf554bcbea9226cd6bddd2189af8fb7479407cd4709a9091cc964f4e3b008

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

@@ -4,7 +4,15 @@
 <% collapse_on_mobile ||= true unless local_assigns[:collapse_on_mobile].eql?(false) %>
 
 <div class='gem-c-contextual-breadcrumbs'>
-  <% if navigation.content_tagged_to_current_step_by_step? %>
+
+  <% if navigation.priority_taxon %>
+    <%= render 'govuk_publishing_components/components/step_by_step_nav_header',
+      {
+        title: navigation.priority_taxon['title'],
+        path: navigation.priority_taxon['base_path']
+      }
+    %>
+  <% elsif navigation.content_tagged_to_current_step_by_step? %>
     <%# Rendering step by step nav breadcrumbs because there's 1 step by step %>
     <%= render 'govuk_publishing_components/components/step_by_step_nav_header',
       navigation.step_nav_helper.header %>

data/lib/govuk_publishing_components.rb

@@ -12,6 +12,7 @@ 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_priority"
 require "govuk_publishing_components/presenters/content_breadcrumbs_based_on_taxons"
 require "govuk_publishing_components/presenters/checkboxes_helper"
 require "govuk_publishing_components/presenters/select"

data/lib/govuk_publishing_components/presenters/content_breadcrumbs_based_on_priority.rb

@@ -0,0 +1,43 @@
+module GovukPublishingComponents
+  module Presenters
+    class ContentBreadcrumbsBasedOnPriority
+      # 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",
+        business_coronavirus: "65666cdf-b177-4d79-9687-b9c32805e450",
+      }.freeze
+
+      # Returns the highest priority taxon that has a content_id matching those in PRIORITY_TAXONS
+      def self.call(content_item)
+        new(content_item).taxon
+      end
+
+      attr_reader :content_item
+
+      def initialize(content_item)
+        @content_item = content_item
+      end
+
+      def taxon
+        @taxon ||= priority_taxons.min_by { |t| PRIORITY_TAXONS.values.index(t["content_id"]) }
+      end
+
+    private
+
+      def priority_taxons
+        taxons = content_item.dig("links", "taxons")&.map do |taxon|
+          taxon.dig("links", "parent_taxons")&.select do |parent_taxon|
+            PRIORITY_TAXONS.values.include?(parent_taxon["content_id"])
+          end
+        end
+        return [] unless taxons
+
+        taxons.flatten!
+        taxons.compact!
+        taxons
+      end
+    end
+  end
+end

data/lib/govuk_publishing_components/presenters/contextual_navigation.rb

@@ -20,6 +20,10 @@ module GovukPublishingComponents
         @taxon_breadcrumbs ||= ContentBreadcrumbsBasedOnTaxons.new(content_item).breadcrumbs
       end
 
+      def priority_taxon
+        @priority_taxon ||= ContentBreadcrumbsBasedOnPriority.call(content_item)
+      end
+
       def breadcrumbs
         if content_tagged_to_a_finder?
           parent_finder = content_item.dig("links", "finder", 0)

data/lib/govuk_publishing_components/presenters/machine_readable/government_service_schema.rb

@@ -29,13 +29,13 @@ module GovukPublishingComponents
 
         {
           "isRelatedTo" => related_links.each_with_object([]) do |link, items|
-            if link["schema_name"] == "transaction"
-              items << {
-                "@type" => "GovernmentService",
-                "name" => link["title"],
-                "url" => link["web_url"],
-              }
-            end
+            next unless link["schema_name"] == "transaction"
+
+            items << {
+              "@type" => "GovernmentService",
+              "name" => link["title"],
+              "url" => link["web_url"],
+            }
           end,
         }
       end

data/lib/govuk_publishing_components/presenters/page_with_step_by_step_navigation.rb

@@ -169,11 +169,11 @@ module GovukPublishingComponents
             next unless content[:contents]
 
             content[:contents].each do |link|
-              if link[:href] == current_path
-                link[:active] = true
-                step_nav_content[:show_step] = step_index + 1
-                step_nav_content[:highlight_step] = step_index + 1
-              end
+              next unless link[:href] == current_path
+
+              link[:active] = true
+              step_nav_content[:show_step] = step_index + 1
+              step_nav_content[:highlight_step] = step_index + 1
             end
           end
         end

data/lib/govuk_publishing_components/version.rb

@@ -1,3 +1,3 @@
 module GovukPublishingComponents
-  VERSION = "21.48.0".freeze
+  VERSION = "21.49.0".freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: govuk_publishing_components
 version: !ruby/object:Gem::Version
-  version: 21.48.0
+  version: 21.49.0
 platform: ruby
 authors:
 - GOV.UK Dev
@@ -748,6 +748,7 @@ files:
 - lib/govuk_publishing_components/presenters/button_helper.rb
 - lib/govuk_publishing_components/presenters/checkboxes_helper.rb
 - lib/govuk_publishing_components/presenters/content_breadcrumbs_based_on_parent.rb
+- lib/govuk_publishing_components/presenters/content_breadcrumbs_based_on_priority.rb
 - lib/govuk_publishing_components/presenters/content_breadcrumbs_based_on_taxons.rb
 - lib/govuk_publishing_components/presenters/content_item.rb
 - lib/govuk_publishing_components/presenters/contents_list_helper.rb