govuk_publishing_components 24.13.4 → 24.15.1

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

@@ -3,7 +3,7 @@
 %>
 
 <nav id="proposition-menu" class="no-proposition-name gem-c-government-navigation" aria-label="Departments and policy navigation">
-  <ul id="proposition-links">
+  <ul id="proposition-links" data-module="gem-track-click">
     <li>
       <a class="<%= 'active' if active == 'departments' %> govuk-link govuk-link--no-underline govuk-link--inverse"
          data-track-category="headerClicked"
@@ -52,7 +52,7 @@
       <a class="<%= 'active' if active == 'consultations' %> govuk-link govuk-link--no-underline govuk-link--inverse"
          data-track-category="headerClicked"
          data-track-action="governmentactivityLink"
-         data-track-label="/government/get-involved"
+         data-track-label="<%= CGI::escapeHTML('/search/policy-papers-and-consultations?content_store_document_type[]=open_consultations&content_store_document_type[]=closed_consultations') %>"
          data-track-dimension="<%= t("components.government_navigation.consultations") %>"
          data-track-dimension-index="29"
          href="<%= CGI::escapeHTML('/search/policy-papers-and-consultations?content_store_document_type[]=open_consultations&content_store_document_type[]=closed_consultations') %>">
@@ -63,7 +63,7 @@
       <a class="<%= 'active' if active == 'statistics' %> govuk-link govuk-link--no-underline govuk-link--inverse"
          data-track-category="headerClicked"
          data-track-action="governmentactivityLink"
-         data-track-label="/government/research-and-statistics"
+         data-track-label="/search/research-and-statistics"
          data-track-dimension="<%= t("components.government_navigation.statistics") %>"
          data-track-dimension-index="29"
       href="/search/research-and-statistics">

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

@@ -37,6 +37,8 @@
     <meta charset="utf-8" />
     <title><%= title %></title>
 
+    <%= javascript_include_tag "govuk_publishing_components/rum-loader", { async: true } %>
+
     <%= csrf_meta_tags %>
 
     <%= stylesheet_link_tag "application", media: "all" %>

data/config/initializers/assets.rb

@@ -7,6 +7,9 @@ Rails.application.config.assets.precompile += %w[
   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.js
+  govuk_publishing_components/vendor/lux-polyfill.js
   govuk_publishing_components/all_components.js
   govuk_publishing_components/ie.js
   govuk_publishing_components/modules.js

data/lib/govuk_publishing_components/presenters/content_breadcrumbs_based_on_priority.rb

@@ -8,13 +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",
-      }.freeze
-
-      BREXIT_TAXONS = {
-        brexit: "d6c2de5d-ef90-45d1-82d4-5f2438369eea",
         brexit_business: "634fd193-8039-4a70-a059-919c34ff4bfc",
-        brexit_citizen: "614b2e65-56ac-4f8d-bb9c-d1a14167ba25",
+        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
@@ -39,7 +35,7 @@ module GovukPublishingComponents
       def breadcrumbs
         taxon && {
           title: taxon["title"],
-          path: taxon["base_path"],
+          path: breadcrumb_path,
           tracking_category: "breadcrumbClicked",
           tracking_action: tracking_action,
           tracking_label: content_item["base_path"],
@@ -52,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
 
@@ -74,17 +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"] == BREXIT_TAXONS[:brexit_business]
-        action << "Brexitcitizen" if taxon["content_id"] == BREXIT_TAXONS[:brexit_business]
-        action << "Brexitbusinessandcitizen" if taxon["content_id"] == BREXIT_TAXONS[:brexit]
+        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.4".freeze
+  VERSION = "24.15.1".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: govuk_publishing_components
 version: !ruby/object:Gem::Version
-  version: 24.13.4
+  version: 24.15.1
 platform: ruby
 authors:
 - GOV.UK Dev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-06-09 00:00:00.000000000 Z
+date: 2021-06-18 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