From aa4c5115ba5ae07dee9710f2e0075675ad2c7f36 Mon Sep 17 00:00:00 2001
From: Andy Sellick <andy.sellick@digital.cabinet-office.gov.uk>
Date: Mon, 2 Oct 2023 13:46:43 +0100
Subject: [PATCH 1/3] Fix GA4 homepage indexes

- each part of the homepage when tracked should include an index section (the index of the section) and an index section count (the total number of sections, currently 6)
- sections were recently reordered, which caused the tracking to report incorrect numbers
- restoring these numbers as partial variables passed from the main index template, to help highlight their existence and purpose
---
 app/views/homepage/_body.html.erb             |  10 --
 .../_departments_and_organisations.html.erb   |  71 ++++++++++
 .../homepage/_government_activity.html.erb    | 128 ++++--------------
 app/views/homepage/_head.html.erb             |   2 -
 app/views/homepage/_links_and_search.html.erb |   4 +-
 app/views/homepage/_more_on_govuk.html.erb    |   4 +-
 app/views/homepage/_promotion-slots.html.erb  |  10 +-
 .../_services_and_information.html.erb        |   6 +-
 app/views/homepage/index.html.erb             |  24 +++-
 9 files changed, 129 insertions(+), 130 deletions(-)
 delete mode 100644 app/views/homepage/_body.html.erb
 create mode 100644 app/views/homepage/_departments_and_organisations.html.erb
 delete mode 100644 app/views/homepage/_head.html.erb

