@visns-studio/visns-components 4.10.45 → 4.10.47

package/package.json

@@ -77,7 +77,7 @@
         "react-dom": "^17.0.0 || ^18.0.0"
     },
     "name": "@visns-studio/visns-components",
-    "version": "4.10.45",
+    "version": "4.10.47",
     "description": "Various packages to assist in the development of our Custom Applications.",
     "main": "src/index.js",
     "files": [

package/src/components/crm/Form.jsx

@@ -710,87 +710,55 @@ function Form({
                         });
                     }
 
-                    if (Array.isArray(formData[fileKey])) {
-                        if (fileUpload && formData[fileKey]) {
-                            const uploadPromises = formData[fileKey].map(
-                                async (file) => {
-                                    const toastId = toast.info(
-                                        `Uploading ${file.name}`,
-                                        {
-                                            progress: 0,
-                                            autoClose: false,
-                                        }
-                                    );
-
-                                    const fileRes = await Vapor.store(file, {
-                                        progress: (progress) => {
-                                            setUploadProgress(progress * 100);
-                                            toast.update(toastId, {
-                                                progress,
-                                            });
-                                        },
-                                    });
-
-                                    toast.update(toastId, {
-                                        render: `${file.name} uploaded successfully!`,
-                                        type: 'success',
-                                        autoClose: 3000,
-                                    });
+                    const files = Array.isArray(formData[fileKey])
+                        ? formData[fileKey]
+                        : [formData[fileKey]];
 
-                                    return {
-                                        uuid: fileRes.uuid,
-                                        key: fileRes.key,
-                                        bucket: fileRes.bucket,
-                                        filename: file.name,
-                                        filesize: file.size,
-                                        extension: fileRes.extension,
-                                        file_relationship: fileKey,
-                                        fileable_field:
-                                            fileFieldSetting.fileable_field,
-                                    };
-                                }
-                            );
-
-                            formData['uploadedFiles'] = await Promise.all(
-                                uploadPromises
-                            );
-                        } else {
+                    if (fileUpload && files.length > 0) {
+                        const uploadPromises = files.map(async (file) => {
                             const toastId = toast.info(
-                                `Uploading ${formData[fileKey].name}`,
+                                `Uploading ${file.name}`,
                                 {
                                     progress: 0,
                                     autoClose: false,
                                 }
                             );
 
-                            const fileRes = await Vapor.store(
-                                formData[fileKey],
-                                {
-                                    progress: (progress) => {
-                                        setUploadProgress(progress * 100);
-                                        toast.update(toastId, {
-                                            progress,
-                                        });
-                                    },
-                                }
-                            );
+                            const fileRes = await Vapor.store(file, {
+                                progress: (progress) => {
+                                    setUploadProgress(progress * 100);
+                                    toast.update(toastId, { progress });
+                                },
+                            });
 
                             toast.update(toastId, {
-                                render: `${formData[fileKey].name} uploaded successfully!`,
+                                render: `${file.name} uploaded successfully!`,
                                 type: 'success',
                                 autoClose: 3000,
                             });
 
-                            formData['uuid'] = fileRes.uuid;
-                            formData['key'] = fileRes.key;
-                            formData['bucket'] = fileRes.bucket;
-                            formData['filename'] = formData[fileKey].name;
-                            formData['filesize'] = formData[fileKey].size;
-                            formData['extension'] = fileRes.extension;
-                            formData['file_relationship'] = fileKey;
-                            formData['fileable_field'] =
-                                fileFieldSetting.fileable_field;
-                        }
+                            return {
+                                uuid: fileRes.uuid,
+                                key: fileRes.key,
+                                bucket: fileRes.bucket,
+                                filename: file.name,
+                                filesize: file.size,
+                                extension: fileRes.extension,
+                                file_relationship: fileKey,
+                                fileable_field:
+                                    fileFieldSetting.fileable_field ||
+                                    fileFieldSetting.id,
+                            };
+                        });
+
+                        // Wait for all uploads to complete
+                        const uploadedFiles = await Promise.all(uploadPromises);
+
+                        // If there are multiple files, store them as an array, otherwise as a single object
+                        formData['uploadedFiles'] =
+                            uploadedFiles.length > 1
+                                ? uploadedFiles
+                                : uploadedFiles[0];
                     }
 
                     // Transform keys with dots into nested objects
@@ -805,8 +773,6 @@ function Form({
                         return acc;
                     }, {});
 
-                    console.info('Payload:', payload);
-
                     const res = await CustomFetch(url, method, payload);
 
                     if (res.data.error === '') {
@@ -891,7 +857,9 @@ function Form({
                             _formData[id] =
                                 newValue instanceof Date
                                     ? newValue
-                                    : moment(newValue).toDate();
+                                    : newValue !== undefined
+                                    ? moment(newValue).toDate()
+                                    : '';
                         } else {
                             _formData[id] = newValue;
                         }