Merge pull request #35147 from dimagi/jls/b5-export-data-source

[B5] Exports: Export Data Source Data view
dimagi · Sep 19, 2024 · 4fbe07b · 4fbe07b
2 parents b15fe1e + 653c162
commit 4fbe07b
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 64 deletions.
diff --git a/corehq/apps/export/forms.py b/corehq/apps/export/forms.py
@@ -9,7 +9,6 @@
 import dateutil
 from crispy_forms import layout as crispy
 from crispy_forms.helper import FormHelper
-from corehq.apps.hqwebapp import crispy as hqcrispy
 from crispy_forms.bootstrap import StrictButton
 
 from corehq import privileges
@@ -1087,8 +1086,6 @@ class DatasourceExportDownloadForm(forms.Form):
     def __init__(self, domain, *args, **kwargs):
         super(DatasourceExportDownloadForm, self).__init__(*args, **kwargs)
         self.helper = FormHelper()
-        self.helper.label_class = 'col-sm-3 col-md-2 col-lg-2'
-        self.helper.field_class = 'col-sm-9 col-md-8 col-lg-3'
 
         self.fields['data_source'].choices = self.domain_datasources(domain)
 
@@ -1104,14 +1101,12 @@ def __init__(self, domain, *args, **kwargs):
                     data_bind='visible: haveDatasources'
                 ),
             ),
-            hqcrispy.FormActions(
-                StrictButton(
-                    _("Download Data Export Tool query file"),
-                    type="submit",
-                    css_class="btn-primary",
-                    data_bind="enable: haveDatasources"
-                ),
-            )
+            StrictButton(
+                _("Download Data Export Tool query file"),
+                type="submit",
+                css_class="btn-primary",
+                data_bind="enable: haveDatasources"
+            ),
         )
 
     @staticmethod

diff --git a/corehq/apps/export/templates/export/bootstrap3/datasource_export_view.html b/corehq/apps/export/templates/export/bootstrap3/datasource_export_view.html
diff --git a/...rt/bootstrap5/datasource_export_view.html → ...plates/export/datasource_export_view.html b/...rt/bootstrap5/datasource_export_view.html → ...plates/export/datasource_export_view.html
@@ -1,4 +1,4 @@
-{%  extends 'hqwebapp/bootstrap3/base_section.html' %}
+{%  extends 'hqwebapp/bootstrap5/base_section.html' %}
 {% load crispy_forms_tags %}
 {% load i18n %}
 {% load compress %}
@@ -13,15 +13,15 @@
 {% block page_content %}
   <p>
     {% blocktrans %}
-    Generate a query file for the Data Export Tool from any of the project's data sources.
+      Generate a query file for the Data Export Tool from any of the project's data sources.
     {% endblocktrans %}
   </p>
   <div id="datasources_export_id" class="form form-horizontal">
     <div data-bind='hidden: haveDatasources'>
       {% blocktrans %}
-      The project has no data sources configured.
+        The project has no data sources configured.
       {% endblocktrans %}
     </div>
-    {% crispy form %}  {# todo B5: check crispy #}
+    {% crispy form %}
   </div>
 {% endblock %}
diff --git a/corehq/apps/export/views/download.py b/corehq/apps/export/views/download.py
@@ -61,7 +61,7 @@
     ExportsPermissionsManager,
     case_type_or_app_limit_exceeded
 )
-from corehq.apps.hqwebapp.decorators import use_daterangepicker
+from corehq.apps.hqwebapp.decorators import use_bootstrap5, use_daterangepicker
 from corehq.apps.hqwebapp.widgets import DateRangePickerWidget
 from corehq.apps.locations.permissions import location_safe
 from corehq.apps.reports.analytics.esaccessors import media_export_is_too_big
@@ -528,8 +528,9 @@ def parent_pages(self):
 class DownloadNewDatasourceExportView(BaseProjectDataView):
     urlname = "data_export_page"
     page_title = gettext_noop("Export Data Source Data")
-    template_name = 'export/bootstrap3/datasource_export_view.html'
+    template_name = 'export/datasource_export_view.html'
 
+    @use_bootstrap5
     def dispatch(self, *args, **kwargs):
         if not EXPORT_DATA_SOURCE_DATA.enabled(self.domain):
             raise Http404()

diff --git a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/export/datasource_export_view.html.diff.txt b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/export/datasource_export_view.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
@@ -136,7 +136,8 @@
     "in_progress": true,
     "templates": [
       "download_data_files.html",
-      "paywall.html"
+      "paywall.html",
+      "datasource_export_view.html"
     ],
     "javascript": [
       "js/download_data_files.js"