diff --git a/app/views/homepage/_body.html.erb b/app/views/homepage/_body.html.erb
deleted file mode 100644
index fe06eb4260..0000000000
--- a/app/views/homepage/_body.html.erb
+++ /dev/null
@@ -1,10 +0,0 @@
-<div class="govuk-grid-row">
-  <div class="govuk-grid-column-full govuk-grid-column-two-thirds-from-desktop">
-    <%= render "homepage/services_and_information" %>
-  </div>
-  <div class="govuk-grid-column-full govuk-grid-column-one-third-from-desktop">
-    <%= render "homepage/promotion-slots" %>
-  </div>
-</div>
-<%= render "homepage/government_activity" %>
-<%= render "homepage/more_on_govuk" %>
diff --git a/app/views/homepage/_departments_and_organisations.html.erb b/app/views/homepage/_departments_and_organisations.html.erb
new file mode 100644
index 0000000000..11380bdce9
--- /dev/null
+++ b/app/views/homepage/_departments_and_organisations.html.erb
@@ -0,0 +1,71 @@
+<div class="govuk-grid-column-full govuk-grid-column-one-third-from-desktop">
+  <section class="homepage-section homepage-section__departments-organisations">
+    <div class="homepage-section__heading">
+      <%= render "govuk_publishing_components/components/heading", {
+        font_size: "m",
+        text: t("homepage.index.departments_and_organisations"),
+        data_attributes: {
+          ga4_scroll_marker: true,
+        },
+      } %>
+    </div>
+
+    <%#
+      The "big number" component links below are hardcoded separately (i.e. not in a loop in this instance) and therefore their 'index' properties are also hardcoded. If a new "big number" component is added or removed, this will need to be reflected in the 'index_link' and 'index_total' properties to ensure that they remain accurate for tracking/analytics purposes.
+    %>
+    <div class="homepage-section__depts" data-module="gem-track-click ga4-link-tracker">
+      <%= render "govuk_publishing_components/components/big_number", {
+        number: t("homepage.index.ministerial_departments_count"),
+        label: t("homepage.index.ministerial_departments"),
+        href: "/government/organisations#ministerial_departments",
+        margin_bottom: 6,
+        data_attributes: {
+          "track-category": "homepageClicked",
+          "track-action": "departmentsLink",
+          "track-label": "/government/organisations#ministerial_departments",
+          "track-dimension": "#{t("homepage.index.ministerial_departments_count")} #{t("homepage.index.ministerial_departments")}",
+          "track-dimension-index": 29,
+          "track-value": 1,
+          "ga4_link": {
+            "event_name": "navigation",
+            "type": "homepage",
+            "index": {
+              "index_section": locals[:index_section],
+              "index_link": 1,
+              "index_section_count": locals[:index_section_count],
+            },
+            "index_total": 2,
+            "section": t("homepage.index.departments_and_organisations", locale: :en),
+            "text": "#{t("homepage.index.ministerial_departments_count")} #{t("homepage.index.ministerial_departments", locale: :en)}"
+          }
+        },
+      } %>
+      <%= render "govuk_publishing_components/components/big_number", {
+        number: t("homepage.index.other_agencies_count"),
+        label: t("homepage.index.other_agencies"),
+        href: "/government/organisations#agencies_and_other_public_bodies",
+        margin_bottom: 6,
+        data_attributes: {
+          "track-category": "homepageClicked",
+          "track-action": "departmentsLink",
+          "track-label": "/government/organisations#agencies_and_other_public_bodies",
+          "track-dimension": "#{t("homepage.index.other_agencies_count")} #{t("homepage.index.other_agencies")}",
+          "track-dimension-index": 29,
+          "track-value": 1,
+          "ga4_link": {
+            "event_name": "navigation",
+            "type": "homepage",
+            "index": {
+              "index_section": locals[:index_section],
+              "index_link": 2,
+              "index_section_count": locals[:index_section_count],
+            },
+            "index_total": 2,
+            "section": t("homepage.index.departments_and_organisations", locale: :en),
+            "text": "#{t("homepage.index.other_agencies_count")} #{t("homepage.index.other_agencies", locale: :en)}"
+          }
+        },
+      } %>
+    </div>
+  </section>
+</div>
\ No newline at end of file
diff --git a/app/views/homepage/_government_activity.html.erb b/app/views/homepage/_government_activity.html.erb
index c561674df2..c25bc8d055 100644
--- a/app/views/homepage/_government_activity.html.erb
+++ b/app/views/homepage/_government_activity.html.erb
@@ -1,112 +1,38 @@
-<div class="govuk-grid-row">
-  <div class="govuk-grid-column-full govuk-grid-column-two-thirds-from-desktop" data-module="gem-track-click ga4-link-tracker">
-    <section class="homepage-section homepage-section__government-activity">
-      <div class="homepage-section__heading">
-        <div class="homepage-section__heading-wrapper">
-          <%= render "govuk_publishing_components/components/heading", {
-            font_size: "m",
-            text: t("homepage.index.government_activity"),
-            data_attributes: {
-              ga4_scroll_marker: true,
-            },
-          } %>
-        </div>
-
-        <%= render "govuk_publishing_components/components/lead_paragraph", {
-          text: t("homepage.index.government_activity_description"),
-          margin_bottom: 0
-        } %>
-      </div>
-
-      <ul class="homepage-services-and-info__list">
-        <% t("homepage.government_activity").each_with_index do | item, index | %>
-          <%= render partial: "homepage/chevron_card", locals: {
-            description: item[:description],
-            link: item[:link],
-            title: item[:title],
-            track_action: "governmentactivityLink",
-            index_values: {
-              index_section: 3,
-              index_link: index + 1,
-              index_section_count: 6,
-            },
-            index_total: t("homepage.government_activity").length,
-            section: t("homepage.index.government_activity", locale: :en)
-          } %>
-        <% end %>
-      </ul>
-    </section>
-  </div>
-
-  <div class="govuk-grid-column-full govuk-grid-column-one-third-from-desktop">
-    <section class="homepage-section homepage-section__departments-organisations">
-      <div class="homepage-section__heading">
+<div class="govuk-grid-column-full govuk-grid-column-two-thirds-from-desktop" data-module="gem-track-click ga4-link-tracker">
+  <section class="homepage-section homepage-section__government-activity">
+    <div class="homepage-section__heading">
+      <div class="homepage-section__heading-wrapper">
         <%= render "govuk_publishing_components/components/heading", {
           font_size: "m",
-          text: t("homepage.index.departments_and_organisations"),
+          text: t("homepage.index.government_activity"),
           data_attributes: {
             ga4_scroll_marker: true,
           },
         } %>
       </div>
 
