From 03169f2d93f105aed12c458e256427fb23317453 Mon Sep 17 00:00:00 2001
From: Andy Sellick <andy.sellick@digital.cabinet-office.gov.uk>
Date: Mon, 30 Oct 2023 15:40:23 +0000
Subject: [PATCH] Flatten GA4 attributes

---
 app/views/content_items/detailed_guide.html.erb      |  4 +---
 app/views/content_items/guide.html+print.erb         |  8 ++------
 app/views/content_items/html_publication.html.erb    |  4 +---
 .../content_items/manuals/_manual_layout.html.erb    |  6 ++----
 .../manuals/_manual_section_layout.html.erb          |  4 +---
 app/views/content_items/manuals/_updates.html.erb    |  4 +---
 app/views/content_items/travel_advice.html+print.erb |  8 ++------
 app/views/content_items/travel_advice.html.erb       | 12 ++++++------
 .../_document_collections_email_signup.html.erb      |  2 +-
 app/views/shared/_email_signup.html.erb              |  6 +++---
 ...published_dates_with_notification_button.html.erb |  8 ++------
 .../shared/_single_page_notification_button.html.erb |  4 +---
 test/test_helper.rb                                  |  2 +-
 13 files changed, 24 insertions(+), 48 deletions(-)

diff --git a/app/views/content_items/detailed_guide.html.erb b/app/views/content_items/detailed_guide.html.erb
index 10093c02c..27bc6f231 100644
--- a/app/views/content_items/detailed_guide.html.erb
+++ b/app/views/content_items/detailed_guide.html.erb
@@ -92,9 +92,7 @@
           ga4_event: {
             event_name: 'print_page',
             type: 'print page',
-            index: {
-              index_link: 1,
-            },
+            index_link: 1,
             index_total: 2,
             section: 'Content',
           },
diff --git a/app/views/content_items/guide.html+print.erb b/app/views/content_items/guide.html+print.erb
index 1092ac399..1101d4856 100644
--- a/app/views/content_items/guide.html+print.erb
+++ b/app/views/content_items/guide.html+print.erb
@@ -29,9 +29,7 @@
         ga4_event: {
           event_name: 'print_page',
           type: 'print page',
-          index: {
-            index_link: 1,
-          },
+          index_link: 1,
           index_total: 2,
           section: 'Content',
         },
@@ -62,9 +60,7 @@
         ga4_event: {
           event_name: 'print_page',
           type: 'print page',
-          index: {
-            index_link: 2,
-          },
+          index_link: 2,
           index_total: 2,
           section: 'Footer',
         },
diff --git a/app/views/content_items/html_publication.html.erb b/app/views/content_items/html_publication.html.erb
index a93cdbd8c..0020b544e 100644
--- a/app/views/content_items/html_publication.html.erb
+++ b/app/views/content_items/html_publication.html.erb
@@ -70,9 +70,7 @@
             ga4_event: {
               event_name: 'print_page',
               type: 'print page',
-              index: {
-                index_link: 1,
-              },
+              index_link: 1,
               index_total: 1,
               section: 'Content',
             },
diff --git a/app/views/content_items/manuals/_manual_layout.html.erb b/app/views/content_items/manuals/_manual_layout.html.erb
index 6d8330de5..c945bcc3e 100644
--- a/app/views/content_items/manuals/_manual_layout.html.erb
+++ b/app/views/content_items/manuals/_manual_layout.html.erb
@@ -23,13 +23,11 @@
         ga4_event: {
           event_name: 'print_page',
           type: 'print page',
-          index: {
-            index_link: 1,
-          },
+          index_link: 1,
           index_total: 1,
           section: 'Footer',
         },
       },
-    } %>    
+    } %>
   </div>
 <% end %>
\ No newline at end of file
diff --git a/app/views/content_items/manuals/_manual_section_layout.html.erb b/app/views/content_items/manuals/_manual_section_layout.html.erb
index dbbf3cd75..fb6bacc03 100644
--- a/app/views/content_items/manuals/_manual_section_layout.html.erb
+++ b/app/views/content_items/manuals/_manual_section_layout.html.erb
@@ -40,9 +40,7 @@
         ga4_event: {
           event_name: 'print_page',
           type: 'print page',
-          index: {
-            index_link: 1,
-          },
+          index_link: 1,
           index_total: 1,
           section: 'Footer',
         },
diff --git a/app/views/content_items/manuals/_updates.html.erb b/app/views/content_items/manuals/_updates.html.erb
index f2d2fa22f..b2ef3667a 100644
--- a/app/views/content_items/manuals/_updates.html.erb
+++ b/app/views/content_items/manuals/_updates.html.erb
@@ -65,9 +65,7 @@
     ga4_event: {
       event_name: 'print_page',
       type: 'print page',
-      index: {
-        index_link: 1,
-      },
+      index_link: 1,
       index_total: 1,
       section: 'Footer',
     },
diff --git a/app/views/content_items/travel_advice.html+print.erb b/app/views/content_items/travel_advice.html+print.erb
index e41a1182a..010433d61 100644
--- a/app/views/content_items/travel_advice.html+print.erb
+++ b/app/views/content_items/travel_advice.html+print.erb
@@ -28,9 +28,7 @@
         ga4_event: {
           event_name: 'print_page',
           type: 'print page',
-          index: {
-            index_link: 1,
-          },
+          index_link: 1,
           index_total: 2,
           section: 'Content',
         },
@@ -62,9 +60,7 @@
         ga4_event: {
           event_name: 'print_page',
           type: 'print page',
-          index: {
-            index_link: 2,
-          },
+          index_link: 2,
           index_total: 2,
           section: 'Footer',
         },
diff --git a/app/views/content_items/travel_advice.html.erb b/app/views/content_items/travel_advice.html.erb
index 1897de70e..7e741f105 100644
--- a/app/views/content_items/travel_advice.html.erb
+++ b/app/views/content_items/travel_advice.html.erb
@@ -19,18 +19,18 @@
    <%= render "govuk_publishing_components/components/govspeak", {
     } do %>
        <% @content_item.alert_status.each do |text| %>
-        <%= render "govuk_publishing_components/components/warning_text", 
-          text: text 
-        %> 
+        <%= render "govuk_publishing_components/components/warning_text",
+          text: text
+        %>
       <% end %>
     <% end %>
 
     <aside class="part-navigation-container" role="complementary">
       <%= render "govuk_publishing_components/components/contents_list", aria: { label: t("travel_advice.pages") }, contents: @content_item.part_link_elements, underline_links: true, ga4_tracking: true %>
 
-      <div 
+      <div
         data-module="ga4-link-tracker"
-        data-ga4-link='{ "event_name": "navigation", "type": "subscribe", "index": { "index_link": 1 }, "index_total": 1, "section": "Top" }'
+        data-ga4-link='{ "event_name": "navigation", "type": "subscribe", "index_link": 1, "index_total": 1, "section": "Top" }'
         data-ga4-track-links-only
       >
         <%= render 'govuk_publishing_components/components/subscription_links',
@@ -46,7 +46,7 @@
   <% unless @content_item.parts.empty? %>
     <div class="govuk-grid-column-two-thirds govuk-!-margin-top-6">
       <%= render 'govuk_publishing_components/components/heading', heading_level: 1, font_size: 'l', margin_bottom: 6, text: @content_item.current_part_title %>
-      
+
       <% if @content_item.no_part_slug_provided? %>
         <%= render 'shared/travel_advice_first_part', content_item: @content_item %>
       <% end %>
diff --git a/app/views/shared/_document_collections_email_signup.html.erb b/app/views/shared/_document_collections_email_signup.html.erb
index 98078f1a5..fa887ad5a 100644
--- a/app/views/shared/_document_collections_email_signup.html.erb
+++ b/app/views/shared/_document_collections_email_signup.html.erb
@@ -1,7 +1,7 @@
 <% if @content_item.taxonomy_topic_email_override_base_path.present? %>
   <div
     data-module="ga4-link-tracker"
-    data-ga4-link='{ "event_name": "navigation", "type": "subscribe", "index": { "index_link": 1 }, "index_total": 1, "section": "Top" }'
+    data-ga4-link='{ "event_name": "navigation", "type": "subscribe", "index_link": 1, "index_total": 1, "section": "Top" }'
     data-ga4-track-links-only
   >
     <%= render "govuk_publishing_components/components/signup_link", {
diff --git a/app/views/shared/_email_signup.html.erb b/app/views/shared/_email_signup.html.erb
index 30a8b6c2a..917aaed49 100644
--- a/app/views/shared/_email_signup.html.erb
+++ b/app/views/shared/_email_signup.html.erb
@@ -6,10 +6,10 @@
     id: "related-subscriptions",
   } %>
 
-  <div 
-    class="related-item__subscription-link" 
+  <div
+    class="related-item__subscription-link"
     data-module="ga4-link-tracker"
-    data-ga4-link='{ "event_name": "navigation", "type": "subscribe", "index": { "index_link": 1 }, "index_total": 1, "section": "Sidebar" }'
+    data-ga4-link='{ "event_name": "navigation", "type": "subscribe", "index_link": 1, "index_total": 1, "section": "Sidebar" }'
     data-ga4-track-links-only
   >
     <%= render "govuk_publishing_components/components/subscription_links", {
diff --git a/app/views/shared/_published_dates_with_notification_button.html.erb b/app/views/shared/_published_dates_with_notification_button.html.erb
index 94e7e8852..5caa0a2fc 100644
--- a/app/views/shared/_published_dates_with_notification_button.html.erb
+++ b/app/views/shared/_published_dates_with_notification_button.html.erb
@@ -20,9 +20,7 @@
       ga4_link: {
         event_name: "navigation",
         type: "subscribe",
-        index: {
-          index_link: 2
-        },
+        index_link: 2,
         index_total: 2,
         section: "Footer"
       }
@@ -36,9 +34,7 @@
       ga4_event: {
         event_name: 'print_page',
         type: 'print page',
-        index: {
-          index_link: 2,
-        },
+        index_link: 2,
         index_total: 2,
         section: 'Footer',
       },
diff --git a/app/views/shared/_single_page_notification_button.html.erb b/app/views/shared/_single_page_notification_button.html.erb
index add2a1ea5..64be0a5a1 100644
--- a/app/views/shared/_single_page_notification_button.html.erb
+++ b/app/views/shared/_single_page_notification_button.html.erb
@@ -4,9 +4,7 @@
     ga4_link: {
       event_name: "navigation",
       type: "subscribe",
-      index: {
-        index_link: 1
-      },
+      index_link: 1,
       index_total: 2,
       section: "Top"
     }
diff --git a/test/test_helper.rb b/test/test_helper.rb
index 5ba789485..5eeb5b776 100644
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@@ -283,7 +283,7 @@ def single_page_notification_button_ga_tracking(index_link, section)
     {
       "event_name" => "navigation",
       "type" => "subscribe",
-      "index" => { "index_link" => index_link },
+      "index_link" => index_link,
       "index_total" => 2,
       "section" => section,
       "url" => "/email/subscriptions/single-page/new",