govuk_publishing_components 24.13.2 → 24.14.1

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

@@ -3,39 +3,81 @@
 %>
 
 <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" href="/government/organisations">
+      <a class="<%= 'active' if active == 'departments' %> govuk-link govuk-link--no-underline govuk-link--inverse"
+         data-track-category="headerClicked"
+         data-track-action="departmentsLink"
+         data-track-label="/government/organisations"
+         data-track-dimension="<%= t("components.government_navigation.departments") %>"
+         data-track-dimension-index="29"
+         href="/government/organisations">
         <%= t("components.government_navigation.departments") %>
       </a>
     </li>
     <li>
-      <a class="<%= 'active' if active == 'worldwide' %> govuk-link govuk-link--no-underline govuk-link--inverse" href="/government/world">
+      <a class="<%= 'active' if active == 'worldwide' %> govuk-link govuk-link--no-underline govuk-link--inverse"
+         data-track-category="headerClicked"
+         data-track-action="worldwideLink"
+         data-track-label="/world"
+         data-track-dimension="<%= t("components.government_navigation.worldwide") %>"
+         data-track-dimension-index="29"
+         href="/world">
         <%= t("components.government_navigation.worldwide") %>
       </a>
     </li>
     <li>
-      <a class="<%= 'active' if active == 'how-government-works' %> govuk-link govuk-link--no-underline govuk-link--inverse" href="/government/how-government-works">
+      <a class="<%= 'active' if active == 'how-government-works' %> govuk-link govuk-link--no-underline govuk-link--inverse"
+         data-track-category="headerClicked"
+         data-track-action="governmentactivityLink"
+         data-track-label="/government/how-government-works"
+         data-track-dimension="<%= t("components.government_navigation.how-government-works") %>"
+         data-track-dimension-index="29"
+         href="/government/how-government-works">
         <%= t("components.government_navigation.how-government-works") %>
       </a>
     </li>
     <li>
-      <a class="<%= 'active' if active == 'get-involved' %> govuk-link govuk-link--no-underline govuk-link--inverse" href="/government/get-involved">
+      <a class="<%= 'active' if active == 'get-involved' %> 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-dimension="<%= t("components.government_navigation.get-involved") %>"
+         data-track-dimension-index="29"
+         href="/government/get-involved">
         <%= t("components.government_navigation.get-involved") %>
       </a>
     </li>
     <li class="clear-child">
-      <a class="<%= 'active' if active == 'consultations' %> govuk-link govuk-link--no-underline govuk-link--inverse" href="<%= CGI::escapeHTML('/search/policy-papers-and-consultations?content_store_document_type[]=open_consultations&content_store_document_type[]=closed_consultations') %>">
+      <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="<%= 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') %>">
         <%= t("components.government_navigation.consultations") %>
       </a>
     </li>
     <li>
-      <a class="<%= 'active' if active == 'statistics' %> govuk-link govuk-link--no-underline govuk-link--inverse" href="/search/research-and-statistics">
+      <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="/search/research-and-statistics"
+         data-track-dimension="<%= t("components.government_navigation.statistics") %>"
+         data-track-dimension-index="29"
+      href="/search/research-and-statistics">
         <%= t("components.government_navigation.statistics") %>
       </a>
     </li>
     <li>
-      <a class="<%= 'active' if active == 'announcements' %> govuk-link govuk-link--no-underline govuk-link--inverse" href="/news-and-communications">
+      <a class="<%= 'active' if active == 'announcements' %> govuk-link govuk-link--no-underline govuk-link--inverse"
+         data-track-category="headerClicked"
+         data-track-action="governmentactivityLink"
+         data-track-label="/search/news-and-communications"
+         data-track-dimension="<%= t("components.government_navigation.news_and_communications") %>"
+         data-track-dimension-index="29"
+         href="/search/news-and-communications">
         <%= t("components.government_navigation.news_and_communications") %>
       </a>
     </li>

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

@@ -4,6 +4,7 @@
   global_bar ||= nil
   html_lang ||= "en"
   layout_helper = GovukPublishingComponents::Presenters::PublicLayoutHelper.new(local_assigns)
+  logo_link ||= "/"
   navigation_items ||= []
   omit_header ||= false
   show_search = local_assigns.include?(:show_search) ? local_assigns[:show_search] : true
