@visns-studio/visns-components 4.10.39 → 4.10.41

package/package.json

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

package/src/components/crm/DataGrid.jsx

@@ -571,18 +571,28 @@ const DataGrid = forwardRef(
                     break;
                 case 'form':
                     if (s.key) {
-                        let fsd = formSettingData;
+                        console.info('Form Setting Data:', formSettingData);
+                        let fsd = s.form;
 
                         if (fsd.fields && fsd.fields.length > 0) {
+                            console.info(
+                                'Form Setting Data Fields:',
+                                fsd.fields.length
+                            );
                             fsd.fields.forEach((fItem, fKey) => {
                                 if (fItem.id === s.key) {
+                                    console.info(
+                                        'Form Setting Data Fields ID:',
+                                        fItem.id
+                                    );
                                     fsd.fields[fKey].value = d.id;
                                 }
                             });
 
-                            console.info(fsd);
-
-                            setFormSettingData(fsd);
+                            setFormSettingData((prevState) => ({
+                                ...prevState,
+                                ...fsd,
+                            }));
                         }
                     }
                     modalSettingOpen('create', 0);
@@ -790,7 +800,13 @@ const DataGrid = forwardRef(
                                         }
                                     }
                                 } else {
-                                    navigate(`${linkUrl}${rowData}`);
+                                    if (rowData) {
+                                        navigate(`${linkUrl}${rowData}`);
+                                    } else {
+                                        toast.warn(
+                                            'No data available for this link.'
+                                        );
+                                    }
                                 }
                             } else {
                                 if (rowProps.data[column.id]) {
@@ -1199,10 +1215,6 @@ const DataGrid = forwardRef(
                 }
             }
 
-            if (s.form) {
-                setFormSettingData(s.form);
-            }
-
             if (allow) {
                 switch (s.id) {
                     case 'activate':

package/src/components/crm/Form.jsx

@@ -269,12 +269,28 @@ function Form({
             let contentValue = inputValue[field.trigger.key];
 
             if (field.trigger.url && field.trigger.payload) {
-                const res = await CustomFetch(field.trigger.url, 'POST', {
-                    [field.trigger.payload.key.id]:
-                        inputValue[field.trigger.payload.value.id],
-                    [field.trigger.payload.key.content]:
-                        inputValue[field.trigger.payload.value.content],
-                });
+                let setContentPayload;
+
+                if (field.trigger?.payload?.key?.id) {
+                    setContentPayload = {
+                        [field.trigger.payload.key.id]:
+                            inputValue[field.trigger.payload.value.id],
+                        [field.trigger.payload.key.content]:
+                            inputValue[field.trigger.payload.value.content],
+                    };
+                } else {
+                    setContentPayload = {
+                        formData: formData,
+                        [field.trigger.payload.key.content]:
+                            inputValue[field.trigger.payload.value.content],
+                    };
+                }
+
+                const res = await CustomFetch(
+                    field.trigger.url,
+                    'POST',
+                    setContentPayload
+                );
 
                 if (res.data.content) {
                     contentValue = res.data.content;