govuk_publishing_components 35.18.0 → 35.20.0

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

@@ -96,11 +96,9 @@
               "external": "false",
               "text": "GOV.UK",
               "section": "Logo",
-              "index": {
-                "index_link": 1,
-                "index_section": 0,
-                "index_section_count": 2,
-              },
+              "index_link": 1,
+              "index_section": 0,
+              "index_section_count": 2,
               "index_total": 1
             }.to_json
           },
@@ -117,7 +115,7 @@
               },
               class: logotype_classes,
               height: "30",
-              width: "36",    
+              width: "36",
               focusable: "false",
               viewBox: "0 0 132 97",
               xmlns: "http://www.w3.org/2000/svg",
@@ -198,10 +196,8 @@
                   event_name: "select_content",
                   type: "header menu bar",
                   text: link[:label],
-                  index: {
-                    index_section: 1,
-                    index_section_count: 2,
-                  },
+                  index_section: 1,
+                  index_section_count: 2,
                   section: link[:label]
                 }
               },
@@ -232,10 +228,8 @@
                   "event_name": "select_content",
                   "type": "header menu bar",
                   "text": "Search",
-                  "index": {
-                    "index_section": 2,
-                    "index_section_count": 2,
-                  },
+                  "index_section": 2,
+                  "index_section_count": 2,
                   "section": "Search"
                   }.to_json
                 }"
@@ -320,11 +314,9 @@
                             ga4_link: {
                               "event_name": "navigation",
                               "type": "header menu bar",
-                              "index": {
-                                "index_section": column_index + 1,
-                                "index_link": index + 1,
-                                "index_section_count": 4,
-                              },
+                              "index_section": column_index + 1,
+                              "index_link": index + 1,
+                              "index_section_count": 4,
                               "index_total": index_total,
                               "section": column[:label],
                             }
@@ -395,11 +387,9 @@
                         ga4_link: {
                           "event_name": "navigation",
                           "type": "header menu bar",
-                          "index": {
-                            "index_section": 4,
-                            "index_link": index + 1,
-                            "index_section_count": 4,
-                          },
+                          "index_section": 4,
+                          "index_link": index + 1,
+                          "index_section_count": 4,
                           "index_total": index_total,
                           "section": popular_links_heading,
                         }

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

@@ -54,9 +54,7 @@
               ga4_link_data = {
                 'event_name': 'navigation',
                 'type': 'share page',
-                'index': {
-                  'index_link': index + 1,
-                },
+                'index_link': index + 1,
                 'index_total': links.length,
                 'text': link[:icon],
               }
@@ -65,9 +63,7 @@
               ga4_link_data = {
                 'event_name': 'navigation',
                 'type': 'follow us',
-                'index': {
-                  'index_link': index + 1,
-                },
+                'index_link': index + 1,
                 'index_total': links.length
               }
             end

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

@@ -84,10 +84,8 @@
                 "ga4-link": {
                   "event_name": "navigation",
                   "type": "step by step",
-                  "index": {
-                    "index_section": step_index + 1,
-                    "index_section_count": steps.length
-                  },
+                  "index_section": step_index + 1,
+                  "index_section_count": steps.length,
                   "section": step[:title]
                 }.to_json
               }

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

@@ -26,6 +26,15 @@
     tracking_options ||= ({ dimension96: tracking_id }).to_json
   end
 
+  if ga4_tracking
+    ga4_data = {
+      event_name: "navigation",
+      type: "super breadcrumb",
+      index_link: "1",
+      index_total: "1",
+    }.to_json
+  end
+
   shared_helper = GovukPublishingComponents::Presenters::SharedHelper.new(local_assigns)
   classes = %w[gem-c-step-nav-header]
   classes << shared_helper.get_margin_bottom if local_assigns[:margin_bottom]
@@ -44,7 +53,7 @@
         data-track-action="<%= tracking_action %>"
         data-track-label="<%= tracking_label %>"
         <% if ga4_tracking %>
-          data-ga4-link='{"event_name":"navigation", "type":"super breadcrumb", "index":{"index_link": "1"}, "index_total":"1"}'
+          data-ga4-link='<%= ga4_data %>'
         <% end %>
         <% if tracking_dimension_enabled %>
           data-track-dimension="<%= tracking_dimension %>"

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

@@ -23,13 +23,11 @@
             data-track-dimension="<%= links[0][:text] %>"
             data-track-dimension-index="29"
             data-track-options='{"dimension96" : "<%= links[0][:tracking_id] %>" }'
-            <% if ga4_tracking 
+            <% if ga4_tracking
               ga4_attributes = {
                 event_name: "navigation",
                 type: "part of",
-                index:{
-                  "index_link": "1"
-                },
+                "index_link": "1",
                 index_total: "1",
                 section: pretitle,
               }.to_json
@@ -53,13 +51,11 @@
                 data-track-dimension="<%= link[:text] %>"
                 data-track-dimension-index="29"
                 data-track-options='{"dimension96" : "<%= link[:tracking_id] %>" }'
-                <% if ga4_tracking 
+                <% if ga4_tracking
                   ga4_attributes = {
                     event_name: "navigation",
                     type: "part of",
-                    index:{
-                      "index_link": (index + 1).to_s
-                    },
+                    index_link: (index + 1).to_s,
                     index_total: (links.length).to_s,
                     section: pretitle,
                   }.to_json

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

@@ -34,10 +34,8 @@
               event_name: "select_content",
               type: "tabs",
               text: tab[:label],
-              index: {
-                index_section: index + 1,
-                index_section_count: tabs.length,
-              },
+              index_section: index + 1,
+              index_section_count: tabs.length,
             }
             ga4_attributes[:event_name] = "navigation" if as_links
             tab[:tab_data_attributes][:ga4_link] = ga4_attributes if as_links

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

