govuk_publishing_components 29.0.1 → 29.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3b2249b313207eb5d21c77d4b5daf9ff81a39459ca3ae488aa27385ac3d107ac
-  data.tar.gz: d484a78ee501972e49e477c386d84e4616b0668f9d865620875ddf687c0c5713
+  metadata.gz: b8ea9dce00e2fc90b3a88d941fa237f4d276295be027676233cf31cbf904bec0
+  data.tar.gz: c3ff5045ff3c0f0be4df536e1ea165c896d01e1b680c4f98f838bc213f4d3931
 SHA512:
-  metadata.gz: d745f36953d411596341155eaf6797db40950023c1bbacf5938b0571e480b3083f6e80453fbf13ed5adf0d8f0c5d13838f33fada99f6287d705efbf9cae17a60
-  data.tar.gz: b155b56e49062bdae108c6932d7e3c6baccb579a510a4018d5b89f789c9e1218d3e54f594738950bca50824c581c77aa573e59455b5aa2da63c4076eb5f4dced
+  metadata.gz: 1fe533fa65e9d6d6e97e94d388e1176031f4bdf9eb896867b7f81ba56deb790fc630383060aab98f3e7f09f5f6b8547db2c27d19519631a97fbdd135f6314759
+  data.tar.gz: 3c7659b2fd425a674de931fee53307329f12586aced6775dde5ae21b982661205a1eaab6aacbdf714bbd81e31e7f095184582bf25ca00b323d57410c45d790b4

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

@@ -12,9 +12,4 @@
                inverse: inverse,
                collapse_on_mobile: collapse_on_mobile %>
   <% end %>
-  <% if breadcrumb_selector.priority_breadcrumbs %>
-    <%= render 'govuk_publishing_components/components/step_by_step_nav_header', breadcrumb_selector.priority_breadcrumbs %>
-    <% meta_tag = GovukPublishingComponents::Presenters::MetaTags.new(content_item, local_assigns, request).brexit_priority_breadcrumb_tag %>
-    <meta name="<%= meta_tag.keys.first %>" content="<%= meta_tag.values.first %>">
-  <% end %>
 </div>

data/lib/govuk_publishing_components/presenters/breadcrumb_selector.rb

@@ -17,19 +17,8 @@ module GovukPublishingComponents
         best_match_option[:step_by_step]
       end
 
-      def priority_breadcrumbs
-        return if hide_priority_breadcrumb?
-        return parent_item_navigation.priority_breadcrumbs if content_item_navigation.html_publication_with_parent?
-
-        content_item_navigation.priority_breadcrumbs
-      end
-
     private
 
-      def hide_priority_breadcrumb?
-        content_item_navigation.content_tagged_to_current_step_by_step? && content_item_navigation.tagged_to_brexit?
-      end
-
       def best_match_option
         return content_item_options unless content_item_navigation.html_publication_with_parent?
 

data/lib/govuk_publishing_components/presenters/contextual_navigation.rb

@@ -33,10 +33,6 @@ module GovukPublishingComponents
         @taxon_breadcrumbs ||= ContentBreadcrumbsBasedOnTaxons.call(content_item)
       end
 
-      def priority_breadcrumbs
-        @priority_breadcrumbs ||= ContentBreadcrumbsBasedOnPriority.call(content_item, query_parameters)
-      end
-
       def topic_breadcrumbs
         @topic_breadcrumbs ||= ContentBreadcrumbsBasedOnTopic.call(content_item)
       end
@@ -92,22 +88,6 @@ module GovukPublishingComponents
         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"
-        world_brexit_taxon = "d4c4d91d-fbe7-4eff-bd57-189138c626c9"
-
-        taxons.each do |taxon|
-          if taxon["content_id"].eql?(brexit_taxon) ||
-              taxon["content_id"].eql?(world_brexit_taxon) ||
-              taxon.dig("links", "parent_taxons").to_a.any? { |taxon_item| taxon_item["content_id"].eql?(brexit_taxon) }
-            return true
-          end
-        end
-
-        false
-      end
-
       def content_tagged_to_current_step_by_step?
         # TODO: remove indirection here
         step_nav_helper.show_header?

data/lib/govuk_publishing_components/presenters/meta_tags.rb

@@ -20,12 +20,7 @@ module GovukPublishingComponents
         meta_tags = add_organisation_tags(meta_tags)
         meta_tags = add_political_tags(meta_tags)
         meta_tags = add_taxonomy_tags(meta_tags)
-        meta_tags = add_step_by_step_tags(meta_tags)
-        add_brexit_tags("govuk:brexit-audience", meta_tags)
-      end
-
-      def brexit_priority_breadcrumb_tag
-        add_brexit_tags("govuk:brexit-superbreadcrumb")
+        add_step_by_step_tags(meta_tags)
       end
 
     private
@@ -116,37 +111,6 @@ module GovukPublishingComponents
         meta_tags
       end
 
