govuk_publishing_components 35.3.0 → 35.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0f87c9fa99d845d53392c5a02a8c4330f7a9557b94290a55cc18b5f169862215
-  data.tar.gz: ee6d97596ccbc7cfc9704f95dd3b1940e6b60254fc3fe7f6c51d5d6c16d1ead4
+  metadata.gz: a7d5e0e3ab0fa8c2a8ab33e0a41c142dbc9c967f53095dae21edcbef938ba2c3
+  data.tar.gz: 52e3130b7b3d04d05456dfb0efa86cad9f2a70a3cd06447da44a70d31a7c06d4
 SHA512:
-  metadata.gz: 635eaae4b3ce872688184197dd240be9751f6d9286680f324a876cea3d00a9bfa0b6037b5817fbf58a66d319510dcbca747ff5c7bc69e5d76a7c33cb345963cb
-  data.tar.gz: 595feac64b2542ef4ff5cb669e7e12462cea78d250cb0d44f01312de9297379d0e2c9f4d8bff0ab75a59a3b523fd6d801df93518f4c407c600b87695c17c1ea8
+  metadata.gz: 5fdfcedf36b4a26d5b834d49fb1a7d4ec64de5e0c808022e6904f1de99f4294c96e125ac9c28096d04ac47ce43796b73cdb0fb288dc2242d3d39682e524d5b64
+  data.tar.gz: c0fe259f8445f2a0f0b7e8cc72334f2fca3880dcb810bd7e2a4b09eababda3633841b49db194864828a9cca44e266c3f0742f574c1ce32b1f6a88f3bec8749b1

data/app/assets/stylesheets/govuk_publishing_components/components/helpers/_brand-colours.scss

@@ -87,3 +87,12 @@
     border-color: govuk-colour("black");
   }
 }
+
+// new colour for DSIT for use until govuk-frontend#3523 has been released
+
+.brand--department-for-science-innovation-and-technology {
+  &.brand__border-color,
+  .brand__border-color {
+    border-color: #045f71;
+  }
+}

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

@@ -5,6 +5,9 @@
   request.query_parameters[:ga4_tracking] = ga4_tracking
   navigation = GovukPublishingComponents::Presenters::ContextualNavigation.new(content_item, request)
   shared_helper = GovukPublishingComponents::Presenters::SharedHelper.new(local_assigns)
+  show_ukraine_cta = navigation.show_ukraine_cta?
+  ga4_tracking_counts = OpenStruct.new(index_section_count: 0)
+  ga4_tracking_counts.index_section_count = 1 if show_ukraine_cta
 %>
 
 <div class="gem-c-contextual-sidebar">
@@ -18,7 +21,7 @@
     <%= render 'govuk_publishing_components/components/step_by_step_nav', navigation.step_nav_helper.sidebar %>
   <% else %>
     <%# Rendering related navigation sidebar because no step by step list %>
-    <%= render 'govuk_publishing_components/components/related_navigation', content_item: content_item, context: :sidebar, ga4_tracking: ga4_tracking %>
+    <%= render 'govuk_publishing_components/components/related_navigation', content_item: content_item, context: :sidebar, ga4_tracking: ga4_tracking, ga4_tracking_counts: ga4_tracking_counts %>
   <% end %>
 
   <% if navigation.content_tagged_to_other_step_by_steps? %>
@@ -31,7 +34,7 @@
     } %>
   <% end %>
 
-  <% if navigation.show_ukraine_cta? %>
-    <%= render 'govuk_publishing_components/components/contextual_sidebar/ukraine_cta', content_item: content_item, ga4_tracking: ga4_tracking %>
+  <% if show_ukraine_cta %>
+    <%= render 'govuk_publishing_components/components/contextual_sidebar/ukraine_cta', content_item: content_item, ga4_tracking: ga4_tracking, ga4_tracking_counts: ga4_tracking_counts %>
   <% end %>
 </div>

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

@@ -5,12 +5,11 @@
   data = {}
   data[:module] = "gem-track-click"
   data[:module] << " ga4-link-tracker" if ga4_tracking
-%>
+  ga4_tracking_counts ||= OpenStruct.new(index_section_count: 0)
+  ga4_tracking_counts.index_section_count += related_nav_helper.index_section_count
 
-<%
   add_gem_component_stylesheet("related-navigation")
 %>
