Merge branch 'master' into fix-move-issue

dprzybyl · dprzybyl · commit 7710efd89fad · 2023-11-05T00:29:22.000+01:00
diff --git a/app/aem/core/src/main/java/com/cognifide/apm/core/endpoints/ScriptDeleteForm.java b/app/aem/core/src/main/java/com/cognifide/apm/core/endpoints/ScriptDeleteForm.java
@@ -0,0 +1,38 @@
+/*
+ * ========================LICENSE_START=================================
+ * AEM Permission Management
+ * %%
+ * Copyright (C) 2013 Wunderman Thompson Technology
+ * %%
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * =========================LICENSE_END==================================
+ */
+
+package com.cognifide.apm.core.endpoints;
+
+import com.cognifide.apm.core.endpoints.params.RequestParameter;
+import javax.inject.Inject;
+import org.apache.sling.api.SlingHttpServletRequest;
+import org.apache.sling.models.annotations.Model;
+
+@Model(adaptables = SlingHttpServletRequest.class)
+public class ScriptDeleteForm {
+
+  @Inject
+  @RequestParameter("paths")
+  private String[] paths;
+
+  public String[] getPaths() {
+    return paths;
+  }
+}
diff --git a/app/aem/core/src/main/java/com/cognifide/apm/core/endpoints/ScriptDeleteServlet.java b/app/aem/core/src/main/java/com/cognifide/apm/core/endpoints/ScriptDeleteServlet.java
@@ -0,0 +1,73 @@
+/*
+ * ========================LICENSE_START=================================
+ * AEM Permission Management
+ * %%
+ * Copyright (C) 2013 Wunderman Thompson Technology
+ * %%
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * =========================LICENSE_END==================================
+ */
+package com.cognifide.apm.core.endpoints;
+
+import com.cognifide.apm.core.Property;
+import com.cognifide.apm.core.endpoints.response.ResponseEntity;
+import com.cognifide.apm.core.endpoints.utils.RequestProcessor;
+import java.io.IOException;
+import javax.jcr.Session;
+import javax.servlet.Servlet;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.sling.api.SlingHttpServletRequest;
+import org.apache.sling.api.SlingHttpServletResponse;
+import org.apache.sling.api.servlets.SlingAllMethodsServlet;
+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,
+    property = {
+        Property.PATH + "/bin/apm/scripts/delete",
+        Property.METHOD + "POST",
+        Property.DESCRIPTION + "APM Script Delete Servlet",
+        Property.VENDOR
+    }
+)
+public class ScriptDeleteServlet extends SlingAllMethodsServlet {
+
+  private static final Logger LOGGER = LoggerFactory.getLogger(ScriptDeleteServlet.class);
+
+  @Reference
+  private ModelFactory modelFactory;
+
+  @Override
+  protected void doPost(SlingHttpServletRequest request, SlingHttpServletResponse response) throws IOException {
+    RequestProcessor.process(modelFactory, ScriptDeleteForm.class, request, response, (form, resourceResolver) -> {
+      try {
+        Session session = resourceResolver.adaptTo(Session.class);
+        for (String path : form.getPaths()) {
+          if (session.nodeExists(path)) {
+            session.removeItem(path);
+            LOGGER.info("Item {} successfully deleted", path);
+          }
+        }
+        session.save();
+        return ResponseEntity.ok("Item(s) successfully deleted");
+      } catch (Exception e) {
+        LOGGER.error("Error while deleting item(s)", e);
+        return ResponseEntity.badRequest(StringUtils.defaultString(e.getMessage(), "Errors while deleting item(s)"));
+      }
+    });
+  }
+}
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/app/aem/core/src/main/java/com/cognifide/apm/core/endpoints/params/RequestParameterInjector.java b/app/aem/core/src/main/java/com/cognifide/apm/core/endpoints/params/RequestParameterInjector.java
@@ -89,7 +89,13 @@ private Object getValue(SlingHttpServletRequest request, Class<?> type, String p
     } else if (type.isEnum()) {
       return toEnum(type, parameterValue);
     } else if (type == String[].class) {
-      return parameterValue.getString().split(",");
+      if (parameterValue.getString().contains(",")) {
+        return parameterValue.getString().split(",");
+      } else {
+        return Arrays.stream(request.getRequestParameters(parameterName))
+            .map(org.apache.sling.api.request.RequestParameter::getString)
+            .toArray(String[]::new);
+      }
     }
     return parameterValue.getString();
   }
diff --git a/app/aem/core/src/main/java/com/cognifide/apm/core/history/ScriptHistoryImpl.java b/app/aem/core/src/main/java/com/cognifide/apm/core/history/ScriptHistoryImpl.java
@@ -20,8 +20,11 @@
 
 package com.cognifide.apm.core.history;
 
+import com.cognifide.apm.api.services.ExecutionMode;
+import java.util.Comparator;
 import javax.inject.Inject;
 import javax.inject.Named;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.sling.api.resource.Resource;
 import org.apache.sling.models.annotations.DefaultInjectionStrategy;
 import org.apache.sling.models.annotations.Model;
