TypeScript: Updated compile target, addressed issues

[bookstack] / app / Entities / Repos / BaseRepo.php

diff --git a/app/Entities/Repos/BaseRepo.php b/app/Entities/Repos/BaseRepo.php
index 17208ae032a196b6780da187b675c7e24967c854..ac5a44e679dbc70f9d9c8563231aeea5ed06e22b 100644 (file)
--- a/app/Entities/Repos/BaseRepo.php
+++ b/app/Entities/Repos/BaseRepo.php
@@ -4,14 +4,16 @@ namespace BookStack\Entities\Repos;
 
 use BookStack\Activity\TagRepo;
 use BookStack\Entities\Models\Book;
 
 use BookStack\Activity\TagRepo;
 use BookStack\Entities\Models\Book;

+use BookStack\Entities\Models\BookChild;

 use BookStack\Entities\Models\Chapter;
 use BookStack\Entities\Models\Entity;
 use BookStack\Entities\Models\HasCoverImage;
 use BookStack\Entities\Models\HasHtmlDescription;
 use BookStack\Entities\Models\Chapter;
 use BookStack\Entities\Models\Entity;
 use BookStack\Entities\Models\HasCoverImage;
 use BookStack\Entities\Models\HasHtmlDescription;

-use BookStack\Entities\Models\Page;
+use BookStack\Entities\Queries\PageQueries;

 use BookStack\Exceptions\ImageUploadException;
 use BookStack\References\ReferenceStore;
 use BookStack\References\ReferenceUpdater;
 use BookStack\Exceptions\ImageUploadException;
 use BookStack\References\ReferenceStore;
 use BookStack\References\ReferenceUpdater;

+use BookStack\Sorting\BookSorter;

 use BookStack\Uploads\ImageRepo;
 use BookStack\Util\HtmlDescriptionFilter;
 use Illuminate\Http\UploadedFile;
 use BookStack\Uploads\ImageRepo;
 use BookStack\Util\HtmlDescriptionFilter;
 use Illuminate\Http\UploadedFile;


@@ -23,6 +25,8 @@ class BaseRepo
         protected ImageRepo $imageRepo,
         protected ReferenceUpdater $referenceUpdater,
         protected ReferenceStore $referenceStore,
         protected ImageRepo $imageRepo,
         protected ReferenceUpdater $referenceUpdater,
         protected ReferenceStore $referenceStore,

+        protected PageQueries $pageQueries,
+        protected BookSorter $bookSorter,

     ) {
     }
 
     ) {
     }
 


@@ -73,7 +77,6 @@ class BaseRepo
             $entity->touch();
         }
 
             $entity->touch();
         }
 

-        $entity->rebuildPermissions();

         $entity->indexForSearch();
         $this->referenceStore->updateForEntity($entity);
 
         $entity->indexForSearch();
         $this->referenceStore->updateForEntity($entity);
 


@@ -125,8 +128,7 @@ class BaseRepo
             return;
         }
 
             return;
         }
 

-        $templateExists = Page::query()->visible()
-            ->where('template', '=', true)
+        $templateExists = $this->pageQueries->visibleTemplates()

             ->where('id', '=', $templateId)
             ->exists();
 
             ->where('id', '=', $templateId)
             ->exists();
 


@@ -134,6 +136,18 @@ class BaseRepo
         $entity->save();
     }
 
         $entity->save();
     }
 

+    /**
+     * Sort the parent of the given entity, if any auto sort actions are set for it.
+     * Typically ran during create/update/insert events.
+     */
+    public function sortParent(Entity $entity): void
+    {
+        if ($entity instanceof BookChild) {
+            $book = $entity->book;
+            $this->bookSorter->runBookAutoSort($book);
+        }
+    }
+

     protected function updateDescription(Entity $entity, array $input): void
     {
         if (!in_array(HasHtmlDescription::class, class_uses($entity))) {
     protected function updateDescription(Entity $entity, array $input): void
     {
         if (!in_array(HasHtmlDescription::class, class_uses($entity))) {