Pārlūkot izejas kodu

HUE-7248 [adls] Ability to compress / uncompress data in ADLS

jdesjean 8 gadi atpakaļ
vecāks
revīzija
5851cce

+ 2 - 2
apps/filebrowser/src/filebrowser/templates/listdir_components.mako

@@ -1054,7 +1054,7 @@ from filebrowser.conf import ENABLE_EXTRACT_UPLOADED_ARCHIVE
         return currentPath.indexOf('/') === 0 || currentPath.indexOf('hdfs') === 0
       });
       self.isCompressEnabled = ko.pureComputed(function () {
-        return self.isHdfs();
+        return !self.isS3();
       });
       self.isSummaryEnabled = ko.pureComputed(function () {
         return self.isHdfs();
@@ -1652,7 +1652,7 @@ from filebrowser.conf import ENABLE_EXTRACT_UPLOADED_ARCHIVE
         if (fileNames.indexOf('.') !== -1) {
           return false;
         }
-        return self.isHdfs() && (self.selectedFiles().length > 1 || !(self.selectedFiles().length === 1 && self.isArchive(self.selectedFile().name)));
+        return self.isCompressEnabled() && (self.selectedFiles().length > 1 || !(self.selectedFiles().length === 1 && self.isArchive(self.selectedFile().name)));
       });
 
       self.setCompressArchiveDefault = function() {

+ 2 - 2
apps/filebrowser/src/filebrowser/views.py

@@ -1314,7 +1314,7 @@ def extract_archive_using_batch_job(request):
 
   response = {'status': -1, 'data': ''}
   if ENABLE_EXTRACT_UPLOADED_ARCHIVE.get():
-    upload_path = request.POST.get('upload_path', None)
+    upload_path = request.fs.netnormpath(request.POST.get('upload_path', None))
     archive_name = request.POST.get('archive_name', None)
 
     if upload_path and archive_name:
@@ -1334,7 +1334,7 @@ def compress_files_using_batch_job(request):
 
   response = {'status': -1, 'data': ''}
   if ENABLE_EXTRACT_UPLOADED_ARCHIVE.get():
-    upload_path = request.POST.get('upload_path', None)
+    upload_path = request.fs.netnormpath(request.POST.get('upload_path', None))
     archive_name = request.POST.get('archive_name', None)
     file_names = request.POST.getlist('files[]')