Merge pull request #35305 from dimagi/jls/webpack-easiest-20-percent

[webpack] Migrate easy, low-risk apps
dimagi · Nov 4, 2024 · 7e60e09 · 7e60e09
2 parents bcd4eab + 17619cc
commit 7e60e09
Show file tree

Hide file tree

Showing 60 changed files with 88 additions and 245 deletions.
diff --git a/corehq/apps/accounting/static/accounting/js/widgets.js b/corehq/apps/accounting/static/accounting/js/widgets.js
@@ -5,6 +5,7 @@ hqDefine('accounting/js/widgets', [
     'underscore',
     'hqwebapp/js/utils/email',
     'select2/dist/js/select2.full.min',
+    'commcarehq_b3',
 ], function (
     $,
     ko,

diff --git a/corehq/apps/accounting/templates/accounting/trigger_accounting_tests.html b/corehq/apps/accounting/templates/accounting/trigger_accounting_tests.html
@@ -2,7 +2,7 @@
 {% load crispy_forms_tags %}
 {% load hq_shared_tags %}
 
-{% requirejs_main "accounting/js/widgets" %}
+{% js_entry_b3 "accounting/js/widgets" %}
 
 {% block page_content %}
   {% crispy trigger_form %}

diff --git a/corehq/apps/accounting/templates/accounting/trigger_bookkeeper.html b/corehq/apps/accounting/templates/accounting/trigger_bookkeeper.html
@@ -2,7 +2,7 @@
 {% load crispy_forms_tags %}
 {% load hq_shared_tags %}
 
-{% requirejs_main "accounting/js/widgets" %}
+{% js_entry_b3 "accounting/js/widgets" %}
 
 {% block page_content %}
   {% crispy trigger_email_form %}

diff --git a/corehq/apps/accounting/templates/accounting/trigger_customer_invoice.html b/corehq/apps/accounting/templates/accounting/trigger_customer_invoice.html
@@ -2,7 +2,7 @@
 {% load crispy_forms_tags %}
 {% load hq_shared_tags %}
 
-{% requirejs_main "accounting/js/widgets" %}
+{% js_entry_b3 "accounting/js/widgets" %}
 
 {% block page_content %}
   {% crispy trigger_customer_form %}

diff --git a/corehq/apps/accounting/templates/accounting/trigger_invoice.html b/corehq/apps/accounting/templates/accounting/trigger_invoice.html
@@ -2,7 +2,7 @@
 {% load crispy_forms_tags %}
 {% load hq_shared_tags %}
 
-{% requirejs_main "accounting/js/widgets" %}
+{% js_entry_b3 "accounting/js/widgets" %}
 
 {% block page_content %}
   {% crispy trigger_form %}

diff --git a/corehq/apps/builds/static/builds/js/edit_builds.js b/corehq/apps/builds/static/builds/js/edit_builds.js
@@ -4,6 +4,7 @@ hqDefine('builds/js/edit_builds', [
     'underscore',
     'knockout',
     'hqwebapp/js/initial_page_data',
+    'commcarehq',
 ], function ($, _, ko, initialPageData) {
     var doc = initialPageData.get('doc');
 

diff --git a/corehq/apps/builds/templates/builds/edit_menu.html b/corehq/apps/builds/templates/builds/edit_menu.html
@@ -3,7 +3,7 @@
 {% load compress %}
 {% load i18n %}
 
-{% requirejs_main_b5 'builds/js/edit_builds' %}
+{% js_entry 'builds/js/edit_builds' %}
 
 {% block page_title %}
 {% trans "Editing CommCare Builds" %}

diff --git a/corehq/apps/commtrack/static/commtrack/js/products_and_programs_main.js b/corehq/apps/commtrack/static/commtrack/js/products_and_programs_main.js
@@ -7,6 +7,7 @@ hqDefine('commtrack/js/products_and_programs_main', [
     'es6!hqwebapp/js/bootstrap5_loader',
     'commtrack/js/base_list_view_model',
     'hqwebapp/js/bootstrap5/widgets',   // "Additional Information" on product page uses a .hqwebapp-select2
+    'commcarehq',
 ], function (
     $,
     ko,

diff --git a/corehq/apps/hqadmin/static/hqadmin/js/admin_restore.js b/corehq/apps/hqadmin/static/hqadmin/js/admin_restore.js
@@ -2,6 +2,7 @@ hqDefine('hqadmin/js/admin_restore',[
     "jquery",
     "hqwebapp/js/base_ace",
     "jquery-treetable/jquery.treetable",
+    "commcarehq_b3",
 ],function ($, baseAce) {
     $(function () {
         $("#timingTable").treetable();

diff --git a/corehq/apps/hqadmin/static/hqadmin/js/app_build_timings.js b/corehq/apps/hqadmin/static/hqadmin/js/app_build_timings.js
@@ -1,6 +1,7 @@
 hqDefine('hqadmin/js/app_build_timings', [
     "jquery",
     "jquery-treetable/jquery.treetable",
+    "commcarehq_b3",
 ], function ($) {
     $(function () {
         $("#timingTable").treetable({

diff --git a/corehq/apps/hqadmin/static/hqadmin/js/authenticate_as.js b/corehq/apps/hqadmin/static/hqadmin/js/authenticate_as.js
diff --git a/corehq/apps/hqadmin/static/hqadmin/js/raw_doc.js b/corehq/apps/hqadmin/static/hqadmin/js/raw_doc.js
@@ -2,7 +2,8 @@ hqDefine('hqadmin/js/raw_doc', [
     'jquery',
     'underscore',
     'hqwebapp/js/initial_page_data',
-    "hqwebapp/js/base_ace",
+    'hqwebapp/js/base_ace',
+    'commcarehq_b3',
 ], function ($, _, intialPageData, baseAce) {
     $(function () {
         var allDatabase = intialPageData.get('all_databases').map(function (database) {

diff --git a/corehq/apps/hqadmin/templates/hqadmin/admin_restore.html b/corehq/apps/hqadmin/templates/hqadmin/admin_restore.html
@@ -8,7 +8,7 @@
   <link type="text/css" rel="stylesheet" href="{% static 'jquery-treetable/css/jquery.treetable.css' %}"/>
 {% endblock stylesheets %}
 
-{% requirejs_main 'hqadmin/js/admin_restore' %}
+{% js_entry_b3 'hqadmin/js/admin_restore' %}
 
 {% block content %}
   <div class="container-fluid">

diff --git a/corehq/apps/hqadmin/templates/hqadmin/app_build_timings.html b/corehq/apps/hqadmin/templates/hqadmin/app_build_timings.html
@@ -8,7 +8,7 @@
   <link type="text/css" rel="stylesheet" href="{% static 'jquery-treetable/css/jquery.treetable.css' %}"/>
 {% endblock stylesheets %}
 
-{% requirejs_main 'hqadmin/js/app_build_timings' %}
+{% js_entry_b3 'hqadmin/js/app_build_timings' %}
 
 {% block content %}
   <div class="container-fluid">

diff --git a/corehq/apps/hqadmin/templates/hqadmin/authenticate_as.html b/corehq/apps/hqadmin/templates/hqadmin/authenticate_as.html
diff --git a/corehq/apps/hqadmin/templates/hqadmin/raw_doc.html b/corehq/apps/hqadmin/templates/hqadmin/raw_doc.html
@@ -4,7 +4,7 @@
 {% block title %}Doc {{ doc_id }} ({{ doc_type }}){% endblock %}
 
 {% block js %}{{ block.super }}
-  {% requirejs_main 'hqadmin/js/raw_doc' %}
+  {% js_entry_b3 'hqadmin/js/raw_doc' %}
 {% endblock %}
 
 

diff --git a/corehq/apps/hqwebapp/templatetags/hq_shared_tags.py b/corehq/apps/hqwebapp/templatetags/hq_shared_tags.py
@@ -746,6 +746,9 @@ def __repr__(self):
 
 @register.filter
 def webpack_bundles(entry_name):
+    if settings.UNIT_TESTING:
+        return []
+
     from corehq.apps.hqwebapp.utils.webpack import get_webpack_manifest, WebpackManifestNotFoundError
     from corehq.apps.hqwebapp.utils.bootstrap import get_bootstrap_version, BOOTSTRAP_5, BOOTSTRAP_3
     bootstrap_version = get_bootstrap_version()

diff --git a/...pps/hqwebapp/tests/data/bootstrap5_diffs/notifications/manage_notifications.html.diff.txt b/...pps/hqwebapp/tests/data/bootstrap5_diffs/notifications/manage_notifications.html.diff.txt
diff --git a/corehq/apps/hqwebapp/utils/bootstrap/status/bootstrap3_to_5.json b/corehq/apps/hqwebapp/utils/bootstrap/status/bootstrap3_to_5.json
@@ -95,7 +95,10 @@
     "is_complete": true
   },
   "notifications": {
-    "in_progress": true
+    "in_progress": true,
+    "templates": [
+      "manage_notifications.html"
+    ]
   },
   "reminders": {
     "is_complete": true

diff --git a/corehq/apps/integration/static/integration/js/biometric.js b/corehq/apps/integration/static/integration/js/biometric.js
@@ -2,6 +2,7 @@ hqDefine('integration/js/biometric', [
     'jquery',
     'hqwebapp/js/initial_page_data',
     'integration/js/simprints',
+    'commcarehq',
 ], function (
     $,
     initialPageData,

diff --git a/corehq/apps/integration/static/integration/js/dialer/domain_dialer_main.js b/corehq/apps/integration/static/integration/js/dialer/domain_dialer_main.js
@@ -9,6 +9,7 @@ hqDefine("integration/js/dialer/domain_dialer_main", [
    "detectrtc/DetectRTC",
    "integration/js/dialer/amazon-connect-min",
    "integration/js/dialer/connect-streams-min",
+   "commcarehq",
 ], function (
    initialPageData,
    dialer_utils

diff --git a/corehq/apps/integration/templates/integration/biometric.html b/corehq/apps/integration/templates/integration/biometric.html
@@ -3,7 +3,7 @@
 {% load hq_shared_tags %}
 {% load crispy_forms_tags %}
 
-{% requirejs_main_b5 'integration/js/biometric' %}
+{% js_entry 'integration/js/biometric' %}
 
 {% block page_content %}
   {% initial_page_data 'simprintsFormData' simprints_form.initial_data %}

diff --git a/corehq/apps/integration/templates/integration/web_app_dialer.html b/corehq/apps/integration/templates/integration/web_app_dialer.html
@@ -2,7 +2,7 @@
 {% load i18n %}
 {% load hq_shared_tags %}
 {% load compress %}
-{% requirejs_main_b5 "integration/js/dialer/domain_dialer_main" %}
+{% js_entry "integration/js/dialer/domain_dialer_main" %}
 
 {% block stylesheets %}
   {{ block.super }}

diff --git a/corehq/apps/integration/templates/integration/web_app_integration_err.html b/corehq/apps/integration/templates/integration/web_app_integration_err.html
@@ -2,7 +2,7 @@
 {% load i18n %}
 {% load hq_shared_tags %}
 {% load compress %}
-{% requirejs_main_b5 "integration/js/dialer/domain_dialer_main" %}
+{% js_entry "integration/js/dialer/domain_dialer_main" %}
 
 {% block stylesheets %}
   {{ block.super }}

diff --git a/corehq/apps/notifications/forms.py b/corehq/apps/notifications/forms.py
@@ -6,9 +6,9 @@
 
 from crispy_forms import bootstrap as twbscrispy
 from crispy_forms import layout as crispy
-from crispy_forms.helper import FormHelper
 
 from corehq.apps.hqwebapp import crispy as hqcrispy
+from corehq.apps.hqwebapp.widgets import BootstrapCheckboxInput
 
 from .models import NOTIFICATION_TYPES, Notification
 
@@ -27,8 +27,11 @@ class NotificationCreationForm(forms.Form):
         choices=NOTIFICATION_TYPES,
     )
     domain_specific = forms.BooleanField(
-        label=gettext_lazy("This notification is not for all domains"),
-        required=False
+        label=gettext_lazy("Domain-specific"),
+        required=False,
+        widget=BootstrapCheckboxInput(
+            inline_label=gettext_lazy("This notification is not for all domains"),
+        ),
     )
     domains = SimpleArrayField(
         base_field=forms.CharField(),
@@ -42,37 +45,28 @@ class NotificationCreationForm(forms.Form):
     def __init__(self, *args, **kwargs):
         from corehq.apps.notifications.views import ManageNotificationView
         super(NotificationCreationForm, self).__init__(*args, **kwargs)
-        self.helper = FormHelper()
+        self.helper = hqcrispy.HQFormHelper()
 
         self.helper.form_method = 'POST'
-        self.helper.form_class = 'form-horizontal'
         self.helper.form_action = '#'
 
-        self.helper.label_class = 'col-sm-3 col-md-2'
-        self.helper.field_class = 'col-sm-9 col-md-8 col-lg-6'
-
         self.helper.layout = crispy.Layout(
             crispy.Field('content'),
             crispy.Field('url'),
             crispy.Field('type'),
-            hqcrispy.B3MultiField(
-                "Domain Specific",
-                crispy.Field('domain_specific')
-            ),
+            twbscrispy.PrependedText('domain_specific', ''),
             crispy.Field('domains'),
-            hqcrispy.FormActions(
-                twbscrispy.StrictButton(
-                    _("Submit Information"),
-                    type="submit",
-                    css_class="btn btn-primary",
-                    name="submit",
-                ),
-                hqcrispy.LinkButton(
-                    _("Cancel"),
-                    reverse(ManageNotificationView.urlname),
-                    css_class="btn btn-default",
-                    name="cancel",
-                ),
+            twbscrispy.StrictButton(
+                _("Submit Information"),
+                type="submit",
+                css_class="btn btn-primary",
+                name="submit",
+            ),
+            hqcrispy.LinkButton(
+                _("Cancel"),
+                reverse(ManageNotificationView.urlname),
+                css_class="btn btn-outline-primary",
+                name="cancel",
             ),
         )
 

diff --git a/corehq/apps/notifications/static/notifications/js/manage_notifications.js b/corehq/apps/notifications/static/notifications/js/manage_notifications.js
@@ -1,6 +1,7 @@
 hqDefine('notifications/js/manage_notifications', [
     'jquery',
     'hqwebapp/js/initial_page_data',
+    'commcarehq',
 ], function (
     $,
     initialPageData