-      def add_brexit_tags(tag_key, meta_tags = {})
-        links = content_item[:links]
-        taxons = links[:taxons] unless links.nil?
-
-        return meta_tags if taxons.blank?
-        return meta_tags unless tagged_to_priority_taxon?
-
-        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.priority_taxon.present?
-      end
-
-      def priority_taxon_helper
-        @priority_taxon_helper ||= ContentBreadcrumbsBasedOnPriority.new(content_item.deep_stringify_keys, request.query_parameters)
-      end
-
-      def priority_taxon
-        priority_taxon_helper.priority_taxon
-      end
-
-      def priority_brexit_taxon
-        priority_taxon_helper.priority_brexit_taxon
-      end
-
       def has_content_history?
         (content_item[:public_updated_at] && details[:first_public_at] && content_item[:public_updated_at] != details[:first_public_at]) ||
           (details[:change_history] && details[:change_history].size > 1)

data/lib/govuk_publishing_components/version.rb

@@ -1,3 +1,3 @@
 module GovukPublishingComponents
-  VERSION = "29.0.1".freeze
+  VERSION = "29.1.0".freeze
 end

data/lib/govuk_publishing_components.rb

@@ -17,7 +17,6 @@ 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/public_layout_helper"
 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"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: govuk_publishing_components
 version: !ruby/object:Gem::Version
-  version: 29.0.1
+  version: 29.1.0
 platform: ruby
 authors:
 - GOV.UK Dev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-03-25 00:00:00.000000000 Z
+date: 2022-03-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: govuk_app_config
@@ -907,7 +907,6 @@ 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_ancestors.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_breadcrumbs_based_on_topic.rb
 - lib/govuk_publishing_components/presenters/content_item.rb

data/lib/govuk_publishing_components/presenters/content_breadcrumbs_based_on_priority.rb

@@ -1,118 +0,0 @@
-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 = {
-        brexit_business: "634fd193-8039-4a70-a059-919c34ff4bfc",
-        brexit_individuals: "614b2e65-56ac-4f8d-bb9c-d1a14167ba25",
-        brexit_taxon: "d6c2de5d-ef90-45d1-82d4-5f2438369eea",
-      }.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
-      end
-
-      attr_reader :content_item, :query_parameters
-
-      def initialize(content_item, query_parameters = nil)
-        @content_item = content_item
-        @query_parameters = query_parameters
-      end
-
-      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_taxons.find { |t| t["content_id"] == PRIORITY_TAXONS[:brexit_taxon] }
-        else
-          priority_taxons.min_by { |t| PRIORITY_TAXONS.values.index(t["content_id"]) }
-        end
-      end
-
-      def breadcrumbs
-        priority_taxon && {
-          title: priority_taxon["title"],
-          path: breadcrumb_path,
-          tracking_category: "breadcrumbClicked",
-          tracking_action: tracking_action,
-          tracking_label: content_item["base_path"],
-          tracking_dimension_enabled: false,
-        }
-      end
-
-      def brexit_audience(taxon)
-        return nil unless taxon
-
-        {
-          PRIORITY_TAXONS[:brexit_business] => "Brexitbusiness",
-          PRIORITY_TAXONS[:brexit_individuals] => "Brexitcitizen",
-          PRIORITY_TAXONS[:brexit_taxon] => "Brexitbusinessandcitizen",
-        }[taxon["content_id"]]
-      end
-
-    private
-
-      def preferred_taxon
-        if preferred_priority_taxon
-          priority_taxons.find { |t| t["content_id"] == preferred_priority_taxon }
-        elsif tagged_to_both_brexit_child_taxons?
-          priority_taxons.find { |t| t["content_id"] == PRIORITY_TAXONS[:brexit_taxon] }
-        end
-      end
-
-      def priority_taxons
-        return [] unless content_item["links"].is_a?(Hash)
-
-        taxons = content_item.dig("links", "taxons")
-        taxon_tree(taxons).select do |taxon|
-          priority_taxon?(taxon)
-        end
-      end
-
-      def taxon_tree(taxons)
-        return [] if taxons.blank?
-
-        taxons + taxons.flat_map { |taxon| taxon_tree(taxon.dig("links", "parent_taxons")) }
-      end
-
-      def priority_taxon?(taxon)
-        PRIORITY_TAXONS.values.include?(taxon["content_id"])
-      end
-
-      def brexit_child_taxon?(taxon)
-        brexit_child_taxons.include?(taxon["content_id"])
-      end
-
-      def brexit_child_taxons
-        [PRIORITY_TAXONS[:brexit_business], PRIORITY_TAXONS[:brexit_individuals]]
-      end
-
-      def preferred_priority_taxon
-        query_parameters["priority-taxon"] if query_parameters
-      end
-
-      def tracking_action
-        action = %w[superBreadcrumb]
-        action << brexit_audience(priority_taxon)
-        action.compact.join(" ")
-      end
-
-      def tagged_to_both_brexit_child_taxons?
-        t = priority_taxons.select { |taxon| brexit_child_taxon?(taxon) }
-        t.uniq.count > 1
-      end
-
-      def breadcrumb_path
-        priority_taxon.dig("details", "url_override").present? ? priority_taxon.dig("details", "url_override") : priority_taxon["base_path"]
-      end
-    end
-  end
-end