-      <%#
-        The "big number" component links below are hardcoded separately (i.e. not in a loop in this instance) and therefore their 'index' properties are also hardcoded. If a new "big number" component is added or removed, this will need to be reflected in the 'index_link' and 'index_total' properties to ensure that they remain accurate for tracking/analytics purposes.
-      %>     
-      <div class="homepage-section__depts" data-module="gem-track-click ga4-link-tracker">
-        <%= render "govuk_publishing_components/components/big_number", {
-          number: t("homepage.index.ministerial_departments_count"),
-          label: t("homepage.index.ministerial_departments"),
-          href: "/government/organisations#ministerial_departments",
-          margin_bottom: 6,
-          data_attributes: {
-            "track-category": "homepageClicked",
-            "track-action": "departmentsLink",
-            "track-label": "/government/organisations#ministerial_departments",
-            "track-dimension": "#{t("homepage.index.ministerial_departments_count")} #{t("homepage.index.ministerial_departments")}",
-            "track-dimension-index": 29,
-            "track-value": 1,
-            "ga4_link": {
-              "event_name": "navigation",
-              "type": "homepage",
-              "index": {
-                "index_section": 4,
-                "index_link": 1,
-                "index_section_count": 6,
-              },
-              "index_total": 2,
-              "section": t("homepage.index.departments_and_organisations", locale: :en),
-              "text": "#{t("homepage.index.ministerial_departments_count")} #{t("homepage.index.ministerial_departments", locale: :en)}"
-            }
-          },
-        } %>
-        <%= render "govuk_publishing_components/components/big_number", {
-          number: t("homepage.index.other_agencies_count"),
-          label: t("homepage.index.other_agencies"),
-          href: "/government/organisations#agencies_and_other_public_bodies",
-          margin_bottom: 6,
-          data_attributes: {
-            "track-category": "homepageClicked",
-            "track-action": "departmentsLink",
-            "track-label": "/government/organisations#agencies_and_other_public_bodies",
-            "track-dimension": "#{t("homepage.index.other_agencies_count")} #{t("homepage.index.other_agencies")}",
-            "track-dimension-index": 29,
-            "track-value": 1,
-            "ga4_link": {
-              "event_name": "navigation",
-              "type": "homepage",
-              "index": {
-                "index_section": 4,
-                "index_link": 2,
-                "index_section_count": 6,
-              },
-              "index_total": 2,
-              "section": t("homepage.index.departments_and_organisations", locale: :en),
-              "text": "#{t("homepage.index.other_agencies_count")} #{t("homepage.index.other_agencies", locale: :en)}"
-            }
+      <%= render "govuk_publishing_components/components/lead_paragraph", {
+        text: t("homepage.index.government_activity_description"),
+        margin_bottom: 0
+      } %>
+    </div>
+
+    <ul class="homepage-services-and-info__list">
+      <% t("homepage.government_activity").each_with_index do | item, index | %>
+        <%= render partial: "homepage/chevron_card", locals: {
+          description: item[:description],
+          link: item[:link],
+          title: item[:title],
+          track_action: "governmentactivityLink",
+          index_values: {
+            index_section: locals[:index_section],
+            index_link: index + 1,
+            index_section_count: locals[:index_section_count],
           },
+          index_total: t("homepage.government_activity").length,
+          section: t("homepage.index.government_activity", locale: :en)
         } %>
-      </div>
-    </section>
-  </div>
+      <% end %>
+    </ul>
+  </section>
 </div>
diff --git a/app/views/homepage/_head.html.erb b/app/views/homepage/_head.html.erb
deleted file mode 100644
index 4766e5e2a4..0000000000
--- a/app/views/homepage/_head.html.erb
+++ /dev/null
@@ -1,2 +0,0 @@
-<%= render "homepage/inverse_header" %>
-<%= render "homepage/links_and_search" %>
diff --git a/app/views/homepage/_links_and_search.html.erb b/app/views/homepage/_links_and_search.html.erb
index ad0ea6723a..7dbc47f58f 100644
--- a/app/views/homepage/_links_and_search.html.erb
+++ b/app/views/homepage/_links_and_search.html.erb
@@ -57,9 +57,9 @@
                     'event_name': 'navigation',
                     'type': 'homepage',
                     'index': {
-                      'index_section': 1,
+                      'index_section': locals[:index_section],
                       'index_link': index + 1,
-                      'index_section_count': 6,
+                      'index_section_count': locals[:index_section_count],
                     },
                     'index_total': t("homepage.index.popular_links").length,
                     'section': "#{t("homepage.index.popular_links_heading", locale: :en)}"
diff --git a/app/views/homepage/_more_on_govuk.html.erb b/app/views/homepage/_more_on_govuk.html.erb
index a89e270769..b514caedf3 100644
--- a/app/views/homepage/_more_on_govuk.html.erb
+++ b/app/views/homepage/_more_on_govuk.html.erb
@@ -27,9 +27,9 @@
               'event_name': 'navigation',
               'type': 'homepage',
               "index": {
-                "index_section": 6,
+                "index_section": locals[:index_section],
                 "index_link": index + 1,
-                "index_section_count": 6,
+                "index_section_count": locals[:index_section_count],
               },
               "index_total": t("homepage.index.more_links").length,
               "section": t("homepage.index.more", locale: :en)
diff --git a/app/views/homepage/_promotion-slots.html.erb b/app/views/homepage/_promotion-slots.html.erb
index 0931369821..0b49951015 100644
--- a/app/views/homepage/_promotion-slots.html.erb
+++ b/app/views/homepage/_promotion-slots.html.erb
@@ -1,6 +1,6 @@
-<%#
-  Before updating a promotion slot please read the documentation.
-  See: https://docs.publishing.service.gov.uk/repos/frontend/update-homepage-promotion-slots.html
+<%
+  # Before updating a promotion slot please read the documentation.
+  # See: https://docs.publishing.service.gov.uk/repos/frontend/update-homepage-promotion-slots.html
 %>
 
 <section class="homepage-section homepage-section--promotion-slots">
@@ -27,9 +27,9 @@
               event_name: 'navigation',
               type: 'homepage',
               index: {
-                index_section: 5,
+                index_section: locals[:index_section],
                 index_link: index + 1,
-                index_section_count: 6,
+                index_section_count: locals[:index_section_count],
               },
               index_total: t("homepage.index.promotion_slots").length,
               section: t("homepage.index.featured", locale: :en)
diff --git a/app/views/homepage/_services_and_information.html.erb b/app/views/homepage/_services_and_information.html.erb
index 17bea7df2e..824696a31c 100644
--- a/app/views/homepage/_services_and_information.html.erb
+++ b/app/views/homepage/_services_and_information.html.erb
@@ -12,7 +12,7 @@
           },
         } %>
       </div>
