dimagi · orangejenny · Nov 22, 2024 · Nov 20, 2024 · Nov 20, 2024 · Nov 20, 2024
diff --git a/corehq/apps/events/static/events/js/new_event.js b/corehq/apps/events/static/events/js/new_event.js
@@ -6,6 +6,7 @@
     "locations/js/widgets",
     "hqwebapp/js/bootstrap3/widgets",
     "jquery-ui/ui/widgets/datepicker",
+    "commcarehq",
 ], function (
     $,
     ko,
@@ -40,7 +41,7 @@
        multiselectUtils.createFullMultiselectWidget('id_attendance_takers', ATTENDANCE_TAKER_PROPS);

        function eventViewModel(initialData) {
            'use strict';
            var self = {};

            // Disable the submit button unless attendance takers are present

diff --git a/corehq/apps/events/templates/events/new_event.html b/corehq/apps/events/templates/events/new_event.html
@@ -3,7 +3,7 @@
 {% load crispy_forms_tags %}
 {% load i18n %}
 
-{% requirejs_main 'events/js/new_event' %}
+{% js_entry_b3 'events/js/new_event' %}
 
 {% block page_content %}
   {% initial_page_data 'current_values' form.current_values %}

@@ -1,11 +1,10 @@
 "use strict";
 hqDefine('hqwebapp/js/multiselect_utils', [
    "jquery",
    "knockout",
     "underscore",
     "hqwebapp/js/assert_properties",
     "multiselect/js/jquery.multi-select",
-    "quicksearch/dist/jquery.quicksearch.min",
 ], function (
     $,
     ko,
@@ -100,15 +99,34 @@
                     selectableSearchString = '#' + that.$container.attr('id') + ' .ms-elem-selectable:not(.ms-selected)',
                     selectionSearchString = '#' + that.$container.attr('id') + ' .ms-elem-selection.ms-selected';
 
-                that.search_left = $selectableSearch.quicksearch(selectableSearchString)
+                const _search = function (query, itemSelector) {
+                    const queries = (query || '').toLowerCase().split(/\s+/);
+                    $(itemSelector).each(function (index, item) {
+                        const $item = $(item),
+                            itemText = $item.text().toLowerCase();
+                        let found = _.every(queries, function (q) {
+                            return !q || itemText.indexOf(q) !== -1;
+                        });
+
+                        if (found) {
+                            $item.removeClass(window.USE_BOOTSTRAP5 ? "d-none" : "hide");
+                        } else {
+                            $item.addClass(window.USE_BOOTSTRAP5 ? "d-none" : "hide");
+                        }
+                    });
+                };
+
+                that.search_left = $selectableSearch
                     .on('keydown', function (e) {
                         if (e.which === 40) {  // down arrow, was recommended by loudev docs
                             that.$selectableUl.focus();
                             return false;
                         }
                     })
                     .on('keyup change search input', function () {
-                    // disable add all functionality so that user is not confused
+                        _search($selectableSearch.val(), selectableSearchString);
+
+                        // disable add all functionality so that user is not confused
                         if (that.search_left.val().length > 0) {
                             $('#' + selectAllId).addClass('disabled').prop('disabled', true);
                         } else {
@@ -118,15 +136,17 @@
                         }
                     });
 
-                that.search_right = $selectionSearch.quicksearch(selectionSearchString)
+                that.search_right = $selectionSearch
                     .on('keydown', function (e) {
                         if (e.which === 40) {  // down arrow, was recommended by loudev docs
                             that.$selectionUl.focus();
                             return false;
                         }
                     })
                     .on('keyup change search input', function () {
-                    // disable remove all functionality so that user is not confused
+                        _search($selectionSearch.val(), selectionSearchString);
+
+                        // disable remove all functionality so that user is not confused
                         if (that.search_right.val().length > 0) {
                             $('#' + removeAllId).addClass('disabled').prop('disabled', true);
                         } else if (!disableModifyAllActions) {
@@ -135,22 +155,14 @@
                     });
             },
             afterSelect: function () {
-                this.search_left.cache();
-                // remove search option so that user doesn't get confused
-                this.search_right.val('').search('');
                 if (!disableModifyAllActions) {
                     $('#' + removeAllId).removeClass('disabled').prop('disabled', false);
                 }
-                this.search_right.cache();
             },
             afterDeselect: function () {
-                // remove search option so that user doesn't get confused
-                this.search_left.val('').search('');
                 if (!disableModifyAllActions) {
                     $('#' + selectAllId).removeClass('disabled').prop('disabled', false);
                 }
-                this.search_left.cache();
-                this.search_right.cache();
             },
         });
 

@@ -408,7 +408,6 @@
     {% if request.use_multiselect and not use_js_bundler %}
       {% compress js %}
         <script src="{% static 'multiselect/js/jquery.multi-select.js' %}"></script>
-        <script src="{% static 'quicksearch/dist/jquery.quicksearch.min.js' %}"></script>
         <script src="{% static 'hqwebapp/js/multiselect_utils.js' %}"></script>
       {% endcompress %}
     {% endif %}

@@ -13,4 +13,4 @@
 +    "hqwebapp/js/bootstrap5/widgets",  // autocomplete widget for email recipient list
      "jquery-ui/ui/widgets/datepicker",
      'hqwebapp/js/components/select_toggle',
- ], function (
+     "commcarehq",
@@ -8,8 +8,8 @@
  {% load i18n %}
 
 
--{% requirejs_main 'reports/js/bootstrap3/edit_scheduled_report' %}
-+{% requirejs_main_b5 'reports/js/bootstrap5/edit_scheduled_report' %}
+-{% js_entry_b3 'reports/js/bootstrap3/edit_scheduled_report' %}
++{% js_entry 'reports/js/bootstrap5/edit_scheduled_report' %}
 
  {% block page_content %}
    {% initial_page_data 'is_configurable_map' is_configurable_map %}

@@ -9,6 +9,7 @@ hqDefine("linked_domain/js/domain_links", [
     'hqwebapp/js/components/pagination',
     'hqwebapp/js/components/search_box',
     'hqwebapp/js/select2_knockout_bindings.ko',     // selects2 for fields
+    'commcarehq',
 ], function (
     RMI,
     initialPageData,

@@ -2,7 +2,7 @@
 {% load hq_shared_tags %}
 {% load i18n %}
 
-{% requirejs_main "linked_domain/js/domain_links" %}
+{% js_entry_b3 "linked_domain/js/domain_links" %}
 
 {% block additional_initial_page_data %}
 {% initial_analytics_data 'appcues.linked_status' linked_status %}

diff --git a/corehq/apps/registry/static/registry/js/registry_edit.js b/corehq/apps/registry/static/registry/js/registry_edit.js
@@ -1,4 +1,4 @@
 "use strict";
 hqDefine("registry/js/registry_edit", [
    'moment',
    'knockout',
@@ -13,6 +13,7 @@
     'hqwebapp/js/bootstrap5/main', // makeHqHelp
     'hqwebapp/js/multiselect_utils',
     'hqwebapp/js/components/inline_edit',
+    'commcarehq',
 ], function (
     moment,
     ko,

diff --git a/corehq/apps/registry/templates/registry/registry_edit.html b/corehq/apps/registry/templates/registry/registry_edit.html
@@ -16,7 +16,7 @@
   {% endcompress %}
 {% endblock %}
 
-{% requirejs_main_b5 'registry/js/registry_edit' %}
+{% js_entry 'registry/js/registry_edit' %}
 
 {% block page_content %}
 {% initial_page_data "registry" registry %}

diff --git a/corehq/apps/reports/static/reports/js/bootstrap3/edit_scheduled_report.js b/corehq/apps/reports/static/reports/js/bootstrap3/edit_scheduled_report.js
@@ -8,6 +8,7 @@ hqDefine("reports/js/bootstrap3/edit_scheduled_report", [
     "hqwebapp/js/bootstrap3/widgets",  // autocomplete widget for email recipient list
     "jquery-ui/ui/widgets/datepicker",
     'hqwebapp/js/components/select_toggle',
+    "commcarehq",
 ], function (
     $,
     _,

diff --git a/corehq/apps/reports/static/reports/js/bootstrap5/edit_scheduled_report.js b/corehq/apps/reports/static/reports/js/bootstrap5/edit_scheduled_report.js
@@ -8,6 +8,7 @@ hqDefine("reports/js/bootstrap5/edit_scheduled_report", [
     "hqwebapp/js/bootstrap5/widgets",  // autocomplete widget for email recipient list
     "jquery-ui/ui/widgets/datepicker",
     'hqwebapp/js/components/select_toggle',
+    "commcarehq",
 ], function (
     $,
     _,

diff --git a/corehq/apps/reports/templates/reports/bootstrap3/edit_scheduled_report.html b/corehq/apps/reports/templates/reports/bootstrap3/edit_scheduled_report.html
@@ -4,7 +4,7 @@
 {% load i18n %}
 
 
-{% requirejs_main 'reports/js/bootstrap3/edit_scheduled_report' %}
+{% js_entry_b3 'reports/js/bootstrap3/edit_scheduled_report' %}
 
 {% block page_content %}
   {% initial_page_data 'is_configurable_map' is_configurable_map %}

diff --git a/corehq/apps/reports/templates/reports/bootstrap5/edit_scheduled_report.html b/corehq/apps/reports/templates/reports/bootstrap5/edit_scheduled_report.html
@@ -4,7 +4,7 @@
 {% load i18n %}
 
 
-{% requirejs_main_b5 'reports/js/bootstrap5/edit_scheduled_report' %}
+{% js_entry 'reports/js/bootstrap5/edit_scheduled_report' %}
 
 {% block page_content %}
   {% initial_page_data 'is_configurable_map' is_configurable_map %}

@@ -36,7 +36,6 @@
       <script src="{% static 'hqwebapp/js/bootstrap3/widgets.js' %}"></script>
       <script src="{% static 'hqwebapp/js/bootstrap3/main.js' %}"></script>
       <script src="{% static 'multiselect/js/jquery.multi-select.js' %}"></script>
-      <script src="{% static 'quicksearch/dist/jquery.quicksearch.min.js' %}"></script>
       <script src="{% static 'hqwebapp/js/multiselect_utils.js' %}"></script>
     {% endcompress %}
   </head>

@@ -122,7 +122,6 @@ <h6>Quick Links</h6>
       <script src="{% static 'hqwebapp/js/bootstrap5/main.js' %}"></script>
       <script src="{% static 'hqwebapp/js/select_2_ajax_widget.js' %}"></script>
       <script src="{% static 'multiselect/js/jquery.multi-select.js' %}"></script>
-      <script src="{% static 'quicksearch/dist/jquery.quicksearch.min.js' %}"></script>
       <script src="{% static 'hqwebapp/js/multiselect_utils.js' %}"></script>
       <script src="{% static 'ace-builds/src-min-noconflict/ace.js' %}"></script>
       <script src="{% static 'ace-builds/src-min-noconflict/mode-python.js' %}"></script>

@@ -1,4 +1,4 @@
 'use strict';

 hqDefine('users/js/edit_commcare_user', [
    'jquery',
@@ -15,6 +15,7 @@
     'registration/js/bootstrap3/password',
     'select2/dist/js/select2.full.min',
     'eonasdan-bootstrap-datetimepicker/build/js/bootstrap-datetimepicker.min',
+    'commcarehq',
 ], function (
     $,
     ko,

@@ -1,10 +1,11 @@
 'use strict';

 hqDefine('users/js/edit_web_user', [
    'jquery',
     'hqwebapp/js/initial_page_data',
     'users/js/custom_data_fields',
     'locations/js/widgets',
+    'commcarehq',
 ], function (
     $,
     initialPageData,

@@ -7,6 +7,7 @@ hqDefine('users/js/filtered_download', [
     'locations/js/widgets',     // location search
     'hqwebapp/js/components/select_toggle',
     'hqwebapp/js/bootstrap3/knockout_bindings.ko', // slideVisible binding
+    'commcarehq',
 ], function (
     $,
     ko,

@@ -3,17 +3,16 @@
     'knockout',
     'hqwebapp/js/initial_page_data',
     'users/js/custom_data_fields',
-    'hqwebapp/js/toggles',
     'hqwebapp/js/bootstrap3/validators.ko',
     'locations/js/widgets',
+    'commcarehq',
 ], function (
     $,
     ko,
     initialPageData,
-    customDataFields,
-    toggles
+    customDataFields
 ) {
     'use strict';
 
    var inviteWebUserFormHandler = function () {
        var self = {},

@@ -15,7 +15,7 @@
 *    as well as a minimum length requirment (the length is configurable).
 *  - If any validation is being used, we automatically generate a suggested password that passes validation.
 */
 'use strict';

 hqDefine("users/js/mobile_workers",[
    'jquery',
@@ -32,6 +32,7 @@
     'hqwebapp/js/components/search_box',
     'hqwebapp/js/bootstrap3/validators.ko', // email address validation
     'eonasdan-bootstrap-datetimepicker/build/js/bootstrap-datetimepicker.min',
+    'commcarehq',
 ], function (
     $,
     ko,
@@ -44,7 +45,7 @@
    locationsWidgets,
    customDataFields
 ) {
    'use strict';
    // These are used as css classes, so the values of success/warning/error need to be what they are.
    var STATUS = {
        NONE: '',

@@ -4,7 +4,7 @@
 {% load hq_shared_tags %}
 {% load i18n %}
 
-{% requirejs_main 'users/js/edit_commcare_user' %}
+{% js_entry_b3 'users/js/edit_commcare_user' %}
 
 {% block page_content %}
   {% initial_page_data "couch_user_id" couch_user.user_id %}

@@ -4,7 +4,7 @@
 {% load hq_shared_tags %}
 {% load i18n %}
 
-{% requirejs_main 'users/js/edit_web_user' %}
+{% js_entry_b3 'users/js/edit_web_user' %}
 
 {% block page_content %}
   {% initial_page_data 'can_edit_original_profile' can_edit_original_profile %}

@@ -3,7 +3,7 @@
 {% load i18n %}
 {% load crispy_forms_tags %}
 
-{% requirejs_main 'users/js/filtered_download' %}
+{% js_entry_b3 'users/js/filtered_download' %}
 
 {% block page_content %}
   {% initial_page_data 'count_users_url' count_users_url %}

@@ -3,7 +3,7 @@
 {% load crispy_forms_tags %}
 {% load i18n %}
 
-{% requirejs_main 'users/js/invite_web_user' %}
+{% js_entry_b3 'users/js/invite_web_user' %}
 
 {% block page_content %}
   {% initial_page_data 'custom_fields_slugs' custom_fields_slugs %}

@@ -4,7 +4,7 @@
 {% load hq_shared_tags %}
 {% load crispy_forms_tags %}
 
-{% requirejs_main 'users/js/mobile_workers' %}
+{% js_entry_b3 'users/js/mobile_workers' %}
 
 {% block page_content %}
   {% initial_page_data 'can_access_all_locations' can_access_all_locations %}

@@ -76,7 +76,6 @@
         "nprogress": "0.2.0",
         "nvd3": "1.1.10",
         "nvd3-1.8.6": "npm:nvd3#1.8.6",
-        "quicksearch": "DeuxHuitHuit/quicksearch#2.2.1",
         "requirejs": "2.3.7",
         "requirejs-babel7": "^1.3.2",
         "select2": "4.1.0-rc.0",

diff --git a/webpack/webpack.b3.common.js b/webpack/webpack.b3.common.js
@@ -14,6 +14,7 @@ module.exports = Object.assign({}, commonDefault, {
         new webpack.ProvidePlugin({
             '$': 'jquery',
             'jQuery': 'jquery',  // needed for bootstrap 3 to work
+            'window.jQuery': 'jquery',  // needed for some third-party libraries that depend on jQuery, such as multiselect
         }),
         new hqPlugins.EntryChunksPlugin({
             filename: 'manifest_b3.json',

diff --git a/webpack/webpack.common.js b/webpack/webpack.common.js
@@ -85,6 +85,7 @@ module.exports = {
         new webpack.ProvidePlugin({
             '$': 'jquery',
             'jQuery': 'jquery',  // needed for bootstrap to work
+            'window.jQuery': 'jquery',  // needed for some third-party libraries that depend on jQuery, such as multiselect
         }),
         new hqPlugins.EntryChunksPlugin(),
     ],