Renamed config.dataTables.bootstrap.js

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/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/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,8 +19,8 @@
  {% 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>

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/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

@@ -1674,7 +1674,7 @@ hqDefine("reports/js/bootstrap3/maps_utils", function () {
             }
         );
         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/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/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/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/templates/reports/standard/bootstrap3/base_template.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/js/datepicker.js' %}"></script>
     <script src="{% static 'reports/js/bootstrap3/hq_report.js' %}"></script>
     <script src="{% static 'reports/js/util.js' %}"></script>

corehq/apps/reports/templates/reports/standard/bootstrap5/base_template.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/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/util.js' %}"></script>

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/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>

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 }},