@@ -36,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" %>
@@ -71,6 +74,7 @@
     <% unless omit_header %>
       <%= render "govuk_publishing_components/components/layout_header", {
         search: show_search,
+        logo_link: logo_link,
         navigation_items: navigation_items,
 
         # The (blue) bottom border needs to be underneath the emergency banner -

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

@@ -8,6 +8,7 @@
   search ||= false
   search_left ||= false
   width_class = full_width ? "govuk-header__container--full-width" : "govuk-width-container"
+  logo_link ||= "/"
 
   header_classes = %w[gem-c-layout-header govuk-header]
   header_classes << "gem-c-layout-header--#{environment}" if environment
@@ -20,7 +21,11 @@
     <% if search_left %>
       <div class="govuk-grid-row">
         <div class="gem-c-layout-header__logo govuk-grid-column-one-third-from-desktop">
-          <%= render "govuk_publishing_components/components/layout_header/header_logo", environment: environment, product_name: product_name %>
+          <%= render "govuk_publishing_components/components/layout_header/header_logo", {
+            environment: environment,
+            logo_link: logo_link,
+            product_name: product_name,
+          } %>
         </div>
       </div>
       <div class="govuk-grid-row">
@@ -36,7 +41,11 @@
     <% else %>
       <div class="govuk-grid-row">
         <div class="gem-c-layout-header__logo govuk-grid-column-two-thirds">
-          <%= render "govuk_publishing_components/components/layout_header/header_logo", environment: environment, product_name: product_name %>
+          <%= render "govuk_publishing_components/components/layout_header/header_logo", {
+            environment: environment,
+            logo_link: logo_link,
+            product_name: product_name,
+          } %>
         </div>
         <% if navigation_items.any? %>
           <div class="govuk-header__content gem-c-header__content govuk-grid-column-full">

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

@@ -10,6 +10,9 @@
   size ||= ""
   value ||= ""
 
+  data_attributes ||= {}
+  data_attributes[:module] = 'gem-track-click'
+
   classes = %w[gem-c-search govuk-!-display-none-print]
   classes << (shared_helper.get_margin_top)
   classes << (shared_helper.get_margin_bottom) if local_assigns[:margin_bottom]
@@ -40,9 +43,9 @@
       value: value,
     ) %>
     <div class="gem-c-search__item gem-c-search__submit-wrapper">
-      <button class="gem-c-search__submit" type="submit">
+      <%= tag.button class: "gem-c-search__submit", type: "submit", data: data_attributes do %>
         <%= button_text %>
-      </button>
+      <% end %>
     </div>
   </div>
 </div>

data/app/views/govuk_publishing_components/components/layout_header/_header_logo.html.erb

@@ -1,11 +1,11 @@
 <div class="govuk-header__logo gem-c-header__logo">
-  <a href="/" class="govuk-header__link govuk-header__link--homepage" data-module="gem-track-click" data-track-category="homeLinkClicked" data-track-action="homeHeader">
+  <a href="<%= logo_link %>" class="govuk-header__link govuk-header__link--homepage" data-module="gem-track-click" data-track-category="homeLinkClicked" data-track-action="homeHeader">
     <span class="govuk-header__logotype">
