[deps] Update django-import-export requirement from ~=3.3.0 to ~=4.1.1

Updates the requirements on [django-import-export](https://github.com/django-import-export/django-import-export) to permit the latest version.
- [Release notes](https://github.com/django-import-export/django-import-export/releases)
- [Changelog](https://github.com/django-import-export/django-import-export/blob/main/docs/changelog.rst)
- [Commits](django-import-export/django-import-export@3.3.0...4.1.1)

---
updated-dependencies:
- dependency-name: django-import-export
  dependency-type: direct:production
...

* [fix] Fixed DeviceResource and GeoDeviceResource
* [tests] Added tests to improve coverage

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Gagan Deep <[email protected]>

Author: dependabot[bot]

openwisp_controller/config/admin.py

@@ -26,6 +26,7 @@
 from django.utils.translation import ngettext_lazy
 from flat_json_widget.widgets import FlatJsonWidget
 from import_export.admin import ImportExportMixin
+from import_export.forms import ExportForm
 from openwisp_ipam.filters import SubnetFilter
 from swapper import load_model
 
@@ -971,6 +972,7 @@ def add_reversion_following(cls, follow):
 
 
 class DeviceAdminExportable(ImportExportMixin, DeviceAdmin):
+    export_form_class = ExportForm
     resource_class = DeviceResource
     # needed to support both reversion and import-export
     change_list_template = 'admin/config/change_list_device.html'

openwisp_controller/config/exportable.py

@@ -127,10 +127,10 @@ def validate_instance(
         if config.device_id != instance.id:
             config.device_id = instance.id
 
-    def after_save_instance(self, instance, using_transactions, dry_run):
-        super().after_save_instance(instance, using_transactions, dry_run)
-        if not dry_run:
-            # save config afte device has been imported
+    def after_save_instance(self, instance, row, **kwargs):
+        super().after_save_instance(instance, row, **kwargs)
+        if not self._is_dry_run(kwargs):
+            # save config after device has been imported
             if instance._has_config():
                 instance.config.save()
 

openwisp_controller/config/tests/test_admin.py

@@ -90,7 +90,7 @@ def test_device_import_export_buttons(self):
 
     def test_device_export(self):
         response = self.client.post(
-            reverse(f'admin:{self.app_label}_device_export'), {'file_format': '0'}
+            reverse(f'admin:{self.app_label}_device_export'), {'format': '0'}
         )
         self.assertNotContains(response, 'error')
         self.assertIsNotNone(response.get('Content-Disposition'))
@@ -108,7 +108,7 @@ def test_device_import(self):
         csv = ContentFile(contents)
         response = self.client.post(
             reverse(f'admin:{self.app_label}_device_import'),
-            {'input_format': '0', 'import_file': csv},
+            {'format': '0', 'import_file': csv},
         )
         self.assertNotContains(response, 'errorlist')
         self.assertNotContains(response, 'Errors')
@@ -132,7 +132,7 @@ def test_device_import_empty_config(self):
         csv = ContentFile(contents)
         response = self.client.post(
             reverse(f'admin:{self.app_label}_device_import'),
-            {'input_format': '0', 'import_file': csv, 'file_name': 'test.csv'},
+            {'format': '0', 'import_file': csv, 'file_name': 'test.csv'},
         )
         self.assertFalse(response.context['result'].has_errors())
         self.assertIn('confirm_form', response.context)
@@ -173,7 +173,7 @@ def test_device_import_missing_config(self):
         csv = ContentFile(contents)
         response = self.client.post(
             reverse(f'admin:{self.app_label}_device_import'),
-            {'input_format': '0', 'import_file': csv, 'file_name': 'test.csv'},
+            {'format': '0', 'import_file': csv, 'file_name': 'test.csv'},
         )
         self.assertFalse(response.context['result'].has_errors())
         self.assertIn('confirm_form', response.context)
@@ -212,7 +212,7 @@ def test_device_import_config_not_templates(self):
         csv = ContentFile(contents)
         response = self.client.post(
             reverse(f'admin:{self.app_label}_device_import'),
-            {'input_format': '0', 'import_file': csv, 'file_name': 'test.csv'},
+            {'format': '0', 'import_file': csv, 'file_name': 'test.csv'},
         )
         self.assertFalse(response.context['result'].has_errors())
         self.assertIn('confirm_form', response.context)
@@ -636,7 +636,7 @@ def test_device_import_with_group_apply_templates(self):
         csv = ContentFile(contents)
         response = self.client.post(
             reverse(f'admin:{self.app_label}_device_import'),
-            {'input_format': '0', 'import_file': csv, 'file_name': 'test.csv'},
+            {'format': '0', 'import_file': csv, 'file_name': 'test.csv'},
         )
         self.assertFalse(response.context['result'].has_errors())
         self.assertIn('confirm_form', response.context)
@@ -682,7 +682,7 @@ def test_device_import_templates_and_config(self):
         csv = ContentFile(contents)
         response = self.client.post(
             reverse(f'admin:{self.app_label}_device_import'),
-            {'input_format': '0', 'import_file': csv, 'file_name': 'test.csv'},
+            {'format': '0', 'import_file': csv, 'file_name': 'test.csv'},
         )
         self.assertFalse(response.context['result'].has_errors())
         self.assertIn('confirm_form', response.context)

openwisp_controller/geo/exportable.py

@@ -52,8 +52,8 @@ def dehydrate_coords(self, device):
         except (ObjectDoesNotExist, AttributeError):
             pass
 
-    def after_import_instance(self, instance, new, row_number=None, **kwargs):
-        super().after_import_instance(instance, new, row_number, **kwargs)
+    def after_init_instance(self, instance, new, row, **kwargs):
+        super().after_init_instance(instance, new, row, **kwargs)
         if not hasattr(instance, 'devicelocation'):
             instance.devicelocation = DeviceLocation()
 
@@ -68,9 +68,9 @@ def validate_instance(
         if device_location.location_id or device_location.floorplan_id:
             device_location.content_object_id = instance.id
 
-    def after_save_instance(self, instance, using_transactions, dry_run):
-        super().after_save_instance(instance, using_transactions, dry_run)
-        if not dry_run:
+    def after_save_instance(self, instance, row, **kwargs):
+        super().after_save_instance(instance, row, **kwargs)
+        if not self._is_dry_run(kwargs):
             device_location = instance.devicelocation
             if device_location.location_id or device_location.floorplan_id:
                 device_location.save()

openwisp_controller/geo/tests/test_admin.py

@@ -164,6 +164,43 @@ class TestDeviceAdmin(
     def setUp(self):
         self.client.force_login(self._get_admin())
 
+    def test_device_export_geo(self):
+        org = self._get_org(org_name='default')
+        location = self._create_location(
+            name='location', type='indoor', organization=org
+        )
+        floorplan = self._create_floorplan(location=location, organization=org)
+        device = self._create_object(
+            name='test',
+            organization=org,
+            mac_address='00:11:22:33:44:66',
+        )
+        self._create_object_location(
+            location=location, floorplan=floorplan, content_object=device
+        )
+        response = self.client.post(
+            reverse(f'admin:{self.app_label}_device_export'), {'format': '0'}
+        )
+        self.assertEqual(response.status_code, 200)
+        contents = response.content.decode('utf-8')
+        self.assertIn(
+            'name,mac_address,organization,group,model,os,system,notes,venue,address,'
+            'coords,is_mobile,venue_type,floor,floor_position,last_ip,management_ip,'
+            'config_status,config_backend,config_data,config_context,config_templates,'
+            'created,modified,id,key,organization_id,group_id,location_id,floorplan_id',
+            contents,
+        )
+        self.assertIn(
+            'test,00:11:22:33:44:66,default,,,,,,location,'
+            '"Via del Corso, Roma, Italia",POINT (12.512124 41.898903),False,indoor,'
+            '1,"-140.38620,40.369227",,,,,,,,',
+            contents,
+        )
+        self.assertIn(
+            f'{device.id},{device.key},{org.id},,{location.id},{floorplan.id}',
+            contents,
+        )
+
     def test_device_import_geo(self):
         org = self._get_org(org_name='default')
         location = self._create_location(
@@ -196,7 +233,7 @@ def test_device_import_geo(self):
         csv = ContentFile(contents)
         response = self.client.post(
             reverse(f'admin:{self.app_label}_device_import'),
-            {'input_format': '0', 'import_file': csv, 'file_name': 'test.csv'},
+            {'format': '0', 'import_file': csv, 'file_name': 'test.csv'},
         )
         self.assertFalse(response.context['result'].has_errors())
         self.assertIn('confirm_form', response.context)
@@ -253,7 +290,7 @@ def test_device_import_geo_no_floorplan(self):
         csv = ContentFile(contents)
         response = self.client.post(
             reverse(f'admin:{self.app_label}_device_import'),
-            {'input_format': '0', 'import_file': csv, 'file_name': 'test.csv'},
+            {'format': '0', 'import_file': csv, 'file_name': 'test.csv'},
         )
         self.assertFalse(response.context['result'].has_errors())
         self.assertIn('confirm_form', response.context)

requirements.txt

@@ -16,4 +16,4 @@ scp~=0.15.0
 django-cache-memoize~=0.2.1
 shortuuid~=1.0.13
 netaddr~=1.3.0
-django-import-export~=3.3.0
+django-import-export~=4.1.1