add images modal upload fully working (for images from banks and new images)

public/content/projects/1_miss-dior-blooming-bouquet/1_client-brief/1805970853_capture-decran-2020-05-30-a-09.18.04.png.txt

@@ -6,11 +6,11 @@ Tags:
 
 ----
 
-Sort: 7
+Date: 2024-10-15 01:10
 
 ----
 
-Uuid: PbMGJPIjFYxbbyhq
+Uuid: cKGbZhC6pCTXislx
 
 ----
 

public/content/projects/1_miss-dior-blooming-bouquet/1_client-brief/client-brief.txt

@@ -14,10 +14,7 @@ Description:
 
 ----
 
-Clientbriefimages:
+Clientbriefimages: - file://cKGbZhC6pCTXislx
-
-- file://PbMGJPIjFYxbbyhq
-- file://STF67mX6eGsLsOGh
 
 ----
 

public/content/projects/1_miss-dior-blooming-bouquet/1_client-brief/perfume-144546_1280.jpg.txt

@@ -1,17 +0,0 @@
-Description: test 2
-
-----
-
-Tags: 
-
-----
-
-Sort: 8
-
-----
-
-Uuid: STF67mX6eGsLsOGh
-
-----
-
-Template: image

public/site/config/routes/upload-images.php

@@ -58,63 +58,72 @@ return [
     }
 
     // Upload new images
-    // if ($uploads = $files->get('images')) {
+    if ($uploads = $files->get('images')) {
-    //   $existingFiles = $page->files();
+      $imagesMeta = $data['imagesMeta'];
-    //   $existingFileMap = [];
+      $existingFiles = $page->files();
-    //   foreach ($existingFiles as $file) {
+      $existingFileMap = [];
-    //     $pos              = strpos($file->filename(), '_');
+      foreach ($existingFiles as $file) {
-    //     $originalSafename = substr($file->filename(), $pos + 1);
+        $pos              = strpos($file->filename(), '_');
-    //     $existingFileMap[$originalSafename . '|' . $file->mime() . '|' . $file->size()] = $file->uuid();
+        $originalSafename = substr($file->filename(), $pos + 1);
-    //   }
+        $existingFileMap[$originalSafename . '|' . $file->mime() . '|' . $file->size()] = $file->uuid();
+      }
 
-    //   foreach ($uploads as $upload) {
+      foreach ($uploads as $index => $upload) {
-    //     // check for duplicate
+        $description = $imagesMeta[$index]['description'] ?? null;
-    //     $files      = page('storage')->files();
+        $tags = json_decode($imagesMeta[$index]['tags'], true) ?? [];
-    //     $duplicates = $files->filter(function ($file) use ($upload) {
+
-    //       // get original safename without prefix
+        // check for duplicate
-    //       $pos              = strpos($file->filename(), '_');
+        $files      = $page->files();
-    //       $originalSafename = substr($file->filename(), $pos + 1);
+        $duplicates = $files->filter(function ($file) use ($upload) {
+          // get original safename without prefix
+          $pos              = strpos($file->filename(), '_');
+          $originalSafename = substr($file->filename(), $pos + 1);
   
-    //       return $originalSafename === F::safeName($upload['name']) &&
+          return $originalSafename === F::safeName($upload['name']) &&
-    //               $file->mime() === $upload['type'] &&
+                  $file->mime() === $upload['type'] &&
-    //               $file->size() === $upload['size'];
+                  $file->size() === $upload['size'];
-    //     });
+        });
   
-    //     if ($duplicates->count() > 0) {
+        if ($duplicates->count() > 0) {
-    //       $correspondingFile = $duplicates->first();
+          $existingFile = $duplicates->first();
-    //       $newFile = $correspondingFile->update([
+          $newFile = $existingFile->update([
-    //         'description' => $upload['description'],
+            'description' => $description,
-    //         'tags' => $upload['tags']
+            'tags' => $tags
-    //       ]);
+          ]);
-    //       $allFiles[] = $newFile->uuid();
+
-    //       $success[$newFile->name()] = 'Successfully updated.';
+          $allFiles = array_filter($allFiles, function ($uuid) use ($existingFile) {
-    //       continue;
+            return $uuid != $existingFile->uuid();
-    //     } else {
+          });
-    //       try {
+
-    //         $name = crc32($upload['name'].microtime()). '_' . $upload['name'];
+          $allFiles[] = $newFile->uuid();
-    //         $newFile = $page->createFile([
+          $success[$newFile->name()] = 'Successfully updated.';
-    //           'source'   => $upload['name'],
+          continue;
-    //           'filename' => $name,
+        } else {          
-    //           'template' => 'image',
+          try {
-    //           'content' => [
+            
-    //               'date' => date('Y-m-d h:m'),
+            $name = crc32($upload['name'].microtime()). '_' . $upload['name'];
-    //               'description' => $upload['description'],
+            $newFile = $page->createFile([
-    //               'tags' => $upload['tags'],
+              'source'   => $upload['tmp_name'],
-    //           ]
+              'filename' => $name,
-    //         ]);
+              'template' => 'image',
-    //         $allFiles[] = $newFile->uuid();
+              'content' => [
-    //         $success[$newFile->name()] = 'Successfully added.';
+                  'date' => date('Y-m-d h:m'),
-    //       } catch (Exception $e) {
+                  'description' => $description,
-    //         $alerts[$upload['name']] = $e->getMessage();
+                  'tags' => $tags,
-    //       }
+              ]
-    //     }
+            ]);
-    //   }
+            $allFiles[] = $newFile->uuid();
-    // }
+            $success[$newFile->name()] = 'Successfully added.';
+          } catch (Throwable $th) {
+            $alerts[$upload['name']] = $th->getMessage() . ' line ' . $th->getLine();
+          }
+        }
+      }
+    }
     
