Merge pull request #60 from tomaszrondio/master

fix: routes reordering
superdesk · Sep 18, 2018 · 372fbdc · 372fbdc
2 parents 3570326 + 945f91e
commit 372fbdc
Showing 1 changed file with 22 additions and 0 deletions.
diff --git a/client/controllers/WebPublisherManagerController.js b/client/controllers/WebPublisherManagerController.js
@@ -382,15 +382,37 @@ export function WebPublisherManagerController($scope, publisher, modal, privileg
 
                 if (removedItem) {
                     removedItem.removed = true;
+                } else if (item.parent) {
+                    // item was a subroute and was moved to other list
+                    let parent = _.find(list.children, {id: item.parent});
+                    removedItem = _.find(parent.children, {id: item.id});
+
+                    if (removedItem) {
+                        removedItem.removed = true;
+                        parent.children = parent.children.filter((item) => !item.removed);
+                    }
+                } else if (!item.parent) {
+                    // item was top level and was moved to other list
+                    removedItem = _.find($scope.routes.children, {id: item.id});
+
+                    if (removedItem) {
+                        removedItem.removed = true;
+                        $scope.routes.children = $scope.routes.children.filter((item) => !item.removed);
+                    }
                 }
 
                 list.children = list.children.slice(0, index)
                     .concat(item)
                     .concat(list.children.slice(index))
                     .filter((item) => !item.removed);
 
+
                 let parentId = list.children[0].parent;
                 let newPosition = list.children.indexOf(item);
+                // when new item was placed on position 0
+                if (newPosition === 0) {
+                    parentId = list.children[list.children.length-1].parent;
+                }
 
                 if (newPosition !== item.position || parentId !== item.parent) {
                     list.children[newPosition].position = newPosition;