Merge pull request #1812 from alphagov/remove-ua

Remove Universal Analytics
alphagov · Jul 5, 2024 · 0b7cb78 · 0b7cb78
2 parents c7e7363 + 6ccd987
commit 0b7cb78
Show file tree

Hide file tree

Showing 16 changed files with 25 additions and 194 deletions.
diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
@@ -2,5 +2,3 @@
 //= require govuk_publishing_components/components/details
 //= require govuk_publishing_components/components/error-summary
 //= require govuk_publishing_components/components/radio
-
-//= require_tree ./modules
diff --git a/app/assets/javascripts/modules/track-email-alert-signup-choices.js b/app/assets/javascripts/modules/track-email-alert-signup-choices.js
diff --git a/app/views/account_subscriptions/confirm.html.erb b/app/views/account_subscriptions/confirm.html.erb
@@ -40,13 +40,7 @@
   <%= hidden_field_tag "return_to_url", @return_to_url %>
   <%= render "govuk_publishing_components/components/button", {
     text: t("account_subscriptions.confirm.confirm"),
-    margin_bottom: 4,
-    data_attributes: {
-      module: "gem-track-click",
-      track_category: "email_subscriptions",
-      track_action: "new_account",
-      track_label: @subscriber_list["title"],
-    },
+    margin_bottom: 4
   } %>
 <% end %>
 

diff --git a/app/views/content_item_signups/confirm.html.erb b/app/views/content_item_signups/confirm.html.erb
@@ -35,12 +35,6 @@
   <% end %>
   <%= render 'govuk_publishing_components/components/button', {
     text: 'Continue',
-    margin_bottom: true,
-    data_attributes: {
-      module: 'gem-track-click',
-      track_category: 'email_subscriptions',
-      track_action: 'new_frequency',
-      track_label: @content_item['title'],
-    },
+    margin_bottom: true
   } %>
 <% end %>
diff --git a/app/views/content_item_signups/taxon.html.erb b/app/views/content_item_signups/taxon.html.erb
@@ -47,10 +47,8 @@
 <%= form_tag({ action: :confirm },
   method: "get",
   data: {
-    module: "track-email-alert-signup-choices ga4-form-tracker",
-    ga4_form: ga4_data,
-    track_action: "new_topic",
-    track_category: "email_subscriptions",
+    module: "ga4-form-tracker",
+    ga4_form: ga4_data
   }) do %>
 
   <%

