Issues/691 develop sling12

.travis.yml

@@ -22,7 +22,7 @@ before_script:
 
 script:
 - if [ ${TRAVIS_PULL_REQUEST} != "false" ]; then BUILD_BRANCH=$TRAVIS_PULL_REQUEST_BRANCH; else BUILD_BRANCH=$TRAVIS_BRANCH; fi
-- cd docker && ./builddocker.sh ${BUILD_BRANCH} develop
+- cd docker && ./builddocker.sh ${BUILD_BRANCH} develop-sling12
 - ./pushdocker-travis.sh
 
 after_script:

admin-base/core/src/main/java/com/peregrine/admin/resource/AdminResourceHandlerService.java

@@ -114,9 +114,6 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
-import javax.imageio.ImageIO;
-import javax.imageio.ImageReader;
-import javax.imageio.stream.ImageInputStream;
 import javax.jcr.*;
 import javax.jcr.version.Version;
 import javax.jcr.version.VersionHistory;
@@ -144,7 +141,8 @@
 )
 public class AdminResourceHandlerService
     implements AdminResourceHandler {
-    public static final String DELETION_PROPERTY_NAME = "_opDelete";
+    public static final String PN_DELETE_NODE = "_opDelete";
+    public static final String PN_DELETE_PROPS = "_opDeleteProps";
     public static final String MODE_PROPERTY = "mode";
 
     private static final String PARENT_NOT_FOUND = "Could not find %s Parent Resource. Path: '%s', name: '%s'";
@@ -951,11 +949,12 @@ private void processNewAsset(PerAsset asset) throws IOException, RepositoryExcep
                     addTagsToNewAsset(asset, directory, directoryName, selector);
                 }
             }
-            // Obtain the Asset Dimension and store directly in the meta data folder
-            handleAssetDimensions(asset);
         } catch (ImageProcessingException e) {
             logger.debug(EMPTY, e);
         }
