metadata_presenter 2.17.8 → 2.17.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fd76b81cc2912dc02d76759ad2ea32cf276786d08a54a3c8b2eab163bc039139
-  data.tar.gz: 283d0486ab6d17e3258ddf7da5603a70adc3591aac3c43c3d646c259b20800a0
+  metadata.gz: 7f753356995076aa70b70538d34770ce68b03aa2fe866208cac8cd5b4ad861e9
+  data.tar.gz: 7ed63dece8665708989288145f64518c5a7c925c3c8e5ec55f5bc44487728b97
 SHA512:
-  metadata.gz: eb930c0728e2c01a503f66074258365110dceb236770dd17598b974fdedb803596937003da48f7079d486e91e67788a0cafd24b522948f6c69dfeaface16a0db
-  data.tar.gz: 0670fa58f9d8076f49c89c6f4e8df5d33b8075fd72a2b0be1f0fd84df0024cc0257566ea7fccfea914d4dee175e2a56a77f96abd90a216d91507b4f90af2ab9f
+  metadata.gz: 0f8629f5c3a5cb9e4be7ac9fc7abf2868f45a7e44f10249fdcc8d47e7ee9ceb848c6e3cafa9683f02137fcddd78391e521f19a6a8e2f55dea5218f46da60d003
+  data.tar.gz: ad83b314cdaa5eb1d2f2babcbe2be7d358305fed7b474f194a73fb1c41829e4e578e4c8bdf8cd7ebcd8ca5d040372943aaa94ef76b8b673b6f3458a36216aadc

data/app/controllers/metadata_presenter/engine_controller.rb

@@ -41,15 +41,22 @@ module MetadataPresenter
     helper_method :analytics_cookie_name
 
     def allow_analytics?
-      no_analytics_cookie? || cookies[analytics_cookie_name] == 'accepted'
+      cookies[analytics_cookie_name] == 'accepted'
     end
     helper_method :allow_analytics?
 
     def show_cookie_banner?
-      no_analytics_cookie? && analytics_tags_present?
+      no_analytics_cookie?
     end
     helper_method :show_cookie_banner?
 
+    def analytics_tags_present?
+      Rails.application.config.supported_analytics.values.flatten.any? do |analytic|
+        ENV[analytic].present?
+      end
+    end
+    helper_method :analytics_tags_present?
+
     private
 
     def not_found
@@ -60,12 +67,6 @@ module MetadataPresenter
       redirect_to File.join(request.script_name, url)
     end
 
-    def analytics_tags_present?
-      Rails.application.config.supported_analytics.values.flatten.any? do |analytic|
-        ENV[analytic].present?
-      end
-    end
-
     def no_analytics_cookie?
       cookies[analytics_cookie_name].blank?
     end

data/app/views/layouts/metadata_presenter/application.html.erb

@@ -38,8 +38,7 @@
       </main>
     </div>
     <%= render template: 'metadata_presenter/footer/footer' %>
-
-    <%= javascript_pack_tag 'application' %>
+    <%= javascript_pack_tag 'runner_application' %>
     <%= javascript_pack_tag 'govuk' %>
   </body>
 </html>

data/app/views/metadata_presenter/analytics/_ga4.html.erb

@@ -1,16 +1,8 @@
-<!-- Google Analytics 4 -->
+<!-- Form Owner Google Analytics 4 -->
 <% if Rails.application.config.respond_to?(:global_ga4) %>
-<script>
-  gtag('config', '<%= measurement_id %>');
-</script>
-<% else %>
-<script async src="https://www.googletagmanager.com/gtag/js?id=<%= measurement_id %>"></script>
-<script>
-  window.dataLayer = window.dataLayer || [];
-  function gtag(){dataLayer.push(arguments);}
-  gtag('js', new Date());
-
-  gtag('config', '<%= measurement_id %>');
-</script>
+  <%# Global Google Analytics (GA4) should be included before this point so we only need a config setting %>
+  <script>
+    gtag('config', '<%= measurement_id %>');
+  </script>
 <% end %>
