@visns-studio/visns-components 4.9.11 → 4.10.0

package/package.json

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

package/src/components/crm/Form.jsx

@@ -204,7 +204,7 @@ function Form({
         }
     };
 
-    const handleChangeSelect = (inputValue, action, id) => {
+    const handleChangeSelect = async (inputValue, action, id) => {
         const updateFormData = (update) => {
             setFormData((prevState) => ({
                 ...prevState,
@@ -212,59 +212,82 @@ function Form({
             }));
         };
 
-        switch (action.action) {
-            case 'select-option':
-                updateFormData({ [id]: inputValue });
+        const handleSelectOption = () => {
+            updateFormData({ [id]: inputValue });
+
+            // Update any matching form data properties
+            Object.keys(inputValue).forEach((key) => {
+                if (formData.hasOwnProperty(key)) {
+                    updateFormData({ [key]: inputValue[key] });
+                }
+            });
 
-                Object.keys(inputValue).forEach((a) => {
-                    if (formData.hasOwnProperty(a)) {
-                        updateFormData({ [a]: inputValue[a] });
+            formSettings.fields.forEach((field) => {
+                if (field.id === id && field.trigger) {
+                    switch (field.trigger.type) {
+                        case 'addDays':
+                            handleAddDaysTrigger(inputValue, field);
+                            break;
+                        case 'setContent':
+                            handleSetContentTrigger(inputValue, field);
+                            break;
                     }
-                });
+                }
+            });
+        };
 
-                formSettings.fields.forEach((f) => {
-                    if (f.id === id && f.trigger) {
-                        switch (f.trigger.type) {
-                            case 'addDays':
-                                let newDate = moment();
-                                let add = false;
+        const handleAddDaysTrigger = (inputValue, field) => {
+            let newDate = moment();
+            let add = false;
 
-                                if (
-                                    inputValue.no_of_days &&
-                                    parseFloat(inputValue.no_of_days) > 0
-                                ) {
-                                    newDate.add(
-                                        parseFloat(inputValue.no_of_days),
-                                        'days'
-                                    );
-                                    add = true;
-                                }
+            if (
+                inputValue.no_of_days &&
+                parseFloat(inputValue.no_of_days) > 0
+            ) {
+                newDate.add(parseFloat(inputValue.no_of_days), 'days');
+                add = true;
+            }
 
-                                if (
-                                    inputValue.no_of_hours &&
-                                    parseFloat(inputValue.no_of_hours) > 0
-                                ) {
-                                    newDate.add(
-                                        parseFloat(inputValue.no_of_hours),
-                                        'hours'
-                                    );
-                                    add = true;
-                                }
+            if (
+                inputValue.no_of_hours &&
+                parseFloat(inputValue.no_of_hours) > 0
+            ) {
+                newDate.add(parseFloat(inputValue.no_of_hours), 'hours');
+                add = true;
+            }
 
-                                if (add) {
-                                    updateFormData({
-                                        [f.trigger.id]: newDate.toDate(),
-                                    });
-                                }
-                                break;
-                            case 'setContent':
-                                updateFormData({
-                                    [f.trigger.id]: inputValue[f.trigger.key],
-                                });
-                                break;
-                        }
-                    }
+            if (add) {
+                updateFormData({
+                    [field.trigger.id]: newDate.toDate(),
+                });
+            }
+        };
+
+        const handleSetContentTrigger = async (inputValue, field) => {
+            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],
                 });
+
+                if (res.data.content) {
+                    contentValue = res.data.content;
+                }
+            }
+
+            updateFormData({
+                [field.trigger.id]: contentValue,
+            });
+        };
+
+        // Switch cases to handle different actions
+        switch (action.action) {
+            case 'select-option':
+                handleSelectOption();
                 break;
             case 'clear':
                 updateFormData({ [id]: '' });

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

@@ -27,6 +27,7 @@ import CustomFetch from '../Fetch';
 import Form from '../Form';
 import GenericDynamic from './GenericDynamic';
 import QrCode from '../QrCode';
+import SortableList from '../sorting/List';
 import Table from '../DataGrid';
 import TableFilter from '../TableFilter';
 
@@ -401,14 +402,14 @@ function GenericDetail({
                 return renderLatestNotes();
             case 'options':
                 return renderOptions();
-            case 'richtext':
-                return renderRichText();
-            case 'total':
-                return renderTotal();
             case 'password':
                 return renderPassword();
             case 'relation':
                 return renderRelation();
+            case 'richtext':
+                return renderRichText();
+            case 'total':
+                return renderTotal();
             default:
                 return size === 'full' && truncatedValue
                     ? parse(`<br /><p>${truncatedValue}</p>`)
@@ -952,6 +953,7 @@ function GenericDetail({
                                             )
                                         )}
                                     </div>
+
                                     {activeTabConfig.form && (
                                         <div className={styles.polActions}>
                                             <button

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

@@ -1610,9 +1610,9 @@ function GenericFormBuilder({ setting, urlParam, userProfile }) {
                                                                                 dataField.type ===
                                                                                 'table_text'
                                                                             ) {
-                                                                                // excludedKeywords.push(
-                                                                                //     'checkbox'
-                                                                                // );
+                                                                                excludedKeywords.push(
+                                                                                    'checkbox'
+                                                                                );
                                                                             }
                                                                             return !excludedKeywords.some(
                                                                                 (