@visns-studio/visns-components 3.6.6 → 3.6.8

package/components/crm/generic/GenericDynamic.jsx

@@ -74,6 +74,7 @@ const GenericDynamic = ({
     primaryKey,
     setData,
     setting,
+    templateStatus = true,
     type,
 }) => {
     const toastId = useRef(null);
@@ -266,13 +267,14 @@ const GenericDynamic = ({
         }
     };
 
-    const handleDownloadForm = async (item, key) => {
+    const handleDownloadForm = async (item, label, data) => {
         // Show loading toast and keep its ID
         const toastId = toast.loading('Downloading form...');
 
         try {
             const res = await Download(setting.download, 'POST', {
                 data: item,
+                dynamicData: data,
                 label: label,
             });
 
@@ -359,6 +361,7 @@ const GenericDynamic = ({
             Object.entries(activeForm).forEach(([key, field]) => {
                 if (
                     field.required === true &&
+                    field.type !== 'dynamicdata' &&
                     (field.value === null || field.value === '')
                 ) {
                     error += `<p>${field.label} is required</p>`;
@@ -366,7 +369,6 @@ const GenericDynamic = ({
             });
 
             if (error === '') {
-                console.info(setting);
                 const res = await CustomFetch(setting.save, 'POST', {
                     [primaryKey]: data.id,
                     form_data: {
@@ -391,28 +393,30 @@ const GenericDynamic = ({
     useEffect(() => {
         if (data[type] && data[type].length > 0) {
             if (multiple) {
-                // Retrieve the last form of the specified type
-                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';
+                if (templateStatus) {
+                    // Retrieve the last form of the specified type
+                    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';
+                                }
                             }
-                        }
-                    });
+                        });
 
-                    // Update the active form with the modified lastForm
-                    setActiveForm(lastForm);
-                    setActiveFormKey(data[type].length - 1);
+                        // Update the active form with the modified lastForm
+                        setActiveForm(lastForm);
+                        setActiveFormKey(data[type].length - 1);
+                    }
                 }
             } else {
-                if (activeForm.length === 0) {
+                if (activeForm.length === 0 && templateStatus) {
                     setActiveForm(data[type]);
                     setActiveFormKey(0);
                 }
@@ -423,10 +427,6 @@ const GenericDynamic = ({
         }
     }, [data, type]);
 
-    useEffect(() => {
-        console.info(activeForm);
-    }, [activeForm]);
-
     return (
         <>
             <div className="formSplit">
@@ -442,6 +442,7 @@ const GenericDynamic = ({
                             <thead>
                                 <tr className="grid-headers">
                                     <th>ID</th>
+                                    <th>Form</th>
                                     <th>Created By</th>
                                     <th>Created At</th>
                                     <th>Updated By</th>
@@ -468,7 +469,8 @@ const GenericDynamic = ({
                                                         );
                                                     }}
                                                 >
-                                                    <td>Form #{item.id}</td>
+                                                    <td>{item.id}</td>
+                                                    <td>{item.form_label}</td>
                                                     <td>{item.created_by}</td>
                                                     <td>
                                                         {item.created_at
@@ -498,7 +500,8 @@ const GenericDynamic = ({
                                                                 onClick={() =>
                                                                     handleDownloadForm(
                                                                         item,
-                                                                        index
+                                                                        label,
+                                                                        data
                                                                     )
                                                                 }
                                                             >
@@ -646,7 +649,7 @@ const GenericDynamic = ({
                 )}
             </div>
             <div className="polActions">
-                {multiple && (
+                {multiple && templateStatus && (
                     <button className="btn" onClick={handleAddNewForm}>
                         Add New Form
                     </button>

package/package.json

@@ -50,7 +50,7 @@
         "react-dom": "^17.0.1"
     },
     "name": "@visns-studio/visns-components",
-    "version": "3.6.6",
+    "version": "3.6.8",
     "description": "Various packages to assist in the development of our Custom Applications.",
     "main": "index.js",
     "scripts": {