@visns-studio/visns-components 4.3.8 → 4.3.10

package/components/crm/generic/GenericDetail.jsx

@@ -543,8 +543,9 @@ function GenericDetail({ extraUrlParam, setting, urlParam, userProfile }) {
                                 <GenericDynamic
                                     data={data}
                                     fetchData={handleReload}
-                                    label={activeTabConfig.setting.label}
+                                    label={data.task_template.label}
                                     multiple={false}
+                                    originalData={data}
                                     primaryKey={activeTabConfig.setting.key}
                                     setData={setData}
                                     setting={activeTabConfig.setting.url}

package/components/crm/generic/GenericDynamic.jsx

@@ -41,10 +41,14 @@ const renderValue = (field, data) => {
             if (field.dynamicfield && typeof field.dynamicfield === 'string') {
                 const [table, key] = field.dynamicfield.split('::');
 
+                console.info(data, table, key);
+
                 if (table && key) {
                     switch (table) {
                         case 'opportunities':
                             return data[table][key];
+                        case 'clients':
+                            return data['client'][key];
                         default:
                             if (key === 'surname' && !data[key]) {
                                 return data['lastname'] || '';
@@ -550,12 +554,17 @@ const GenericDynamic = ({
                     }
                 }
             } else {
-                if (
-                    Object.keys(activeForm).length === 0 &&
-                    templateStatus &&
-                    data[type][0]
-                ) {
-                    setActiveForm(data[type][0]);
+                if (data[type].hasOwnProperty('id')) {
+                    if (
+                        Object.keys(activeForm).length === 0 &&
+                        templateStatus &&
+                        data[type][0]
+                    ) {
+                        setActiveForm(data[type][0]);
+                        setActiveFormKey(0);
+                    }
+                } else {
+                    setActiveForm(data[type]);
                     setActiveFormKey(0);
                 }
             }
@@ -707,7 +716,7 @@ const GenericDynamic = ({
                     <>
                         <div className={styles.gridtxt__header}>
                             <span>
-                                {label}{' '}
+                                {label}
                                 {multiple && ` - Form #${activeForm?.id ?? ''}`}
                             </span>
                         </div>
@@ -830,7 +839,7 @@ const GenericDynamic = ({
                     </button>
                 )}
 
-                {activeForm.id && (
+                {activeForm.id ? (
                     <>
                         {multiple && activeForm.form_status === 0 ? (
                             <button className="btn" onClick={handleSaveForm}>
@@ -842,6 +851,10 @@ const GenericDynamic = ({
                             </button>
                         )}
                     </>
+                ) : (
+                    <button className="btn" onClick={handleSaveForm}>
+                        Save
+                    </button>
                 )}
             </div>
         </>

package/components/crm/generic/GenericFormBuilder.jsx

@@ -124,15 +124,27 @@ function GenericFormBuilder({ setting, urlParam, userProfile }) {
     const handleAddRowOption = (e) => {
         e.preventDefault();
 
+        console.info(dataField);
+
+        // Initialize rows if it doesn't exist
+        if (!dataField.rows) {
+            setDataField((items) => ({
+                ...items,
+                rows: [],
+            }));
+        }
+
         if (rowOption.label !== '') {
-            const isLabelUnique = !dataField.rows.some(
-                (option) => option.label === rowOption.label
-            );
+            const isLabelUnique = dataField.rows
+                ? !dataField.rows.some(
+                      (option) => option.label === rowOption.label
+                  )
+                : true;
 
             if (isLabelUnique) {
                 setDataField((items) => ({
                     ...items,
-                    rows: [...items.rows, rowOption],
+                    rows: [...(items.rows || []), rowOption],
                 }));
 
                 setRowOption(() => ({
@@ -179,6 +191,7 @@ function GenericFormBuilder({ setting, urlParam, userProfile }) {
             label: '',
             type: '',
             options: [],
+            // rows: [],
             size: 'half',
             required: 'no',
         }));

package/package.json

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