From 0159913261d49fafb6fbfc584b2647889a76b15f Mon Sep 17 00:00:00 2001
From: Matt Westcott <matt@west.co.tt>
Date: Fri, 24 Jun 2022 20:54:31 +0100
Subject: [PATCH] use generic creation_form.html for document chooser upload
 template

---
 .../documents/document-chooser-modal.js       |  1 -
 .../wagtaildocs/chooser/upload_form.html      | 25 -------------------
 wagtail/documents/tests/test_admin_views.py   | 12 ++++++---
 wagtail/documents/views/chooser.py            | 14 +++++++++--
 4 files changed, 21 insertions(+), 31 deletions(-)
 delete mode 100644 wagtail/documents/templates/wagtaildocs/chooser/upload_form.html

diff --git a/client/src/entrypoints/documents/document-chooser-modal.js b/client/src/entrypoints/documents/document-chooser-modal.js
index 0e0a1a65e0..80c5c1fc0d 100644
--- a/client/src/entrypoints/documents/document-chooser-modal.js
+++ b/client/src/entrypoints/documents/document-chooser-modal.js
@@ -22,7 +22,6 @@ window.DOCUMENT_CHOOSER_MODAL_ONLOAD_HANDLERS =
     searchFilterSelectors: ['#collection_chooser_collection_id'],
     searchInputDelay: 50,
     chosenResponseName: 'documentChosen',
-    creationFormSelector: 'form.document-upload',
     creationFormFileFieldSelector: '#id_document-chooser-upload-file',
     creationFormTitleFieldSelector: '#id_document-chooser-upload-title',
     creationFormEventName: 'wagtail:documents-upload',
diff --git a/wagtail/documents/templates/wagtaildocs/chooser/upload_form.html b/wagtail/documents/templates/wagtaildocs/chooser/upload_form.html
deleted file mode 100644
index 627d92c25a..0000000000
--- a/wagtail/documents/templates/wagtaildocs/chooser/upload_form.html
+++ /dev/null
@@ -1,25 +0,0 @@
-{% load i18n wagtailadmin_tags %}
-<section
-    id="tab-create"
-    class="w-tabs__panel"
-    role="tabpanel"
-    hidden
-    aria-labelledby="tab-label-create"
->
-    {% include "wagtailadmin/shared/non_field_errors.html" with form=creation_form %}
-    <form class="document-upload" action="{% url 'wagtaildocs:chooser_upload' %}" method="POST" enctype="multipart/form-data" novalidate>
-        {% csrf_token %}
-        <ul class="fields">
-            {% for field in creation_form %}
-                {% if field.is_hidden %}
-                    {{ field }}
-                {% else %}
-                    {% include "wagtailadmin/shared/field_as_li.html" with field=field %}
-                {% endif %}
-            {% endfor %}
-            <li>
-                <button type="submit" class="button button-longrunning" data-clicked-text="{% trans 'Uploading…' %}">{% icon name="spinner" %}<em>{% trans 'Upload' %}</em></button>
-            </li>
-        </ul>
-    </form>
-</section>
diff --git a/wagtail/documents/tests/test_admin_views.py b/wagtail/documents/tests/test_admin_views.py
index 1f75ef850d..1ab5a9e30e 100644
--- a/wagtail/documents/tests/test_admin_views.py
+++ b/wagtail/documents/tests/test_admin_views.py
@@ -1586,7 +1586,9 @@ class TestDocumentChooserUploadView(TestCase, WagtailTestUtils):
     def test_simple(self):
         response = self.client.get(reverse("wagtaildocs:chooser_upload"))
         self.assertEqual(response.status_code, 200)
-        self.assertTemplateUsed(response, "wagtaildocs/chooser/upload_form.html")
+        self.assertTemplateUsed(
+            response, "wagtailadmin/generic/chooser/creation_form.html"
+        )
         response_json = json.loads(response.content.decode())
         self.assertEqual(response_json["step"], "reshow_creation_form")
 
@@ -1630,7 +1632,9 @@ class TestDocumentChooserUploadView(TestCase, WagtailTestUtils):
 
         # Shouldn't redirect anywhere
         self.assertEqual(response.status_code, 200)
-        self.assertTemplateUsed(response, "wagtaildocs/chooser/upload_form.html")
+        self.assertTemplateUsed(
+            response, "wagtailadmin/generic/chooser/creation_form.html"
+        )
 
         # The form should have an error
         self.assertContains(
@@ -1668,7 +1672,9 @@ class TestDocumentChooserUploadViewWithLimitedPermissions(TestCase, WagtailTestU
     def test_simple(self):
         response = self.client.get(reverse("wagtaildocs:chooser_upload"))
         self.assertEqual(response.status_code, 200)
-        self.assertTemplateUsed(response, "wagtaildocs/chooser/upload_form.html")
+        self.assertTemplateUsed(
+            response, "wagtailadmin/generic/chooser/creation_form.html"
+        )
         response_json = json.loads(response.content.decode())
         self.assertEqual(response_json["step"], "reshow_creation_form")
 
diff --git a/wagtail/documents/views/chooser.py b/wagtail/documents/views/chooser.py
index d646d1eaa6..7dd76f2ad3 100644
--- a/wagtail/documents/views/chooser.py
+++ b/wagtail/documents/views/chooser.py
@@ -161,6 +161,9 @@ class BaseChooseView(ModalPageFurnitureMixin, ContextMixin, View):
                 # so that we don't have to construct a redundant form object just to
                 # test for its presence
                 "creation_form": self.creation_form,
+                "create_action_url": reverse("wagtaildocs:chooser_upload"),
+                "create_action_label": _("Upload"),
+                "create_action_clicked_label": _("Uploading…"),
             }
         )
         return context
@@ -173,7 +176,7 @@ class ChooseView(BaseChooseView):
     search_tab_label = _("Search")
     create_action_label = _("Upload")
     creation_tab_label = None
-    creation_form_template_name = "wagtaildocs/chooser/upload_form.html"
+    creation_form_template_name = "wagtailadmin/generic/chooser/creation_form.html"
 
     def get_context_data(self, **kwargs):
         context = super().get_context_data(**kwargs)
@@ -252,7 +255,14 @@ def chooser_upload(request):
         json_data={
             "step": "reshow_creation_form",
             "htmlFragment": render_to_string(
-                "wagtaildocs/chooser/upload_form.html", {"creation_form": form}, request
+                "wagtailadmin/generic/chooser/creation_form.html",
+                {
+                    "creation_form": form,
+                    "create_action_url": reverse("wagtaildocs:chooser_upload"),
+                    "create_action_label": _("Upload"),
+                    "create_action_clicked_label": _("Uploading…"),
+                },
+                request,
             ),
         },
     )