From 96cab933f546a52ce17307240b1934203d10dd28 Mon Sep 17 00:00:00 2001 From: Jenny Schweers Date: Wed, 11 Dec 2024 17:48:40 -0500 Subject: [PATCH 1/3] Renamed reports.async.js --- .../js/{reports.async.js.diff.txt => async.js.diff.txt} | 4 ++-- .../javascript/reports/js/standard_hq_report.js.diff.txt | 4 ++-- .../reports/standard/base_template.html.diff.txt | 4 ++-- .../reports/js/bootstrap3/{reports.async.js => async.js} | 2 +- .../static/reports/js/bootstrap3/standard_hq_report.js | 2 +- .../reports/js/bootstrap5/{reports.async.js => async.js} | 2 +- .../static/reports/js/bootstrap5/standard_hq_report.js | 2 +- .../templates/reports/standard/bootstrap3/base_template.html | 2 +- .../templates/reports/standard/bootstrap5/base_template.html | 2 +- 9 files changed, 12 insertions(+), 12 deletions(-) rename corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/javascript/reports/js/{reports.async.js.diff.txt => async.js.diff.txt} (97%) rename corehq/apps/reports/static/reports/js/bootstrap3/{reports.async.js => async.js} (99%) rename corehq/apps/reports/static/reports/js/bootstrap5/{reports.async.js => async.js} (99%) diff --git a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/javascript/reports/js/reports.async.js.diff.txt b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/javascript/reports/js/async.js.diff.txt similarity index 97% rename from corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/javascript/reports/js/reports.async.js.diff.txt rename to corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/javascript/reports/js/async.js.diff.txt index 8f557f2d0608..457cdc36dfa9 100644 --- a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/javascript/reports/js/reports.async.js.diff.txt +++ b/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 = {}; diff --git a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/javascript/reports/js/standard_hq_report.js.diff.txt b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/javascript/reports/js/standard_hq_report.js.diff.txt index f08f6cd614a2..bf61fc3a2021 100644 --- a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/javascript/reports/js/standard_hq_report.js.diff.txt +++ b/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(); diff --git a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/reports/standard/base_template.html.diff.txt b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/reports/standard/base_template.html.diff.txt index d34556b3fd1e..8cda917aa5dd 100644 --- a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/reports/standard/base_template.html.diff.txt +++ b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/reports/standard/base_template.html.diff.txt @@ -25,9 +25,9 @@ - + -- +- - -+ ++ + {% endcompress %} diff --git a/corehq/apps/reports/static/reports/js/bootstrap3/reports.async.js b/corehq/apps/reports/static/reports/js/bootstrap3/async.js similarity index 99% rename from corehq/apps/reports/static/reports/js/bootstrap3/reports.async.js rename to corehq/apps/reports/static/reports/js/bootstrap3/async.js index 75b9ce35c90e..4211ace96ac4 100644 --- a/corehq/apps/reports/static/reports/js/bootstrap3/reports.async.js +++ b/corehq/apps/reports/static/reports/js/bootstrap3/async.js @@ -1,4 +1,4 @@ -hqDefine("reports/js/bootstrap3/reports.async", function () { +hqDefine("reports/js/bootstrap3/async", function () { return function (o) { 'use strict'; var self = {}; diff --git a/corehq/apps/reports/static/reports/js/bootstrap3/standard_hq_report.js b/corehq/apps/reports/static/reports/js/bootstrap3/standard_hq_report.js index f0303b73e2a7..34a2dfb6478e 100644 --- a/corehq/apps/reports/static/reports/js/bootstrap3/standard_hq_report.js +++ b/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(); diff --git a/corehq/apps/reports/static/reports/js/bootstrap5/reports.async.js b/corehq/apps/reports/static/reports/js/bootstrap5/async.js similarity index 99% rename from corehq/apps/reports/static/reports/js/bootstrap5/reports.async.js rename to corehq/apps/reports/static/reports/js/bootstrap5/async.js index d966d0d81bb1..eac1014347a7 100644 --- a/corehq/apps/reports/static/reports/js/bootstrap5/reports.async.js +++ b/corehq/apps/reports/static/reports/js/bootstrap5/async.js @@ -1,4 +1,4 @@ -hqDefine("reports/js/bootstrap5/reports.async", function () { +hqDefine("reports/js/bootstrap5/async", function () { return function (o) { 'use strict'; var self = {}; diff --git a/corehq/apps/reports/static/reports/js/bootstrap5/standard_hq_report.js b/corehq/apps/reports/static/reports/js/bootstrap5/standard_hq_report.js index a303b04f92b2..c3043da65c79 100644 --- a/corehq/apps/reports/static/reports/js/bootstrap5/standard_hq_report.js +++ b/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(); diff --git a/corehq/apps/reports/templates/reports/standard/bootstrap3/base_template.html b/corehq/apps/reports/templates/reports/standard/bootstrap3/base_template.html index aa62e3737d05..5af89c0114af 100644 --- a/corehq/apps/reports/templates/reports/standard/bootstrap3/base_template.html +++ b/corehq/apps/reports/templates/reports/standard/bootstrap3/base_template.html @@ -17,7 +17,7 @@ - + {% endcompress %} diff --git a/corehq/apps/reports/templates/reports/standard/bootstrap5/base_template.html b/corehq/apps/reports/templates/reports/standard/bootstrap5/base_template.html index 2aa429586c16..17bb19ad87d6 100644 --- a/corehq/apps/reports/templates/reports/standard/bootstrap5/base_template.html +++ b/corehq/apps/reports/templates/reports/standard/bootstrap5/base_template.html @@ -17,7 +17,7 @@ - + {% endcompress %} From c373361bf293730a043da3300a8ab71f081b2299 Mon Sep 17 00:00:00 2001 From: Jenny Schweers Date: Wed, 11 Dec 2024 17:57:22 -0500 Subject: [PATCH 2/3] Renamed reports.util.js --- corehq/apps/export/static/export/js/download_export.js | 2 +- .../reports/standard/base_template.html.diff.txt | 2 +- corehq/apps/reports/static/reports/js/bootstrap3/async.js | 2 +- corehq/apps/reports/static/reports/js/bootstrap5/async.js | 2 +- .../apps/reports/static/reports/js/{reports.util.js => util.js} | 2 +- .../templates/reports/standard/bootstrap3/base_template.html | 2 +- .../templates/reports/standard/bootstrap5/base_template.html | 2 +- .../userreports/static/userreports/js/configurable_report.js | 2 +- .../userreports/templates/userreports/configurable_report.html | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) rename corehq/apps/reports/static/reports/js/{reports.util.js => util.js} (96%) diff --git a/corehq/apps/export/static/export/js/download_export.js b/corehq/apps/export/static/export/js/download_export.js index 2fcd616006f0..c683aaa83b1e 100644 --- a/corehq/apps/export/static/export/js/download_export.js +++ b/corehq/apps/export/static/export/js/download_export.js @@ -17,7 +17,7 @@ hqDefine('export/js/download_export', [ '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 ( diff --git a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/reports/standard/base_template.html.diff.txt b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/reports/standard/base_template.html.diff.txt index 8cda917aa5dd..0bf42de5ccd7 100644 --- a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/reports/standard/base_template.html.diff.txt +++ b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/reports/standard/base_template.html.diff.txt @@ -24,7 +24,7 @@ - + - + - - + diff --git a/corehq/apps/reports/static/reports/js/bootstrap3/async.js b/corehq/apps/reports/static/reports/js/bootstrap3/async.js index 4211ace96ac4..abed3b2f91a3 100644 --- a/corehq/apps/reports/static/reports/js/bootstrap3/async.js +++ b/corehq/apps/reports/static/reports/js/bootstrap3/async.js @@ -58,7 +58,7 @@ hqDefine("reports/js/bootstrap3/async", function () { 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; diff --git a/corehq/apps/reports/static/reports/js/bootstrap5/async.js b/corehq/apps/reports/static/reports/js/bootstrap5/async.js index eac1014347a7..07ef47672dc1 100644 --- a/corehq/apps/reports/static/reports/js/bootstrap5/async.js +++ b/corehq/apps/reports/static/reports/js/bootstrap5/async.js @@ -58,7 +58,7 @@ hqDefine("reports/js/bootstrap5/async", function () { 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; diff --git a/corehq/apps/reports/static/reports/js/reports.util.js b/corehq/apps/reports/static/reports/js/util.js similarity index 96% rename from corehq/apps/reports/static/reports/js/reports.util.js rename to corehq/apps/reports/static/reports/js/util.js index 844a2d67225a..c99e756de768 100644 --- a/corehq/apps/reports/static/reports/js/reports.util.js +++ b/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 || []; diff --git a/corehq/apps/reports/templates/reports/standard/bootstrap3/base_template.html b/corehq/apps/reports/templates/reports/standard/bootstrap3/base_template.html index 5af89c0114af..8178dc55be96 100644 --- a/corehq/apps/reports/templates/reports/standard/bootstrap3/base_template.html +++ b/corehq/apps/reports/templates/reports/standard/bootstrap3/base_template.html @@ -16,7 +16,7 @@ - + diff --git a/corehq/apps/reports/templates/reports/standard/bootstrap5/base_template.html b/corehq/apps/reports/templates/reports/standard/bootstrap5/base_template.html index 17bb19ad87d6..a8394a2306cb 100644 --- a/corehq/apps/reports/templates/reports/standard/bootstrap5/base_template.html +++ b/corehq/apps/reports/templates/reports/standard/bootstrap5/base_template.html @@ -16,7 +16,7 @@ - + diff --git a/corehq/apps/userreports/static/userreports/js/configurable_report.js b/corehq/apps/userreports/static/userreports/js/configurable_report.js index d586f854816d..636f4a29b94b 100644 --- a/corehq/apps/userreports/static/userreports/js/configurable_report.js +++ b/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'), diff --git a/corehq/apps/userreports/templates/userreports/configurable_report.html b/corehq/apps/userreports/templates/userreports/configurable_report.html index 2cc248aee250..2551757d487d 100644 --- a/corehq/apps/userreports/templates/userreports/configurable_report.html +++ b/corehq/apps/userreports/templates/userreports/configurable_report.html @@ -5,7 +5,7 @@ {% block js %}{{ block.super }} {% compress js %} - + From 3fdccf41d17eaff95059dd30baa3a409a2d12b95 Mon Sep 17 00:00:00 2001 From: Jenny Schweers Date: Wed, 11 Dec 2024 18:18:20 -0500 Subject: [PATCH 3/3] Renamed config.dataTables.bootstrap.js --- corehq/apps/fixtures/static/fixtures/js/view-table.js | 2 +- .../apps/hqadmin/static/hqadmin/js/hqadmin_base_report.js | 2 +- ....bootstrap.js.diff.txt => datatables_config.js.diff.txt} | 4 ++-- .../javascript/reports/js/maps_utils.js.diff.txt | 4 ++-- .../javascript/reports/js/tabular.js.diff.txt | 4 ++-- .../reports/standard/base_template.html.diff.txt | 4 ++-- corehq/apps/reports/generic.py | 2 +- ...{config.dataTables.bootstrap.js => datatables_config.js} | 2 +- .../apps/reports/static/reports/js/bootstrap3/maps_utils.js | 2 +- corehq/apps/reports/static/reports/js/bootstrap3/tabular.js | 2 +- ...{config.dataTables.bootstrap.js => datatables_config.js} | 2 +- .../apps/reports/static/reports/js/bootstrap5/maps_utils.js | 2 +- corehq/apps/reports/static/reports/js/bootstrap5/tabular.js | 2 +- .../reports/standard/bootstrap3/base_template.html | 2 +- .../reports/standard/bootstrap5/base_template.html | 2 +- .../templates/styleguide/bootstrap5/organisms/tables.html | 6 +++--- corehq/apps/toggle_ui/static/toggle_ui/js/flags.js | 2 +- corehq/apps/userreports/static/userreports/js/base.js | 2 +- corehq/apps/userreports/templates/userreports/base.html | 2 +- custom/inddex/templates/inddex/partials/report_table.html | 2 +- 20 files changed, 26 insertions(+), 26 deletions(-) rename corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/javascript/reports/js/{config.dataTables.bootstrap.js.diff.txt => datatables_config.js.diff.txt} (80%) rename corehq/apps/reports/static/reports/js/bootstrap3/{config.dataTables.bootstrap.js => datatables_config.js} (99%) rename corehq/apps/reports/static/reports/js/bootstrap5/{config.dataTables.bootstrap.js => datatables_config.js} (99%) diff --git a/corehq/apps/fixtures/static/fixtures/js/view-table.js b/corehq/apps/fixtures/static/fixtures/js/view-table.js index 534b3f49378c..6adaaead9964 100644 --- a/corehq/apps/fixtures/static/fixtures/js/view-table.js +++ b/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 ( diff --git a/corehq/apps/hqadmin/static/hqadmin/js/hqadmin_base_report.js b/corehq/apps/hqadmin/static/hqadmin/js/hqadmin_base_report.js index b2274f3c4d90..687970a3f1e8 100644 --- a/corehq/apps/hqadmin/static/hqadmin/js/hqadmin_base_report.js +++ b/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, diff --git a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/javascript/reports/js/config.dataTables.bootstrap.js.diff.txt b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/javascript/reports/js/datatables_config.js.diff.txt similarity index 80% rename from corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/javascript/reports/js/config.dataTables.bootstrap.js.diff.txt rename to corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/javascript/reports/js/datatables_config.js.diff.txt index b183a57c08cc..29ddb70f9605 100644 --- a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/javascript/reports/js/config.dataTables.bootstrap.js.diff.txt +++ b/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', diff --git a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/javascript/reports/js/maps_utils.js.diff.txt b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/javascript/reports/js/maps_utils.js.diff.txt index 5640274cef6f..e272f0e2193a 100644 --- a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/javascript/reports/js/maps_utils.js.diff.txt +++ b/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, }); diff --git a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/javascript/reports/js/tabular.js.diff.txt b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/javascript/reports/js/tabular.js.diff.txt index 8c53df0dc990..8ef04a2165d6 100644 --- a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/javascript/reports/js/tabular.js.diff.txt +++ b/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 ( $, diff --git a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/reports/standard/base_template.html.diff.txt b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/reports/standard/base_template.html.diff.txt index 0bf42de5ccd7..137b93812833 100644 --- a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/reports/standard/base_template.html.diff.txt +++ b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/reports/standard/base_template.html.diff.txt @@ -19,8 +19,8 @@ {% block js %}{{ block.super }} {% compress js %} -- -+ +- ++ - + diff --git a/corehq/apps/reports/generic.py b/corehq/apps/reports/generic.py index bdaa7777ab1f..6a254e91006b 100644 --- a/corehq/apps/reports/generic.py +++ b/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 diff --git a/corehq/apps/reports/static/reports/js/bootstrap3/config.dataTables.bootstrap.js b/corehq/apps/reports/static/reports/js/bootstrap3/datatables_config.js similarity index 99% rename from corehq/apps/reports/static/reports/js/bootstrap3/config.dataTables.bootstrap.js rename to corehq/apps/reports/static/reports/js/bootstrap3/datatables_config.js index bb2151e12e42..0bf18553bb80 100644 --- a/corehq/apps/reports/static/reports/js/bootstrap3/config.dataTables.bootstrap.js +++ b/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', diff --git a/corehq/apps/reports/static/reports/js/bootstrap3/maps_utils.js b/corehq/apps/reports/static/reports/js/bootstrap3/maps_utils.js index ad6ebe0090a2..15ea715b31c9 100644 --- a/corehq/apps/reports/static/reports/js/bootstrap3/maps_utils.js +++ b/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, }); diff --git a/corehq/apps/reports/static/reports/js/bootstrap3/tabular.js b/corehq/apps/reports/static/reports/js/bootstrap3/tabular.js index dabcfa903e34..b970787c92c6 100644 --- a/corehq/apps/reports/static/reports/js/bootstrap3/tabular.js +++ b/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 ( $, diff --git a/corehq/apps/reports/static/reports/js/bootstrap5/config.dataTables.bootstrap.js b/corehq/apps/reports/static/reports/js/bootstrap5/datatables_config.js similarity index 99% rename from corehq/apps/reports/static/reports/js/bootstrap5/config.dataTables.bootstrap.js rename to corehq/apps/reports/static/reports/js/bootstrap5/datatables_config.js index 67982d789f69..9220723ab2db 100644 --- a/corehq/apps/reports/static/reports/js/bootstrap5/config.dataTables.bootstrap.js +++ b/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', diff --git a/corehq/apps/reports/static/reports/js/bootstrap5/maps_utils.js b/corehq/apps/reports/static/reports/js/bootstrap5/maps_utils.js index ec54bca0e7c3..3d67a4fc15f3 100644 --- a/corehq/apps/reports/static/reports/js/bootstrap5/maps_utils.js +++ b/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, }); diff --git a/corehq/apps/reports/static/reports/js/bootstrap5/tabular.js b/corehq/apps/reports/static/reports/js/bootstrap5/tabular.js index 3e99e9a4ae27..6fd3642e3f2e 100644 --- a/corehq/apps/reports/static/reports/js/bootstrap5/tabular.js +++ b/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 ( $, diff --git a/corehq/apps/reports/templates/reports/standard/bootstrap3/base_template.html b/corehq/apps/reports/templates/reports/standard/bootstrap3/base_template.html index 8178dc55be96..3c16772294ba 100644 --- a/corehq/apps/reports/templates/reports/standard/bootstrap3/base_template.html +++ b/corehq/apps/reports/templates/reports/standard/bootstrap3/base_template.html @@ -13,7 +13,7 @@ {% block js %}{{ block.super }} {% compress js %} - + diff --git a/corehq/apps/reports/templates/reports/standard/bootstrap5/base_template.html b/corehq/apps/reports/templates/reports/standard/bootstrap5/base_template.html index a8394a2306cb..2426375af92f 100644 --- a/corehq/apps/reports/templates/reports/standard/bootstrap5/base_template.html +++ b/corehq/apps/reports/templates/reports/standard/bootstrap5/base_template.html @@ -13,7 +13,7 @@ {% block js %}{{ block.super }} {% compress js %} - + diff --git a/corehq/apps/styleguide/templates/styleguide/bootstrap5/organisms/tables.html b/corehq/apps/styleguide/templates/styleguide/bootstrap5/organisms/tables.html index 75c49ba22077..895a0d6d0fc7 100644 --- a/corehq/apps/styleguide/templates/styleguide/bootstrap5/organisms/tables.html +++ b/corehq/apps/styleguide/templates/styleguide/bootstrap5/organisms/tables.html @@ -179,7 +179,7 @@

In CommCare HQ, we have created a wrapper class around our reporting use of datatables called GenericTabularReport, which takes care of generating the datatables configuration in - config.dataTables.bootstrap.js. This was done in an effort to reduce the amount of HTML and + datatables_config.js. 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 @@

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 config.dataTables.bootstrap.js if you examine the strangely named variables in + which you can see in datatables_config.js 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 conversion guide for the older configuration @@ -204,7 +204,7 @@

{# todo future developer: remove with use_bootstrap5 removal cleanup and revisit text above too #} Important: 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 - config.dataTables.bootstrap.js is updated. Thank you. + datatables_config.js is updated. Thank you.

Simple Example diff --git a/corehq/apps/toggle_ui/static/toggle_ui/js/flags.js b/corehq/apps/toggle_ui/static/toggle_ui/js/flags.js index bd08471256f1..4e5e92094c4a 100644 --- a/corehq/apps/toggle_ui/static/toggle_ui/js/flags.js +++ b/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 ( diff --git a/corehq/apps/userreports/static/userreports/js/base.js b/corehq/apps/userreports/static/userreports/js/base.js index 3eac22b0628b..4c8cd929ef06 100644 --- a/corehq/apps/userreports/static/userreports/js/base.js +++ b/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'), diff --git a/corehq/apps/userreports/templates/userreports/base.html b/corehq/apps/userreports/templates/userreports/base.html index c6a071920d03..39f463a2de43 100644 --- a/corehq/apps/userreports/templates/userreports/base.html +++ b/corehq/apps/userreports/templates/userreports/base.html @@ -13,7 +13,7 @@ {% block js %}{{ block.super }} {% compress js %} - + diff --git a/custom/inddex/templates/inddex/partials/report_table.html b/custom/inddex/templates/inddex/partials/report_table.html index 216f133000c4..0d32f661e952 100644 --- a/custom/inddex/templates/inddex/partials/report_table.html +++ b/custom/inddex/templates/inddex/partials/report_table.html @@ -42,7 +42,7 @@