Rename a few reports js files

corehq/apps/export/static/export/js/download_export.js

@@ -17,7 +17,7 @@
     'analytix/js/google',
     'analytix/js/kissmetrix',
     'reports/js/filters/bootstrap5/main',
-    'reports/js/reports.util',
+    'reports/js/util',
     'export/js/utils',
     'jquery.cookie/jquery.cookie',      // for resuming export downloads on refresh
 ], function (
@@ -33,7 +33,7 @@
     reportUtils,
     exportUtils
 ) {
     'use strict';
 
     var downloadFormModel = function (options) {
         assertProperties.assert(options, [

corehq/apps/fixtures/static/fixtures/js/view-table.js

@@ -2,7 +2,7 @@ hqDefine("fixtures/js/view-table", [
     "jquery",
     "hqwebapp/js/initial_page_data",
     "reports/js/bootstrap3/standard_hq_report",
-    "reports/js/bootstrap3/config.dataTables.bootstrap",
+    "reports/js/bootstrap3/datatables_config",
     "reports/js/filters/bootstrap3/main",
     "datatables.fixedColumns",
 ], function (

corehq/apps/hqadmin/static/hqadmin/js/hqadmin_base_report.js

@@ -1,7 +1,7 @@
 hqDefine('hqadmin/js/hqadmin_base_report', [
     'jquery',
     'hqwebapp/js/initial_page_data',
-    'reports/js/bootstrap3/config.dataTables.bootstrap',
+    'reports/js/bootstrap3/datatables_config',
 ], function (
     $,
     initialPageData,

corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/javascript/reports/js/reports.async.js.diff.txt → corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/javascript/reports/js/async.js.diff.txt

@@ -1,8 +1,8 @@
 --- 
 +++ 
 @@ -1,4 +1,4 @@
--hqDefine("reports/js/bootstrap3/reports.async", function () {
-+hqDefine("reports/js/bootstrap5/reports.async", function () {
+-hqDefine("reports/js/bootstrap3/async", function () {
++hqDefine("reports/js/bootstrap5/async", function () {
      return function (o) {
          'use strict';
          var self = {};

corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/javascript/reports/js/config.dataTables.bootstrap.js.diff.txt → corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/javascript/reports/js/datatables_config.js.diff.txt

@@ -1,8 +1,8 @@
 --- 
 +++ 
 @@ -1,4 +1,4 @@
--hqDefine("reports/js/bootstrap3/config.dataTables.bootstrap", [
-+hqDefine("reports/js/bootstrap5/config.dataTables.bootstrap", [
+-hqDefine("reports/js/bootstrap3/datatables_config", [
++hqDefine("reports/js/bootstrap5/datatables_config", [
      'jquery',
      'underscore',
      'analytix/js/google',

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

@@ -10,8 +10,8 @@
              }
          );
          var table;
--        table = hqImport("reports/js/bootstrap3/config.dataTables.bootstrap").HQReportDataTables({
-+        table = hqImport("reports/js/bootstrap5/config.dataTables.bootstrap").HQReportDataTables({
+-        table = hqImport("reports/js/bootstrap3/datatables_config").HQReportDataTables({
++        table = hqImport("reports/js/bootstrap5/datatables_config").HQReportDataTables({
              aoColumns: colSorting,
          });
 

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

@@ -22,8 +22,8 @@
 
          var reportOptions = initialPageData.get('js_options') || {};
          if (reportOptions.slug && reportOptions.async) {
--            var asyncHQReport = hqImport("reports/js/bootstrap3/reports.async")({
-+            var asyncHQReport = hqImport("reports/js/bootstrap5/reports.async")({
+-            var asyncHQReport = hqImport("reports/js/bootstrap3/async")({
++            var asyncHQReport = hqImport("reports/js/bootstrap5/async")({
                  standardReport: getStandard(),
              });
              asyncHQReport.init();

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

@@ -6,9 +6,9 @@
      'jquery',
      'underscore',
      'hqwebapp/js/initial_page_data',
--    'reports/js/bootstrap3/config.dataTables.bootstrap',
+-    'reports/js/bootstrap3/datatables_config',
 -    'reports/js/bootstrap3/standard_hq_report',
-+    'reports/js/bootstrap5/config.dataTables.bootstrap',
++    'reports/js/bootstrap5/datatables_config',
 +    'reports/js/bootstrap5/standard_hq_report',
  ], function (
      $,

corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/reports/standard/base_template.html.diff.txt

@@ -19,15 +19,15 @@
  {% block js %}{{ block.super }}
    {% compress js %}
      <script src="{% static 'hqwebapp/js/select2_knockout_bindings.ko.js' %}"></script>
--    <script src="{% static 'reports/js/bootstrap3/config.dataTables.bootstrap.js' %}"></script>
-+    <script src="{% static 'reports/js/bootstrap5/config.dataTables.bootstrap.js' %}"></script>
+-    <script src="{% static 'reports/js/bootstrap3/datatables_config.js' %}"></script>
++    <script src="{% static 'reports/js/bootstrap5/datatables_config.js' %}"></script>
      <script src="{% static 'reports/js/datepicker.js' %}"></script>
 -    <script src="{% static 'reports/js/bootstrap3/hq_report.js' %}"></script>
 +    <script src="{% static 'reports/js/bootstrap5/hq_report.js' %}"></script>
-     <script src="{% static 'reports/js/reports.util.js' %}"></script>
--    <script src="{% static 'reports/js/bootstrap3/reports.async.js' %}"></script>
+     <script src="{% static 'reports/js/util.js' %}"></script>
+-    <script src="{% static 'reports/js/bootstrap3/async.js' %}"></script>
 -    <script src="{% static 'reports/js/bootstrap3/standard_hq_report.js' %}"></script>
-+    <script src="{% static 'reports/js/bootstrap5/reports.async.js' %}"></script>
++    <script src="{% static 'reports/js/bootstrap5/async.js' %}"></script>
 +    <script src="{% static 'reports/js/bootstrap5/standard_hq_report.js' %}"></script>
      <script src="{% static 'userreports/js/report_analytix.js' %}"></script>
    {% endcompress %}

corehq/apps/reports/generic.py

@@ -841,7 +841,7 @@ class GenericTabularReport(GenericReportView):
     bad_request_error_text = None
     exporting_as_excel = False
 
-    # Sets bSort in the datatables instance to true/false (config.dataTables.bootstrap.js)
+    # Sets bSort in the datatables instance to true/false (datatables_config.js)
     sortable = True
 
     # override old class properties

corehq/apps/reports/static/reports/js/bootstrap3/reports.async.js → corehq/apps/reports/static/reports/js/bootstrap3/async.js

@@ -1,6 +1,6 @@
-hqDefine("reports/js/bootstrap3/reports.async", function () {
+hqDefine("reports/js/bootstrap3/async", function () {
     return function (o) {
         'use strict';
         var self = {};
         self.reportContent = $('#report-content');
         self.filterForm = o.filterForm || $('#paramSelectorForm');
@@ -58,7 +58,7 @@
                 self.standardReport.filterSubmitButton.addClass('disabled');
             }
             self.filterForm.submit(function () {
-                var params = hqImport('reports/js/reports.util').urlSerialize(this);
+                var params = hqImport('reports/js/util').urlSerialize(this);
                 if (self.isCaseListRelated(pathName)) {
                     var url = window.location.href.replace(self.standardReport.urlRoot,
                         self.standardReport.urlRoot + 'async/') + "?" + "&" + params;

corehq/apps/reports/static/reports/js/bootstrap3/config.dataTables.bootstrap.js → corehq/apps/reports/static/reports/js/bootstrap3/datatables_config.js

@@ -1,4 +1,4 @@
-hqDefine("reports/js/bootstrap3/config.dataTables.bootstrap", [
+hqDefine("reports/js/bootstrap3/datatables_config", [
     'jquery',
     'underscore',
     'analytix/js/google',

corehq/apps/reports/static/reports/js/bootstrap3/maps_utils.js

@@ -109,7 +109,7 @@
             root.unselectAll();
 
             var node = this;
             while (node != null) {
                 node.selected(true);
                 node.expanded(true);
                 node = node.parent;
@@ -142,7 +142,7 @@
         },
 
         render: function (metric) {
             if (metric == null) {
                 this.$div.hide();
                 return;
             }
@@ -165,17 +165,17 @@
         },
 
         setActive: function (feature, metric) {
             if (feature == null ||
                 (metric == null && !this.options.config.name_column)) { // nothing to show
                 this.$div.hide();
                 return;
             }
 
             var cols = [];
             if (metric != null) {
                 forEachDimension(metric, function (type, meta) {
                     var col = meta.column;
                     if (cols.indexOf(col) == -1) {
                         cols.push(col);
                     }
                 });
@@ -263,10 +263,10 @@
         });
 
         // make a default detail view if not specified
         if (config.detail_columns == null) {
             config.detail_columns = getAllCols(config, data);
         }
         if (config.table_columns == null) {
             config.table_columns = config.detail_columns.slice(0);
         }
 
@@ -353,7 +353,7 @@
         if (table !== undefined) {
             metrics.table = table;
         }
         var m = new MetricsControl(metrics).addTo(map);
 
         zoomToAll(map);
     }
@@ -428,7 +428,7 @@
     // generate the proper geojson styling for the given display metric
     function makeDisplayContext(metric, setActiveFeature) {
         return {
             filter: function (feature, layer) {
                 if (feature.geometry.type == "Point") {
                     feature._conf = markerFactory(metric, feature.properties);
                 } else {
@@ -1674,7 +1674,7 @@
             }
         );
         var table;
-        table = hqImport("reports/js/bootstrap3/config.dataTables.bootstrap").HQReportDataTables({
+        table = hqImport("reports/js/bootstrap3/datatables_config").HQReportDataTables({
             aoColumns: colSorting,
         });
 

corehq/apps/reports/static/reports/js/bootstrap3/standard_hq_report.js

@@ -65,7 +65,7 @@ hqDefine("reports/js/bootstrap3/standard_hq_report", [
 
         var reportOptions = initialPageData.get('js_options') || {};
         if (reportOptions.slug && reportOptions.async) {
-            var asyncHQReport = hqImport("reports/js/bootstrap3/reports.async")({
+            var asyncHQReport = hqImport("reports/js/bootstrap3/async")({
                 standardReport: getStandard(),
             });
             asyncHQReport.init();

corehq/apps/reports/static/reports/js/bootstrap3/tabular.js

@@ -2,7 +2,7 @@ hqDefine("reports/js/bootstrap3/tabular", [
     'jquery',
     'underscore',
     'hqwebapp/js/initial_page_data',
-    'reports/js/bootstrap3/config.dataTables.bootstrap',
+    'reports/js/bootstrap3/datatables_config',
     'reports/js/bootstrap3/standard_hq_report',
 ], function (
     $,

corehq/apps/reports/static/reports/js/bootstrap5/reports.async.js → corehq/apps/reports/static/reports/js/bootstrap5/async.js

@@ -1,6 +1,6 @@
-hqDefine("reports/js/bootstrap5/reports.async", function () {
+hqDefine("reports/js/bootstrap5/async", function () {
     return function (o) {
         'use strict';
         var self = {};
         self.reportContent = $('#report-content');
         self.filterForm = o.filterForm || $('#paramSelectorForm');
@@ -58,7 +58,7 @@
                 self.standardReport.filterSubmitButton.addClass('disabled');
             }
             self.filterForm.submit(function () {
-                var params = hqImport('reports/js/reports.util').urlSerialize(this);
+                var params = hqImport('reports/js/util').urlSerialize(this);
                 if (self.isCaseListRelated(pathName)) {
                     var url = window.location.href.replace(self.standardReport.urlRoot,
                         self.standardReport.urlRoot + 'async/') + "?" + "&" + params;

corehq/apps/reports/static/reports/js/bootstrap5/config.dataTables.bootstrap.js → corehq/apps/reports/static/reports/js/bootstrap5/datatables_config.js

@@ -1,4 +1,4 @@
-hqDefine("reports/js/bootstrap5/config.dataTables.bootstrap", [
+hqDefine("reports/js/bootstrap5/datatables_config", [
     'jquery',
     'underscore',
     'analytix/js/google',

corehq/apps/reports/static/reports/js/bootstrap5/maps_utils.js

@@ -1674,7 +1674,7 @@ hqDefine("reports/js/bootstrap5/maps_utils", function () {
             }
         );
         var table;
-        table = hqImport("reports/js/bootstrap5/config.dataTables.bootstrap").HQReportDataTables({
+        table = hqImport("reports/js/bootstrap5/datatables_config").HQReportDataTables({
             aoColumns: colSorting,
         });
 

corehq/apps/reports/static/reports/js/bootstrap5/standard_hq_report.js

@@ -65,7 +65,7 @@ hqDefine("reports/js/bootstrap5/standard_hq_report", [
 
         var reportOptions = initialPageData.get('js_options') || {};
         if (reportOptions.slug && reportOptions.async) {
-            var asyncHQReport = hqImport("reports/js/bootstrap5/reports.async")({
+            var asyncHQReport = hqImport("reports/js/bootstrap5/async")({
                 standardReport: getStandard(),
             });
             asyncHQReport.init();

corehq/apps/reports/static/reports/js/bootstrap5/tabular.js

@@ -2,7 +2,7 @@ hqDefine("reports/js/bootstrap5/tabular", [
     'jquery',
     'underscore',
     'hqwebapp/js/initial_page_data',
-    'reports/js/bootstrap5/config.dataTables.bootstrap',
+    'reports/js/bootstrap5/datatables_config',
     'reports/js/bootstrap5/standard_hq_report',
 ], function (
     $,

corehq/apps/reports/static/reports/js/reports.util.js → corehq/apps/reports/static/reports/js/util.js

@@ -1,4 +1,4 @@
-hqDefine('reports/js/reports.util', ['jquery'], function ($) {
+hqDefine('reports/js/util', ['jquery'], function ($) {
     return {
         urlSerialize: function (filters, exclude) {
             exclude = exclude || [];

corehq/apps/reports/templates/reports/standard/bootstrap3/base_template.html

@@ -13,11 +13,11 @@
 {% block js %}{{ block.super }}
   {% compress js %}
     <script src="{% static 'hqwebapp/js/select2_knockout_bindings.ko.js' %}"></script>
-    <script src="{% static 'reports/js/bootstrap3/config.dataTables.bootstrap.js' %}"></script>
+    <script src="{% static 'reports/js/bootstrap3/datatables_config.js' %}"></script>
     <script src="{% static 'reports/js/datepicker.js' %}"></script>
     <script src="{% static 'reports/js/bootstrap3/hq_report.js' %}"></script>
-    <script src="{% static 'reports/js/reports.util.js' %}"></script>
-    <script src="{% static 'reports/js/bootstrap3/reports.async.js' %}"></script>
+    <script src="{% static 'reports/js/util.js' %}"></script>
+    <script src="{% static 'reports/js/bootstrap3/async.js' %}"></script>
     <script src="{% static 'reports/js/bootstrap3/standard_hq_report.js' %}"></script>
     <script src="{% static 'userreports/js/report_analytix.js' %}"></script>
   {% endcompress %}

corehq/apps/reports/templates/reports/standard/bootstrap5/base_template.html

@@ -13,11 +13,11 @@
 {% block js %}{{ block.super }}
   {% compress js %}
     <script src="{% static 'hqwebapp/js/select2_knockout_bindings.ko.js' %}"></script>
-    <script src="{% static 'reports/js/bootstrap5/config.dataTables.bootstrap.js' %}"></script>
+    <script src="{% static 'reports/js/bootstrap5/datatables_config.js' %}"></script>
     <script src="{% static 'reports/js/datepicker.js' %}"></script>
     <script src="{% static 'reports/js/bootstrap5/hq_report.js' %}"></script>
-    <script src="{% static 'reports/js/reports.util.js' %}"></script>
-    <script src="{% static 'reports/js/bootstrap5/reports.async.js' %}"></script>
+    <script src="{% static 'reports/js/util.js' %}"></script>
+    <script src="{% static 'reports/js/bootstrap5/async.js' %}"></script>
     <script src="{% static 'reports/js/bootstrap5/standard_hq_report.js' %}"></script>
     <script src="{% static 'userreports/js/report_analytix.js' %}"></script>
   {% endcompress %}

corehq/apps/styleguide/templates/styleguide/bootstrap5/organisms/tables.html

@@ -179,7 +179,7 @@ <h2 id="datatables" class="pt-4">
   <p>
     In CommCare HQ, we have created a wrapper class around our reporting use of datatables called
     <code>GenericTabularReport</code>, which takes care of generating the datatables configuration in
-    <code>config.dataTables.bootstrap.js</code>. This was done in an effort to reduce the amount of HTML and
+    <code>datatables_config.js</code>. This was done in an effort to reduce the amount of HTML and
     javascript required to create a report, as generating custom reports for projects was once very common in HQ.
     With the introduction of User Configurable Reports (UCRs), this need for quickly creating these hard-coded
     custom reports has since been eliminated.
@@ -194,7 +194,7 @@ <h2 id="datatables" class="pt-4">
   </p>
   <p>
     When our reporting tools were created, DataTables was still a fairly young library and had its own set of issues,
-    which you can see in <code>config.dataTables.bootstrap.js</code> if you examine the strangely named variables in
+    which you can see in <code>datatables_config.js</code> if you examine the strangely named variables in
     still in "hungarian notation" style. Thankfully, the developers of dataTables have kept later versions
     backwards-compatible with this older notation, but for reference here is a
     <a href="https://datatables.net/upgrade/1.10-convert" target="_blank">conversion guide</a> for the older configuration
@@ -204,7 +204,7 @@ <h2 id="datatables" class="pt-4">
     {# todo future developer: remove with use_bootstrap5 removal cleanup and revisit text above too #}
     <strong>Important:</strong> As of the time of this writing, the Bootstrap 3 to 5 migration is still ongoing
     and the Reporting section has not yet been migrated. Please ensure that during that migration, the notation in
-    <code>config.dataTables.bootstrap.js</code> is updated. Thank you.
+    <code>datatables_config.js</code> is updated. Thank you.
   </div>
   <h3 id="datatables-simple" class="pt-3">
     Simple Example

corehq/apps/toggle_ui/static/toggle_ui/js/flags.js

@@ -3,7 +3,7 @@ hqDefine('toggle_ui/js/flags', [
     'knockout',
     'underscore',
     'hqwebapp/js/bootstrap3/alert_user',
-    'reports/js/bootstrap3/config.dataTables.bootstrap',
+    'reports/js/bootstrap3/datatables_config',
     'hqwebapp/js/components/select_toggle',
     'commcarehq',
 ], function (

corehq/apps/userreports/static/userreports/js/base.js

@@ -65,7 +65,7 @@ hqDefine('userreports/js/base', function () {
             }
         };
 
-        var reportTables = hqImport("reports/js/bootstrap3/config.dataTables.bootstrap").HQReportDataTables({
+        var reportTables = hqImport("reports/js/bootstrap3/datatables_config").HQReportDataTables({
             dataTableElem: '#report_table_' + initialPageData.get('report_slug'),
             defaultRows: initialPageData.get('table_default_rows'),
             startAtRowNum: initialPageData.get('table_start_at_row'),

corehq/apps/userreports/static/userreports/js/configurable_report.js

@@ -31,7 +31,7 @@ hqDefine("userreports/js/configurable_report", function () {
             hqImport('userreports/js/report_analytix').track.event.apply(this, e);
         });
 
-        var urlSerialize = hqImport('reports/js/reports.util').urlSerialize;
+        var urlSerialize = hqImport('reports/js/util').urlSerialize;
         var reportOptions = {
             domain: initialPageData.get('domain'),
             urlRoot: initialPageData.get('url_root'),

corehq/apps/userreports/templates/userreports/base.html

@@ -13,7 +13,7 @@
 {% block js %}{{ block.super }}
   {% compress js %}
     <script src="{% static 'hqwebapp/js/select2_knockout_bindings.ko.js' %}"></script>
-    <script src="{% static 'reports/js/bootstrap3/config.dataTables.bootstrap.js' %}"></script>
+    <script src="{% static 'reports/js/bootstrap3/datatables_config.js' %}"></script>
     <script src="{% static 'reports_core/js/choice_list_utils.js' %}"></script>
     <script src="{% static 'reports_core/js/charts.js' %}"></script>
     <script src="{% static 'userreports/js/report_analytix.js' %}"></script>

corehq/apps/userreports/templates/userreports/configurable_report.html

@@ -5,7 +5,7 @@
 
 {% block js %}{{ block.super }}
   {% compress js %}
-    <script src="{% static 'reports/js/reports.util.js' %}"></script>
+    <script src="{% static 'reports/js/util.js' %}"></script>
     <script src="{% static 'reports/js/bootstrap3/hq_report.js' %}"></script>
     <script src="{% static 'reports/js/bootstrap3/standard_hq_report.js' %}"></script>
     <script src="{% static 'reports/js/bootstrap3/report_config_models.js' %}"></script>

custom/inddex/templates/inddex/partials/report_table.html

@@ -42,7 +42,7 @@
 <script>
    {% if report_table and report_table.datatables %}
    $(function() {
-        var reportTables = hqImport("reports/js/bootstrap3/config.dataTables.bootstrap").HQReportDataTables({
+        var reportTables = hqImport("reports/js/bootstrap3/datatables_config").HQReportDataTables({
             dataTableElem: '#report_table_{{ report_table.slug }}',
             defaultRows: {{ report_table.default_rows|default:10 }},
             startAtRowNum: {{ report_table.start_at_row|default:0 }},