Merge pull request ckan#38 from qld-gov-au/develop

Develop to master
JVickery-TBS · Mar 14, 2023 · 7abfbdd · 7abfbdd
2 parents 10ce4dd + c7a54ac
commit 7abfbdd
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 2 deletions.
diff --git a/ckanext/validation/assets/js/module-resource-schema.js b/ckanext/validation/assets/js/module-resource-schema.js
@@ -272,6 +272,9 @@ this.ckan.module('resource-schema', function($) {
     },
 
     _markUnaligned: function() {
+        if (this.align_block.hasClass("no-default-schema")) {
+            return;
+        }
         this.align_block.removeClass('hidden');
         this.field_align.prop('checked', false);
     }

diff --git a/ckanext/validation/utils.py b/ckanext/validation/utils.py
@@ -2,6 +2,7 @@
 
 import logging
 import json
+import os
 from six import ensure_str
 from io import BytesIO
 from datetime import datetime as dt
@@ -114,8 +115,7 @@ def run_sync_validation(resource_data):
         if is_url_valid(resource_data['url']):
             source = resource_data['url']
         else:
-            upload = uploader.get_resource_uploader(resource_data)
-            source = upload.get_path(resource_data["id"])
+            source = _get_uploaded_resource_path(resource_data)
 
     report = validate(source,
                       format=_format,
@@ -138,6 +138,31 @@ def run_sync_validation(resource_data):
         resource_data['_success_validation'] = True
 
 
+def _get_uploaded_resource_path(resource_data):
+    """Get a path for uploaded resource. Supports a default ResourceUpload and
+    ckanext-s3filestore S3ResourceUploader."""
+    upload = uploader.get_resource_uploader(resource_data)
+    path = None
+
+    if isinstance(upload, uploader.ResourceUpload):
+        path = upload.get_path(resource_data['id'])
+    else:
+        try:
+            from ckanext.s3filestore.uploader import S3ResourceUploader
+        except Exception:
+            return path
+
+        if isinstance(upload, S3ResourceUploader):
+            filename = os.path.basename(resource_data["url"])
+            key_path = upload.get_path(resource_data["id"], filename)
+            path = upload.get_signed_url_to_key(key_path, {
+                'ResponseContentDisposition':
+                'attachment; filename=' + filename,
+            })
+
+    return path
+
+
 def _get_session(resource_data):
     dataset = tk.get_action('package_show')({
         'user': get_site_user()['name']