Skip to content

Commit 03169f2

Browse files
andysellickandysellick
committed
Flatten GA4 attributes
1 parent 44300c5 commit 03169f2

13 files changed

+24
-48
lines changed

‎app/views/content_items/detailed_guide.html.erb

+1-3
Original file line numberDiff line numberDiff line change
@@ -92,9 +92,7 @@
9292
ga4_event: {
9393
event_name: 'print_page',
9494
type: 'print page',
95-
index: {
96-
index_link: 1,
97-
},
95+
index_link: 1,
9896
index_total: 2,
9997
section: 'Content',
10098
},

‎app/views/content_items/guide.html+print.erb

+2-6
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,7 @@
2929
ga4_event: {
3030
event_name: 'print_page',
3131
type: 'print page',
32-
index: {
33-
index_link: 1,
34-
},
32+
index_link: 1,
3533
index_total: 2,
3634
section: 'Content',
3735
},
@@ -62,9 +60,7 @@
6260
ga4_event: {
6361
event_name: 'print_page',
6462
type: 'print page',
65-
index: {
66-
index_link: 2,
67-
},
63+
index_link: 2,
6864
index_total: 2,
6965
section: 'Footer',
7066
},

‎app/views/content_items/html_publication.html.erb

+1-3
Original file line numberDiff line numberDiff line change
@@ -70,9 +70,7 @@
7070
ga4_event: {
7171
event_name: 'print_page',
7272
type: 'print page',
73-
index: {
74-
index_link: 1,
75-
},
73+
index_link: 1,
7674
index_total: 1,
7775
section: 'Content',
7876
},

‎app/views/content_items/manuals/_manual_layout.html.erb

+2-4
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,11 @@
2323
ga4_event: {
2424
event_name: 'print_page',
2525
type: 'print page',
26-
index: {
27-
index_link: 1,
28-
},
26+
index_link: 1,
2927
index_total: 1,
3028
section: 'Footer',
3129
},
3230
},
33-
} %>
31+
} %>
3432
</div>
3533
<% end %>

‎app/views/content_items/manuals/_manual_section_layout.html.erb

+1-3
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,7 @@
4040
ga4_event: {
4141
event_name: 'print_page',
4242
type: 'print page',
43-
index: {
44-
index_link: 1,
45-
},
43+
index_link: 1,
4644
index_total: 1,
4745
section: 'Footer',
4846
},

‎app/views/content_items/manuals/_updates.html.erb

+1-3
Original file line numberDiff line numberDiff line change
@@ -65,9 +65,7 @@
6565
ga4_event: {
6666
event_name: 'print_page',
6767
type: 'print page',
68-
index: {
69-
index_link: 1,
70-
},
68+
index_link: 1,
7169
index_total: 1,
7270
section: 'Footer',
7371
},

‎app/views/content_items/travel_advice.html+print.erb

+2-6
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,7 @@
2828
ga4_event: {
2929
event_name: 'print_page',
3030
type: 'print page',
31-
index: {
32-
index_link: 1,
33-
},
31+
index_link: 1,
3432
index_total: 2,
3533
section: 'Content',
3634
},
@@ -62,9 +60,7 @@
6260
ga4_event: {
6361
event_name: 'print_page',
6462
type: 'print page',
65-
index: {
66-
index_link: 2,
67-
},
63+
index_link: 2,
6864
index_total: 2,
6965
section: 'Footer',
7066
},

‎app/views/content_items/travel_advice.html.erb

+6-6
Original file line numberDiff line numberDiff line change
@@ -19,18 +19,18 @@
1919
<%= render "govuk_publishing_components/components/govspeak", {
2020
} do %>
2121
<% @content_item.alert_status.each do |text| %>
22-
<%= render "govuk_publishing_components/components/warning_text",
23-
text: text
24-
%>
22+
<%= render "govuk_publishing_components/components/warning_text",
23+
text: text
24+
%>
2525
<% end %>
2626
<% end %>
2727

