@visns-studio/visns-components 4.10.20 → 4.10.21

package/package.json

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

package/src/components/crm/generic/GenericDynamic.jsx

@@ -629,53 +629,34 @@ const GenericDynamic = ({
     };
 
     useEffect(() => {
-        if (data[type] && data[type].length > 0) {
-            if (multiple) {
-                if (templateStatus) {
-                    let lastForm = data[type][data[type].length - 1];
-
-                    if (lastForm && typeof lastForm === 'object') {
-                        Object.entries(lastForm).forEach(([key, field]) => {
-                            if (field && field.required) {
-                                if (
-                                    field.required === 'yes' ||
-                                    field.required === 'no'
-                                ) {
-                                    lastForm[key].required =
-                                        field.required === 'yes';
-                                }
-                            }
-                        });
-
-                        setActiveForm(lastForm);
-                        setActiveFormKey(data[type].length - 1);
-                    }
-                }
-            } else {
-                let formData = data[type][0] ? data[type][0] : data[type];
+        if (!data[type] || data[type].length === 0) {
+            setActiveForm({});
+            return;
+        }
 
-                if (formData.hasOwnProperty('id')) {
-                    if (
-                        Object.keys(activeForm).length === 0 &&
-                        templateStatus &&
-                        formData[0] &&
-                        formData[0].created_at
-                    ) {
-                        setActiveForm(formData[0]);
-                        setActiveFormKey(0);
-                    } else {
-                        setActiveForm(formData);
-                        setActiveFormKey(0);
-                    }
-                } else {
-                    setActiveForm(formData);
-                    setActiveFormKey(0);
+        const formData = multiple
+            ? data[type][data[type].length - 1]
+            : data[type].hasOwnProperty('created_at')
+            ? data[type][0] || data[type]
+            : data[type];
+
+        if (
+            multiple &&
+            templateStatus &&
+            formData &&
+            typeof formData === 'object'
+        ) {
+            // Process the last form for required fields
+            Object.entries(formData).forEach(([key, field]) => {
+                if (field?.required) {
+                    field.required = field.required === 'yes';
                 }
-            }
-        } else {
-            setActiveForm({});
+            });
         }
-    }, [data, type]);
+
+        setActiveForm(formData);
+        setActiveFormKey(0);
+    }, [data, type, multiple, templateStatus]);
 
     useEffect(() => {
         if (data[type] && data[type].length > 0) {