@@ -1,4 +1,4 @@
-<% 
+<%
   shared_helper = GovukPublishingComponents::Presenters::SharedHelper.new(local_assigns)
   title = t("components.related_navigation.ukraine.title")
   lang = shared_helper.t_locale("components.related_navigation.ukraine.title")
@@ -15,11 +15,9 @@
           ga4_attributes = {
             event_name: "navigation",
             type: "related content",
-            index: {
-              index_section: "#{ga4_tracking_counts.index_section_count}",
-              index_link: "#{index + 1}",
-              index_section_count: "#{ga4_tracking_counts.index_section_count}",
-            },
+            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/docs/image_card.yml

@@ -205,12 +205,12 @@ examples:
       <div class="govuk-!-width-full">
         <%= component %>
       </div>
-  two_thirds_column:
-    description: This variant is used for the featured section on the homepage.
+  two_thirds:
+    description: This variant is used for the featured section on the homepage. The aspect ratio used is 1:1 and the width of the image is constrained to 80px wide.
     data:
       two_thirds: true
       href: "/still-not-a-page"
-      image_src: "https://assets.publishing.service.gov.uk/government/uploads/system/uploads/feature/image/91397/s712_SG_Swear_in_1_.jpg"
+      image_src: "https://www.gov.uk/assets/static/govuk-apple-touch-icon-180x180-026deaa34fa328ae5f1f519a37dbd15e6555c5086e1ba83986cd0827a7209902.png"
       image_alt: "some meaningful alt text please"
       heading_text: "Something has happened nearby possibly"
       description: "Following a news report that something has happened, further details are emerging of the thing that has happened and what that means for you."

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

@@ -24,7 +24,7 @@
   <% end %>
 
   <ul class="gem-c-related-navigation__link-list">
-    <% 
+    <%
       constructed_link_array = []
       section_link_limit = related_nav_helper.calculate_section_link_limit(links)
       index_total = links.length
@@ -35,11 +35,9 @@
         ga4_attributes = {
           event_name: "navigation",
           type: ga4_type,
-          index: {
-            index_section: "#{section_index}",
-            index_link: "#{index}",
-            index_section_count: "#{section_count}",
-          },
+          index_section: "#{section_index}",
+          index_link: "#{index}",
+          index_section_count: "#{section_count}",
           index_total: "#{index_total}",
           section: ga4_heading_text,
         } if ga4_tracking
@@ -70,7 +68,7 @@
 
     <% if links.length > section_link_limit %>
       <%
-        classes = "gem-c-related-navigation__link toggle-wrap"      
+        classes = "gem-c-related-navigation__link toggle-wrap"
         data_attributes_li = { module: "ga4-event-tracker" } if ga4_tracking
         data_attributes_link = {
           controls: "toggle_#{section_title}",
@@ -83,7 +81,7 @@
         <%= link_to("#", class: "gem-c-related-navigation__toggle", data: data_attributes_link) do %>
           <%= t("common.toggle_more",
             show: t('common.show'),
-            number: related_nav_helper.remaining_link_count(links)) %>        
+            number: related_nav_helper.remaining_link_count(links)) %>
         <% end %>
       <% end %>
 

data/lib/govuk_publishing_components/presenters/breadcrumbs_helper.rb

@@ -61,9 +61,7 @@ module GovukPublishingComponents
           ga4_link: {
             event_name: "navigation",
             type: "breadcrumb",
-            index: {
-              index_link: index.to_s,
-            },
+            index_link: index.to_s,
             index_total: breadcrumbs_length.to_s,
           },
         }

data/lib/govuk_publishing_components/presenters/contents_list_helper.rb

@@ -48,10 +48,10 @@ module GovukPublishingComponents
         total
       end
 
-      def get_ga4_type(link)
-        return "select content" if link.start_with?("#")
+      def get_ga4_event_name(link)
+        return "select_content" if link.start_with?("#")
 
-        "contents list"
+        "navigation"
       end
 
     private

data/lib/govuk_publishing_components/presenters/image_card_helper.rb

@@ -63,6 +63,10 @@ module GovukPublishingComponents
       def image
         classes = %w[gem-c-image-card__image-wrapper]
         classes << "gem-c-image-card__image-wrapper--one-third" if @two_thirds
+        height = 200
+        width = 300
+        height = 90 if @two_thirds
+        width = 90 if @two_thirds
 
         if @image_src
           content_tag(:figure, class: classes) do
@@ -73,8 +77,8 @@ module GovukPublishingComponents
               loading: @image_loading,
               sizes: @sizes,
               srcset: @srcset,
-              height: 200,
-              width: 300,
+              height:,
+              width:,
             )
           end
         end

data/lib/govuk_publishing_components/presenters/layout_footer_helper.rb

@@ -23,11 +23,9 @@ module GovukPublishingComponents
         {
           "event_name": "navigation",
           "type": "footer",
-          "index": {
-            "index_link": (index_link + 1).to_s,
-            "index_section": (index_section + 1).to_s,
-            "index_section_count": @ga4_index_section_count.to_s,
-          },
+          "index_link": (index_link + 1).to_s,
+          "index_section": (index_section + 1).to_s,
+          "index_section_count": @ga4_index_section_count.to_s,
           "index_total": index_total.to_s,
           "section": section,
         }

data/lib/govuk_publishing_components/version.rb

@@ -1,3 +1,3 @@
 module GovukPublishingComponents
-  VERSION = "35.18.0".freeze
+  VERSION = "35.20.0".freeze
 end