Merge branch 'develop'

cklei-carly · cklei-carly · commit 5a9f134bb5f9 · 2025-04-17T17:22:34.000+08:00
* develop:
  add thumbnail icon for svg (con't)
  Fix styling
  add thumbnail icon for svg
  bugfix: missing thumbnail for media library
  bugfix: have error on bulk action for media library
  add limited mime type + max size + min size configs for medira library
diff --git a/resources/views/components/media-library/thumbnail-icon.blade.php b/resources/views/components/media-library/thumbnail-icon.blade.php
@@ -1,6 +1,6 @@
 @props(['icon'])
 
-@if (str_starts_with($icon, 'inspirecms-support::'))
+@if (str_starts_with($icon, 'inspirecms::'))
     <x-filament::icon :alias="$icon" {{ $attributes }} />
 @else
     <x-filament::icon :icon="$icon" {{ $attributes }} />
diff --git a/resources/views/icons/svg.blade.php b/resources/views/icons/svg.blade.php
@@ -0,0 +1,17 @@
+<svg version="1.1" id="_x32_" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 512 512" xml:space="preserve" fill="currentColor">
+    <g id="SVGRepo_bgCarrier" stroke-width="0"></g>
+    <g id="SVGRepo_tracerCarrier" stroke-linecap="round" stroke-linejoin="round"></g>
+    <g id="SVGRepo_iconCarrier">
+      <style type="text/css">
+        .st0 {
+          fill: currentColor;
+        }
+      </style>
+      <g>
+        <path class="st0" d="M378.409,0H208.294h-13.176l-9.314,9.315L57.017,138.101l-9.314,9.315v13.176v265.513 c0,47.36,38.528,85.896,85.895,85.896h244.811c47.361,0,85.888-38.535,85.888-85.896V85.896C464.297,38.528,425.77,0,378.409,0z M432.493,426.104c0,29.877-24.214,54.091-54.084,54.091H133.598c-29.877,0-54.091-24.214-54.091-54.091V160.592h83.717 c24.884,0,45.07-20.179,45.07-45.071V31.804h170.114c29.87,0,54.084,24.214,54.084,54.091V426.104z"></path>
+        <path class="st0" d="M180.296,296.668l-4.846-0.67c-10.63-1.487-14.265-4.978-14.265-10.104c0-5.78,4.309-9.817,12.383-9.817 c5.653,0,11.305,1.62,15.745,3.764c1.886,0.942,3.903,1.487,5.789,1.487c4.845,0,8.612-3.63,8.612-8.616 c0-3.226-1.481-5.921-4.71-7.939c-5.384-3.372-15.476-6.06-25.572-6.06c-19.781,0-32.436,11.171-32.436,27.998 c0,16.15,10.232,24.898,28.938,27.454l4.846,0.67c10.903,1.48,14.129,4.846,14.129,10.229c0,6.326-5.247,10.766-14.939,10.766 c-6.727,0-12.111-1.745-19.645-5.921c-1.616-0.942-3.634-1.62-5.788-1.62c-5.115,0-8.885,3.91-8.885,8.756 c0,3.226,1.616,6.326,4.713,8.344c6.054,3.764,15.878,7.8,28.798,7.8c23.823,0,35.934-12.24,35.934-28.795 C209.097,307.84,199.273,299.356,180.296,296.668z"></path>
+        <path class="st0" d="M281.108,259.382c-4.577,0-7.939,2.43-9.556,7.674l-16.69,54.51h-0.402l-17.634-54.51 c-1.745-5.244-4.978-7.674-9.551-7.674c-5.653,0-9.692,4.176-9.692,9.287c0,1.347,0.269,2.834,0.67,4.175l23.286,68.104 c2.96,8.477,6.727,11.57,12.652,11.57c5.785,0,9.555-3.093,12.516-11.57l23.282-68.104c0.406-1.341,0.674-2.828,0.674-4.175 C290.664,263.558,286.76,259.382,281.108,259.382z"></path>
+        <path class="st0" d="M364.556,300.836h-18.841c-5.114,0-8.344,3.1-8.344,7.806c0,4.713,3.23,7.814,8.344,7.814h6.193 c0.538,0,0.803,0.258,0.803,0.803c0,3.505-0.265,6.598-1.075,9.014c-1.882,5.796-7.67,9.426-14.669,9.426 c-7.943,0-12.921-3.903-14.939-10.096c-1.075-3.365-1.48-7.8-1.48-19.648c0-11.842,0.405-16.15,1.48-19.516 c2.018-6.325,6.867-10.228,14.67-10.228c5.924,0,10.362,1.885,13.859,6.724c2.695,3.777,5.387,4.852,8.749,4.852 c4.981,0,9.021-3.638,9.021-8.888c0-2.151-0.674-4.035-1.752-5.921c-4.842-8.204-15.071-14.264-29.877-14.264 c-16.287,0-28.935,7.408-33.644,22.204c-2.022,6.466-2.559,11.576-2.559,25.038c0,13.454,0.538,18.573,2.559,25.031 c4.709,14.802,17.357,22.204,33.644,22.204c16.286,0,28.668-8.204,33.374-22.881c1.617-5.111,2.29-12.645,2.29-20.716v-0.95 C372.362,303.664,369.538,300.836,364.556,300.836z"></path>
+      </g>
+    </g>
+  </svg>
diff --git a/src/Base/Manifests/MediaLibraryRegistry.php b/src/Base/Manifests/MediaLibraryRegistry.php
@@ -19,6 +19,12 @@ class MediaLibraryRegistry implements MediaLibraryRegistryInterface
      */
     protected array $registerConversionsUsing = [];
 
+    protected ?array $limitedMimeTypes = null;
+
+    protected ?int $maxSize = null;
+
+    protected ?int $minSize = null;
+
     public function setDisk(string $disk): void
     {
         $this->disk = $disk;
@@ -39,6 +45,30 @@ public function setShouldMapVideoPropertiesWithFfmpeg(bool $condition): void
         $this->shouldMapVideoPropertiesWithFfmpeg = $condition;
     }
 
+    public function setLimitedMimeTypes(array $limitedMimeTypes): void
+    {
+        $this->limitedMimeTypes = $limitedMimeTypes;
+    }
+
+    public function registerConversionUsing(Closure $callback, bool $merge = true): void
+    {
+        if ($merge) {
+            $this->registerConversionsUsing[] = $callback;
+        } else {
+            $this->registerConversionsUsing = [$callback];
+        }
+    }
+
+    public function setMaxSize(?int $maxSize): void
+    {
+        $this->maxSize = $maxSize;
+    }
+
+    public function setMinSize(?int $minSize): void
+    {
+        $this->minSize = $minSize;
+    }
+
     public function getDisk(): string
     {
         return $this->disk;
@@ -59,17 +89,28 @@ public function shouldMapVideoPropertiesWithFfmpeg(): bool
         return $this->shouldMapVideoPropertiesWithFfmpeg;
     }
 
-    public function registerConversionUsing(Closure $callback, bool $merge = true): void
+    public function hasLimitedMimeTypes(): bool
     {
-        if ($merge) {
-            $this->registerConversionsUsing[] = $callback;
-        } else {
-            $this->registerConversionsUsing = [$callback];
-        }
+        return ! empty($this->getLimitedMimeTypes());
+    }
+
+    public function getLimitedMimeTypes(): array
+    {
+        return $this->limitedMimeTypes ?? [];
     }
 
     public function getRegisterConversionsUsing(): array
     {
         return $this->registerConversionsUsing;
     }
+
+    public function getMaxSize(): ?int
+    {
+        return $this->maxSize;
+    }
+
+    public function getMinSize(): ?int
+    {
+        return $this->minSize;
+    }
 }
