Merge pull request #164 from entando/ENG-4886_As-a-user-that-only-visualizes-a-Virtual-Tree-that-can-only-manage-pages-of-group-free-I-MUST-be-able-to-change-around-the-order

ENG-4886 As a user that only visualizes a Virtual Tree, that can only manage pages of group `free`, I MUST be able to change around the order of pages even if there are siblings that are hidden to me.

Author: entgigi

engine/src/main/java/org/entando/entando/aps/system/services/TreeNodeHelper.java

@@ -1,9 +1,12 @@
 package org.entando.entando.aps.system.services;
 
 import com.agiletec.aps.system.common.tree.ITreeNode;
+import lombok.extern.slf4j.Slf4j;
+
 import java.util.ArrayList;
 import java.util.List;
 
+@Slf4j
 public abstract class TreeNodeHelper<T extends ITreeNode> {
 
     public List<T> getNodes(String parentNodeCode) {
@@ -15,11 +18,15 @@ public List<T> getNodes(String parentNodeCode) {
     }
 
     private List<T> buildNodesList(T parentNode, List<T> nodes, boolean root) {
+        log.debug("build node list for parentNode:'{}'", parentNode.getCode());
         if (root || !this.isNodeAllowed(parentNode)) {
             for (String childNodeCode : parentNode.getChildrenCodes()) {
                 T childNode = this.getTreeNode(childNodeCode);
+
                 if (this.isNodeAllowed(childNode)) {
                     nodes.add(childNode);
+                    log.debug("added child:'{}' for parentNode:'{}' absolutePosition:'{}'",
+                            childNodeCode, parentNode.getCode(), childNode.getPosition());
                 }
                 buildNodesList(childNode, nodes, false);
             }

engine/src/main/java/org/entando/entando/aps/system/services/page/PageService.java

@@ -16,6 +16,7 @@
 import com.agiletec.aps.system.common.FieldSearchFilter;
 import com.agiletec.aps.system.common.IManager;
 import com.agiletec.aps.system.common.model.dao.SearcherDaoPaginatedResult;
+import com.agiletec.aps.system.common.tree.ITreeNode;
 import com.agiletec.aps.system.services.group.Group;
 import com.agiletec.aps.system.services.group.GroupUtilizer;
 import com.agiletec.aps.system.services.group.IGroupManager;
@@ -437,10 +438,27 @@ public PageDto updatePageStatus(String pageCode, String status) {
 
     @Override
     public PageDto movePage(String pageCode, PagePositionRequest pageRequest, UserDetails user) {
+        int absolutePosition = getAbsolutePosition(pageRequest.getParentCode(), pageRequest.getPosition(), user);
+        logger.debug("before move page:'{}' replace position:'{}' with absolutePosition:'{}' under parent:'{}'",
+                pageCode, pageRequest.getPosition(), absolutePosition, pageRequest.getParentCode());
+        pageRequest.setPosition(absolutePosition);
         PageDto pageDto = this.movePage(pageCode, pageRequest);
         return this.loadVirtualChildren(pageDto, user);
     }
 
+    private int getAbsolutePosition(String parentCode, int position, UserDetails user){
+        PageTreeNodeHelper helper = new PageTreeNodeHelper(this.getPageManager(), this.pageAuthorizationService, user);
+        List<IPage> pages = helper.getNodes(parentCode);
+        int absolutePosition = position;
+        for(int i=0; i < pages.size(); i++) {
+            if(i == position-1){
+                absolutePosition = pages.get(i).getPosition();
+                break;
+            }
+        }
+        return absolutePosition;
+    }
+
     @Override
     public PageDto movePage(String pageCode, PagePositionRequest pageRequest) {
         BeanPropertyBindingResult bindingResult = new BeanPropertyBindingResult(pageCode, "page");