@@ -72,20 +75,28 @@ public static ScriptHistoryImpl empty(String scriptPath) {
 
   @Override
   public HistoryEntry getLastLocalRun() {
-    lastLocalRun = getHistoryEntry(lastLocalRun, lastLocalRunPath);
+    lastLocalRun = getHistoryEntry(lastLocalRun, lastLocalRunPath, ExecutionMode.RUN);
     return lastLocalRun;
   }
 
   @Override
   public HistoryEntry getLastLocalDryRun() {
-    lastLocalDryRun = getHistoryEntry(lastLocalDryRun, lastLocalDryRunPath);
+    lastLocalDryRun = getHistoryEntry(lastLocalDryRun, lastLocalDryRunPath, ExecutionMode.DRY_RUN);
     return lastLocalDryRun;
   }
 
-  private HistoryEntry getHistoryEntry(HistoryEntry entry, String historyEntryPath) {
+  private HistoryEntry getHistoryEntry(HistoryEntry entry, String historyEntryPath, ExecutionMode mode) {
     HistoryEntry historyEntry = entry;
     if (historyEntry == null && resource != null && historyEntryPath != null) {
       historyEntry = history.findHistoryEntry(resource.getResourceResolver(), historyEntryPath);
+      if (historyEntry == null) {
+        historyEntry = history.findAllHistoryEntries(resource.getResourceResolver())
+            .stream()
+            .filter(it -> StringUtils.equals(it.getScriptPath(), scriptPath)
+                && StringUtils.equals(it.getMode(), mode.toString()))
+            .max(Comparator.comparing(HistoryEntry::getExecutionTime))
+            .orElse(new HistoryEntryImpl());
+      }
     }
     return historyEntry;
   }
diff --git a/app/aem/ui.apps.base/src/main/content/jcr_root/apps/apm/clientlibs/views/scripts/js.txt b/app/aem/ui.apps.base/src/main/content/jcr_root/apps/apm/clientlibs/views/scripts/js.txt
@@ -1,4 +1,5 @@
 #base=js
 apm-scripts.js
 fileupload.js
-view-mode.js
+view-mode.js
+deleteitem.js
diff --git a/app/aem/ui.apps.base/src/main/content/jcr_root/apps/apm/clientlibs/views/scripts/js/deleteitem.js b/app/aem/ui.apps.base/src/main/content/jcr_root/apps/apm/clientlibs/views/scripts/js/deleteitem.js
@@ -0,0 +1,90 @@
+/*-
+ * ========================LICENSE_START=================================
+ * AEM Permission Management
+ * %%
+ * Copyright (C) 2013 - 2016 Wunderman Thompson Technology
+ * %%
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * =========================LICENSE_END==================================
+ */
+(function (window, document, $) {
+  function deletePages(collection, paths) {
+    const ui = $(window).adaptTo('foundation-ui');
+    ui.wait();
+    $.ajax({
+      url: '/bin/apm/scripts/delete',
+      type: 'POST',
+      data: {
+        paths: paths
+      },
+      dataType: 'json',
+      success: function () {
+        ui.clearWait();
+        const api = collection.adaptTo('foundation-collection');
+        if (api && 'reload' in api) {
+          api.reload();
+          return
+        }
+        const contentApi = $('.foundation-content').adaptTo('foundation-content');
+        if (contentApi) {
+          contentApi.refresh();
+        }
+      },
+      error: function () {
+        ui.clearWait();
+        ui.alert('Error', 'Errors while deleting item(s)', 'error');
+      }
+    });
+  }
+
+  function createEl(name) {
+    return $(document.createElement(name));
+  }
+
+  $(window).adaptTo('foundation-registry').register('foundation.collection.action.action', {
+    name: 'com.cognifide.apm.delete',
+    handler: function (name, el, config, collection, selections) {
+      const message = createEl('div');
+      const intro = createEl('p').appendTo(message);
+      if (selections.length === 1) {
+        intro.text('You are going to delete the following item:');
+      } else {
+        intro.text('You are going to delete the following ' + selections.length + ' items:');
+      }
+      let list = [];
+      const maxCount = Math.min(selections.length, 12);
+      for (let i = 0; i < maxCount; i++) {
+        const title = $(selections[i]).find('.foundation-collection-item-title').text();
+        const time = $(selections[i]).find('.foundation-collection-item-time').text();
+        list.push(createEl('b').text(time ? title + ' (' + time.trim() + ')' : title).prop('outerHTML'))
+      }
+      if (selections.length > maxCount) {
+        list.push('\x26#8230;');
+      }
+      createEl('p').html(list.join('\x3cbr\x3e')).appendTo(message);
+      const ui = $(window).adaptTo('foundation-ui');
+      ui.prompt('Delete', message.html(), 'notice', [{
+        text: 'Cancel'
+      }, {
+        text: 'Delete',
+        warning: true,
+        handler: function () {
+          const paths = selections.map(function (value) {
+            return $(value).data('foundationCollectionItemId');
+          });
+          deletePages($(collection), paths);
+        }
+      }]);
+    }
+  });
+})(window, document, Granite.$);
diff --git a/app/aem/ui.apps.base/src/main/content/jcr_root/apps/apm/clientlibs/views/scripts/js/fileupload.js b/app/aem/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();
     }
   });
diff --git a/app/aem/ui.apps.base/src/main/content/jcr_root/apps/apm/components/historyRow/historyRow.html b/app/aem/ui.apps.base/src/main/content/jcr_root/apps/apm/components/historyRow/historyRow.html
diff --git a/app/aem/ui.apps.base/src/main/content/jcr_root/apps/apm/views/history/.content.xml b/app/aem/ui.apps.base/src/main/content/jcr_root/apps/apm/views/history/.content.xml
diff --git a/app/aem/ui.apps.base/src/main/content/jcr_root/apps/apm/views/scripts/.content.xml b/app/aem/ui.apps.base/src/main/content/jcr_root/apps/apm/views/scripts/.content.xml
