wip

src/Uploaders/MediaAjaxUploader.php

@@ -11,6 +11,19 @@ class MediaAjaxUploader extends BackpackAjaxUploader
 {
     use Traits\IdentifiesMedia;
     use Traits\AddMediaToModels;
+    use Traits\HasConstrainedFileAdder;
+    use Traits\HasMediaName;
+    use Traits\HasCustomProperties;
+    use Traits\HasSavingCallback;
+    use Traits\HasCollections;
+
+    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';
+    }
 
     public function uploadRepeatableFiles($values, $previousValues, $entry = null)
     {

src/Uploaders/MediaDropzoneUploader.php

@@ -10,7 +10,6 @@
 use Illuminate\Support\Str;
 use Prologue\Alerts\Facades\Alert;
 use Symfony\Component\HttpFoundation\File\File;
-use Illuminate\Support\Facades\Storage;
 
 class MediaDropzoneUploader extends MediaAjaxUploader
 {
@@ -42,7 +41,7 @@ public function uploadFiles(Model $entry, $value = null)
         }
 
         foreach ($uploadedFiles as $key => $value) {
-            $file = new File(Storage::disk($this->temporaryDisk)->path($value));
+            $file = new File($this->temporaryDisk->path($value));
 
             $this->addMediaFile($entry, $file);
         }

src/Uploaders/MediaUploader.php

@@ -4,27 +4,24 @@
 
 use Backpack\CRUD\app\Library\Uploaders\Uploader;
 use Illuminate\Database\Eloquent\Model;
-use Illuminate\Http\UploadedFile;
 use Illuminate\Support\Collection;
 use Spatie\MediaLibrary\HasMedia;
 use Spatie\MediaLibrary\MediaCollections\Models\Media;
-use Symfony\Component\HttpFoundation\File\File;
 
 abstract class MediaUploader extends Uploader
 {
     use Traits\IdentifiesMedia;
     use Traits\AddMediaToModels;
-
-    public $mediaName;
-
-    public $collection;
+    use Traits\HasConstrainedFileAdder;
+    use Traits\HasMediaName;
+    use Traits\HasCustomProperties;
+    use Traits\HasSavingCallback;
+    use Traits\HasCollections;
 
     public $displayConversions;
 
     public $order;
 
-    public $savingEventCallback = null;
-
     public function __construct(array $crudObject, array $configuration)
     {
         $this->collection = $configuration['collection'] ?? 'default';
@@ -110,7 +107,7 @@ public function retrieveUploadedFiles(Model $entry): Model
                 return $this->getMediaIdentifier($item, $entry);
             })->toArray();
         }
-
+        dd($entry);
         return $entry;
     }
 
@@ -214,21 +211,6 @@ private function getModelInstance($crudObject): Model
         return new ($crudObject['baseModel'] ?? get_class(app('crud')->getModel()));
     }
 
