TypeScript: Updated compile target, addressed issues

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

diff --git a/app/Entities/Repos/PageRepo.php b/app/Entities/Repos/PageRepo.php
index 74aed072a0657f5c7494a4838f8ca9970ea7cdf0..63e8b8370ee046ad20b14de6b122ce18e050ecd6 100644 (file)
--- a/app/Entities/Repos/PageRepo.php
+++ b/app/Entities/Repos/PageRepo.php
@@ -11,13 +11,14 @@ use BookStack\Entities\Models\PageRevision;
 use BookStack\Entities\Queries\EntityQueries;
 use BookStack\Entities\Tools\BookContents;
 use BookStack\Entities\Tools\PageContent;
 use BookStack\Entities\Queries\EntityQueries;
 use BookStack\Entities\Tools\BookContents;
 use BookStack\Entities\Tools\PageContent;

-use BookStack\Entities\Tools\PageEditorData;
+use BookStack\Entities\Tools\PageEditorType;

 use BookStack\Entities\Tools\TrashCan;
 use BookStack\Exceptions\MoveOperationException;
 use BookStack\Exceptions\PermissionsException;
 use BookStack\Facades\Activity;
 use BookStack\References\ReferenceStore;
 use BookStack\References\ReferenceUpdater;
 use BookStack\Entities\Tools\TrashCan;
 use BookStack\Exceptions\MoveOperationException;
 use BookStack\Exceptions\PermissionsException;
 use BookStack\Facades\Activity;
 use BookStack\References\ReferenceStore;
 use BookStack\References\ReferenceUpdater;

+use BookStack\Util\DatabaseTransaction;

 use Exception;
 
 class PageRepo
 use Exception;
 
 class PageRepo


@@ -27,7 +28,8 @@ class PageRepo
         protected RevisionRepo $revisionRepo,
         protected EntityQueries $entityQueries,
         protected ReferenceStore $referenceStore,
         protected RevisionRepo $revisionRepo,
         protected EntityQueries $entityQueries,
         protected ReferenceStore $referenceStore,

-        protected ReferenceUpdater $referenceUpdater
+        protected ReferenceUpdater $referenceUpdater,
+        protected TrashCan $trashCan,

     ) {
     }
 
     ) {
     }
 


@@ -42,6 +44,7 @@ class PageRepo
             'owned_by'   => user()->id,
             'updated_by' => user()->id,
             'draft'      => true,
             'owned_by'   => user()->id,
             'updated_by' => user()->id,
             'draft'      => true,

+            'editor'     => PageEditorType::getSystemDefault()->value,

         ]);
 
         if ($parent instanceof Chapter) {
         ]);
 
         if ($parent instanceof Chapter) {


@@ -59,8 +62,10 @@ class PageRepo
             ]);
         }
 
             ]);
         }
 

-        $page->save();
-        $page->refresh()->rebuildPermissions();
+        (new DatabaseTransaction(function () use ($page) {
+            $page->save();
+            $page->refresh()->rebuildPermissions();
+        }))->run();

 
         return $page;
     }
 
         return $page;
     }


