fix edit gallery on edit

code4romania · Oct 17, 2023 · a799704 · a799704
1 parent 9ad2205
commit a799704
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 2 deletions.
diff --git a/app/Services/ProjectService.php b/app/Services/ProjectService.php
@@ -12,6 +12,7 @@
 use App\Notifications\Admin\ProjectCreated as ProjectCreatedAdmin;
 use App\Notifications\Ngo\ProjectCreated;
 use Illuminate\Support\Facades\Notification;
+use Spatie\MediaLibrary\MediaCollections\Models\Media;
 
 class ProjectService
 {
@@ -25,6 +26,21 @@ public function __construct($projectClass = null)
         }
     }
 
+    private static function updateGallery(Project $project, ?array $value): void
+    {
+        $mediaIds = collect($value)
+            ->filter(fn ($item) => \is_array($item))
+            ->pluck('id');
+        $project->getMedia('gallery')
+            ->map(function (Media $media) use ($mediaIds) {
+                if (! $mediaIds->contains($media->id)) {
+                    $media->delete();
+                }
+            });
+        collect($value)->filter(fn ($image) => ! \is_array($image))
+            ->map(fn ($image) => $project->addMedia($image)->toMediaCollection('gallery'));
+    }
+
     public function create(array $data): Project|RegionalProject
     {
         $data['organization_id'] = auth()->user()->organization_id;
@@ -103,11 +119,13 @@ public static function update(Project $project, array $attributes)
         $key = $attributes->keys()->first();
         $value = $attributes->get($key);
 
+//        dd($attributes,$value);
+
         return match ($key) {
             'counties' => $project->counties()->sync($value),
             'categories' => $project->categories()->sync($value),
             'image' => $project->addMedia($value)->toMediaCollection('preview'),
-            'gallery' => collect($value)->map(fn ($image) => $project->addMedia($image)->toMediaCollection('gallery')),
+            'gallery' => self::updateGallery($project, $value),
 
             default => ($project->status === ProjectStatus::approved && \in_array($key, $project->requiresApproval))
                 ? $project->fill($attributes->all())->saveForApproval()

diff --git a/resources/js/Pages/AdminOng/Projects/EditProject.vue b/resources/js/Pages/AdminOng/Projects/EditProject.vue
@@ -355,7 +355,23 @@
                     </div>
                 </template>
             </Field>
-            <FileGroup v-model="originalProject.gallery" sync :label="$t('photo_gallery')" @removeImage="removeGalleryImage(id)"/>
+            <Field :label="$t('main_image')" :errors="formChangeStatus.errors.preview">
+                <template #value>
+                    <div class="flex items-center col-span-12 gap-6 text-base font-medium leading-6 text-gray-700">
+                        <img class="object-contain w-32 h-32 shrink-0" v-for="image in originalProject.gallery" :src="image.url"  alt="" />
+
+                        <div>
+                            <EditModal
+                                @action="editField('gallery')"
+                                @cancel="resetField('gallery')"
+                                :text="$t('change_image_label')"
+                            >
+                                <FileGroup v-model="originalProject.gallery" :label="$t('photo_gallery')"/>
+                            </EditModal>
+                        </div>
+                    </div>
+                </template>
+            </Field>
 
         </dl>