fix the display of media conversions (#49)

* fix the display of media conversions

* remove die and dump

Author: pxpm

src/Uploaders/MediaAjaxUploader.php

@@ -21,10 +21,29 @@ class MediaAjaxUploader extends BackpackAjaxUploader
 
     public function __construct(array $crudObject, array $configuration)
     {
-        parent::__construct($crudObject, $configuration);
+        
         $this->mediaName = $configuration['mediaName'] ?? $crudObject['name'];
         $this->savingEventCallback = $configuration['whenSaving'] ?? null;
         $this->collection = $configuration['collection'] ?? 'default';
+
+        $this->displayConversions = $configuration['displayConversions'] ?? [];
+
+        $modelDefinition = $this->getModelInstance($crudObject)->getRegisteredMediaCollections()
+                            ->reject(function ($item) {
+                                return $item->name !== $this->collection;
+                            })
+                            ->first();
+
+        $configuration['disk'] ??= $modelDefinition?->diskName ?? null;
+
+        $configuration['disk'] = empty($configuration['disk']) ? ($crudObject['disk'] ?? config('media-library.disk_name')) : $configuration['disk'];
+
+        // read https://spatie.be/docs/laravel-medialibrary/v11/advanced-usage/using-a-custom-directory-structure#main
+        // on how to customize file directory
+        $crudObject['prefix'] = $configuration['path'] = '';
+
+        parent::__construct($crudObject, $configuration);
+
     }
 
     public function uploadRepeatableFiles($values, $previousValues, $entry = null)

src/Uploaders/MediaDropzoneUploader.php

@@ -5,7 +5,6 @@
 use Backpack\CRUD\app\Library\CrudPanel\CrudPanelFacade as CRUD;
 use Backpack\CRUD\app\Library\Uploaders\Support\Interfaces\UploaderInterface;
 use Illuminate\Database\Eloquent\Model;
-use Illuminate\Support\Arr;
 use Illuminate\Support\Facades\Log;
 use Illuminate\Support\Str;
 use Prologue\Alerts\Facades\Alert;

src/Uploaders/MediaUploader.php

@@ -19,8 +19,6 @@ abstract class MediaUploader extends Uploader
     use Traits\HandleRepeatableUploads;
     use Traits\DeletesUploadedFiles;
 
-    public $displayConversions;
-
     public $order;
 
     public function __construct(array $crudObject, array $configuration)
@@ -34,7 +32,7 @@ public function __construct(array $crudObject, array $configuration)
 
         $modelDefinition = $this->getModelInstance($crudObject)->getRegisteredMediaCollections()
                             ->reject(function ($item) {
-                                $item->name !== $this->collection;
+                                return $item->name !== $this->collection;
                             })
                             ->first();
 
@@ -63,27 +61,4 @@ protected function get(HasMedia|Model $entry)
 
         return $media->first();
     }
-
-    
-
-    /**************************************************
-     *     Private methods- default implementation    *
-     **************************************************/
-
-    private function getModelInstance($crudObject): Model
-    {
-        return new ($crudObject['baseModel'] ?? get_class(app('crud')->getModel()));
-    }
-
-    private function getConversionToDisplay($item)
-    {
-        foreach ($this->displayConversions as $displayConversion) {
-            if ($item->hasGeneratedConversion($displayConversion)) {
-                return $displayConversion;
-            }
-        }
-
-        return false;
-    }
-
 }

src/Uploaders/Traits/AddMediaToModels.php

@@ -50,4 +50,9 @@ public function storeUploadedFiles(Model $entry): Model
 
         return $entry;
     }
+
+    private function getModelInstance($crudObject): Model
+    {
+        return new ($crudObject['baseModel'] ?? get_class(app('crud')->getModel()));
+    }
 }

src/Uploaders/Traits/IdentifiesMedia.php

@@ -22,8 +22,9 @@ public function getMediaIdentifier($media, $entry = null)
 
             return $path->getPathForConversions($media).$conversion->getConversionFile($media);
         }
+        
         if (is_null($path)) {
-            dd($media);
+            return '';
         }
 
         return $path->getPath($media).$media->file_name;

src/Uploaders/Traits/RetrievesUploadedFiles.php

@@ -6,6 +6,8 @@
 
 trait RetrievesUploadedFiles
 {
+    public $displayConversions = [];
+
     public function retrieveUploadedFiles(Model $entry): Model
     {
         $media = $this->getPreviousFiles($entry);
@@ -64,4 +66,14 @@ public function getPreviousFiles(Model $entry): mixed
         return $media->first();
     }
 
+    public function getConversionToDisplay($item)
+    {
+        foreach ($this->displayConversions as $displayConversion) {
+            if ($item->hasGeneratedConversion($displayConversion)) {
+                return $displayConversion;
+            }
+        }
+
+        return false;
+    }
 }