2828
<aside class="part-navigation-container" role="complementary">
2929
<%= 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 %>
3030

31-
<div
31+
<div
3232
data-module="ga4-link-tracker"
33-
data-ga4-link='{ "event_name": "navigation", "type": "subscribe", "index": { "index_link": 1 }, "index_total": 1, "section": "Top" }'
33+
data-ga4-link='{ "event_name": "navigation", "type": "subscribe", "index_link": 1, "index_total": 1, "section": "Top" }'
3434
data-ga4-track-links-only
3535
>
3636
<%= render 'govuk_publishing_components/components/subscription_links',
@@ -46,7 +46,7 @@
4646
<% unless @content_item.parts.empty? %>
4747
<div class="govuk-grid-column-two-thirds govuk-!-margin-top-6">
4848
<%= render 'govuk_publishing_components/components/heading', heading_level: 1, font_size: 'l', margin_bottom: 6, text: @content_item.current_part_title %>
49-
49+
5050
<% if @content_item.no_part_slug_provided? %>
5151
<%= render 'shared/travel_advice_first_part', content_item: @content_item %>
5252
<% end %>

‎app/views/shared/_document_collections_email_signup.html.erb

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<% if @content_item.taxonomy_topic_email_override_base_path.present? %>
22
<div
33
data-module="ga4-link-tracker"
4-
data-ga4-link='{ "event_name": "navigation", "type": "subscribe", "index": { "index_link": 1 }, "index_total": 1, "section": "Top" }'
4+
data-ga4-link='{ "event_name": "navigation", "type": "subscribe", "index_link": 1, "index_total": 1, "section": "Top" }'
55
data-ga4-track-links-only
66
>
77
<%= render "govuk_publishing_components/components/signup_link", {

‎app/views/shared/_email_signup.html.erb

+3-3
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@
66
id: "related-subscriptions",
77
} %>
88

9-
<div
10-
class="related-item__subscription-link"
9+
<div
10+
class="related-item__subscription-link"
1111
data-module="ga4-link-tracker"
12-
data-ga4-link='{ "event_name": "navigation", "type": "subscribe", "index": { "index_link": 1 }, "index_total": 1, "section": "Sidebar" }'
12+
data-ga4-link='{ "event_name": "navigation", "type": "subscribe", "index_link": 1, "index_total": 1, "section": "Sidebar" }'
1313
data-ga4-track-links-only
1414
>
1515
<%= render "govuk_publishing_components/components/subscription_links", {

‎app/views/shared/_published_dates_with_notification_button.html.erb

+2-6
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,7 @@
2020
ga4_link: {
2121
event_name: "navigation",
2222
type: "subscribe",
23-
index: {
24-
index_link: 2
25-
},
23+
index_link: 2,
2624
index_total: 2,
2725
section: "Footer"
2826
}
@@ -36,9 +34,7 @@
3634
ga4_event: {
3735
event_name: 'print_page',
3836
type: 'print page',
39-
index: {
40-
index_link: 2,
41-
},
37+
index_link: 2,
4238
index_total: 2,
4339
section: 'Footer',
4440
},

‎app/views/shared/_single_page_notification_button.html.erb

+1-3
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,7 @@
44
ga4_link: {
55
event_name: "navigation",
66
type: "subscribe",
7-
index: {
8-
index_link: 1
9-
},
7+
index_link: 1,
108
index_total: 2,
119
section: "Top"
1210
}

‎test/test_helper.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -283,7 +283,7 @@ def single_page_notification_button_ga_tracking(index_link, section)
283283
{
284284
"event_name" => "navigation",
285285
"type" => "subscribe",
286-
"index" => { "index_link" => index_link },
286+
"index_link" => index_link,
287287
"index_total" => 2,
288288
"section" => section,
289289
"url" => "/email/subscriptions/single-page/new",

0 commit comments

Comments
 (0)