Refactor accept field in import plugins to match react-dropzone

rdmo/projects/imports.py

@@ -88,7 +88,10 @@ def get_view(self, view_uri):
 
 class RDMOXMLImport(Import):
 
-    accept = '.xml'
+    accept = {
+        'application/xml': ['.xml'],
+        'text/xml': ['.xml']
+    }
 
     def check(self):
         file_type, encoding = mimetypes.guess_type(self.file_name)
@@ -231,6 +234,9 @@ def get_value(self, value_node):
 
 class URLImport(RDMOXMLImport):
 
+    accept = False
+    upload = False
+
     class Form(forms.Form):
         url = forms.URLField(label=_('Import project from this URL'), required=True)
 

rdmo/projects/utils.py

@@ -1,4 +1,5 @@
 import logging
+from collections import defaultdict
 from pathlib import Path
 
 from django.conf import settings
@@ -175,10 +176,13 @@ def set_context_querystring_with_filter_and_page(context: dict) -> dict:
 
 
 def get_upload_accept():
-    accept = set()
+    accept = defaultdict(set)
     for import_plugin in get_plugins('PROJECT_IMPORTS').values():
         if import_plugin.accept:
-            accept.add(import_plugin.accept)
-        else:
-            return None
-    return ','.join(accept)
+            for key, values in import_plugin.accept.items():
+                accept[key].update(values)
+        elif import_plugin.upload is True:
+            # if one of the plugins does not have the accept field, but is marked as upload plugin
+            # all file types are allowed
+            return {}
+    return accept

rdmo/projects/views/project.py

@@ -87,7 +87,9 @@ def get_context_data(self, **kwargs):
         context['snapshots'] = project.snapshots.all()
         context['invites'] = project.invites.all()
         context['membership'] = Membership.objects.filter(project=project, user=self.request.user).first()
-        context['upload_accept'] = get_upload_accept()
+        context['upload_accept'] = ','.join([
+            suffix for suffixes in get_upload_accept().values() for suffix in suffixes
+        ])
         return context