Update/sling12

admin-base/pom.xml

@@ -69,9 +69,9 @@
     </build>
 
     <modules>
+        <module>sling.ui.apps</module>
         <module>core</module>
         <module>materialize</module>
         <module>ui.apps</module>
-        <module>sling.ui.apps</module>
     </modules>
 </project>

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

@@ -533,6 +533,10 @@ export default {
       this.reWrapEditable()
     },
 
+    refreshEditor(vm) {
+      vm.$refs.editview.contentWindow.location.reload()
+    },
+
     onInlineClick(event) {
       this.pingToolbar()
     },

admin-base/ui.apps/src/main/content/jcr_root/apps/admin/runmodes/config/org.apache.sling.jcr.repoinit.RepositoryInitializer-peregrineAdminBaseUI.config

@@ -0,0 +1,37 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with this
+# work for additional information regarding copyright ownership. The ASF
+# licenses this file to You 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.
+
+scripts=[\
+"
+# This Repoinit Script is here to make sure that during an upgrade the necessary users
+# and permissions are available
+#
+# ATTENTION: because of creating users and groups with path this script depends on org.apache.sling.jcr.repoinit-1.1.10
+#
+
+# set ACL's for all_tenants group on paths lower than root 
+# Note: this replaces jcr:read for everyone on root
+    set ACL for all_tenants
+        allow jcr:read on /index.html
+        allow jcr:read on /favicon.ico
+        allow jcr:read on /robots.txt
+        allow jcr:read on /perapi/admin
+        allow jcr:read on /apps
+        allow jcr:read on /i18n
+        allow jcr:read on /content
+    end
+
+"\
+]

admin-base/ui.apps/src/main/js/stateActions/addComponentToPath.js

@@ -61,19 +61,22 @@ export default function(me, target) {
         processed = true;
         return me.getApi().insertNodeAt(target.pagePath+targetNode.path, componentPath, target.drop, variation)
             .then( (data) => {
-                        if(targetNodeUpdate.fromTemplate === true) {
-                            return me.getApi().populatePageView(me.getNodeFromView('/pageView/path'))
-                        } else {
-                            if(target.drop.startsWith('into')) {
-                                Vue.set(targetNodeUpdate, 'children', data.children)
-                            }
-                            else if(target.drop === 'before' || target.drop === 'after')
-                            {
-                                Vue.set(targetNodeUpdate, 'children', data.children)
-                            }
-                            log.fine(data)
-                        }
-                    })
+                if(view.pageView.page.serverSide) {
+                    me.action(me.getApp().$children[0], 'refreshEditor', view.pageView.page)
+                    return me.getApi().populatePageView(me.getNodeFromView('/pageView/path'))
+                } else if(targetNodeUpdate.fromTemplate === true) {
+                    return me.getApi().populatePageView(me.getNodeFromView('/pageView/path'))
+                } else {
+                    if(target.drop.startsWith('into')) {
+                        Vue.set(targetNodeUpdate, 'children', data.children)
+                    }
+                    else if(target.drop === 'before' || target.drop === 'after')
+                    {
+                        Vue.set(targetNodeUpdate, 'children', data.children)
+                    }
+                    log.fine(data)
+                }
+            })
     }
 
     // copy/paste?

admin-base/ui.apps/src/main/js/stateActions/savePageEdit.js

