Fix: Google Analytics 4 tag (#424)

* revert the change in ontologies_analytics to use last month analytics * Merge pull request #271 from ncbo/feature/ga4-migration/270 Universal Analytics -> Google Analytics 4 migration
ontoportal-lirmm · Dec 28, 2023 · b498460 · b498460
1 parent d18a700
commit b498460
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 66 deletions.
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
@@ -25,11 +25,8 @@ module ApplicationHelper
 
 
   def ontologies_analytics
-    LinkedData::Client::Analytics.all.to_h.map do |key, ontology_analytics|
-      next if key.eql?(:links) || key.eql?(:context)
-
-      [key.to_s, ontology_analytics.to_h.values.map { |x| x&.values }.flatten.compact.sum]
-    end.compact.to_h
+    data = LinkedData::Client::Analytics.last_month.onts
+    data.map{|x| [x[:ont].to_s, x[:views]]}.to_h
   end
 
   def get_apikey

diff --git a/app/views/application/_ga_tracking.html.haml b/app/views/application/_ga_tracking.html.haml
@@ -1,9 +1,10 @@
--# Google Analytics
-- unless $ANALYTICS_ID.nil? || $ANALYTICS_ID.empty?
+-# Google tag
+- tag_id = Rails.application.credentials.dig(:google_analytics, :tag_id) || $ANALYTICS_ID
+- if tag_id.present?
+  <script async src="https://www.googletagmanager.com/gtag/js?id=#{tag_id}"></script>
   %script
-    window.ga=window.ga||function(){(ga.q=ga.q||[]).push(arguments)};ga.l=+new Date;
-    ga('create', '#{$ANALYTICS_ID}', 'auto');
-    ga('send', 'pageview');
-  <script async src='https://www.google-analytics.com/analytics.js'></script>
+    window.dataLayer = window.dataLayer || [];
+    function gtag(){dataLayer.push(arguments);}
+    gtag('js', new Date());
 
-
+    gtag('config', '#{tag_id}');
diff --git a/app/views/layouts/_footer.html.haml b/app/views/layouts/_footer.html.haml
@@ -28,4 +28,3 @@
 
 
 = javascript_include_tag "application"
-= render partial: "ga_tracking"
diff --git a/app/views/layouts/_header.html.erb b/app/views/layouts/_header.html.erb
@@ -1,6 +1,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" <%="xml:lang=\"#{I18n.locale}\""%> lang="<%=I18n.locale%>">
 <head>
+	<%= render partial: 'ga_tracking' %>
 	<meta http-equiv="content-type" content="text/html;charset=UTF-8" />
 
 	<!-- Force IE to use latest rendering engine -->

diff --git a/app/views/layouts/appliance.html.haml b/app/views/layouts/appliance.html.haml
@@ -1,6 +1,7 @@
 !!! Strict
 %html
   %head
+    = render partial: 'ga_tracking'
     <meta http-equiv="content-type" content="text/html;charset=UTF-8" />
     <meta name="turbo-cache-control" content="no-cache">
 

diff --git a/app/views/layouts/minimal.html.erb b/app/views/layouts/minimal.html.erb
diff --git a/app/views/layouts/popup.html.erb b/app/views/layouts/popup.html.erb
@@ -1,6 +1,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" style="background: none !important;">
 <head>
+  <%= render partial: "ga_tracking" %>
   <meta http-equiv="content-type" content="text/html;charset=UTF-8" />
   <meta http-equiv="X-UA-Compatible" content="IE=Edge"/>
   <meta name="google-site-verification" content="IBxfKu6VbYH9atd5OLu2zXVD2ZRWi9SgMKTi8nvw3ks" />
Original file line number	Diff line number	Diff line change
Expand Up		@@ -28,4 +28,3 @@


		= javascript_include_tag "application"
		= render partial: "ga_tracking"