diff --git a/app/views/govuk_account_signups/show.html.erb b/app/views/govuk_account_signups/show.html.erb
@@ -23,10 +23,7 @@
   <%= render "govuk_publishing_components/components/button", {
     text: t("single_page_subscriptions.create_or_sign_in_description"),
     data_attributes: {
-      module: "gem-track-click ga4-link-tracker",
-      track_action: t("single_page_subscriptions.create_or_sign_in_description"),
-      track_category: "External link clicked",
-      track_label: @topic_id,
+      module: "ga4-link-tracker",
       ga4_link: {
         "event_name": "navigation",
         "type": "generic link",

diff --git a/app/views/subscriber_authentication/sign_in.html.erb b/app/views/subscriber_authentication/sign_in.html.erb
@@ -70,11 +70,6 @@
 
   <%= render 'govuk_publishing_components/components/button', {
     text: 'Continue',
-    margin_bottom: true,
-    data_attributes: {
-      module: 'auto-track-event',
-      track_category: 'email_subscriptions',
-      track_action: 'authenticate',
-    },
+    margin_bottom: true
   } %>
 <%- end -%>
diff --git a/app/views/subscriptions/new_address.html.erb b/app/views/subscriptions/new_address.html.erb
@@ -63,12 +63,6 @@
 
   <%= render "govuk_publishing_components/components/button", {
     text: "Continue",
-    margin_bottom: true,
-    data_attributes: {
-      module: 'gem-track-click',
-      track_category: 'email_subscriptions',
-      track_action: 'new_email_confirm',
-      track_label: "#{@topic_id} #{@frequency}",
-    },
+    margin_bottom: true
   } %>
 <% end %>
diff --git a/app/views/subscriptions/new_frequency.html.erb b/app/views/subscriptions/new_frequency.html.erb
@@ -40,9 +40,7 @@
 <%= form_tag(subscription_frequency_path,
   class: "checklist-email-signup",
   data: {
-    module: "track-email-alert-signup-choices ga4-form-tracker",
-    track_category: "email_subscriptions",
-    track_action: 'new_address',
+    module: "ga4-form-tracker",
     ga4_form: ga4_data
   }) do %>
   <%= hidden_field_tag :topic_id, @topic_id %>

diff --git a/app/views/subscriptions_management/confirm_unsubscribe_all.html.erb b/app/views/subscriptions_management/confirm_unsubscribe_all.html.erb
@@ -34,12 +34,7 @@
   <%= hidden_field_tag(:from, @from) %>
   <%= render 'govuk_publishing_components/components/button', {
     text: 'Unsubscribe',
-    margin_bottom: true,
-    data_attributes: {
-      module: 'auto-track-event',
-      track_category: 'email_subscriptions',
-      track_action: 'unsubscribe_all',
-    },
+    margin_bottom: true
   } %>
 <% end %>
 <p class="govuk-body">

diff --git a/app/views/subscriptions_management/index.html.erb b/app/views/subscriptions_management/index.html.erb
@@ -112,27 +112,15 @@
       <% end %>
       <%= link_to change_frequency_link_text,
                   update_frequency_path(id: subscription['id']),
-                  class: %w[govuk-link govuk-link--no-visited-state],
-                  data: {
-                    module: "gem-track-click",
-                    track_category: "Manage_your_email_subscriptions",
-                    track_action: "Change-frequency",
-                    track_label: use_govuk_account_layout? ? "From_specific_logged_in" : "From_specific_logged_out",
-                  } %>
+                  class: %w[govuk-link govuk-link--no-visited-state] %>
     </p>
     <p class="govuk-body">
       <% unsubscribe_link_text = capture do %>
         Unsubscribe <span class="govuk-visually-hidden"> from <%= subscription['subscriber_list']['title'] %></span>
       <% end %>
       <%= link_to unsubscribe_link_text,
                   confirm_unsubscribe_path(id: subscription['id']),
-                  class: %w[govuk-link govuk-link--no-visited-state],
-                  data: {
-                    module: "gem-track-click",
-                    track_category: "Manage_your_email_subscriptions",
-                    track_action: "Unsubscribe",
-                    track_label: use_govuk_account_layout? ? "From_specific_logged_in" : "From_specific_logged_out",
-                  } %>
+                  class: %w[govuk-link govuk-link--no-visited-state] %>
     </p>
 
     <hr class="govuk-section-break govuk-section-break--l govuk-section-break--visible">
@@ -141,12 +129,6 @@
     <%= render "govuk_publishing_components/components/button", {
       text: "Unsubscribe from everything",
       href: confirm_unsubscribe_all_path,
-      data_attributes: {
-        module: "gem-track-click",
-        track_category: "Manage_your_email_subscriptions",
-        track_action: "Unsubscribe",
-        track_label: use_govuk_account_layout? ? "From_everything_logged_in" : "From_everything_logged_out",
-      },
       secondary_solid: true
     } %>
   </p>

diff --git a/app/views/subscriptions_management/update_address.html.erb b/app/views/subscriptions_management/update_address.html.erb
@@ -56,7 +56,7 @@
   change_address_path,
   method: :post,
   data: {
-    module: "track-email-alert-signup-choices ga4-form-tracker",
+    module: "ga4-form-tracker",
     ga4_form: ga4_data,
   }) do %>
   <%= render 'govuk_publishing_components/components/input', {
@@ -77,12 +77,7 @@
   <% end %>
   <%= render 'govuk_publishing_components/components/button', {
     text: 'Save',
-    margin_bottom: true,
-    data_attributes: {
-      module: 'auto-track-event',
-      track_category: 'email_subscriptions',
-      track_action: 'update_address',
-    },
+    margin_bottom: true
   } %>
 <%- end -%>
 <p class="govuk-body">

diff --git a/app/views/subscriptions_management/update_frequency.html.erb b/app/views/subscriptions_management/update_frequency.html.erb
@@ -39,13 +39,7 @@
 
     <%= render 'govuk_publishing_components/components/button', {
       text: 'Save',
-      margin_bottom: true,
-      data_attributes: {
-        module: 'auto-track-event',
-        track_category: 'email_subscriptions',
-        track_action: 'update_frequency',
-        track_label: @current_frequency,
-      }
+      margin_bottom: true
     } %>
 <% end %>
 <p class="govuk-body">

diff --git a/app/views/unsubscriptions/confirm.html.erb b/app/views/unsubscriptions/confirm.html.erb
@@ -36,13 +36,7 @@
 
   <%= render 'govuk_publishing_components/components/button', {
     text: 'Unsubscribe',
-    margin_bottom: true,
-    data_attributes: {
-      module: 'auto-track-event',
-      track_category: 'email_subscriptions',
-      track_action: 'unsubscribe_list',
-      track_label: @title,
-    },
+    margin_bottom: true
   } %>
 <% end %>
 

diff --git a/spec/javascripts/modules/dummy-test.spec.js b/spec/javascripts/modules/dummy-test.spec.js
@@ -0,0 +1,10 @@
+/*
+* We want to keep the jasmine/standardx functionality for tests in this repo, however they both crash if no JS spec files exist.
+* Therefore we can keep this dummy test in. It can be removed if real tests are written for something in the future.
+*/
+
+describe('dummy test', function () {
+  it('accepts the truth', function () {
+    expect(true).toBe(true)
+  })
+})
diff --git a/spec/javascripts/modules/track-email-alert-signup-choices.spec.js b/spec/javascripts/modules/track-email-alert-signup-choices.spec.js