-
 <% if related_nav_helper.related_navigation? %>
   <% random = SecureRandom.hex(4) %>
   <%= tag.div(class: "gem-c-related-navigation", data: data) do %>
@@ -30,7 +29,6 @@
     <% end %>
 
     <% section_index = 0 %>
-
     <% related_nav_helper.related_navigation.each do |section_title, links| %>
       <% next unless links.any? %>
 
@@ -42,6 +40,7 @@
         section_title: section_title,
         links: links,
         section_index: section_index,
+        section_count: ga4_tracking_counts.index_section_count,
         random: random,
         ga4_tracking: ga4_tracking %>
     <% end %>

data/app/views/govuk_publishing_components/components/contextual_sidebar/_ukraine_cta.html.erb

@@ -8,13 +8,19 @@
 <%= tag.div class: "gem-c-contextual-sidebar__cta gem-c-contextual-sidebar__cta--ukraine", data: { module: data_module } do %>
   <%= tag.h2 title, class: "gem-c-contextual-sidebar__heading govuk-heading-s" %>
   <%= tag.ul class: "gem-c-contextual-sidebar__list" do %>
+    <% index_total = t("components.related_navigation.ukraine.links").length %>
     <% t("components.related_navigation.ukraine.links").each_with_index do |link, index| %>
       <%= tag.li class: "gem-c-contextual-sidebar__text govuk-body" do %>
         <%
           ga4_attributes = {
             event_name: "navigation",
             type: "related content",
-            index: "1.#{index + 1}",
+            index: {
+              index_section: "#{ga4_tracking_counts.index_section_count}",
+              index_link: "#{index + 1}",
+              index_section_count: "#{ga4_tracking_counts.index_section_count}",
+            },
+            index_total: "#{index_total}",
             section: title,
           } if ga4_tracking
         %>

data/app/views/govuk_publishing_components/components/related_navigation/_section.html.erb

@@ -24,17 +24,23 @@
   <% end %>
 
   <ul class="gem-c-related-navigation__link-list">
-    <% constructed_link_array = [] %>
-
-    <% section_link_limit = related_nav_helper.calculate_section_link_limit(links) %>
-
+    <% 
+      constructed_link_array = []
+      section_link_limit = related_nav_helper.calculate_section_link_limit(links)
+      index_total = links.length
+    %>
     <% links.each.with_index(1) do |link, index| %>
       <%
         link_class = "govuk-link #{related_nav_helper.section_css_class("govuk-link gem-c-related-navigation__section-link", section_title, link: link, link_is_inline: (index >= section_link_limit))}"
         ga4_attributes = {
           event_name: "navigation",
           type: "related content",
-          index: "#{section_index}.#{index}",
+          index: {
+            index_section: "#{section_index}",
+            index_link: "#{index}",
+            index_section_count: "#{section_count}",
+          },
+          index_total: "#{index_total}",
           section: ga4_heading_text,
         } if ga4_tracking
         link_element = link_to(

data/lib/govuk_publishing_components/presenters/related_navigation_helper.rb

@@ -16,12 +16,16 @@ module GovukPublishingComponents
         "UK Mission to the European Union" => "uk-mission-to-the-eu",
       }.freeze
 
+      attr_reader :related_navigation, :index_section_count
+
       def initialize(options = {})
         @content_item = options.fetch(:content_item) { raise ArgumentError, "missing argument: content_item" }
         @context = options.fetch(:context, nil)
+        @related_navigation = related_navigation_contents
+        @index_section_count = section_count
       end
 
-      def related_navigation
+      def related_navigation_contents
         case @context.try(:to_sym)
         when :sidebar
           {
@@ -53,6 +57,10 @@ module GovukPublishingComponents
         end
       end
 
+      def section_count
+        @related_navigation.select { |_, links| links.any? }.length
+      end
+
       def construct_section_text(section, underscores_to_spaces)
         unless section == "related_items"
           defaults = [I18n.t("components.related_navigation.#{section}")]

data/lib/govuk_publishing_components/version.rb

@@ -1,3 +1,3 @@
 module GovukPublishingComponents
-  VERSION = "35.3.0".freeze
+  VERSION = "35.3.1".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: govuk_publishing_components
 version: !ruby/object:Gem::Version
-  version: 35.3.0
+  version: 35.3.1
 platform: ruby
 authors:
 - GOV.UK Dev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-04-17 00:00:00.000000000 Z
+date: 2023-04-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: govuk_app_config