diff --git a/src/Base/Manifests/MediaLibraryRegistryInterface.php b/src/Base/Manifests/MediaLibraryRegistryInterface.php
@@ -12,6 +12,14 @@ public function setThumbnailCrop(int $width, int $height): void;
 
     public function setShouldMapVideoPropertiesWithFfmpeg(bool $condition): void;
 
+    public function setLimitedMimeTypes(array $limitedMimeTypes): void;
+
+    public function registerConversionUsing(\Closure $callback, bool $merge = true): void;
+
+    public function setMaxSize(?int $maxSize): void;
+
+    public function setMinSize(?int $minSize): void;
+
     public function getDisk(): string;
 
     public function getDirectory(): string;
@@ -23,7 +31,13 @@ public function getThumbnailCrop(): array;
 
     public function shouldMapVideoPropertiesWithFfmpeg(): bool;
 
-    public function registerConversionUsing(\Closure $callback, bool $merge = true): void;
+    public function hasLimitedMimeTypes(): bool;
+
+    public function getLimitedMimeTypes(): array;
 
     public function getRegisterConversionsUsing(): array;
+
+    public function getMaxSize(): ?int;
+
+    public function getMinSize(): ?int;
 }
diff --git a/src/Facades/MediaLibraryRegistry.php b/src/Facades/MediaLibraryRegistry.php
@@ -10,12 +10,19 @@
  * @method static void setDirectory(string $directory)
  * @method static void setThumbnailCrop(int $width, int $height)
  * @method static void setShouldMapVideoPropertiesWithFfmpeg(bool $condition)
