From c0dff6d4a6227549e7f756cdd0d7cd6a003b9886 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Fri, 22 Nov 2024 21:03:04 +0000
Subject: [PATCH] ZIP Imports: Added book content ordering to import preview

---
 app/Exports/ZipExports/Models/ZipExportBook.php    | 14 ++++++++++++++
 app/Exports/ZipExports/Models/ZipExportChapter.php |  7 ++++++-
 app/Exports/ZipExports/Models/ZipExportPage.php    |  2 +-
 app/Exports/ZipExports/ZipExportReader.php         |  1 -
 .../views/exports/parts/import-item.blade.php      | 14 ++++++++------
 5 files changed, 29 insertions(+), 9 deletions(-)

diff --git a/app/Exports/ZipExports/Models/ZipExportBook.php b/app/Exports/ZipExports/Models/ZipExportBook.php
index 47ab8f0a6..4f641d25b 100644
--- a/app/Exports/ZipExports/Models/ZipExportBook.php
+++ b/app/Exports/ZipExports/Models/ZipExportBook.php
@@ -36,6 +36,20 @@ class ZipExportBook extends ZipExportModel
         }
     }
 
+    public function children(): array
+    {
+        $children = [
+            ...$this->pages,
+            ...$this->chapters,
+        ];
+
+        usort($children, function ($a, $b) {
+            return ($a->priority ?? 0) - ($b->priority ?? 0);
+        });
+
+        return $children;
+    }
+
     public static function fromModel(Book $model, ZipExportFiles $files): self
     {
         $instance = new self();
diff --git a/app/Exports/ZipExports/Models/ZipExportChapter.php b/app/Exports/ZipExports/Models/ZipExportChapter.php
index 5a5fe350f..bf2dc78f8 100644
--- a/app/Exports/ZipExports/Models/ZipExportChapter.php
+++ b/app/Exports/ZipExports/Models/ZipExportChapter.php
@@ -20,7 +20,7 @@ class ZipExportChapter extends ZipExportModel
 
     public function metadataOnly(): void
     {
-        $this->description_html = $this->priority = null;
+        $this->description_html = null;
 
         foreach ($this->pages as $page) {
             $page->metadataOnly();
@@ -30,6 +30,11 @@ class ZipExportChapter extends ZipExportModel
         }
     }
 
+    public function children(): array
+    {
+        return $this->pages;
+    }
+
     public static function fromModel(Chapter $model, ZipExportFiles $files): self
     {
         $instance = new self();
diff --git a/app/Exports/ZipExports/Models/ZipExportPage.php b/app/Exports/ZipExports/Models/ZipExportPage.php
index 16e7e9255..097443df0 100644
--- a/app/Exports/ZipExports/Models/ZipExportPage.php
+++ b/app/Exports/ZipExports/Models/ZipExportPage.php
@@ -23,7 +23,7 @@ class ZipExportPage extends ZipExportModel
 
     public function metadataOnly(): void
     {
-        $this->html = $this->markdown = $this->priority = null;
+        $this->html = $this->markdown = null;
 
         foreach ($this->attachments as $attachment) {
             $attachment->metadataOnly();
diff --git a/app/Exports/ZipExports/ZipExportReader.php b/app/Exports/ZipExports/ZipExportReader.php
index 6b88ef61c..c3d5c23cf 100644
--- a/app/Exports/ZipExports/ZipExportReader.php
+++ b/app/Exports/ZipExports/ZipExportReader.php
@@ -5,7 +5,6 @@ namespace BookStack\Exports\ZipExports;
 use BookStack\Exceptions\ZipExportException;
 use BookStack\Exports\ZipExports\Models\ZipExportBook;
 use BookStack\Exports\ZipExports\Models\ZipExportChapter;
-use BookStack\Exports\ZipExports\Models\ZipExportModel;
 use BookStack\Exports\ZipExports\Models\ZipExportPage;
 use BookStack\Util\WebSafeMimeSniffer;
 use ZipArchive;
diff --git a/resources/views/exports/parts/import-item.blade.php b/resources/views/exports/parts/import-item.blade.php
index 811a3b31b..5da4b2140 100644
--- a/resources/views/exports/parts/import-item.blade.php
+++ b/resources/views/exports/parts/import-item.blade.php
@@ -16,11 +16,13 @@ $model - object
                 <span>@icon('tag'){{ count($model->tags) }}</span>
             @endif
         </div>
-        @foreach($model->chapters ?? [] as $chapter)
-            @include('exports.parts.import-item', ['type' => 'chapter', 'model' => $chapter])
-        @endforeach
-        @foreach($model->pages ?? [] as $page)
-            @include('exports.parts.import-item', ['type' => 'page', 'model' => $page])
-        @endforeach
+        @if(method_exists($model, 'children'))
+            @foreach($model->children() as $child)
+                @include('exports.parts.import-item', [
+                    'type' => ($child instanceof \BookStack\Exports\ZipExports\Models\ZipExportPage) ? 'page' : 'chapter',
+                    'model' => $child
+                ])
+            @endforeach
+        @endif
     </div>
 </div>
\ No newline at end of file