Merge branch 'feature/handle-missing-ga' into feature/fix-google-anal…

…ytics
silinternational · Nov 27, 2024 · 5bb3bf0 · 5bb3bf0
2 parents 31ea007 + 8ac7ae8
commit 5bb3bf0
Show file tree

Hide file tree

Showing 7 changed files with 34 additions and 18 deletions.
diff --git a/modules/material/themes/material/default/selectidp-links.twig b/modules/material/themes/material/default/selectidp-links.twig
@@ -14,13 +14,15 @@
       idpInput.value = id;
 
       document.querySelector('form').appendChild(idpInput);
+      
       {% if analytics_tracking_id is not empty %}
         gtag('event', 'IdP', {
           'event_category': 'hub',
           'event_label': 'choice',
           'value': id
         });
       {% endif %}
+      
       document.querySelector('form').submit();
     }
     
@@ -33,7 +35,9 @@
     });
 
     function clickedAnyway(idpName) {
-      ga('send', 'event', 'hub', 'choice-disabled', 'IdP', idpName);
+      {% if analytics_tracking_id is not empty %}
+        ga('send', 'event', 'hub', 'choice-disabled', 'IdP', idpName);
+      {% endif %}
     }
   </script>
 </head>

diff --git a/modules/material/themes/material/mfa/new-backup-codes.twig b/modules/material/themes/material/mfa/new-backup-codes.twig
@@ -136,9 +136,11 @@
           </div>
         </div>
 
-        <script>
-          ga('send', 'event', 'error', 'backupcode', 'generation-failed');
-        </script>
+        {% if analytics_tracking_id is not empty %}
+          <script>
+            ga('send', 'event', 'error', 'backupcode', 'generation-failed');
+          </script>
+        {% endif %}
       {% endif %}
 
       <div layout-children="row" class="fill-parent">

diff --git a/modules/material/themes/material/mfa/prompt-for-mfa-backupcode.twig b/modules/material/themes/material/mfa/prompt-for-mfa-backupcode.twig
@@ -53,9 +53,11 @@
             </p>
           </div>
 
-          <script>
-            ga('send', 'event', 'error', 'backupcode', '{{ error_message|e('js')|raw }}');
-          </script>
+          {% if analytics_tracking_id is not empty %}
+            <script>
+              ga('send', 'event', 'error', 'backupcode', '{{ error_message|e('js')|raw }}');
+            </script>
+          {% endif %}
         {% endif %}
 
         <div class="mdl-card__actions" layout-children="row">

diff --git a/modules/material/themes/material/mfa/prompt-for-mfa-manager.twig b/modules/material/themes/material/mfa/prompt-for-mfa-manager.twig
@@ -53,9 +53,11 @@
             </p>
           </div>
 
-          <script>
-            ga('send', 'event', 'error', 'managercode', '{{ error_message|e('js')|raw }}');
-          </script>
+          {% if analytics_tracking_id is not empty %}
+            <script>
+              ga('send', 'event', 'error', 'managercode', '{{ error_message|e('js')|raw }}');
+            </script>
+          {% endif %}
         {% endif %}
 
         <div class="mdl-card__actions" layout-children="row">

diff --git a/modules/material/themes/material/mfa/prompt-for-mfa-totp.twig b/modules/material/themes/material/mfa/prompt-for-mfa-totp.twig
@@ -51,9 +51,11 @@
             </p>
           </div>
 
-          <script>
-            ga('send', 'event', 'error', 'totp', '{{ error_message|e('js')|raw }}');
-          </script>
+          {% if analytics_tracking_id is not empty %}
+            <script>
+              ga('send', 'event', 'error', 'totp', '{{ error_message|e('js')|raw }}');
+            </script>
+          {% endif %}
         {% endif %}
 
         <div class="mdl-card__actions" layout-children="row">

diff --git a/modules/material/themes/material/mfa/prompt-for-mfa-webauthn.twig b/modules/material/themes/material/mfa/prompt-for-mfa-webauthn.twig
@@ -94,7 +94,7 @@
           </p>
         </div>
 
-        {% if error_message is not empty %}
+        {% if error_message is not empty and analytics_tracking_id is not empty %}
           <script>
             ga('send', 'event', 'error', 'webauthn', '{{ error_message|e('js')|raw }}');
           </script>

diff --git a/modules/material/themes/material/silauth/loginuserpass.twig b/modules/material/themes/material/silauth/loginuserpass.twig
@@ -28,7 +28,9 @@
         });
       }
 
-      ga('send', 'event', 'reCAPTCHA', 'required');
+      {% if analytics_tracking_id is not empty %}
+        ga('send', 'event', 'reCAPTCHA', 'required');
+      {% endif %}
     </script>
   {% endif %}
 </head>
@@ -100,9 +102,11 @@
             </span>
           </p>
 
-          <script>
-            ga('send', 'event', 'error', '{{ errorcode|e('js') }}', 'message', '{{ message|e('js') }}');
-          </script>
+          {% if analytics_tracking_id is not empty %}
+            <script>
+              ga('send', 'event', 'error', '{{ errorcode|e('js') }}', 'message', '{{ message|e('js') }}');
+            </script>
+          {% endif %}
         {% endif %}
 
         <div class="mdl-card__actions" layout-children="row">