+ * @method static void setLimitedMimeTypes(array $limitedMimeTypes)
+ * @method static void registerConversionUsing(\Closure $callback, bool $merge = true)
+ * @method static void setMaxSize(?int $maxSize)
+ * @method static void setMinSize(?int $minSize)
  * @method static string getDisk()
  * @method static string getDirectory()
  * @method static array getThumbnailCrop()
  * @method static bool shouldMapVideoPropertiesWithFfmpeg()
- * @method static void registerConversionUsing(\Closure $callback, bool $merge = true)
+ * @method static bool hasLimitedMimeTypes()
+ * @method static array getLimitedMimeTypes()
  * @method static array getRegisterConversionsUsing()
+ * @method static ?int getMaxSize()
+ * @method static ?int getMinSize()
  *
  * @see \SolutionForest\InspireCms\Support\Base\Manifests\MediaLibraryRegistry
  */
diff --git a/src/InspireCmsSupportServiceProvider.php b/src/InspireCmsSupportServiceProvider.php
@@ -131,6 +131,7 @@ protected function getIcons(): array
 
             'pdf' => view('inspirecms-support::icons.pdf'),
             'excel' => view('inspirecms-support::icons.excel'),
+            'svg' => view('inspirecms-support::icons.svg'),
 
         ])->mapWithKeys(fn ($icon, $key) => ["{$iconPrefix}{$key}" => $icon])->all();
     }
diff --git a/src/MediaLibrary/Actions/Action.php b/src/MediaLibrary/Actions/Action.php
@@ -17,7 +17,7 @@ protected function setUp(): void
 
         $this->model(ModelRegistry::get(MediaAsset::class));
 
-        $this->modelLabel(fn ($record) => $record ? $this->getRecordTitle($record) : __('inspirecms-support::media-library.media'));
+        $this->modelLabel(fn ($record) => $record ? $this->getRecordTitle($record) : __('inspirecms-support::media-library.media.singular'));
 
         $this->recordTitleAttribute('title');
     }
diff --git a/src/MediaLibrary/Actions/EditAction.php b/src/MediaLibrary/Actions/EditAction.php
@@ -46,8 +46,9 @@ protected function setUp(): void
 
                 return $data;
             })
