umwd-components 0.1.784 → 0.1.785

package/dist/esm/src/data/actions/media/minio/uploadMinioMediaAction.js

@@ -55,73 +55,58 @@ async function uploadMinioMediaAction(prevState, formData) {
                 severity: "error",
             };
         }
-        // VALIDATE THE FILES
-        const validatedFields = {
-            success: true,
-        };
-        /* filesSchema.safeParse({
-          files: validFiles.length === 1 ? validFiles[0] : validFiles,
-        }); */
-        if (!validatedFields.success) ;
         console.log(`Uploading ${validFiles.length} file(s):`);
-        // Upload each file
-        const uploadResults = [];
-        const errors = [];
+        // Prepare files data for upload
+        const filesData = [];
         for (const file of validFiles) {
-            try {
-                // Convert file to ArrayBuffer first, then to Buffer, then to base64 string
-                const arrayBuffer = await file.arrayBuffer();
-                const fileContent = Buffer.from(arrayBuffer).toString("base64");
-                console.log("Uploading file:", file.name, "Size:", Math.round(fileContent.length / 1024 / 1024), "MB");
-                // UPLOAD FILE TO MINIO
-                const fileUploadResponse = reference && refID && field
-                    ? await minioUploadService(bucketName, file.name, fileContent, reference, refID, field)
-                    : await minioUploadService(bucketName, file.name, fileContent);
-                if (!fileUploadResponse) {
-                    errors.push(`Failed to upload ${file.name}`);
-                    continue;
-                }
-                if (fileUploadResponse.error) {
-                    errors.push(`Failed to upload ${file.name}: ${fileUploadResponse.error.message || 'Unknown error'}`);
-                    continue;
-                }
-                const flattenedData = flattenAttributes(fileUploadResponse);
-                uploadResults.push({
-                    fileName: file.name,
-                    data: flattenedData
-                });
-            }
-            catch (fileError) {
-                console.error(`Error uploading ${file.name}:`, fileError);
-                errors.push(`Failed to process ${file.name}`);
-            }
+            const arrayBuffer = await file.arrayBuffer();
+            const fileContent = Buffer.from(arrayBuffer).toString("base64");
+            filesData.push({
+                fileName: file.name,
+                fileContent: fileContent,
+            });
+            console.log("Prepared file:", file.name, "Size:", Math.round(fileContent.length / 1024 / 1024), "MB");
+        }
+        // UPLOAD ALL FILES TO MINIO
+        const fileUploadResponse = await minioUploadService(bucketName, filesData, reference, refID, field);
+        if (!fileUploadResponse) {
+            return {
+                ...prevState,
+                strapiErrors: null,
+                zodErrors: null,
+                message: "Failed to upload files",
+                severity: "error",
+            };
         }
-        // Check results
-        if (uploadResults.length === 0) {
+        if (fileUploadResponse.error) {
             return {
                 ...prevState,
-                strapiErrors: errors.length > 0 ? { message: errors.join(', ') } : null,
+                strapiErrors: fileUploadResponse.error,
                 zodErrors: null,
-                message: "Failed to upload any files",
+                message: "Failed to upload files",
                 severity: "error",
             };
         }
-        if (errors.length > 0 && uploadResults.length > 0) {
+        // Handle partial failures
+        if (fileUploadResponse.errors && fileUploadResponse.errors.length > 0) {
+            const successCount = fileUploadResponse.uploadResults?.length || 0;
+            const errorCount = fileUploadResponse.errors.length;
             return {
                 ...prevState,
-                data: uploadResults,
+                data: fileUploadResponse.uploadResults,
                 zodErrors: null,
                 strapiErrors: null,
-                message: `Uploaded ${uploadResults.length} file(s) successfully. ${errors.length} file(s) failed: ${errors.join(', ')}`,
-                severity: "warning",
+                message: `Uploaded ${successCount} file(s) successfully. ${errorCount} file(s) failed.`,
+                severity: successCount > 0 ? "warning" : "error",
             };
         }
+        const flattenedData = flattenAttributes(fileUploadResponse);
         return {
             ...prevState,
-            data: uploadResults,
+            data: flattenedData,
             zodErrors: null,
             strapiErrors: null,
-            message: `Successfully uploaded ${uploadResults.length} file(s)`,
+            message: `Successfully uploaded ${validFiles.length} file(s)`,
             severity: "success",
         };
     }

package/dist/esm/src/data/services/common/media/minio/minioUploadService.js

@@ -8,7 +8,7 @@
 import { getAuthToken } from '../../../get-token.js';
 import { getStrapiURL } from '../../../../../lib/utils.js';
 
-async function minioUploadService(bucketName, fileName, fileContent, reference, refID, field) {
+async function minioUploadService(bucketName, files, reference, refID, field) {
     const authToken = await getAuthToken();
     if (!authToken)
         throw new Error("No auth token found");
@@ -16,13 +16,15 @@ async function minioUploadService(bucketName, fileName, fileContent, reference,
     const url = new URL("/api/minio-plugin/uploadbyreference", baseUrl);
     try {
         const response = await fetch(url, {
-            headers: { Authorization: `Bearer ${authToken}` },
+            headers: {
+                Authorization: `Bearer ${authToken}`,
+                "Content-Type": "application/json",
+            },
             method: "POST",
             body: JSON.stringify({
                 data: {
                     bucketName,
-                    fileName,
-                    fileContent,
+                    files,
                     reference,
                     refID,
                     field,
@@ -33,7 +35,7 @@ async function minioUploadService(bucketName, fileName, fileContent, reference,
         return dataResponse;
     }
     catch (error) {
-        console.error("Error uploading image:", error);
+        console.error("Error uploading files:", error);
         throw error;
     }
 }