Merge pull request #35060 from dimagi/ay/adblocker-gtm-fix-local

Fixes the issue of adblocker blocking the tag manager HQ script

corehq/apps/analytics/README.md

@@ -106,7 +106,7 @@ Their script is included in [signup](https://github.com/dimagi/commcare-hq/blob/
 
 ### Google Tag Manager (GTM)
 
-Its script is available in the [gtm.js](https://github.com/dimagi/commcare-hq/blob/master/corehq/apps/analytics/static/analytix/js/gtm.js) which loads the GTM tracking script and sends the desired user properties to GTM.
+Its script is available in the [gtx.js](https://github.com/dimagi/commcare-hq/blob/master/corehq/apps/analytics/static/analytix/js/gtx.js) which loads the GTM tracking script and sends the desired user properties to GTM.
 Any tracking of events should be configured at the GTM console end in tandem with the desired analytics tooling. The goal is to track specific features in HQ and also disable them when there is no need via the GTM console itself.
 Any `id` attribute added to html element for tracking through console should be prefixed with `gtm-` to indicate that this element is likely being tracked in GTM.
 This should potentially avoid accidental removal of id attribute from these elements. (Similar approach may be followed for any tooling in case of tracking of elements through console.)

corehq/apps/analytics/static/analytix/js/gtm.js → corehq/apps/analytics/static/analytix/js/gtx.js

@@ -1,8 +1,9 @@
 "use strict";
 /**
- *  Handles communication with the google tag manager API. 
+ *  Handles communication with the google tag manager API.
+ *  gtx is the filename because some ad blockers blocks 'gtm.js'*
  */
-hqDefine('analytix/js/gtm', [
+hqDefine('analytix/js/gtx', [
     'jquery',
     'underscore',
     'analytix/js/initial',

corehq/apps/analytics/templates/analytics/analytics_js.html

@@ -12,5 +12,6 @@
   <script src="{% static 'analytix/js/hubspot.js' %}"></script>
   <script src="{% static 'analytix/js/drift.js' %}"></script>
   <script src="{% static 'analytix/js/appcues.js' %}"></script>
-  <script src="{% static 'analytix/js/gtm.js' %}"></script>
+  {# gtx is the filename because some adblockers blocks 'gtm.js' #}
+  <script src="{% static 'analytix/js/gtx.js' %}"></script>
 {% endcompress %}

corehq/apps/hqwebapp/static/hqwebapp/js/bootstrap3/base_main.js

@@ -13,7 +13,7 @@ hqDefine("hqwebapp/js/bootstrap3/base_main", [
     'analytix/js/google',
     'analytix/js/hubspot',
     'analytix/js/kissmetrix',
-    'analytix/js/gtm',
+    'analytix/js/gtx',
     'hqwebapp/js/bootstrap3/mobile_experience_warning',
 ], function () {
     // nothing to do, this is just to define the dependencies for hqwebapp/base.html

corehq/apps/hqwebapp/static/hqwebapp/js/bootstrap5/base_main.js

@@ -13,7 +13,7 @@ hqDefine("hqwebapp/js/bootstrap5/base_main", [
     'analytix/js/google',
     'analytix/js/hubspot',
     'analytix/js/kissmetrix',
-    'analytix/js/gtm',
+    'analytix/js/gtx',
     'hqwebapp/js/bootstrap5/mobile_experience_warning',
 ], function () {
     // nothing to do, this is just to define the dependencies for hqwebapp/base.html

corehq/apps/hqwebapp/templatetags/tests/rendered/javascript_libraries_hq.html

@@ -24,7 +24,7 @@
 <script src="{% static 'analytix/js/hubspot.js' %}"></script>
 <script src="{% static 'analytix/js/drift.js' %}"></script>
 <script src="{% static 'analytix/js/appcues.js' %}"></script>
-<script src="{% static 'analytix/js/gtm.js' %}"></script>
+<script src="{% static 'analytix/js/gtx.js' %}"></script>
 
 <script src="{% static 'knockout/build/output/knockout-latest.js' %}"></script>
 <script src="{% static 'hqwebapp/js/lib/knockout_plugins/knockout_mapping.ko.min.js' %}"></script>

corehq/apps/hqwebapp/templatetags/tests/rendered/javascript_libraries_hq_bootstrap5.html

@@ -24,7 +24,7 @@
 <script src="{% static 'analytix/js/hubspot.js' %}"></script>
 <script src="{% static 'analytix/js/drift.js' %}"></script>
 <script src="{% static 'analytix/js/appcues.js' %}"></script>
-<script src="{% static 'analytix/js/gtm.js' %}"></script>
+<script src="{% static 'analytix/js/gtx.js' %}"></script>
 
 <script src="{% static 'knockout/build/output/knockout-latest.js' %}"></script>
 <script src="{% static 'hqwebapp/js/lib/knockout_plugins/knockout_mapping.ko.min.js' %}"></script>

corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/javascript/hqwebapp/js/base_main.js.diff.txt

@@ -25,7 +25,7 @@
      'analytix/js/google',
      'analytix/js/hubspot',
      'analytix/js/kissmetrix',
-     'analytix/js/gtm',
+     'analytix/js/gtx',
 -    'hqwebapp/js/bootstrap3/mobile_experience_warning',
 +    'hqwebapp/js/bootstrap5/mobile_experience_warning',
  ], function () {