Fix regression of form not being passed to `get_import_resource_kwa…

…rgs()` (#1789)

* form param fix

* added test for form in kwargs

docs/changelog.rst

@@ -5,6 +5,11 @@ Changelog
 
     Version 4 introduces breaking changes.  Please refer to :doc:`release notes<release_notes>`.
 
+4.0.0-rc.3 (unreleased)
+-----------------------
+
+- fix form not being passed to ``get_import_resource_kwargs()`` (#1789)
+
 4.0.0-rc.2 (2024-04-08)
 -----------------------
 

import_export/admin.py

@@ -186,7 +186,7 @@ def process_dataset(
         request,
         **kwargs,
     ):
-        res_kwargs = self.get_import_resource_kwargs(request, **kwargs)
+        res_kwargs = self.get_import_resource_kwargs(request, form=form, **kwargs)
         resource = self.choose_import_resource_class(form, request)(**res_kwargs)
         imp_kwargs = self.get_import_data_kwargs(request=request, form=form, **kwargs)
         imp_kwargs["retain_instance_in_row_result"] = True

tests/core/admin.py

@@ -82,6 +82,9 @@ def get_import_resource_kwargs(self, request, **kwargs):
         # update resource kwargs so that the Resource is passed the authenticated user
         # This is included as an example of how dynamic values
         # can be passed to resources
+        if "form" not in kwargs:
+            # test for #1789
+            raise ValueError("'form' param was expected in kwargs")
         kwargs = super().get_resource_kwargs(request, **kwargs)
         kwargs.update({"user": request.user})
         return kwargs