-            ->form([
-                FileUpload::make('file')
+            ->form(function () {
+
+                $file = FileUpload::make('file')
                     ->label(__('inspirecms-support::media-library.forms.file.label'))
                     ->validationAttribute(__('inspirecms-support::media-library.forms.file.validation_attribute'))
                     ->disk(MediaLibraryRegistry::getDisk())
@@ -73,18 +74,33 @@ protected function setUp(): void
                         $record->addMedia($file)->toMediaCollection();
 
                         return $record->getFirstMedia()->getPathRelativeToRoot();
-                    }),
-                TextInput::make('title')
-                    ->label(__('inspirecms-support::media-library.forms.title.label'))
-                    ->validationAttribute(__('inspirecms-support::media-library.forms.title.validation_attribute'))
-                    ->required(),
-                TextInput::make('caption')
-                    ->label(__('inspirecms-support::media-library.forms.caption.label'))
-                    ->validationAttribute(__('inspirecms-support::media-library.forms.title.caption')),
-                Textarea::make('description')
-                    ->label(__('inspirecms-support::media-library.forms.description.label'))
-                    ->validationAttribute(__('inspirecms-support::media-library.forms.description.caption')),
-            ])
+                    });
+
+                if (MediaLibraryRegistry::hasLimitedMimeTypes()) {
+                    $file->acceptedFileTypes(MediaLibraryRegistry::getLimitedMimeTypes());
+                }
+
+                if (($maxSize = MediaLibraryRegistry::getMaxSize()) !== null) {
+                    $file->maxSize($maxSize);
+                }
+                if (($minSize = MediaLibraryRegistry::getMinSize()) !== null) {
+                    $file->minSize($minSize);
+                }
+
+                return [
+                    $file,
+                    TextInput::make('title')
+                        ->label(__('inspirecms-support::media-library.forms.title.label'))
+                        ->validationAttribute(__('inspirecms-support::media-library.forms.title.validation_attribute'))
+                        ->required(),
+                    TextInput::make('caption')
+                        ->label(__('inspirecms-support::media-library.forms.caption.label'))
+                        ->validationAttribute(__('inspirecms-support::media-library.forms.title.caption')),
+                    Textarea::make('description')
+                        ->label(__('inspirecms-support::media-library.forms.description.label'))
+                        ->validationAttribute(__('inspirecms-support::media-library.forms.description.caption')),
+                ];
+            })
             ->action(function (array $data, ?Model $record, Action $action) {
                 if (empty($data) || ! $record) {
                     return;
diff --git a/src/MediaLibrary/Actions/UploadAction.php b/src/MediaLibrary/Actions/UploadAction.php
@@ -37,18 +37,31 @@ protected function setUp(): void
 
         $this->modalSubmitActionLabel(__('inspirecms-support::media-library.buttons.upload.label'));
 
-        $this->form([
+        $this->form(function () {
 
-            \Filament\Forms\Components\FileUpload::make('files')
+            $file = \Filament\Forms\Components\FileUpload::make('files')
                 ->label(__('inspirecms-support::media-library.forms.files.label'))
                 ->validationAttribute(__('inspirecms-support::media-library.forms.files.validation_attribute'))
                 ->disk(MediaLibraryRegistry::getDisk())
                 ->directory(MediaLibraryRegistry::getDirectory())
                 ->imageEditor()
                 ->multiple()
-                ->storeFiles(false),
+                ->storeFiles(false);
 
-        ])->action(function (array $data) {
+            if (MediaLibraryRegistry::hasLimitedMimeTypes()) {
+                $file->acceptedFileTypes(MediaLibraryRegistry::getLimitedMimeTypes());
+            }
+
+            if (($maxSize = MediaLibraryRegistry::getMaxSize()) !== null) {
+                $file->maxSize($maxSize);
+            }
+            if (($minSize = MediaLibraryRegistry::getMinSize()) !== null) {
+                $file->minSize($minSize);
+            }
+
+            return [$file];
+
+        })->action(function (array $data) {
             if (empty($data['files'])) {
                 return;
             }
diff --git a/src/Models/Contracts/MediaAsset.php b/src/Models/Contracts/MediaAsset.php
@@ -54,6 +54,13 @@ public function getThumbnailUrl();
      */
     public function getThumbnail();
 
+    /**
+     * Determine if the media asset is a svg.
+     *
+     * @return bool True if the media asset is s svg, false otherwise.
+     */
+    public function isSvg();
+
     /**
      * Determine if the media asset is an image.
      *
@@ -75,6 +82,13 @@ public function isVideo();
      */
     public function isAudio();
 
+    /**
+     * Determine if the media asset is a PDF.
+     *
+     * @return bool True if the media asset is a PDF, false otherwise.
+     */
+    public function isPdf();
+
     /**
      * Determine if the media asset is a folder.
      *
diff --git a/src/Models/MediaAsset.php b/src/Models/MediaAsset.php

Original file line number	Diff line number	Diff line change
`@@ -131,6 +131,7 @@ protected function getIcons(): array`
`131`	`131`
`132`	`132`	`'pdf' => view('inspirecms-support::icons.pdf'),`
`133`	`133`	`'excel' => view('inspirecms-support::icons.excel'),`
	`134`	`+ 'svg' => view('inspirecms-support::icons.svg'),`
`134`	`135`
`135`	`136`	`])->mapWithKeys(fn ($icon, $key) => ["{$iconPrefix}{$key}" => $icon])->all();`
`136`	`137`	`}`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ protected function setUp(): void`
`17`	`17`
`18`	`18`	`$this->model(ModelRegistry::get(MediaAsset::class));`
`19`	`19`
`20`		`- $this->modelLabel(fn ($record) => $record ? $this->getRecordTitle($record) : __('inspirecms-support::media-library.media'));`
	`20`	`+ $this->modelLabel(fn ($record) => $record ? $this->getRecordTitle($record) : __('inspirecms-support::media-library.media.singular'));`
`21`	`21`
`22`	`22`	`$this->recordTitleAttribute('title');`
`23`	`23`	`}`