Merge pull request #431 from wttech/fix-upload-file

fixed script upload
wttech · Nov 4, 2023 · a95e13c · a95e13c
2 parents e2af52b + f484d4e
commit a95e13c
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 12 deletions.
diff --git a/app/aem/core/src/main/java/com/cognifide/apm/core/endpoints/ScriptUploadServlet.java b/app/aem/core/src/main/java/com/cognifide/apm/core/endpoints/ScriptUploadServlet.java
@@ -39,6 +39,8 @@
 import org.apache.sling.models.factory.ModelFactory;
 import org.osgi.service.component.annotations.Component;
 import org.osgi.service.component.annotations.Reference;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 @Component(
     service = Servlet.class,
@@ -51,6 +53,8 @@
 )
 public class ScriptUploadServlet extends SlingAllMethodsServlet {
 
+  private static final Logger LOGGER = LoggerFactory.getLogger(ScriptUploadServlet.class);
+
   @Reference
   private ScriptStorage scriptStorage;
 
@@ -66,12 +70,15 @@ protected void doPost(SlingHttpServletRequest request, SlingHttpServletResponse
       try {
         Script script = scriptStorage.save(form, resourceResolver);
         scriptManager.process(script, ExecutionMode.VALIDATION, resourceResolver);
-        return ResponseEntity.ok("File successfully saved")
+        LOGGER.info("Script {} successfully saved", script.getPath());
+        return ResponseEntity.ok("Script successfully saved")
             .addEntry("uploadedScript", new ScriptDto(script));
       } catch (ScriptStorageException e) {
+        LOGGER.error("Errors while saving script", e);
         return ResponseEntity.badRequest(StringUtils.defaultString(e.getMessage(), "Errors while saving script"))
             .addEntry("errors", e.getErrors());
       } catch (PersistenceException | RepositoryException e) {
+        LOGGER.error("Errors while saving script", e);
         throw new RuntimeException(e);
       }
     });

diff --git a/...ui.apps.base/src/main/content/jcr_root/apps/apm/clientlibs/views/scripts/js/fileupload.js b/...ui.apps.base/src/main/content/jcr_root/apps/apm/clientlibs/views/scripts/js/fileupload.js
@@ -17,11 +17,11 @@
  * limitations under the License.
  * =========================LICENSE_END==================================
  */
-(function(window, $, Coral) {
+(function (window, $, Coral) {
   'use strict';
 
   let dragCounter = 0,
-      fileUploader;
+    fileUploader    ;
 
   function init() {
     fileUploader = new Coral.FileUpload();
@@ -42,9 +42,9 @@
         ];
         fileUploader.upload(filename);
       })
-      .on('coral-fileupload:load', function(event) {
+      .on('coral-fileupload:load', function (event) {
         let savePath = window.location.pathname.split('.html')[1];
-        fileUploader.uploadQueue.forEach(function(item, index) {
+        fileUploader.uploadQueue.forEach(function (item, index) {
           let filename = event.detail.item.file.name;
           if (item.file.name === filename) {
             item._parameters = [
@@ -57,23 +57,26 @@
           _reload();
         }
       });
+    fileUploader._getTargetChangeInput().addEventListener('change', function (event) {
+      fileUploader._onInputChange(event);
+    });
 
     const coralShell = $('coral-shell-content').get(0);
-    coralShell.addEventListener('drop', function(event) {
+    coralShell.addEventListener('drop', function (event) {
       dragCounter = 0;
       event.preventDefault();
       _dropZoneDrop();
       fileUploader._onInputChange(event);
     }, false);
-    coralShell.addEventListener('dragenter', function(event) {
+    coralShell.addEventListener('dragenter', function (event) {
       event.preventDefault();
       dragCounter++;
       _dropZoneDragEnter();
     }, false);
-    coralShell.addEventListener('dragover', function(event) {
+    coralShell.addEventListener('dragover', function (event) {
       event.preventDefault();
     }, false);
-    coralShell.addEventListener('dragleave', function() {
+    coralShell.addEventListener('dragleave', function () {
       dragCounter--;
       if (dragCounter === 0) {
         _dropZoneDragLeave();
@@ -87,21 +90,21 @@
 
   function _dropZoneDragEnter() {
     let message = Granite.I18n.get('Drag and drop to upload'),
-        dragAndDropMessage = $('<div class=\"drag-drop-message\" style="text-align: center;"><h1 > <span>{</span>' + message + '<span>}</span></h1></div>');
+      dragAndDropMessage = $('<div class=\"drag-drop-message\" style="text-align: center;"><h1 > <span>{</span>' + message + '<span>}</span></h1></div>');
     $('.foundation-collection').overlayMask('show', dragAndDropMessage);
   }
 
   function _dropZoneDragLeave() {
     $('.foundation-collection').overlayMask('hide');
   }
 
-  function _dropZoneDrop () {
+  function _dropZoneDrop() {
     $('.foundation-collection').overlayMask('hide');
   }
 
   $(window).adaptTo('foundation-registry').register('foundation.collection.action.action', {
     name: 'scripts.upload',
-    handler: function() {
+    handler: function () {
       fileUploader._showFileDialog();
     }
   });