-      <svg aria-hidden="true" focusable="false" class="govuk-header__logotype-crown" xmlns="http://www.w3.org/2000/svg" viewbox="0 0 132 97" height="32" width="36">
+      <svg aria-hidden="true" focusable="false" class="gem-c-header__logotype-crown govuk-header__logotype-crown" xmlns="http://www.w3.org/2000/svg" viewbox="0 0 132 97" height="32" width="36">
         <path fill="currentColor" fill-rule="evenodd"
           d="M25 30.2c3.5 1.5 7.7-.2 9.1-3.7 1.5-3.6-.2-7.8-3.9-9.2-3.6-1.4-7.6.3-9.1 3.9-1.4 3.5.3 7.5 3.9 9zM9 39.5c3.6 1.5 7.8-.2 9.2-3.7 1.5-3.6-.2-7.8-3.9-9.1-3.6-1.5-7.6.2-9.1 3.8-1.4 3.5.3 7.5 3.8 9zM4.4 57.2c3.5 1.5 7.7-.2 9.1-3.8 1.5-3.6-.2-7.7-3.9-9.1-3.5-1.5-7.6.3-9.1 3.8-1.4 3.5.3 7.6 3.9 9.1zm38.3-21.4c3.5 1.5 7.7-.2 9.1-3.8 1.5-3.6-.2-7.7-3.9-9.1-3.6-1.5-7.6.3-9.1 3.8-1.3 3.6.4 7.7 3.9 9.1zm64.4-5.6c-3.6 1.5-7.8-.2-9.1-3.7-1.5-3.6.2-7.8 3.8-9.2 3.6-1.4 7.7.3 9.2 3.9 1.3 3.5-.4 7.5-3.9 9zm15.9 9.3c-3.6 1.5-7.7-.2-9.1-3.7-1.5-3.6.2-7.8 3.7-9.1 3.6-1.5 7.7.2 9.2 3.8 1.5 3.5-.3 7.5-3.8 9zm4.7 17.7c-3.6 1.5-7.8-.2-9.2-3.8-1.5-3.6.2-7.7 3.9-9.1 3.6-1.5 7.7.3 9.2 3.8 1.3 3.5-.4 7.6-3.9 9.1zM89.3 35.8c-3.6 1.5-7.8-.2-9.2-3.8-1.4-3.6.2-7.7 3.9-9.1 3.6-1.5 7.7.3 9.2 3.8 1.4 3.6-.3 7.7-3.9 9.1zM69.7 17.7l8.9 4.7V9.3l-8.9 2.8c-.2-.3-.5-.6-.9-.9L72.4 0H59.6l3.5 11.2c-.3.3-.6.5-.9.9l-8.8-2.8v13.1l8.8-4.7c.3.3.6.7.9.9l-5 15.4v.1c-.2.8-.4 1.6-.4 2.4 0 4.1 3.1 7.5 7 8.1h.2c.3 0 .7.1 1 .1.4 0 .7 0 1-.1h.2c4-.6 7.1-4.1 7.1-8.1 0-.8-.1-1.7-.4-2.4V34l-5.1-15.4c.4-.2.7-.6 1-.9zM66 92.8c16.9 0 32.8 1.1 47.1 3.2 4-16.9 8.9-26.7 14-33.5l-9.6-3.4c1 4.9 1.1 7.2 0 10.2-1.5-1.4-3-4.3-4.2-8.7L108.6 76c2.8-2 5-3.2 7.5-3.3-4.4 9.4-10 11.9-13.6 11.2-4.3-.8-6.3-4.6-5.6-7.9 1-4.7 5.7-5.9 8-.5 4.3-8.7-3-11.4-7.6-8.8 7.1-7.2 7.9-13.5 2.1-21.1-8 6.1-8.1 12.3-4.5 20.8-4.7-5.4-12.1-2.5-9.5 6.2 3.4-5.2 7.9-2 7.2 3.1-.6 4.3-6.4 7.8-13.5 7.2-10.3-.9-10.9-8-11.2-13.8 2.5-.5 7.1 1.8 11 7.3L80.2 60c-4.1 4.4-8 5.3-12.3 5.4 1.4-4.4 8-11.6 8-11.6H55.5s6.4 7.2 7.9 11.6c-4.2-.1-8-1-12.3-5.4l1.4 16.4c3.9-5.5 8.5-7.7 10.9-7.3-.3 5.8-.9 12.8-11.1 13.8-7.2.6-12.9-2.9-13.5-7.2-.7-5 3.8-8.3 7.1-3.1 2.7-8.7-4.6-11.6-9.4-6.2 3.7-8.5 3.6-14.7-4.6-20.8-5.8 7.6-5 13.9 2.2 21.1-4.7-2.6-11.9.1-7.7 8.8 2.3-5.5 7.1-4.2 8.1.5.7 3.3-1.3 7.1-5.7 7.9-3.5.7-9-1.8-13.5-11.2 2.5.1 4.7 1.3 7.5 3.3l-4.7-15.4c-1.2 4.4-2.7 7.2-4.3 8.7-1.1-3-.9-5.3 0-10.2l-9.5 3.4c5 6.9 9.9 16.7 14 33.5 14.8-2.1 30.8-3.2 47.7-3.2z"></path>
         <%# Deliberate use of image tag as a fallback method https://lynn.ru/examples/svg/en.html %>
-        <image src="<%= asset_path('govuk-logotype-crown.png') %>" class="govuk-header__logotype-crown-fallback-image"></image>
+        <image src="<%= asset_path('govuk-logotype-crown.png') %>" xlink:href="" display="none" class="govuk-header__logotype-crown-fallback-image" width="36" height="32"></image>
       </svg>
       <span class="govuk-header__logotype-text">
         GOV.UK

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,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.2".freeze
+  VERSION = "24.14.1".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: govuk_publishing_components
 version: !ruby/object:Gem::Version
-  version: 24.13.2
+  version: 24.14.1
 platform: ruby
 authors:
 - GOV.UK Dev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-06-04 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