fix nesting issue

Author: ctf0

src/Controllers/Admin/Traits/MenuOps.php

@@ -17,9 +17,11 @@ trait MenuOps
      */
     public function getMenuPages($id)
     {
-        $pages = $this->cache->tags('sm')->get('menus')->find($id)->pages()->orderBy('pivot_order', 'asc')->get()->each(function ($item) {
-            $item['from'] = 'pages';
-        });
+        $pages = collect($this->cache->tags('sm')->get('menus')->find($id)->pages)
+                ->sortBy('pivot_order')
+                ->each(function ($item) {
+                    $item['from'] = 'pages';
+                });
 
         $allPages = $this->cache->tags('sm')->get('pages')->diff($pages)->each(function ($item) {
             $item['from'] = 'allPages';

src/resources/assets/js/components/menu-comp.vue

@@ -19,6 +19,9 @@ export default {
     created() {
         this.getPages()
     },
+    updated() {
+        admin_sticky_sidebar()
+    },
     methods: {
         getPages() {
             $.get(this.getMenuPages, (res) => {
@@ -63,14 +66,6 @@ export default {
                     this.allPages = res.allPages.filter((x) => this.pages.indexOf(x) < 0 )
                 })
             })
-
-            EventHub.listen('childDragStart', () => {
-                this.isDragging = true
-            })
-
-            EventHub.listen('childDragEnd', () => {
-                this.isDragging = false
-            })
         },
 
         // styling
@@ -87,14 +82,6 @@ export default {
         },
 
         // nests
-        dragStart() {
-            this.isDragging = true
-            EventHub.fire('parentDragStart')
-        },
-        dragEnd() {
-            this.isDragging = false
-            EventHub.fire('parentDragEnd')
-        },
         loop(item) {
             let childs = []
 

src/resources/assets/js/components/menu-comp_childs.vue

@@ -78,15 +78,6 @@ export default {
         pushBackToList(item) {
             return item.from == 'pages' ? this.pages.unshift(item) : this.allPages.unshift(item)
         },
-        eventsListeners() {
-            EventHub.listen('parentDragStart', () => {
-                this.isDragging = true
-            })
-
-            EventHub.listen('parentDragEnd', () => {
-                this.isDragging = false
-            })
-        },
 
         // styling
         updateList(e) {
@@ -100,16 +91,6 @@ export default {
             if (e.moved || e.removed || e.added && e.added.element.from == 'allPages') {
                 EventHub.fire('updatePagesHierarchy')
             }
-        },
-
-        // nests
-        dragStart() {
-            this.isDragging = true
-            EventHub.fire('childDragStart')
-        },
-        dragEnd() {
-            this.isDragging = false
-            EventHub.fire('childDragEnd')
         }
     }
 }

src/resources/assets/js/components/mixins/menu.js

@@ -15,6 +15,22 @@ export default {
 
             return title.hasOwnProperty(locale) ? Object.values(title)[v] : Object.values(title)[0].concat(` "${Object.keys(title)[0]}"`)
         },
+
+        // ops
+        eventsListeners() {
+            EventHub.listen('DragStart', () => {
+                this.isDragging = true
+            })
+
+            EventHub.listen('DragEnd', () => {
+                this.isDragging = false
+            })
+        },
+        hasChilds(item) {
+            return item.nests && item.nests.length > 0
+        },
+
+        // style
         classObj(item) {
             if (this.checkFrom(item)) {
                 return 'is-warning'
@@ -30,8 +46,16 @@ export default {
 
             return 'fa-caret-right'
         },
-        hasChilds(item) {
-            return item.nests && item.nests.length > 0
+
+        // nests
+        dragStart() {
+            this.isDragging = true
+            EventHub.fire('DragStart')
+        },
+        dragEnd() {
+            this.isDragging = false
+            EventHub.fire('DragEnd')
         }
+
     }
 }