@visns-studio/visns-components 4.10.46 → 4.10.48

package/package.json

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

package/src/components/crm/DataGrid.jsx

@@ -2064,6 +2064,38 @@ const DataGrid = forwardRef(
                                         }, '');
 
                                         if (value) {
+                                            let columnStyle = {};
+                                            let columnValueChecker = '';
+
+                                            if (
+                                                column?.active?.id &&
+                                                column?.active?.value
+                                            ) {
+                                                if (
+                                                    data[column.active.id]
+                                                        ?.value
+                                                ) {
+                                                    columnValueChecker =
+                                                        data[column.active.id]
+                                                            ?.value;
+                                                } else if (
+                                                    data[column.active.id]
+                                                ) {
+                                                    columnValueChecker =
+                                                        data[column.active.id];
+                                                }
+
+                                                if (
+                                                    columnValueChecker ===
+                                                    column.active.value
+                                                ) {
+                                                    columnStyle = {
+                                                        color: column.active
+                                                            .colour,
+                                                    };
+                                                }
+                                            }
+
                                             if (Array.isArray(value)) {
                                                 if (value[0]) {
                                                     value = value[0];
@@ -2096,7 +2128,7 @@ const DataGrid = forwardRef(
                                                 column.placeholder !== ''
                                             ) {
                                                 return (
-                                                    <span>
+                                                    <span style={columnStyle}>
                                                         {column.placeholder}
                                                     </span>
                                                 );
@@ -2117,7 +2149,13 @@ const DataGrid = forwardRef(
                                                 }
 
                                                 if (typeof value === 'string') {
-                                                    return <span>{value}</span>;
+                                                    return (
+                                                        <span
+                                                            style={columnStyle}
+                                                        >
+                                                            {value}
+                                                        </span>
+                                                    );
                                                 } else {
                                                     return null;
                                                 }

package/src/components/crm/Form.jsx

@@ -218,11 +218,14 @@ function Form({
             updateFormData({ [id]: inputValue });
 
             // Update any matching form data properties
-            Object.keys(inputValue).forEach((key) => {
-                if (formData.hasOwnProperty(key)) {
-                    updateFormData({ [key]: inputValue[key] });
-                }
-            });
+            Object.keys(inputValue)
+                .filter(
+                    (key) =>
+                        formData.hasOwnProperty(key) &&
+                        key !== 'id' &&
+                        key !== 'label'
+                )
+                .forEach((key) => updateFormData({ [key]: inputValue[key] }));
 
             formSettings.fields.forEach((field) => {
                 if (field.id === id && field.trigger) {
@@ -710,87 +713,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,
-                                    });
-
-                                    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,
-                                    };
-                                }
-                            );
+                    const files = Array.isArray(formData[fileKey])
+                        ? formData[fileKey]
+                        : [formData[fileKey]];
 
-                            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 +776,6 @@ function Form({
                         return acc;
                     }, {});
 
-                    console.info('Payload:', payload);
-
                     const res = await CustomFetch(url, method, payload);
 
                     if (res.data.error === '') {