-    private function initFileAdder($entry, $file)
-    {
-        if (is_a($file, UploadedFile::class, true)) {
-            return $entry->addMedia($file);
-        }
-
-        if (is_string($file)) {
-            return $entry->addMediaFromBase64($file);
-        }
-
-        if (get_class($file) === File::class) {
-            return $entry->addMedia($file->getPathName());
-        }
-    }
-
     private function getConversionToDisplay($item)
     {
         foreach ($this->displayConversions as $displayConversion) {
@@ -243,12 +225,5 @@ private function getConversionToDisplay($item)
     /*************************
      *     Helper methods    *
      *************************/
-    public function getCustomProperties()
-    {
-        return [
-            'name'                    => $this->getName(),
-            'repeatableContainerName' => $this->repeatableContainerName,
-            'repeatableRow'           => $this->order,
-        ];
-    }
+
 }

src/Uploaders/Traits/HasCollections.php

@@ -0,0 +1,9 @@
+<?php
+
+namespace Backpack\MediaLibraryUploaders\Uploaders\Traits;
+
+trait HasCollections
+{
+    public string $collection;
+
+}

src/Uploaders/Traits/HasConstrainedFileAdder.php

@@ -0,0 +1,25 @@
+<?php
+
+namespace Backpack\MediaLibraryUploaders\Uploaders\Traits;
+
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Http\UploadedFile;
+use Symfony\Component\HttpFoundation\File\File;
+
+trait HasConstrainedFileAdder
+{
+    private function initFileAdder(Model $entry, File|UploadedFile|string $file)
+    {
+        if (is_a($file, UploadedFile::class, true)) {
+            return $entry->addMedia($file);
+        }
+
+        if (is_string($file)) {
+            return $entry->addMediaFromBase64($file);
+        }
+
+        if (get_class($file) === File::class) {
+            return $entry->addMedia($file->getPathName());
+        }
+    }
+}

src/Uploaders/Traits/HasCustomProperties.php

@@ -0,0 +1,15 @@
+<?php
+
+namespace Backpack\MediaLibraryUploaders\Uploaders\Traits;
+
+trait HasCustomProperties
+{
+    public function getCustomProperties()
+    {
+        return [
+            'name'                    => $this->getName(),
+            'repeatableContainerName' => $this->repeatableContainerName,
+            'repeatableRow'           => $this->order,
+        ];
+    }
+}

src/Uploaders/Traits/HasMediaName.php

@@ -0,0 +1,12 @@
+<?php
+
+namespace Backpack\MediaLibraryUploaders\Uploaders\Traits;
+
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Http\UploadedFile;
+use Symfony\Component\HttpFoundation\File\File;
+
+trait HasMediaName
+{
+    public string $mediaName;
+}

src/Uploaders/Traits/HasSavingCallback.php

@@ -0,0 +1,10 @@
+<?php
+
+namespace Backpack\MediaLibraryUploaders\Uploaders\Traits;
+
+use Closure;
+
+trait HasSavingCallback
+{
+    public null|Closure $savingEventCallback = null;
+}

tests/Feature/MediaUploadersTest.php

@@ -4,10 +4,9 @@
 
 use Backpack\CRUD\Tests\config\Uploads\HasUploadedFiles;
 use Backpack\MediaLibraryUploaders\Tests\Config\Controllers\MediaUploaderCrudController;
-use Backpack\MediaLibraryUploaders\Tests\FeatureTestCase;
 use Backpack\MediaLibraryUploaders\Tests\Config\Models\MediaUploader;
+use Backpack\MediaLibraryUploaders\Tests\FeatureTestCase;
 use Illuminate\Support\Facades\Storage;
-use Illuminate\Http\UploadedFile;
 
 class MediaUploadersTest extends FeatureTestCase
 {
@@ -76,7 +75,7 @@ public function test_it_can_upload_multiple_files()
     public function test_it_can_upload_files_for_multiple_uploaders()
     {
         $response = $this->post($this->testBaseUrl, [
-            'upload' => $this->getUploadedFile('avatar1.jpg'),
+            'upload'          => $this->getUploadedFile('avatar1.jpg'),
             'upload_multiple' => [
                 $this->getUploadedFile('avatar2.jpg'),
                 $this->getUploadedFile('avatar3.jpg'),
@@ -106,11 +105,6 @@ public function test_it_display_the_edit_page_without_files()
         $response->assertStatus(200);
     }
 
-    /**
-     * Undocumented function
-     *
-     * @group fail
-     */
     public function test_it_display_the_upload_page_with_files()
     {
         self::initUploaderWithFiles();
@@ -123,6 +117,104 @@ public function test_it_display_the_upload_page_with_files()
         $response->assertSee('avatar3.jpg');
     }
 
+    public function test_it_can_update_files()
+    {
+        self::initUploaderWithFiles();
+
+        $response = $this->put($this->testBaseUrl.'/1', [
+            'upload'          => $this->getUploadedFile('avatar4.jpg'),
+            'upload_multiple' => [
+                $this->getUploadedFile('avatar5.jpg'),
+                $this->getUploadedFile('avatar6.jpg'),
+            ],
+            'clear_upload_multiple' => ['2/avatar2.jpg',  '3/avatar3.jpg'],
+            'id'                    => 1,
+        ]);
+
+        $response->assertStatus(302);
+
+        $response->assertRedirect($this->testBaseUrl);
+
+        $this->assertDatabaseCount('media_uploaders', 1);
+
+        $uploader = MediaUploader::first();
+
+        $this->assertEquals(3, $uploader->getMedia()->count());
+
+        $this->assertTrue(Storage::disk('uploaders')->exists('4/avatar4.jpg'));
+        $this->assertTrue(Storage::disk('uploaders')->exists('5/avatar5.jpg'));
+        $this->assertTrue(Storage::disk('uploaders')->exists('6/avatar6.jpg'));
+        $this->assertFalse(Storage::disk('uploaders')->exists('2/avatar2.jpg'));
+        $this->assertFalse(Storage::disk('uploaders')->exists('3/avatar3.jpg'));
+        $this->assertFalse(Storage::disk('uploaders')->exists('1/avatar1.jpg'));
+
+    }
+
+    public function test_it_keeps_previous_values_unchanged_when_not_deleted()
+    {
+        self::initUploaderWithFiles();
+
+        $response = $this->put($this->testBaseUrl.'/1', [
+            'upload_multiple' => ['2/avatar2.jpg', '3/avatar3.jpg'],
+            'id'                    => 1,
+        ]);
+
+        $response->assertStatus(302);
+
+        $response->assertRedirect($this->testBaseUrl);
+
+        $this->assertDatabaseCount('media_uploaders', 1);
+
+        $uploader = MediaUploader::first();
+
+        $this->assertEquals(3, $uploader->getMedia()->count());
+
+        $this->assertTrue(Storage::disk('uploaders')->exists('1/avatar1.jpg'));
+        $this->assertTrue(Storage::disk('uploaders')->exists('2/avatar2.jpg'));
+        $this->assertTrue(Storage::disk('uploaders')->exists('3/avatar3.jpg'));
+    }
+
+    public function test_upload_multiple_can_delete_uploaded_files_and_add_at_the_same_time()
+    {
+        self::initUploaderWithFiles();
+
+        $response = $this->put($this->testBaseUrl.'/1', [
+            'upload_multiple' => $this->getUploadedFiles(['avatar4.jpg', 'avatar5.jpg']),
+            'clear_upload_multiple' => ['2/avatar2.jpg'],
+            'id' => 1,
+        ]);
+
+        $response->assertStatus(302);
+
+        $response->assertRedirect($this->testBaseUrl);
+
+        $this->assertDatabaseCount('media_uploaders', 1);
+
+        $uploader = MediaUploader::first();
+
+        $this->assertEquals(4, $uploader->getMedia()->count());
+
+        $this->assertTrue(Storage::disk('uploaders')->exists('1/avatar1.jpg'));
+        $this->assertTrue(Storage::disk('uploaders')->exists('3/avatar3.jpg'));
+        $this->assertTrue(Storage::disk('uploaders')->exists('4/avatar4.jpg'));
+        $this->assertTrue(Storage::disk('uploaders')->exists('5/avatar5.jpg'));
+
+    }
+
+    public function test_it_can_delete_uploaded_files()
+    {
+        self::initUploaderWithFiles();
+
+        $response = $this->delete($this->testBaseUrl.'/1');
+
+        $response->assertStatus(200);
+
+        $this->assertDatabaseCount('media_uploaders', 0);
+
+        $files = Storage::disk('uploaders')->allFiles();
+
+        $this->assertEquals(0, count($files));
+    }
 
     private static function initUploader()
     {
@@ -134,22 +226,20 @@ private function initUploaderWithFiles()
     {
         $uploader = new MediaUploader();
         $uploader->addMedia($this->getUploadedFile('avatar1.jpg'))->withCustomProperties([
-            'name' => 'upload',
+            'name'                    => 'upload',
             'repeatableContainerName' => null,
-            'repeatableRow' => null,
+            'repeatableRow'           => null,
         ])->preservingOriginal()->toMediaCollection('default', 'uploaders');
         $uploader->addMedia($this->getUploadedFile('avatar2.jpg'))->withCustomProperties([
-            'name' => 'upload_multiple',
+            'name'                    => 'upload_multiple',
             'repeatableContainerName' => null,
-            'repeatableRow' => null,
+            'repeatableRow'           => null,
         ])->preservingOriginal()->toMediaCollection('default', 'uploaders');
         $uploader->addMedia($this->getUploadedFile('avatar3.jpg'))->withCustomProperties([
-            'name' => 'upload_multiple',
+            'name'                    => 'upload_multiple',
             'repeatableContainerName' => null,
-            'repeatableRow' => null,
+            'repeatableRow'           => null,
         ])->preservingOriginal()->toMediaCollection('default', 'uploaders');
         $uploader->save();
     }
-
-
 }