metadata_presenter 2.17.8 → 2.17.9

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (10) hide show
  1. checksums.yaml +4 -4
  2. data/app/controllers/metadata_presenter/engine_controller.rb +9 -8
  3. data/app/views/layouts/metadata_presenter/application.html.erb +1 -2
  4. data/app/views/metadata_presenter/analytics/_ga4.html.erb +6 -14
  5. data/app/views/metadata_presenter/analytics/_global_analytics.html.erb +2 -3
  6. data/app/views/metadata_presenter/analytics/_gtm.html.erb +2 -2
  7. data/app/views/metadata_presenter/analytics/_ua.html.erb +2 -2
  8. data/app/views/metadata_presenter/analytics/analytics.html.erb +7 -3
  9. data/lib/metadata_presenter/version.rb +1 -1
  10. metadata +2 -2
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: fd76b81cc2912dc02d76759ad2ea32cf276786d08a54a3c8b2eab163bc039139
4
- data.tar.gz: 283d0486ab6d17e3258ddf7da5603a70adc3591aac3c43c3d646c259b20800a0
3
+ metadata.gz: 7f753356995076aa70b70538d34770ce68b03aa2fe866208cac8cd5b4ad861e9
4
+ data.tar.gz: 7ed63dece8665708989288145f64518c5a7c925c3c8e5ec55f5bc44487728b97
5
5
  SHA512:
6
- metadata.gz: eb930c0728e2c01a503f66074258365110dceb236770dd17598b974fdedb803596937003da48f7079d486e91e67788a0cafd24b522948f6c69dfeaface16a0db
7
- data.tar.gz: 0670fa58f9d8076f49c89c6f4e8df5d33b8075fd72a2b0be1f0fd84df0024cc0257566ea7fccfea914d4dee175e2a56a77f96abd90a216d91507b4f90af2ab9f
6
+ metadata.gz: 0f8629f5c3a5cb9e4be7ac9fc7abf2868f45a7e44f10249fdcc8d47e7ee9ceb848c6e3cafa9683f02137fcddd78391e521f19a6a8e2f55dea5218f46da60d003
7
+ data.tar.gz: ad83b314cdaa5eb1d2f2babcbe2be7d358305fed7b474f194a73fb1c41829e4e578e4c8bdf8cd7ebcd8ca5d040372943aaa94ef76b8b673b6f3458a36216aadc
data/app/controllers/metadata_presenter/engine_controller.rb CHANGED
@@ -41,15 +41,22 @@ module MetadataPresenter
41
41
  helper_method :analytics_cookie_name
42
42
 
43
43
  def allow_analytics?
44
- no_analytics_cookie? || cookies[analytics_cookie_name] == 'accepted'
44
+ cookies[analytics_cookie_name] == 'accepted'
45
45
  end
46
46
  helper_method :allow_analytics?
47
47
 
48
48
  def show_cookie_banner?
49
- no_analytics_cookie? && analytics_tags_present?
49
+ no_analytics_cookie?
50
50
  end
51
51
  helper_method :show_cookie_banner?
52
52
 
53
+ def analytics_tags_present?
54
+ Rails.application.config.supported_analytics.values.flatten.any? do |analytic|
55
+ ENV[analytic].present?
56
+ end
57
+ end
58
+ helper_method :analytics_tags_present?
59
+
53
60
  private
54
61
 
55
62
  def not_found
@@ -60,12 +67,6 @@ module MetadataPresenter
60
67
  redirect_to File.join(request.script_name, url)
61
68
  end
62
69
 
63
- def analytics_tags_present?
64
- Rails.application.config.supported_analytics.values.flatten.any? do |analytic|
65
- ENV[analytic].present?
66
- end
67
- end
68
-
69
70
  def no_analytics_cookie?
70
71
  cookies[analytics_cookie_name].blank?
71
72
  end
data/app/views/layouts/metadata_presenter/application.html.erb CHANGED
@@ -38,8 +38,7 @@
38
38
  </main>
39
39
  </div>
40
40
  <%= render template: 'metadata_presenter/footer/footer' %>
41
-
42
- <%= javascript_pack_tag 'application' %>
41
+ <%= javascript_pack_tag 'runner_application' %>
43
42
  <%= javascript_pack_tag 'govuk' %>
44
43
  </body>
45
44
  </html>
data/app/views/metadata_presenter/analytics/_ga4.html.erb CHANGED
@@ -1,16 +1,8 @@
1
- <!-- Google Analytics 4 -->
1
+ <!-- Form Owner Google Analytics 4 -->
2
2
  <% if Rails.application.config.respond_to?(:global_ga4) %>