-      
+
       <ul class="homepage-services-and-info__list" data-module="gem-track-click ga4-link-tracker">
         <% t("homepage.categories").each_with_index do | item, index | %>
           <%= render partial: "homepage/chevron_card", locals: {
@@ -21,9 +21,9 @@
             title: item[:title],
             track_action: "topicsLink",
             index_values: {
-              index_section: 2,
+              index_section: locals[:index_section],
               index_link: index + 1,
-              index_section_count: 6,
+              index_section_count: locals[:index_section_count],
             },
             index_total: t("homepage.categories").length,
             section: t("homepage.index.services_and_information", locale: :en)
diff --git a/app/views/homepage/index.html.erb b/app/views/homepage/index.html.erb
index b86e8b2cc1..982c472a79 100644
--- a/app/views/homepage/index.html.erb
+++ b/app/views/homepage/index.html.erb
@@ -10,13 +10,27 @@
 <% content_for :body_classes, "homepage" %><%# The `homepage` body class is required for emergency banner. %>
 
 <main id="content" role="main">
-  <%#
-    The GA4 tracking on the homepage depends on some hardcoded values for index. If a section is added or removed, these values will need to be updated. Specifically 'index_section_count' (the total number of sections) and potentially 'index_section' (the index of the section e.g. 2 for the 2nd second).
+  <%
+    # The GA4 tracking on the homepage depends on some hardcoded values for index. If a section is added or removed, these values will need to be updated.
+    # Specifically 'index_section_count' (the total number of sections) and 'index_section' (the index of the section e.g. 2 for the 2nd section).
+    index_section_count = 6
   %>
-
-  <%= render "homepage/head" %>
+  <%= render "homepage/inverse_header" %>
+  <%= render "homepage/links_and_search", locals: { index_section: 1, index_section_count: index_section_count } %>
 
   <div class="govuk-width-container">
-    <%= render "homepage/body" %>
+    <div class="govuk-grid-row">
+      <div class="govuk-grid-column-full govuk-grid-column-two-thirds-from-desktop">
+        <%= render "homepage/services_and_information", locals: { index_section: 2, index_section_count: index_section_count } %>
+      </div>
+      <div class="govuk-grid-column-full govuk-grid-column-one-third-from-desktop">
+        <%= render "homepage/promotion-slots", locals: { index_section: 3, index_section_count: index_section_count } %>
+      </div>
+    </div>
+    <div class="govuk-grid-row">
+      <%= render "homepage/government_activity", locals: { index_section: 4, index_section_count: index_section_count } %>
+      <%= render "homepage/departments_and_organisations", locals: { index_section: 5, index_section_count: index_section_count } %>
+    </div>
+    <%= render "homepage/more_on_govuk", locals: { index_section: 6, index_section_count: index_section_count } %>
   </div>
 </main>

From 0f716bb9b74185a1e65d8b21579105fcd255458e Mon Sep 17 00:00:00 2001
From: Andy Sellick <andy.sellick@digital.cabinet-office.gov.uk>
Date: Mon, 2 Oct 2023 13:53:41 +0100
Subject: [PATCH 2/3] Fix formatting and comment layout

---
 .../_departments_and_organisations.html.erb   |  5 +-
 app/views/homepage/_promotion-slots.html.erb  | 82 +++++++++----------
 2 files changed, 44 insertions(+), 43 deletions(-)

diff --git a/app/views/homepage/_departments_and_organisations.html.erb b/app/views/homepage/_departments_and_organisations.html.erb
index 11380bdce9..2d544cf956 100644
--- a/app/views/homepage/_departments_and_organisations.html.erb
+++ b/app/views/homepage/_departments_and_organisations.html.erb
@@ -10,8 +10,9 @@
       } %>
     </div>
 