-<!-- End Google Analytics 4 -->
+<!-- End Form Owner Google Analytics 4 -->

data/app/views/metadata_presenter/analytics/_global_analytics.html.erb

@@ -1,10 +1,9 @@
 <!-- Global MoJ Forms site tag (gtag.js) - Google Analytics 4 -->
-<script async src="https://www.googletagmanager.com/gtag/js?id=<%= measurement_id %>"></script>
+<script async src="https://www.googletagmanager.com/gtag/js?id=#{global_measurement_id}"></script>
 <script>
   window.dataLayer = window.dataLayer || [];
   function gtag(){dataLayer.push(arguments);}
   gtag('js', new Date());
-
-  gtag('config', '<%= measurement_id %>');
+  gtag('config', '<%= global_measurement_id %>');
 </script>
 <!-- End Global MoJ Forms site tag (gtag.js) - Google Analytics 4 -->

data/app/views/metadata_presenter/analytics/_gtm.html.erb

@@ -1,7 +1,7 @@
-<!-- Google Tag Manager -->
+<!-- Google Tag Manager for Form Owner -->
 <script>(function(w,d,s,l,i){w[l]=w[l]||[];w[l].push({'gtm.start':
 new Date().getTime(),event:'gtm.js'});var f=d.getElementsByTagName(s)[0],
 j=d.createElement(s),dl=l!='dataLayer'?'&l='+l:'';j.async=true;j.src=
 'https://www.googletagmanager.com/gtm.js?id='+i+dl;f.parentNode.insertBefore(j,f);
 })(window,document,'script','dataLayer','<%= measurement_id %>');</script>
-<!-- End Google Tag Manager -->
+<!-- End Google Tag Manager for Form Owner -->

data/app/views/metadata_presenter/analytics/_ua.html.erb

@@ -1,4 +1,4 @@
-<!-- Google Universal Analytics -->
+<!-- Google Universal Analytics for Form Owner -->
 <script>
   (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
   (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
@@ -8,4 +8,4 @@
   ga('create', '<%= measurement_id %>', 'auto');
   ga('send', 'pageview');
 </script>
-<!-- End Google Universal Analytics -->
+<!-- End Google Universal Analytics for Form Owner -->

data/app/views/metadata_presenter/analytics/analytics.html.erb

@@ -1,7 +1,11 @@
+<%# MoJ Forms Google Analytic Reporting %>
 <% if Rails.application.config.respond_to?(:global_ga4) %>
-  <%= render partial: 'metadata_presenter/analytics/global_analytics', locals: { measurement_id: Rails.application.config.global_ga4 } %>
+  <%= render partial: 'metadata_presenter/analytics/global_analytics', locals: { global_measurement_id: Rails.application.config.global_ga4 } %>
 <% end %>
 
-<% Rails.application.config.supported_analytics.each do |provider, analytics| %>
-  <%= render partial: "metadata_presenter/analytics/#{provider}", locals: { analytics: analytics } %>
+<%# Analytic reporting set by form owners %>
+<% if analytics_tags_present? %>
+  <% Rails.application.config.supported_analytics.each do |provider, analytics| %>
+    <%= render partial: "metadata_presenter/analytics/#{provider}", locals: { analytics: analytics } %>
+  <% end %>
 <% end %>

data/lib/metadata_presenter/version.rb

@@ -1,3 +1,3 @@
 module MetadataPresenter
-  VERSION = '2.17.8'.freeze
+  VERSION = '2.17.9'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metadata_presenter
 version: !ruby/object:Gem::Version
-  version: 2.17.8
+  version: 2.17.9
 platform: ruby
 authors:
 - MoJ Forms
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-07-13 00:00:00.000000000 Z
+date: 2022-07-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: govuk_design_system_formbuilder