@@ -38,7 +38,8 @@ export default function(me, target) {
             delete view.state.editor;
             set(view, '/state/editorVisible', false)
             if(view.pageView.page.serverSide) {
-                me.action(me.getApp().$children[0], 'refreshEditor', view.pageView.page).then( () => { resolve() })
+                me.action(me.getApp().$children[0], 'refreshEditor', view.pageView.page)
+                resolve()
             } else {
                 resolve()
             }

pagerenderer/server/core/pom.xml

@@ -132,8 +132,9 @@
         </dependency>
 
         <dependency>
-            <groupId>commons-lang</groupId>
-            <artifactId>commons-lang</artifactId>
+            <artifactId>commons-lang3</artifactId>
+            <groupId>org.apache.commons</groupId>
+            <scope>provided</scope>
         </dependency>
 
         <dependency>
@@ -150,6 +151,19 @@
             <groupId>javax.inject</groupId>
             <artifactId>javax.inject</artifactId>
         </dependency>
+
+        <dependency>
+            <groupId>javax.annotation</groupId>
+            <artifactId>javax.annotation-api</artifactId>
+            <version>1.3.2</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.sling</groupId>
+            <artifactId>org.apache.sling.scripting.sightly.compiler.java</artifactId>
+            <version>1.0.18</version>
+            <scope>provided</scope>
+        </dependency>
     </dependencies>
 
     <profiles>

pagerenderer/server/core/src/main/java/com/peregrine/pagerender/server/helpers/BaseHelper.java

@@ -0,0 +1,150 @@
+package com.peregrine.pagerender.server.helpers;
+
+import com.peregrine.adaption.PerPage;
+import org.apache.sling.api.SlingHttpServletRequest;
+import org.apache.sling.api.SlingHttpServletResponse;
+import org.apache.sling.api.resource.Resource;
+import org.apache.sling.api.resource.ResourceResolver;
+import org.apache.sling.api.resource.ValueMap;
+import org.apache.sling.api.scripting.SlingScriptHelper;
+import org.apache.sling.models.factory.ModelFactory;
+import org.apache.sling.scripting.sightly.pojo.Use;
+import org.slf4j.Logger;
+
+import javax.jcr.Node;
+import javax.jcr.Session;
+import javax.script.Bindings;
+import java.io.BufferedReader;
+import java.io.PrintWriter;
+import java.util.Objects;
+
+import static com.peregrine.commons.util.PerConstants.JCR_CONTENT;
+
+public class BaseHelper implements Use {
+
+    // GLOBAL OBJECTS (from Use API Binding)
+    private Node currentNode;
+    private Session currentSession;
+    private Logger log;
+    private PrintWriter out;
+    private ValueMap properties;
+    private BufferedReader reader;
+    private SlingHttpServletRequest request;
+    private ResourceResolver resolver;
+    private Resource resource;
+    private SlingHttpServletResponse response;
+    private SlingScriptHelper sling;
+
+    // Peregrine API
+    private Object model;
+    private Resource siteRoot;
+    private PerPage currentPage;
+    private String pagePath;
+
+    // Constants
+    public static String CURRENT_NODE = "currentNode";
+    public static String CURRENT_SESSION = "currentSession";
+    public static String LOG = "log";
+    public static String OUT = "out";
+    public static String PROPERTIES = "properties";
+    public static String READER = "reader";
+    public static String REQUEST = "request";
+    public static String RESOLVER = "resolver";
+    public static String RESOURCE = "resource";
+    public static String RESPONSE = "response";
+    public static String SLING = "sling";
+
+    public void init(Bindings bindings) {
+        // initialize all global bindings (minus caconfig)
+        currentNode = (Node) bindings.get(CURRENT_NODE);
+        currentSession = (Session) bindings.get(CURRENT_SESSION);
+        log = (Logger) bindings.get(LOG);
+        out = (PrintWriter) bindings.get(OUT);
+        properties = (ValueMap) bindings.get(PROPERTIES);
+        reader = (BufferedReader) bindings.get(READER);
+        request = (SlingHttpServletRequest) bindings.get(REQUEST);
+        resolver = (ResourceResolver) bindings.get(RESOLVER);
+        resource = (Resource) bindings.get(RESOURCE);
+        response = (SlingHttpServletResponse) bindings.get(RESPONSE);
+        sling = (SlingScriptHelper) bindings.get(SLING);
+
+        // initialize peregrine api
+        pagePath = request.getRequestPathInfo().getResourcePath();
+        pagePath = pagePath.substring(0, pagePath.indexOf(JCR_CONTENT));
+        Resource pageRes = resolver.getResource(pagePath);
+        if (Objects.nonNull(pageRes)){
+            currentPage = pageRes.adaptTo(PerPage.class);
+        }
+        if (Objects.nonNull(currentPage)){
+            siteRoot = currentPage.getSiteResource();
+        }
+        try {
+            model = sling.getService(ModelFactory.class).getModelFromResource(resource);
+            if (Objects.isNull(model)) {
+                model = sling.getService(ModelFactory.class).getModelFromRequest(request);
+            }            
+        } catch(Throwable t) {
+            log.warn("could not get model for "+resource.getPath());
+        }
+    }
+
+    public PrintWriter getOut() {
+        return out;
+    }
+
+    public ValueMap getProperties() {
+        return properties;
+    }
+
+    public BufferedReader getReader() {
+        return reader;
+    }
+
+    public SlingHttpServletRequest getRequest() {
+        return request;
+    }
+
+    public ResourceResolver getResolver() {
+        return resolver;
+    }
+
+    public Resource getResource() {
+        return resource;
+    }
+
+    public SlingHttpServletResponse getResponse() {
+        return response;
+    }
+
+    public SlingScriptHelper getSling() {
+        return sling;
+    }
+
+    public Object getModel() {
+        return model;
+    }
+
+    public Resource getSiteRoot() {
+        return siteRoot;
+    }
+
+    public PerPage getCurrentPage() {
+        return currentPage;
+    }
+
+    public String getPagePath() {
+        return pagePath;
+    }
+
+    public Node getCurrentNode() {
+        return currentNode;
+    }
+
+    public Session getCurrentSession() {
+        return currentSession;
+    }
+
+    public Logger getLog() {
+        return log;
+    }
+}

pagerenderer/server/core/src/main/java/com/peregrine/pagerender/server/helpers/PageHelper.java

@@ -0,0 +1,30 @@
+package com.peregrine.pagerender.server.helpers;
+
+import javax.script.Bindings;
+import com.peregrine.pagerender.server.models.PageModel;
+
+import java.util.Objects;
+
+public class PageHelper extends BaseHelper {
+
+    public String getPath() {
+        return this.getResource().getPath();
+    }
+
+    public String getSiteRootPath() {
+        return Objects.nonNull(getSiteRoot()) ? getSiteRoot().getPath() : null;
+    }
+
+    public String getModelClass() {
+        return Objects.nonNull(getModel()) ? getModel().getClass().toString() : null;
+    }
+
+    public String[] getSiteCSS(){
+        PageModel page = getResource().adaptTo(PageModel.class);
+        return page.getSiteCSS();
+    }
+
+    public void init(Bindings bindings) {
+        super.init(bindings);
+    }
+}