Design: Updated buttons to be a bit friendlier

[bookstack] / app / Uploads / Controllers / ImageController.php

diff --git a/app/Uploads/Controllers/ImageController.php b/app/Uploads/Controllers/ImageController.php
index 2c611c515bff8746f87c868c0d5ec5f3dce1c0e4..c68ffdf6bd0361fae8f904b38499dbe0ea0a5bff 100644 (file)
--- a/app/Uploads/Controllers/ImageController.php
+++ b/app/Uploads/Controllers/ImageController.php
@@ -4,19 +4,22 @@ namespace BookStack\Uploads\Controllers;
 
 use BookStack\Exceptions\ImageUploadException;
 use BookStack\Exceptions\NotFoundException;
 
 use BookStack\Exceptions\ImageUploadException;
 use BookStack\Exceptions\NotFoundException;

+use BookStack\Exceptions\NotifyException;

 use BookStack\Http\Controller;
 use BookStack\Uploads\Image;
 use BookStack\Uploads\ImageRepo;
 use BookStack\Http\Controller;
 use BookStack\Uploads\Image;
 use BookStack\Uploads\ImageRepo;

+use BookStack\Uploads\ImageResizer;

 use BookStack\Uploads\ImageService;
 use BookStack\Uploads\ImageService;

+use BookStack\Util\OutOfMemoryHandler;

 use Exception;
 use Illuminate\Http\Request;
 use Exception;
 use Illuminate\Http\Request;

-use Illuminate\Validation\ValidationException;

 
 class ImageController extends Controller
 {
     public function __construct(
         protected ImageRepo $imageRepo,
 
 class ImageController extends Controller
 {
     public function __construct(
         protected ImageRepo $imageRepo,

-        protected ImageService $imageService
+        protected ImageService $imageService,
+        protected ImageResizer $imageResizer,

     ) {
     }
 
     ) {
     }
 


@@ -38,13 +41,10 @@ class ImageController extends Controller
 
     /**
      * Update image details.
 
     /**
      * Update image details.

-     *
-     * @throws ImageUploadException
-     * @throws ValidationException

      */
     public function update(Request $request, string $id)
     {
      */
     public function update(Request $request, string $id)
     {

-        $this->validate($request, [
+        $data = $this->validate($request, [

             'name' => ['required', 'min:2', 'string'],
         ]);
 
             'name' => ['required', 'min:2', 'string'],
         ]);
 


@@ -52,9 +52,7 @@ class ImageController extends Controller
         $this->checkImagePermission($image);
         $this->checkOwnablePermission('image-update', $image);
 
         $this->checkImagePermission($image);
         $this->checkOwnablePermission('image-update', $image);
 

-        $image = $this->imageRepo->updateImageDetails($image, $request->all());
-
-        $this->imageRepo->loadThumbs($image);
+        $image = $this->imageRepo->updateImageDetails($image, $data);

 
         return view('pages.parts.image-manager-form', [
             'image'          => $image,
 
         return view('pages.parts.image-manager-form', [
             'image'          => $image,


@@ -76,6 +74,10 @@ class ImageController extends Controller
         $this->checkOwnablePermission('image-update', $image);
         $file = $request->file('file');
 
         $this->checkOwnablePermission('image-update', $image);
         $file = $request->file('file');
 

+        new OutOfMemoryHandler(function () {
+            return $this->jsonError(trans('errors.image_upload_memory_limit'));
+        });
+

         try {
             $this->imageRepo->updateImageFile($image, $file);
         } catch (ImageUploadException $exception) {
         try {
             $this->imageRepo->updateImageFile($image, $file);
         } catch (ImageUploadException $exception) {


@@ -99,12 +101,20 @@ class ImageController extends Controller
             $dependantPages = $this->imageRepo->getPagesUsingImage($image);
         }
 
             $dependantPages = $this->imageRepo->getPagesUsingImage($image);
         }
 

-        $this->imageRepo->loadThumbs($image);
-
-        return view('pages.parts.image-manager-form', [
+        $viewData = [

             'image'          => $image,
             'dependantPages' => $dependantPages ?? null,
             'image'          => $image,
             'dependantPages' => $dependantPages ?? null,

-        ]);
+            'warning'        => '',
+        ];
+
+        new OutOfMemoryHandler(function () use ($viewData) {
+            $viewData['warning'] = trans('errors.image_thumbnail_memory_limit');
+            return response()->view('pages.parts.image-manager-form', $viewData);
+        });
+
+        $this->imageResizer->loadGalleryThumbnailsForImage($image, false);
+
+        return view('pages.parts.image-manager-form', $viewData);

     }
 
     /**
     }
 
     /**


@@ -123,10 +133,29 @@ class ImageController extends Controller
         return response('');
     }
 
         return response('');
     }
 

+    /**
+     * Rebuild the thumbnails for the given image.
+     */
+    public function rebuildThumbnails(string $id)
+    {
+        $image = $this->imageRepo->getById($id);
+        $this->checkImagePermission($image);
+        $this->checkOwnablePermission('image-update', $image);
+
+        new OutOfMemoryHandler(function () {
+            return $this->jsonError(trans('errors.image_thumbnail_memory_limit'));
+        });
+
+        $this->imageResizer->loadGalleryThumbnailsForImage($image, true);
+
+        return response(trans('components.image_rebuild_thumbs_success'));
+    }
+

     /**
      * Check related page permission and ensure type is drawio or gallery.
     /**
      * Check related page permission and ensure type is drawio or gallery.

+     * @throws NotifyException

      */
      */

-    protected function checkImagePermission(Image $image)
+    protected function checkImagePermission(Image $image): void

     {
         if ($image->type !== 'drawio' && $image->type !== 'gallery') {
             $this->showPermissionError();
     {
         if ($image->type !== 'drawio' && $image->type !== 'gallery') {
             $this->showPermissionError();