@visns-studio/visns-components 4.7.9 → 4.7.10

package/package.json

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

package/src/components/crm/Field.jsx

@@ -554,8 +554,25 @@ function Field({
                                 className={styles.buttonRight}
                                 onClick={(e) => {
                                     e.preventDefault();
+                                    let allow = false;
 
-                                    handleAddEntry(settings.create);
+                                    if (settings.create.parent_id) {
+                                        if (
+                                            formData[settings.create.parent_id]
+                                        ) {
+                                            allow = true;
+                                        }
+                                    } else {
+                                        allow = true;
+                                    }
+
+                                    if (allow) {
+                                        handleAddEntry(settings.create);
+                                    } else {
+                                        toast.warning(
+                                            'Please select a parent item first'
+                                        );
+                                    }
                                 }}
                             >
                                 <CirclePlus strokeWidth={2} size={16} />
@@ -897,8 +914,25 @@ function Field({
                                 className={styles.buttonRight}
                                 onClick={(e) => {
                                     e.preventDefault();
+                                    let allow = false;
 
-                                    handleAddEntry(settings.create);
+                                    if (settings.create.parent_id) {
+                                        if (
+                                            formData[settings.create.parent_id]
+                                        ) {
+                                            allow = true;
+                                        }
+                                    } else {
+                                        allow = true;
+                                    }
+
+                                    if (allow) {
+                                        handleAddEntry(settings.create);
+                                    } else {
+                                        toast.warning(
+                                            'Please select a parent item first'
+                                        );
+                                    }
                                 }}
                             >
                                 <CirclePlus strokeWidth={2} size={16} />
@@ -1572,29 +1606,13 @@ function Field({
 
     const handleAddEntry = (form) => {
         if (form) {
-            let f = { ...form }; // Create a copy of the form object to avoid direct mutation
+            let f = form;
 
             form.fields.forEach((item, itemKey) => {
-                if (item.hasOwnProperty('dataId')) {
-                    let value;
-
-                    if (Array.isArray(item.dataId)) {
-                        // If dataId is an array, nest the keys to access formData
-                        value = item.dataId.reduce((acc, key) => {
-                            return acc && acc[key] ? acc[key] : undefined;
-                        }, formData);
-                    } else {
-                        // If dataId is not an array, access formData directly
-                        value = formData[item.dataId]
-                            ? formData[item.dataId].value ||
-                              formData[item.dataId]
-                            : undefined;
-                    }
-
-                    // Set the value if it exists
-                    if (value !== undefined) {
-                        f.fields[itemKey].value = value;
-                    }
+                if (item.hasOwnProperty('dataId') && formData[item.dataId]) {
+                    f.fields[itemKey].value = formData[item.dataId].value
+                        ? formData[item.dataId].value
+                        : formData[item.dataId];
                 }
             });