3
- <script>
4
- gtag('config', '<%= measurement_id %>');
5
- </script>
6
- <% else %>
7
- <script async src="https://www.googletagmanager.com/gtag/js?id=<%= measurement_id %>"></script>
8
- <script>
9
- window.dataLayer = window.dataLayer || [];
10
- function gtag(){dataLayer.push(arguments);}
11
- gtag('js', new Date());
12
-
13
- gtag('config', '<%= measurement_id %>');
14
- </script>
3
+ <%# Global Google Analytics (GA4) should be included before this point so we only need a config setting %>
4
+ <script>
5
+ gtag('config', '<%= measurement_id %>');
6
+ </script>
15
7
  <% end %>
16
- <!-- End Google Analytics 4 -->
8
+ <!-- End Form Owner Google Analytics 4 -->
data/app/views/metadata_presenter/analytics/_global_analytics.html.erb CHANGED
@@ -1,10 +1,9 @@
1
1
  <!-- Global MoJ Forms site tag (gtag.js) - Google Analytics 4 -->
2
- <script async src="https://www.googletagmanager.com/gtag/js?id=<%= measurement_id %>"></script>
2
+ <script async src="https://www.googletagmanager.com/gtag/js?id=#{global_measurement_id}"></script>
3
3
  <script>
4
4
  window.dataLayer = window.dataLayer || [];
5
5
  function gtag(){dataLayer.push(arguments);}
6
6
  gtag('js', new Date());
7
-
8
- gtag('config', '<%= measurement_id %>');
7
+ gtag('config', '<%= global_measurement_id %>');
9
8
  </script>
10
9
  <!-- End Global MoJ Forms site tag (gtag.js) - Google Analytics 4 -->
data/app/views/metadata_presenter/analytics/_gtm.html.erb CHANGED
@@ -1,7 +1,7 @@
1
- <!-- Google Tag Manager -->
1
+ <!-- Google Tag Manager for Form Owner -->
2
2
  <script>(function(w,d,s,l,i){w[l]=w[l]||[];w[l].push({'gtm.start':
3
3
  new Date().getTime(),event:'gtm.js'});var f=d.getElementsByTagName(s)[0],
4
4
  j=d.createElement(s),dl=l!='dataLayer'?'&l='+l:'';j.async=true;j.src=
5
5
  'https://www.googletagmanager.com/gtm.js?id='+i+dl;f.parentNode.insertBefore(j,f);
6
6
  })(window,document,'script','dataLayer','<%= measurement_id %>');</script>
7
- <!-- End Google Tag Manager -->
7
+ <!-- End Google Tag Manager for Form Owner -->
data/app/views/metadata_presenter/analytics/_ua.html.erb CHANGED
@@ -1,4 +1,4 @@
1
- <!-- Google Universal Analytics -->
1
+ <!-- Google Universal Analytics for Form Owner -->
2
2
  <script>
3
3
  (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
4
4
  (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
@@ -8,4 +8,4 @@
8
8
  ga('create', '<%= measurement_id %>', 'auto');
9
9
  ga('send', 'pageview');
10
10
  </script>
11
- <!-- End Google Universal Analytics -->
11
+ <!-- End Google Universal Analytics for Form Owner -->
data/app/views/metadata_presenter/analytics/analytics.html.erb CHANGED
@@ -1,7 +1,11 @@
1
+ <%# MoJ Forms Google Analytic Reporting %>
1
2
  <% if Rails.application.config.respond_to?(:global_ga4) %>
2
- <%= render partial: 'metadata_presenter/analytics/global_analytics', locals: { measurement_id: Rails.application.config.global_ga4 } %>
3
+ <%= render partial: 'metadata_presenter/analytics/global_analytics', locals: { global_measurement_id: Rails.application.config.global_ga4 } %>
3
4
  <% end %>
4
5
 
5
- <% Rails.application.config.supported_analytics.each do |provider, analytics| %>
6
- <%= render partial: "metadata_presenter/analytics/#{provider}", locals: { analytics: analytics } %>
6
+ <%# Analytic reporting set by form owners %>
7
+ <% if analytics_tags_present? %>
8
+ <% Rails.application.config.supported_analytics.each do |provider, analytics| %>
9
+ <%= render partial: "metadata_presenter/analytics/#{provider}", locals: { analytics: analytics } %>
10
+ <% end %>
7
11
  <% end %>
data/lib/metadata_presenter/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module MetadataPresenter
2
- VERSION = '2.17.8'.freeze
2
+ VERSION = '2.17.9'.freeze
3
3
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: metadata_presenter
3
3
  version: !ruby/object:Gem::Version
4
- version: 2.17.8
4
+ version: 2.17.9
5
5
  platform: ruby
6
6
  authors:
7
7
  - MoJ Forms
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2022-07-13 00:00:00.000000000 Z
11
+ date: 2022-07-19 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: govuk_design_system_formbuilder