@@ -70,18 +75,34 @@ class PageRepo
      */
     public function publishDraft(Page $draft, array $input): Page
     {
      */
     public function publishDraft(Page $draft, array $input): Page
     {

-        $draft->draft = false;
-        $draft->revision_count = 1;
-        $draft->priority = $this->getNewPriority($draft);
-        $this->updateTemplateStatusAndContentFromInput($draft, $input);
-        $this->baseRepo->update($draft, $input);
-
-        $this->revisionRepo->storeNewForPage($draft, trans('entities.pages_initial_revision'));
-        $draft->refresh();
-
-        Activity::add(ActivityType::PAGE_CREATE, $draft);
+        return (new DatabaseTransaction(function () use ($draft, $input) {
+            $draft->draft = false;
+            $draft->revision_count = 1;
+            $draft->priority = $this->getNewPriority($draft);
+            $this->updateTemplateStatusAndContentFromInput($draft, $input);
+            $this->baseRepo->update($draft, $input);
+            $draft->rebuildPermissions();
+
+            $summary = trim($input['summary'] ?? '') ?: trans('entities.pages_initial_revision');
+            $this->revisionRepo->storeNewForPage($draft, $summary);
+            $draft->refresh();
+
+            Activity::add(ActivityType::PAGE_CREATE, $draft);
+            $this->baseRepo->sortParent($draft);
+
+            return $draft;
+        }))->run();
+    }

 
 

-        return $draft;
+    /**
+     * Directly update the content for the given page from the provided input.
+     * Used for direct content access in a way that performs required changes
+     * (Search index and reference regen) without performing an official update.
+     */
+    public function setContentFromInput(Page $page, array $input): void
+    {
+        $this->updateTemplateStatusAndContentFromInput($page, $input);
+        $this->baseRepo->update($page, []);

     }
 
     /**
     }
 
     /**


@@ -101,7 +122,7 @@ class PageRepo
         $page->revision_count++;
         $page->save();
 
         $page->revision_count++;
         $page->save();
 

-        // Remove all update drafts for this user & page.
+        // Remove all update drafts for this user and page.

         $this->revisionRepo->deleteDraftsForCurrentUser($page);
 
         // Save a revision after updating
         $this->revisionRepo->deleteDraftsForCurrentUser($page);
 
         // Save a revision after updating


@@ -114,18 +135,21 @@ class PageRepo
         }
 
         Activity::add(ActivityType::PAGE_UPDATE, $page);
         }
 
         Activity::add(ActivityType::PAGE_UPDATE, $page);

+        $this->baseRepo->sortParent($page);

 
         return $page;
     }
 
 
         return $page;
     }
 

-    protected function updateTemplateStatusAndContentFromInput(Page $page, array $input)
+    protected function updateTemplateStatusAndContentFromInput(Page $page, array $input): void

     {
         if (isset($input['template']) && userCan('templates-manage')) {
             $page->template = ($input['template'] === 'true');
         }
 
         $pageContent = new PageContent($page);
     {
         if (isset($input['template']) && userCan('templates-manage')) {
             $page->template = ($input['template'] === 'true');
         }
 
         $pageContent = new PageContent($page);

-        $currentEditor = $page->editor ?: PageEditorData::getSystemDefaultEditor();
+        $defaultEditor = PageEditorType::getSystemDefault();
+        $currentEditor = PageEditorType::forPage($page) ?: $defaultEditor;
+        $inputEditor = PageEditorType::fromRequestValue($input['editor'] ?? '') ?? $currentEditor;

         $newEditor = $currentEditor;
 
         $haveInput = isset($input['markdown']) || isset($input['html']);
         $newEditor = $currentEditor;
 
         $haveInput = isset($input['markdown']) || isset($input['html']);


@@ -134,15 +158,17 @@ class PageRepo
         if ($haveInput && $inputEmpty) {
             $pageContent->setNewHTML('', user());
         } elseif (!empty($input['markdown']) && is_string($input['markdown'])) {
         if ($haveInput && $inputEmpty) {
             $pageContent->setNewHTML('', user());
         } elseif (!empty($input['markdown']) && is_string($input['markdown'])) {

-            $newEditor = 'markdown';
+            $newEditor = PageEditorType::Markdown;

             $pageContent->setNewMarkdown($input['markdown'], user());
         } elseif (isset($input['html'])) {
             $pageContent->setNewMarkdown($input['markdown'], user());
         } elseif (isset($input['html'])) {

-            $newEditor = 'wysiwyg';
+            $newEditor = ($inputEditor->isHtmlBased() ? $inputEditor : null) ?? ($defaultEditor->isHtmlBased() ? $defaultEditor : null) ?? PageEditorType::WysiwygTinymce;

             $pageContent->setNewHTML($input['html'], user());
         }
 
             $pageContent->setNewHTML($input['html'], user());
         }
 

-        if ($newEditor !== $currentEditor && userCan('editor-change')) {
-            $page->editor = $newEditor;
+        if (($newEditor !== $currentEditor || empty($page->editor)) && userCan('editor-change')) {
+            $page->editor = $newEditor->value;
+        } elseif (empty($page->editor)) {
+            $page->editor = $defaultEditor->value;

         }
     }
 
         }
     }
 


@@ -184,10 +210,9 @@ class PageRepo
      */
     public function destroy(Page $page)
     {
      */
     public function destroy(Page $page)
     {

-        $trashCan = new TrashCan();
-        $trashCan->softDestroyPage($page);
+        $this->trashCan->softDestroyPage($page);

         Activity::add(ActivityType::PAGE_DELETE, $page);
         Activity::add(ActivityType::PAGE_DELETE, $page);

-        $trashCan->autoClearOld();
+        $this->trashCan->autoClearOld();

     }
 
     /**
     }
 
     /**


@@ -226,6 +251,8 @@ class PageRepo
         Activity::add(ActivityType::PAGE_RESTORE, $page);
         Activity::add(ActivityType::REVISION_RESTORE, $revision);
 
         Activity::add(ActivityType::PAGE_RESTORE, $page);
         Activity::add(ActivityType::REVISION_RESTORE, $revision);
 

+        $this->baseRepo->sortParent($page);
+

         return $page;
     }
 
         return $page;
     }
 


@@ -248,14 +275,18 @@ class PageRepo
             throw new PermissionsException('User does not have permission to create a page within the new parent');
         }
 
             throw new PermissionsException('User does not have permission to create a page within the new parent');
         }
 

-        $page->chapter_id = ($parent instanceof Chapter) ? $parent->id : null;
-        $newBookId = ($parent instanceof Chapter) ? $parent->book->id : $parent->id;
-        $page->changeBook($newBookId);
-        $page->rebuildPermissions();
+        return (new DatabaseTransaction(function () use ($page, $parent) {
+            $page->chapter_id = ($parent instanceof Chapter) ? $parent->id : null;
+            $newBookId = ($parent instanceof Chapter) ? $parent->book->id : $parent->id;
+            $page->changeBook($newBookId);
+            $page->rebuildPermissions();
+
+            Activity::add(ActivityType::PAGE_MOVE, $page);

 
 

-        Activity::add(ActivityType::PAGE_MOVE, $page);
+            $this->baseRepo->sortParent($page);

 
 

-        return $parent;
+            return $parent;
+        }))->run();

     }
 
     /**
     }
 
     /**