From b44ace699207a3ff4741194230a723a78cbe9a7b Mon Sep 17 00:00:00 2001
From: Paulo Gustavo Veiga <pveiga@wisemapping.com>
Date: Sun, 29 May 2022 21:47:44 -0700
Subject: [PATCH] Update GA4 for public

---
 .../src/main/webapp/jsp/googleAnalytics.jsf      | 16 ----------------
 .../src/main/webapp/jsp/mindmapViewonly.jsp      | 15 ++++++++++++++-
 2 files changed, 14 insertions(+), 17 deletions(-)
 delete mode 100644 wise-webapp/src/main/webapp/jsp/googleAnalytics.jsf
diff --git a/wise-webapp/src/main/webapp/jsp/googleAnalytics.jsf b/wise-webapp/src/main/webapp/jsp/googleAnalytics.jsf
deleted file mode 100644
index 2161cee1..00000000
--- a/wise-webapp/src/main/webapp/jsp/googleAnalytics.jsf
+++ /dev/null
@@ -1,16 +0,0 @@
-<%@taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
-
-<c:if test="${requestScope['google.analytics.enabled']}">
-<!-- Google Analytics -->
-    <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),
-    m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
-    })(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
-
-    ga('create', '${requestScope['google.analytics.account']}', 'auto');
-    ga('send', 'pageview');
-    </script>
-    <!-- End Google Analytics -->
-</c:if>
-
diff --git a/wise-webapp/src/main/webapp/jsp/mindmapViewonly.jsp b/wise-webapp/src/main/webapp/jsp/mindmapViewonly.jsp
index 324433ad..ddc4a8d0 100644
--- a/wise-webapp/src/main/webapp/jsp/mindmapViewonly.jsp
+++ b/wise-webapp/src/main/webapp/jsp/mindmapViewonly.jsp
@@ -19,7 +19,20 @@
           var locale = '${locale}';
           var isAuth = ${principal != null};
      </script>
-     <%@ include file="/jsp/googleAnalytics.jsf" %>
+    <c:if test="${requestScope['google.analytics.enabled']}">
+        <!-- Global site tag (gtag.js) - Google Analytics -->
+        <script async src="https://www.googletagmanager.com/gtag/js?id='${requestScope['google.analytics.account']}'"></script>
+        <script>
+          window.dataLayer = window.dataLayer || [];
+          function gtag(){dataLayer.push(arguments);}
+          gtag('js', new Date());
+          gtag('config', '${requestScope['google.analytics.account']}',
+          {
+            'page_title' : 'Public - ${mindmap.id}'
+          });
+        </script>
+    </c:if>
+
 </head>
 <body>
 
