govuk_publishing_components 24.13.1 → 24.14.0

data/config/locales/uz.yml

@@ -116,6 +116,9 @@ uz:
       topical_events:
       topics:
       transition:
+        hub_page_link_path:
+        hub_page_link_text:
+        hub_page_title:
         link_path:
         link_text:
         title:

data/config/locales/vi.yml

@@ -116,6 +116,9 @@ vi:
       topical_events:
       topics:
       transition:
+        hub_page_link_path:
+        hub_page_link_text:
+        hub_page_title:
         link_path:
         link_text:
         title:

data/config/locales/zh-hk.yml

@@ -116,6 +116,9 @@ zh-hk:
       topical_events:
       topics:
       transition:
+        hub_page_link_path:
+        hub_page_link_text:
+        hub_page_title:
         link_path:
         link_text:
         title:

data/config/locales/zh-tw.yml

@@ -116,6 +116,9 @@ zh-tw:
       topical_events:
       topics:
       transition:
+        hub_page_link_path:
+        hub_page_link_text:
+        hub_page_title:
         link_path:
         link_text:
         title:

data/config/locales/zh.yml

@@ -116,6 +116,9 @@ zh:
       topical_events:
       topics:
       transition:
+        hub_page_link_path:
+        hub_page_link_text:
+        hub_page_title:
         link_path:
         link_text:
         title:

data/lib/govuk_publishing_components.rb

@@ -7,6 +7,7 @@ require "govuk_publishing_components/presenters/shared_helper"
 require "govuk_publishing_components/presenters/attachment"
 require "govuk_publishing_components/presenters/breadcrumbs"
 require "govuk_publishing_components/presenters/breadcrumb_selector"
+require "govuk_publishing_components/presenters/brexit_cta_helper"
 require "govuk_publishing_components/presenters/button_helper"
 require "govuk_publishing_components/presenters/contextual_navigation"
 require "govuk_publishing_components/presenters/related_navigation_helper"

data/lib/govuk_publishing_components/presenters/brexit_cta_helper.rb

@@ -0,0 +1,33 @@
+module GovukPublishingComponents
+  module Presenters
+    class BrexitCtaHelper
+      BREXIT_HUB_PAGE_IDS = %w[
+        6555e0bf-c270-4cf9-a0c5-d20b95fab7f1
+        91cd6143-69d5-4f27-99ff-a52fb0d51c78
+      ].freeze
+
+      def initialize(content_item)
+        @content_item = content_item
+      end
+
+      def title_key
+        use_brexit_hub_page_navigation? ? "components.related_navigation.transition.hub_page_title" : "components.related_navigation.transition.title"
+      end
+
+      def link_text_key
+        use_brexit_hub_page_navigation? ? "components.related_navigation.transition.hub_page_link_text" : "components.related_navigation.transition.link_text"
+      end
+
+      def link_path_key
+        use_brexit_hub_page_navigation? ? "components.related_navigation.transition.hub_page_link_path" : "components.related_navigation.transition.link_path"
+      end
+
+    private
+
+      def use_brexit_hub_page_navigation?
+        I18n.locale == :en &&
+          BREXIT_HUB_PAGE_IDS.include?(@content_item["content_id"])
+      end
+    end
+  end
+end

data/lib/govuk_publishing_components/presenters/content_breadcrumbs_based_on_priority.rb

@@ -8,7 +8,9 @@ module GovukPublishingComponents
         education_coronavirus: "272308f4-05c8-4d0d-abc7-b7c2e3ccd249",
         worker_coronavirus: "b7f57213-4b16-446d-8ded-81955d782680",
         business_coronavirus: "65666cdf-b177-4d79-9687-b9c32805e450",
-        transition_period: "d6c2de5d-ef90-45d1-82d4-5f2438369eea",
+        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
@@ -33,9 +35,9 @@ module GovukPublishingComponents
       def breadcrumbs
         taxon && {
           title: taxon["title"],
-          path: taxon["base_path"],
+          path: breadcrumb_path,
           tracking_category: "breadcrumbClicked",
-          tracking_action: "superBreadcrumb",
+          tracking_action: tracking_action,
           tracking_label: content_item["base_path"],
           tracking_dimension_enabled: false,
         }
@@ -46,6 +48,8 @@ module GovukPublishingComponents
       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
 
@@ -68,9 +72,34 @@ module GovukPublishingComponents
         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 << "Brexitbusiness" if taxon["content_id"] == PRIORITY_TAXONS[:brexit_business]
+        action << "Brexitcitizen" if taxon["content_id"] == PRIORITY_TAXONS[:brexit_individuals]
+        action << "Brexitbusinessandcitizen" if taxon["content_id"] == PRIORITY_TAXONS[:brexit_taxon]
+        action.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
+        taxon.dig("details", "url_override").present? ? taxon.dig("details", "url_override") : taxon["base_path"]
+      end
     end
   end
 end

data/lib/govuk_publishing_components/presenters/contextual_navigation.rb

@@ -194,6 +194,7 @@ module GovukPublishingComponents
           maib_report
           raib_report
           simple_smart_answer
+          smart_answer
           transaction
         ]
       end

data/lib/govuk_publishing_components/version.rb

@@ -1,3 +1,3 @@
 module GovukPublishingComponents
-  VERSION = "24.13.1".freeze
+  VERSION = "24.14.0".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: govuk_publishing_components
 version: !ruby/object:Gem::Version
-  version: 24.13.1
+  version: 24.14.0
 platform: ruby
 authors:
 - GOV.UK Dev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-06-03 00:00:00.000000000 Z
+date: 2021-06-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: govuk_app_config
@@ -484,8 +484,11 @@ files:
 - app/assets/javascripts/govuk_publishing_components/lib/track-click.js
 - app/assets/javascripts/govuk_publishing_components/lib/trigger-event.js
 - app/assets/javascripts/govuk_publishing_components/modules.js
+- app/assets/javascripts/govuk_publishing_components/rum-loader.js.erb
 - app/assets/javascripts/govuk_publishing_components/vendor/html5shiv-printshiv.js
 - app/assets/javascripts/govuk_publishing_components/vendor/json2.js
+- app/assets/javascripts/govuk_publishing_components/vendor/lux/lux-polyfill.js
+- app/assets/javascripts/govuk_publishing_components/vendor/lux/lux.js
 - app/assets/javascripts/govuk_publishing_components/vendor/modernizr.js
 - app/assets/javascripts/govuk_publishing_components/vendor/polyfills/closest.js
 - app/assets/javascripts/govuk_publishing_components/vendor/polyfills/common.js
@@ -883,6 +886,7 @@ files:
 - lib/govuk_publishing_components/presenters/attachment.rb
 - lib/govuk_publishing_components/presenters/breadcrumb_selector.rb
 - lib/govuk_publishing_components/presenters/breadcrumbs.rb
+- lib/govuk_publishing_components/presenters/brexit_cta_helper.rb
 - 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