[Fixes GeoNode#7989] Misbehavior with upload resources requiring further user inputs (GeoNode#7990)

* [Fixes GeoNode#7989] Misbehavior with upload resources requiring further user inputs

* [Fixes GeoNode#7989] Misbehavior with upload resources requiring further user inputs

Author: Alessio Fabiani

geonode/resource/manager.py

@@ -238,6 +238,7 @@ def delete(self, uuid: str, /, instance: ResourceBase = None) -> int:
         _resource = instance or ResourceManager._get_instance(uuid)
         if _resource and ResourceBase.objects.filter(uuid=uuid).exists():
             try:
+                _resource.set_processing_state(enumerations.STATE_RUNNING)
                 self._concrete_resource_manager.delete(uuid, instance=_resource)
                 if isinstance(_resource.get_real_instance(), Dataset):
                     """
@@ -320,8 +321,7 @@ def create(self, uuid: str, /, resource_type: typing.Optional[object] = None, de
                     _resource = self._concrete_resource_manager.create(uuid, resource_type=resource_type, defaults=defaults)
             except Exception as e:
                 logger.exception(e)
-                _resource.set_processing_state(enumerations.STATE_INVALID)
-                _resource.delete()
+                self.delete(instance=_resource)
                 raise e
             finally:
                 _resource.set_processing_state(enumerations.STATE_PROCESSED)
@@ -419,6 +419,7 @@ def ingest(self, files: typing.List[str], /, uuid: str = None, resource_type: ty
     def copy(self, instance: ResourceBase, /, uuid: str = None, owner: settings.AUTH_USER_MODEL = None, defaults: dict = {}) -> ResourceBase:
         if instance:
             try:
+                instance.set_processing_state(enumerations.STATE_RUNNING)
                 with transaction.atomic():
                     _owner = owner or instance.get_real_instance().owner
                     _perms = instance.get_real_instance().get_all_level_info()

geonode/static/geonode/js/upload/upload.js

@@ -317,36 +317,6 @@ define(['underscore',
                 .fail(function () {});
         }
 
-        function handleResume(options) {
-            $.ajax({
-                url: options.url,
-                async: false,
-                mode: "queue",
-                contentType: false,
-            })
-                .done(function (data) {
-                    if('redirect_to' in data) {
-                        common.make_request({
-                            url: data.redirect_to,
-                            async: false,
-                            failure: function (resp, status) {
-                                common.logError(resp, status);
-                            },
-                            success: function (resp, status) {
-                                window.location = resp.url;
-                            }
-                        });
-                    } else if ('url' in data) {
-                        window.location = data.url;
-                    } else {
-                        common.logError("unexpected response");
-                    }
-                })
-                .fail(function (resp) {
-                    common.logError(resp);
-                });
-        }
-
         function progressBar(properties) {
             properties.parent.style.position = 'relative';
             // add a small progress bar in the progressNode
@@ -421,7 +391,7 @@ define(['underscore',
                 resumeTool.setAttribute('data-toggle', 'tooltip');
                 resumeTool.setAttribute('data-placement', 'top');
                 resumeTool.innerHTML = '<i class="fa fa-play"></i>';
-                resumeTool.onclick = function() { handleResume({ id: properties.id, url: properties.resume_url }); };
+                resumeTool.onclick = function () { window.location = properties.resume_url; };
                 infoTools.appendChild(resumeTool);
                 $(resumeTool).tooltip();
             } else {

geonode/static/lib/js/assets.min.js

@@ -0,0 +1,18 @@
+# Generated by Django 3.2.4 on 2021-08-25 00:14
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('upload', '0033_auto_20210531_1252'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='upload',
+            name='resume_url',
+            field=models.CharField(blank=True, max_length=256, null=True),
+        ),
+    ]

geonode/static/lib/js/openlayers-plugins.min.js

@@ -95,6 +95,8 @@ class Upload(models.Model):
     mosaic_elev_regex = models.CharField(max_length=128, null=True)
     mosaic_elev_value = models.CharField(max_length=128, null=True)
 
+    resume_url = models.CharField(max_length=256, null=True, blank=True)
+
     class Meta:
         ordering = ['-date']
 
@@ -166,9 +168,14 @@ def progress(self):
                 return 66.0
             return 80.0
 
+    def set_resume_url(self, resume_url):
+        if self.resume_url != resume_url:
+            self.resume_url = resume_url
+            Upload.objects.filter(id=self.id).update(resume_url=resume_url)
+
     def get_resume_url(self):
         if self.state == enumerations.STATE_WAITING and self.import_id:
-            return f"{reverse('data_upload')}?id={self.import_id}"
+            return self.resume_url
         return None
 
     def get_delete_url(self):

geonode/upload/migrations/0034_upload_resume_url.py

@@ -180,8 +180,11 @@ def _update_upload_session_state(self, upload_session_id: int):
                     if isinstance(content, bytes):
                         content = content.decode('UTF-8')
                     response_json = json.loads(content)
-                    if response_json['success'] and 'redirect_to' in response_json:
-                        if 'upload/final' not in response_json['redirect_to'] and 'upload/check' not in response_json['redirect_to']:
+                    _success = response_json.get('success', False)
+                    _redirect_to = response_json.get('redirect_to', '')
+                    if _success:
+                        if 'upload/final' not in _redirect_to and 'upload/check' not in _redirect_to:
+                            _upload.set_resume_url(_redirect_to)
                             _upload.set_processing_state(enumerations.STATE_WAITING)
                         else:
                             if session.state == enumerations.STATE_COMPLETE and _upload.state == enumerations.STATE_PENDING: