From 272f2c6add3b9e26aa1853779ea2533656e9392a Mon Sep 17 00:00:00 2001
From: "francesco.mangiacrapa" <francesco.mangiacrapa@isti.cnr.it>
Date: Mon, 12 Jun 2023 15:36:10 +0200
Subject: [PATCH] Updated to GA4, see #25253

---
 ckanext/googleanalytics/plugin/__init__.py               | 6 +++++-
 .../templates/googleanalytics/snippets/gtag_header.html  | 9 +++++++++
 2 files changed, 14 insertions(+), 1 deletion(-)
 create mode 100644 ckanext/googleanalytics/templates/googleanalytics/snippets/gtag_header.html

diff --git a/ckanext/googleanalytics/plugin/__init__.py b/ckanext/googleanalytics/plugin/__init__.py
index 815460a..51eee24 100644
--- a/ckanext/googleanalytics/plugin/__init__.py
+++ b/ckanext/googleanalytics/plugin/__init__.py
@@ -150,6 +150,10 @@ class GoogleAnalyticsPlugin(GAMixinPlugin, p.SingletonPlugin):
             "googleanalytics_fields": str(self.googleanalytics_fields),
             "googleanalytics_linked_domains": self.googleanalytics_linked_domains,
         }
+        #return p.toolkit.render_snippet(
+        #    "googleanalytics/snippets/googleanalytics_header.html", data
+        #)
+        # Updated to GA4 #25196
         return p.toolkit.render_snippet(
-            "googleanalytics/snippets/googleanalytics_header.html", data
+            "googleanalytics/snippets/gtag_header.html", data
         )
diff --git a/ckanext/googleanalytics/templates/googleanalytics/snippets/gtag_header.html b/ckanext/googleanalytics/templates/googleanalytics/snippets/gtag_header.html
new file mode 100644
index 0000000..3cb79d6
--- /dev/null
+++ b/ckanext/googleanalytics/templates/googleanalytics/snippets/gtag_header.html
@@ -0,0 +1,9 @@
+<!-- Google tag (gtag.js) -->
+<script async src="https://www.googletagmanager.com/gtag/js?id={{googleanalytics_id}}"></script>
+<script>
+  window.dataLayer = window.dataLayer || [];
+  function gtag(){dataLayer.push(arguments);}
+  gtag('js', new Date());
+
+  gtag('config', '{{googleanalytics_id}}');
+</script>