ZIP Imports: Added book content ordering to import preview

Author: ssddanbrown

app/Exports/ZipExports/Models/ZipExportBook.php

@@ -36,6 +36,20 @@ public function metadataOnly(): void
         }
     }
 
+    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();

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 @@ public function metadataOnly(): void
         }
     }
 
+    public function children(): array
+    {
+        return $this->pages;
+    }
+
     public static function fromModel(Chapter $model, ZipExportFiles $files): self
     {
         $instance = new self();

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();

app/Exports/ZipExports/ZipExportReader.php

@@ -5,7 +5,6 @@
 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;

resources/views/exports/parts/import-item.blade.php

@@ -16,11 +16,13 @@
                 <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>