From 0984fa00b76582f9d938b29f7f6e8789521781df Mon Sep 17 00:00:00 2001
From: Noah Lancien <noah.lancien@ldc.fr>
Date: Tue, 6 May 2025 10:55:59 +0200
Subject: [PATCH] fix: many fixes from develop branch + new re7 feedbacks

---
 app/Http/Controllers/MediaController.php                     | 2 ++
 app/Models/Media.php                                         | 4 ++--
 resources/js/components/media-manager/MmActionsComponent.vue | 3 ---
 resources/js/components/media-manager/MmFolderComponent.vue  | 2 +-
 resources/views/media_manager.blade.php                      | 1 -
 5 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/app/Http/Controllers/MediaController.php b/app/Http/Controllers/MediaController.php
index b7eb143..e03487b 100644
--- a/app/Http/Controllers/MediaController.php
+++ b/app/Http/Controllers/MediaController.php
@@ -499,6 +499,8 @@ class MediaController extends Controller
             // ---- Creation des vignettes en lien avec le sujet du média
             $clonedMedia->createSubjectThumbnails();
 
+            $clonedMedia->isDuplicate = true;
+
             $clonedMedia->save();
 
             // * Add relations after having a media id
diff --git a/app/Models/Media.php b/app/Models/Media.php
index 84d5f74..29b15b7 100644
--- a/app/Models/Media.php
+++ b/app/Models/Media.php
@@ -807,7 +807,7 @@ class Media extends Model
         $storage = Storage::disk('media');
 
         // * format spécifique
-        if ($format->system) {
+        if (!$format->system) {
             if (in_array($this->extension, ['gif', 'jpeg', 'jpg', 'png', 'pdf', 'ai', 'psd'])) {
                 return $storage->path("/{$this->folder}/{$this->uid}_{$format->libelle}.{$format->extension->value}");
             }
@@ -822,7 +822,7 @@ class Media extends Model
             } elseif (in_array($this->extension, ['pdf', 'ai', 'psd'])) {
                 return $storage->path("/{$this->folder}/{$this->uid}_{$format->libelle}.png");
             }
-            return $storage->path("/{$this->folder}/{$this->uid}.{$this->extension}");
+            return $storage->path("/{$this->folder}/{$this->uid}.{$this->extension->value}");
         }
         throw new \RuntimeException("Unhandled Format $format->id $format->libelle");
     }
diff --git a/resources/js/components/media-manager/MmActionsComponent.vue b/resources/js/components/media-manager/MmActionsComponent.vue
index cd8bf4e..dc9da65 100644
--- a/resources/js/components/media-manager/MmActionsComponent.vue
+++ b/resources/js/components/media-manager/MmActionsComponent.vue
@@ -489,9 +489,6 @@ export default {
             .querySelector('meta[name="csrf-token"]')
             .getAttribute("content"),
         },
-        query: {
-            media_id: this.storeMedia.id
-        }
       });
 
       this.resumable.on("fileAdded", this.uploadFileAdded);
diff --git a/resources/js/components/media-manager/MmFolderComponent.vue b/resources/js/components/media-manager/MmFolderComponent.vue
index 1534680..68a9d00 100644
--- a/resources/js/components/media-manager/MmFolderComponent.vue
+++ b/resources/js/components/media-manager/MmFolderComponent.vue
@@ -184,7 +184,7 @@ export default {
   },
   mounted() {
     const data = JSON.parse(this.$parent.$options.json);
-    if (data.selectedFolder) {
+    if (data.selectedFolder && data.selectedFolder != -1) {
         this.selectedFolder = data.selectedFolder;
         this.selectFolder(data.selectedFolder);
         this.$store.commit({
diff --git a/resources/views/media_manager.blade.php b/resources/views/media_manager.blade.php
index 07c3dd2..2b5c4d9 100644
--- a/resources/views/media_manager.blade.php
+++ b/resources/views/media_manager.blade.php
@@ -26,7 +26,6 @@
                         'textsearch' => $textSearch,
                         'typesmedia' => $typesmedia,
                         'etiquettes' => $etiquettes,
-                        'selectedFolder' => $currentFolder,
                     ];
                 @endphp
                 <div id="mm-filters" data-json='@json($dataVue)'></div>