Guest create page: name field autofocus

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

diff --git a/app/Entities/Repos/BaseRepo.php b/app/Entities/Repos/BaseRepo.php
index 8b2e70074fe09a3b95c8688b81061f90fef2760c..815c0bb2ec503522ec9962f959e60e5fad079292 100644 (file)
--- a/app/Entities/Repos/BaseRepo.php
+++ b/app/Entities/Repos/BaseRepo.php
@@ -2,32 +2,29 @@
 
 namespace BookStack\Entities\Repos;
 
 
 namespace BookStack\Entities\Repos;
 

-use BookStack\Actions\ActivityType;

 use BookStack\Actions\TagRepo;
 use BookStack\Actions\TagRepo;

-use BookStack\Auth\User;

 use BookStack\Entities\Models\Entity;
 use BookStack\Entities\Models\HasCoverImage;
 use BookStack\Exceptions\ImageUploadException;
 use BookStack\Entities\Models\Entity;
 use BookStack\Entities\Models\HasCoverImage;
 use BookStack\Exceptions\ImageUploadException;

-use BookStack\Facades\Activity;
+use BookStack\References\ReferenceUpdater;

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

-use Illuminate\Support\Collection;

 
 class BaseRepo
 {
 
 class BaseRepo
 {

+    protected TagRepo $tagRepo;
+    protected ImageRepo $imageRepo;
+    protected ReferenceUpdater $referenceUpdater;

 
 

-    protected $tagRepo;
-    protected $imageRepo;
-
-
-    public function __construct(TagRepo $tagRepo, ImageRepo $imageRepo)
+    public function __construct(TagRepo $tagRepo, ImageRepo $imageRepo, ReferenceUpdater $referenceUpdater)

     {
         $this->tagRepo = $tagRepo;
         $this->imageRepo = $imageRepo;
     {
         $this->tagRepo = $tagRepo;
         $this->imageRepo = $imageRepo;

+        $this->referenceUpdater = $referenceUpdater;

     }
 
     /**
     }
 
     /**

-     * Create a new entity in the system
+     * Create a new entity in the system.

      */
     public function create(Entity $entity, array $input)
     {
      */
     public function create(Entity $entity, array $input)
     {


@@ -35,7 +32,7 @@ class BaseRepo
         $entity->forceFill([
             'created_by' => user()->id,
             'updated_by' => user()->id,
         $entity->forceFill([
             'created_by' => user()->id,
             'updated_by' => user()->id,

-            'owned_by' => user()->id,
+            'owned_by'   => user()->id,

         ]);
         $entity->refreshSlug();
         $entity->save();
         ]);
         $entity->refreshSlug();
         $entity->save();


@@ -44,6 +41,7 @@ class BaseRepo
             $this->tagRepo->saveTagsToEntity($entity, $input['tags']);
         }
 
             $this->tagRepo->saveTagsToEntity($entity, $input['tags']);
         }
 

+        $entity->refresh();

         $entity->rebuildPermissions();
         $entity->indexForSearch();
     }
         $entity->rebuildPermissions();
         $entity->indexForSearch();
     }


@@ -53,10 +51,12 @@ class BaseRepo
      */
     public function update(Entity $entity, array $input)
     {
      */
     public function update(Entity $entity, array $input)
     {

+        $oldUrl = $entity->getUrl();
+

         $entity->fill($input);
         $entity->updated_by = user()->id;
 
         $entity->fill($input);
         $entity->updated_by = user()->id;
 

-        if ($entity->isDirty('name')) {
+        if ($entity->isDirty('name') || empty($entity->slug)) {

             $entity->refreshSlug();
         }
 
             $entity->refreshSlug();
         }
 


@@ -64,28 +64,37 @@ class BaseRepo
 
         if (isset($input['tags'])) {
             $this->tagRepo->saveTagsToEntity($entity, $input['tags']);
 
         if (isset($input['tags'])) {
             $this->tagRepo->saveTagsToEntity($entity, $input['tags']);

+            $entity->touch();

         }
 
         $entity->rebuildPermissions();
         $entity->indexForSearch();
         }
 
         $entity->rebuildPermissions();
         $entity->indexForSearch();

+
+        if ($oldUrl !== $entity->getUrl()) {
+            $this->referenceUpdater->updateEntityPageReferences($entity, $oldUrl);
+        }

     }
 
     /**
      * Update the given items' cover image, or clear it.
     }
 
     /**
      * Update the given items' cover image, or clear it.

+     *
+     * @param Entity&HasCoverImage $entity
+     *

      * @throws ImageUploadException
      * @throws \Exception
      */
      * @throws ImageUploadException
      * @throws \Exception
      */

-    public function updateCoverImage(HasCoverImage $entity, ?UploadedFile $coverImage, bool $removeImage = false)
+    public function updateCoverImage($entity, ?UploadedFile $coverImage, bool $removeImage = false)

     {
         if ($coverImage) {
     {
         if ($coverImage) {

-            $this->imageRepo->destroyImage($entity->cover);
-            $image = $this->imageRepo->saveNew($coverImage, 'cover_book', $entity->id, 512, 512, true);
+            $imageType = $entity->coverImageTypeKey();
+            $this->imageRepo->destroyImage($entity->cover()->first());
+            $image = $this->imageRepo->saveNew($coverImage, $imageType, $entity->id, 512, 512, true);

             $entity->cover()->associate($image);
             $entity->save();
         }
 
         if ($removeImage) {
             $entity->cover()->associate($image);
             $entity->save();
         }
 
         if ($removeImage) {

-            $this->imageRepo->destroyImage($entity->cover);
+            $this->imageRepo->destroyImage($entity->cover()->first());

             $entity->image_id = 0;
             $entity->save();
         }
             $entity->image_id = 0;
             $entity->save();
         }