-    <%#
-      The "big number" component links below are hardcoded separately (i.e. not in a loop in this instance) and therefore their 'index' properties are also hardcoded. If a new "big number" component is added or removed, this will need to be reflected in the 'index_link' and 'index_total' properties to ensure that they remain accurate for tracking/analytics purposes.
+    <%
+      # The "big number" component links below are hardcoded separately (i.e. not in a loop in this instance) and therefore their 'index' properties are also hardcoded.
+      # If a new "big number" component is added or removed, this will need to be reflected in the 'index_link' and 'index_total' properties to ensure that they remain accurate for tracking/analytics purposes.
     %>
     <div class="homepage-section__depts" data-module="gem-track-click ga4-link-tracker">
       <%= render "govuk_publishing_components/components/big_number", {
diff --git a/app/views/homepage/_promotion-slots.html.erb b/app/views/homepage/_promotion-slots.html.erb
index 0b49951015..60e37a982b 100644
--- a/app/views/homepage/_promotion-slots.html.erb
+++ b/app/views/homepage/_promotion-slots.html.erb
@@ -4,47 +4,47 @@
 %>
 
 <section class="homepage-section homepage-section--promotion-slots">
-    <%= render "govuk_publishing_components/components/heading", {
-      text: t("homepage.index.featured"),
-      font_size: "m",
-      margin_bottom: 6,
-      data_attributes: {
-        ga4_scroll_marker: true,
-      },
-    } %>
+  <%= render "govuk_publishing_components/components/heading", {
+    text: t("homepage.index.featured"),
+    font_size: "m",
+    margin_bottom: 6,
+    data_attributes: {
+      ga4_scroll_marker: true,
+    },
+  } %>
 
-    <% t("homepage.index.promotion_slots").each_with_index do | item, index | %>
-        <%= render "govuk_publishing_components/components/image_card", {
-          href: item[:href],
-          href_data_attributes: {
-            track_category: "homepageClicked",
-            track_action: "promoLink",
-            track_label: item[:href],
-            track_value: "1",
-            track_dimension_index: "29",
-            track_dimension: item[:title],
-            ga4_link: {
-              event_name: 'navigation',
-              type: 'homepage',
-              index: {
-                index_section: locals[:index_section],
-                index_link: index + 1,
-                index_section_count: locals[:index_section_count],
-              },
-              index_total: t("homepage.index.promotion_slots").length,
-              section: t("homepage.index.featured", locale: :en)
-            }
+  <% t("homepage.index.promotion_slots").each_with_index do | item, index | %>
+    <%= render "govuk_publishing_components/components/image_card", {
+      href: item[:href],
+      href_data_attributes: {
+        track_category: "homepageClicked",
+        track_action: "promoLink",
+        track_label: item[:href],
+        track_value: "1",
+        track_dimension_index: "29",
+        track_dimension: item[:title],
+        ga4_link: {
+          event_name: 'navigation',
+          type: 'homepage',
+          index: {
+            index_section: locals[:index_section],
+            index_link: index + 1,
+            index_section_count: locals[:index_section_count],
           },
-          image_src: image_path(item[:image_src]),
-          image_alt: "",
-          image_loading: "lazy",
-          heading_level: 3,
-          heading_text: item[:title],
-          two_thirds: true,
-          description: item[:text],
-          font_size: "s",
-          sizes: "(max-width: 640px) 100vw, (max-width: 1020px) 33vw, 300px",
-          srcset: item.fetch(:srcset, {}).stringify_keys.transform_keys { |k| image_path(k) }.presence
-        } %>
-    <% end %>
+          index_total: t("homepage.index.promotion_slots").length,
+          section: t("homepage.index.featured", locale: :en)
+        }
+      },
+      image_src: image_path(item[:image_src]),
+      image_alt: "",
+      image_loading: "lazy",
+      heading_level: 3,
+      heading_text: item[:title],
+      two_thirds: true,
+      description: item[:text],
+      font_size: "s",
+      sizes: "(max-width: 640px) 100vw, (max-width: 1020px) 33vw, 300px",
+      srcset: item.fetch(:srcset, {}).stringify_keys.transform_keys { |k| image_path(k) }.presence
+    } %>
+  <% end %>
 </section>

From 04d90fd204d6f94e1e5291f5d174944dafc7ae8c Mon Sep 17 00:00:00 2001
From: Andy Sellick <andy.sellick@digital.cabinet-office.gov.uk>
Date: Mon, 2 Oct 2023 15:18:20 +0100
Subject: [PATCH 3/3] Flatten the GA4 index data

- we recently modified the GA4 code so that we no longer have to mirror the structure of the GA4 schema when passing data via attributes, the JS identifies each attribute and places it in the correct place in the schema automatically
---
 .../_departments_and_organisations.html.erb      | 16 ++++++----------
 app/views/homepage/_links_and_search.html.erb    |  8 +++-----
 app/views/homepage/_more_on_govuk.html.erb       |  8 +++-----
 app/views/homepage/_promotion-slots.html.erb     |  8 +++-----
 4 files changed, 15 insertions(+), 25 deletions(-)

diff --git a/app/views/homepage/_departments_and_organisations.html.erb b/app/views/homepage/_departments_and_organisations.html.erb
index 2d544cf956..a6be93f01b 100644
--- a/app/views/homepage/_departments_and_organisations.html.erb
+++ b/app/views/homepage/_departments_and_organisations.html.erb
@@ -30,11 +30,9 @@
           "ga4_link": {
             "event_name": "navigation",
             "type": "homepage",
-            "index": {
-              "index_section": locals[:index_section],
-              "index_link": 1,
-              "index_section_count": locals[:index_section_count],
-            },
+            "index_section": locals[:index_section],
+            "index_link": 1,
+            "index_section_count": locals[:index_section_count],
             "index_total": 2,
             "section": t("homepage.index.departments_and_organisations", locale: :en),
             "text": "#{t("homepage.index.ministerial_departments_count")} #{t("homepage.index.ministerial_departments", locale: :en)}"
@@ -56,11 +54,9 @@
           "ga4_link": {
             "event_name": "navigation",
             "type": "homepage",
-            "index": {
-              "index_section": locals[:index_section],
-              "index_link": 2,
-              "index_section_count": locals[:index_section_count],
-            },
+            "index_section": locals[:index_section],
+            "index_link": 2,
+            "index_section_count": locals[:index_section_count],
             "index_total": 2,
             "section": t("homepage.index.departments_and_organisations", locale: :en),
             "text": "#{t("homepage.index.other_agencies_count")} #{t("homepage.index.other_agencies", locale: :en)}"
diff --git a/app/views/homepage/_links_and_search.html.erb b/app/views/homepage/_links_and_search.html.erb
index 7dbc47f58f..9546335769 100644
--- a/app/views/homepage/_links_and_search.html.erb
+++ b/app/views/homepage/_links_and_search.html.erb
@@ -56,11 +56,9 @@
                   ga4_link: {
                     'event_name': 'navigation',
                     'type': 'homepage',
-                    'index': {
-                      'index_section': locals[:index_section],
-                      'index_link': index + 1,
-                      'index_section_count': locals[:index_section_count],
-                    },
+                    'index_section': locals[:index_section],
+                    'index_link': index + 1,
+                    'index_section_count': locals[:index_section_count],
                     'index_total': t("homepage.index.popular_links").length,
                     'section': "#{t("homepage.index.popular_links_heading", locale: :en)}"
                   }
diff --git a/app/views/homepage/_more_on_govuk.html.erb b/app/views/homepage/_more_on_govuk.html.erb
index b514caedf3..6de186cc51 100644
--- a/app/views/homepage/_more_on_govuk.html.erb
+++ b/app/views/homepage/_more_on_govuk.html.erb
@@ -26,11 +26,9 @@
             "ga4_link": {
               'event_name': 'navigation',
               'type': 'homepage',
-              "index": {
-                "index_section": locals[:index_section],
-                "index_link": index + 1,
-                "index_section_count": locals[:index_section_count],
-              },
+              "index_section": locals[:index_section],
+              "index_link": index + 1,
+              "index_section_count": locals[:index_section_count],
               "index_total": t("homepage.index.more_links").length,
               "section": t("homepage.index.more", locale: :en)
             }
diff --git a/app/views/homepage/_promotion-slots.html.erb b/app/views/homepage/_promotion-slots.html.erb
index 60e37a982b..c71df0df96 100644
--- a/app/views/homepage/_promotion-slots.html.erb
+++ b/app/views/homepage/_promotion-slots.html.erb
@@ -26,11 +26,9 @@
         ga4_link: {
           event_name: 'navigation',
           type: 'homepage',
-          index: {
-            index_section: locals[:index_section],
-            index_link: index + 1,
-            index_section_count: locals[:index_section_count],
-          },
+          index_section: locals[:index_section],
+          index_link: index + 1,
+          index_section_count: locals[:index_section_count],
           index_total: t("homepage.index.promotion_slots").length,
           section: t("homepage.index.featured", locale: :en)
         }