+
+        // Obtain the Asset Dimension and store directly in the meta data folder
+        asset.setDimension();
     }
 
     private void addTagsToNewAssetAsJson(PerAsset asset, Directory directory, String directoryName, ImageMetadataSelector selector) throws PersistenceException, RepositoryException {
@@ -2008,7 +2007,20 @@ private void updateResourceTree(Resource resource, Map<String, Object> propertie
         if (deleteIfContainsMarkerProperty(resource, properties)) {
             return;
         }
+
         ModifiableValueMap updateProperties = getModifiableProperties(resource, false);
+        if (properties.containsKey(PN_DELETE_PROPS)) {
+            final Object value = properties.remove(PN_DELETE_PROPS);
+            if (value instanceof String) {
+                properties.remove(value);
+                updateProperties.remove(value);
+            } else if (value instanceof List) {
+                final var list = (List) value;
+                list.forEach(properties::remove);
+                list.forEach(updateProperties::remove);
+            }
+        }
+
         for (Entry<String, Object> entry : properties.entrySet()) {
             String name = entry.getKey();
             Object value = entry.getValue();
@@ -2020,12 +2032,13 @@ private void updateResourceTree(Resource resource, Map<String, Object> propertie
                 updateProperties.put(name, value);
             }
         }
+
         baseResourceHandler.updateModification(resource);
     }
 
     private boolean deleteIfContainsMarkerProperty(Resource resource, Map<String, Object> properties) throws ManagementException {
-        if (properties.containsKey(DELETION_PROPERTY_NAME)) {
-            Object value = properties.get(DELETION_PROPERTY_NAME);
+        if (properties.containsKey(PN_DELETE_NODE)) {
+            Object value = properties.get(PN_DELETE_NODE);
             if (value == null || Boolean.TRUE.toString().equalsIgnoreCase(value.toString())) {
                 // This indicates that this node shall be removed
                 try {
@@ -2068,6 +2081,7 @@ private void applyChildProperties(Resource parent, String childName, Map childPr
             childProperties.remove(NAME);
             childProperties.remove(SLING_RESOURCE_TYPE);
             childProperties.remove(JCR_PRIMARY_TYPE);
+            childProperties.remove(PN_DELETE_PROPS);
             child = createNode(parent, childName, NT_UNSTRUCTURED, resourceType);
             // Now update the child with any remaining properties
             writeProperties(childProperties, child);
@@ -2192,7 +2206,7 @@ private Resource handleExistingItem(Resource parent, Resource child, Map itemPro
         // Get index of the matching resource child to compare with the index in the list
         int index = getChildIndex(parent, child);
         String name = child.getName();
-        if (getBoolean(itemProperties, DELETION_PROPERTY_NAME, false)) {
+        if (getBoolean(itemProperties, PN_DELETE_NODE, false)) {
             try {
                 logger.trace("Remove List Child: '{}' ('{}')", name, child.getPath());
                 parent.getResourceResolver().delete(child);
@@ -2315,25 +2329,6 @@ private Node createPageOrTemplate(Resource parent, String name, String templateC
         return newPage;
     }
 
-    public void handleAssetDimensions(PerAsset perAsset) throws RepositoryException, IOException {
-        InputStream is = perAsset.getRenditionStream((String) null);
-        // Ignore images that do not have a jcr:data element aka stream
-        if (is != null) {
-            ImageInputStream iis = ImageIO.createImageInputStream(is);
-            Iterator<ImageReader> readers = ImageIO.getImageReaders(iis);
-            while (readers.hasNext()) {
-                ImageReader reader = readers.next();
-                reader.setInput(iis);
-                int minIndex = reader.getMinIndex();
-                int width = reader.getWidth(minIndex);
-                int height = reader.getHeight(minIndex);
-                perAsset.addTag("per-data", "width", width);
-                perAsset.addTag("per-data", "height", height);
-                break;
-            }
-        }
-    }
-
     private String getPropsFromMap(Map source, String key, String defaultValue) {
         String answer = defaultValue;
         Object temp = source.get(key);

admin-base/core/src/main/java/com/peregrine/admin/servlets/UpdateResourceServlet.java

@@ -49,7 +49,6 @@
 import java.io.IOException;
 import javax.servlet.Servlet;
 import org.apache.sling.api.resource.Resource;
-import org.apache.sling.models.factory.ModelFactory;
 import org.osgi.service.component.annotations.Component;
 import org.osgi.service.component.annotations.Reference;
 
@@ -82,8 +81,6 @@
 public class UpdateResourceServlet extends AbstractBaseServlet {
 
     public static final String FAILED_TO_UPDATE_PAGE = "Failed to Update Page";
-    @Reference
-    ModelFactory modelFactory;
 
     @Reference
     AdminResourceHandler resourceManagement;

admin-base/ui.apps/src/main/content/jcr_root/apps/admin/components/contentview/template.vue

@@ -150,6 +150,7 @@ export default {
         firstTime: [],
         selection: null
       },
+      dynWatchers: [],
       toast: {
         templateComponent: null,
         missingEventPath: null
@@ -431,6 +432,9 @@ export default {
     },
 
     updateSelectedComponent() {
+      this.dynWatchers.forEach((watcher) => {
+        watcher.unwatch()
+      })
       $perAdminApp.action(this, 'showComponentEdit', this.path).then(() => {
         this.flushInlineState()
         return this.$nextTick()
@@ -549,6 +553,14 @@ export default {
       const dataInline = this.targetInline.split('.').slice(1)
       this.inline = dataInline.join('.')
       set(this.view, '/state/inline/doc', this.iframe.doc)
+      const modelPropName = this.getCurrentModelPropName()
+      this.dynWatchers.some((w, index) => {
+        if (w.modelPropName === modelPropName) {
+          w.unwatch()
+          this.dynWatchers.splice(index, 1)
+          return true
+        }
+      })
     },
 
     onInlineFocusOut(event) {
@@ -558,6 +570,9 @@ export default {
       if (!isChromeBrowser() && event.target.innerHTML) {
         event.target.innerHTML = event.target.innerHTML.trim()
       }
+      const modelPropName = this.getCurrentModelPropName()
+      const unwatch = this.$watch(`node.${modelPropName}`, (val) => event.target.innerHTML = val)
+      this.dynWatchers.push({modelPropName, unwatch})
     },
 
     onInlineKeyDown(event) {
@@ -911,6 +926,10 @@ export default {
       style.setAttribute('id', 'editing-extra-styles')
     },
 
+    getCurrentModelPropName(vm = this) {
+      return vm.targetInline.split('.').slice(1).join('.')
+    },
+
     isContentEditableOrNested(el) {
       const component = this.findComponentEl(el)
       let found = el

admin-base/ui.apps/src/main/content/jcr_root/apps/field/material-range/template.vue

@@ -75,6 +75,19 @@ export default {
   watch: {
     value(val) {
       this.model[this.schema.model] = val
+
+      let propsToRemove = this.model['_opDeleteProps'] || []
+      if (val || val === 0 || val === "0") {
+        propsToRemove = propsToRemove.filter(x => x !== this.schema.model)
+      } else {
+        propsToRemove.push(this.schema.model)
+      }
+
+      if (propsToRemove.length > 0) {
+        this.model['_opDeleteProps'] = propsToRemove
+      } else {
+        delete this.model['_opDeleteProps']
+      }
     }
   },
   created() {