+    // Empty page update needed to updates its files data
+    $newPage = $page->update([]);
     if (!empty($allFiles)) {
-      // Empty page update needed to updates its files data
-      $newPage = $page->update([]);
-      
       $newPage = $page->update([
         'clientBriefImages' => $allFiles
       ]);
@@ -122,15 +131,15 @@ return [
     
 
     $images = [];
-    // foreach ($newPage->clientBriefImages()->toFiles() as $image) {
+    foreach ($newPage->clientBriefImages()->toFiles() as $image) {
-    //   $images[] = [
+      $images[] = [
-    //     'url' => $image->url(),
+        'url' => $image->url(),
-    //     'uuid' => (string) $image->uuid(),
+        'uuid' => (string) $image->uuid(),
-    //     'tags' => $image->tags()->split(),
+        'tags' => $image->tags()->split(),
-    //     'name' => $image->filename(),
+        'name' => $image->filename(),
-    //     'description' => $image->description()->value(),
+        'description' => $image->description()->value(),
-    //   ];
+      ];
-    // }
+    }
     return compact('images', 'alerts', 'success');
   }
 ];

src/components/project/client-brief/add-images-modal/ImagesEditPanel.vue

@@ -169,12 +169,21 @@ const images = computed(() => {
 function addImagesToBrief() {
   const formData = new FormData();
 
-  const blobPromises = images.value.map((item) => {
+  const blobPromises = images.value.map((item, index) => {
+    console.log(item);
     if (item.url.startsWith("blob:")) {
       return fetch(item.url)
         .then((response) => response.blob())
         .then((blob) => {
-          formData.append("images[]", blob, JSON.stringify(item));
+          formData.append("images[]", blob, item.name);
+          formData.append(
+            `imagesMeta[${index}][description]`,
+            item.description
+          );
+          formData.append(
+            `imagesMeta[${index}][tags]`,
+            JSON.stringify(item.tags)
+          );
         });
     } else {
       formData.append("imageUris[]", JSON.stringify(item));