From: Dan Brown <redacted>
Date: Fri, 27 Jan 2023 17:39:51 +0000 (+0000)
Subject: Added prevention of nested chapters on sort
X-Git-Tag: v23.01~1^2~3^2
X-Git-Url: http://source.bookstackapp.com/bookstack/commitdiff_plain/refs/pull/3999/head?ds=inline

Added prevention of nested chapters on sort
---

diff --git a/resources/js/components/book-sort.js b/resources/js/components/book-sort.js
index 6e56e43a5..5ae283fd0 100644
--- a/resources/js/components/book-sort.js
+++ b/resources/js/components/book-sort.js
@@ -260,7 +260,8 @@ export class BookSort extends Component {
                 animation: 150,
                 fallbackOnBody: true,
                 swapThreshold: 0.65,
-                onSort: () => {
+                onSort: (event) => {
+                    this.ensureNoNestedChapters()
                     this.updateMapInput();
                     this.updateMoveActionStateForAll();
                 },
@@ -273,6 +274,20 @@ export class BookSort extends Component {
         }
     }
 
+    /**
+     * Handle nested chapters by moving them to the parent book.
+     * Needed since sorting with multi-sort only checks group rules based on the active item,
+     * not all in group, therefore need to manually check after a sort.
+     * Must be done before updating the map input.
+     */
+    ensureNoNestedChapters() {
+        const nestedChapters = this.container.querySelectorAll('[data-type="chapter"] [data-type="chapter"]');
+        for (const chapter of nestedChapters) {
+            const parentChapter = chapter.parentElement.closest('[data-type="chapter"]');
+            parentChapter.insertAdjacentElement('afterend', chapter);
+        }
+    }
+
     /**
      * Update the input with our sort data.
      */