@visns-studio/visns-components 5.7.13 → 5.7.15

package/package.json

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

package/src/components/crm/DataGrid.jsx

@@ -515,66 +515,27 @@ const DataGrid = forwardRef(
                     (typeof param.selected === 'object' &&
                         Object.keys(param.selected).length > 0)
                 ) {
-                    // Show confirmation dialog for selection
-                    const selectedCount =
-                        param.selected === true ? param.data.length : 1;
-                    const itemText = selectedCount === 1 ? 'item' : 'items';
-
-                    confirmDialog({
-                        title: 'Selection Confirmation',
-                        message: `You have selected ${selectedCount} ${itemText}. Do you want to proceed with this selection?`,
-                        data:
-                            param.selected === true
-                                ? param.data
-                                : param.selected, // Pass the selected data
-                        buttons: [
-                            {
-                                label: 'Yes',
-                                onClick: () => {
-                                    // Process the selection as before
-                                    if (param.selected === true) {
-                                        const s = {};
-                                        param.data.forEach((obj) => {
-                                            s[obj.id] = obj;
-                                        });
-                                        setSelected(s);
-                                    } else if (
-                                        typeof param.selected === 'object'
-                                    ) {
-                                        const selectedKey = Object.keys(
-                                            param.selected
-                                        )[0];
-                                        const isSelectedAlready =
-                                            selected.hasOwnProperty(
-                                                selectedKey
-                                            );
-
-                                        if (isSelectedAlready) {
-                                            setSelected({});
-                                        } else {
-                                            setSelected((prevSelected) => ({
-                                                ...prevSelected,
-                                                [selectedKey]:
-                                                    param.selected[selectedKey],
-                                            }));
-                                        }
-                                    }
-
-                                    // Show a success message
-                                    toast.success(
-                                        `Selection of ${selectedCount} ${itemText} confirmed`
-                                    );
-                                },
-                            },
-                            {
-                                label: 'No',
-                                onClick: () => {
-                                    // Clear selection if user cancels
-                                    setSelected({});
-                                },
-                            },
-                        ],
-                    });
+                    // Process the selection directly without confirmation
+                    if (param.selected === true) {
+                        const s = {};
+                        param.data.forEach((obj) => {
+                            s[obj.id] = obj;
+                        });
+                        setSelected(s);
+                    } else if (typeof param.selected === 'object') {
+                        const selectedKey = Object.keys(param.selected)[0];
+                        const isSelectedAlready =
+                            selected.hasOwnProperty(selectedKey);
+
+                        if (isSelectedAlready) {
+                            setSelected({});
+                        } else {
+                            setSelected((prevSelected) => ({
+                                ...prevSelected,
+                                [selectedKey]: param.selected[selectedKey],
+                            }));
+                        }
+                    }
                 } else {
                     // Handle deselection directly without confirmation
                     setSelected(param.selected);

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

@@ -45,6 +45,8 @@ function useConfig(setting, tabs, filters, setRowsSelected, tableSetting) {
             style: setting.style || {},
             tableSetting,
             type: setting.type ? setting.type : 'table',
+            // Make sure to include functions if they exist in the setting
+            functions: setting.functions || {},
         };
 
         setConfig(newConfig);
@@ -135,6 +137,11 @@ function useConfig(setting, tabs, filters, setRowsSelected, tableSetting) {
                         type: activeTabConfig.type
                             ? activeTabConfig.type
                             : 'table',
+                        tableSetting:
+                            activeTabConfig.tableSetting || tableSetting,
+                        // Preserve functions from the tab config, falling back to the original config functions
+                        functions:
+                            activeTabConfig.functions || config.functions || {},
                     };
 
                     setConfig(updatedConfig);
@@ -156,6 +163,8 @@ function useConfig(setting, tabs, filters, setRowsSelected, tableSetting) {
                         style: config.style || setting.style || {},
                         tableSetting,
                         type: setting.type ? setting.type : 'table',
+                        // Preserve functions from the original config or setting
+                        functions: config.functions || setting.functions || {},
                     };
 
                     // Add the filter for the active child
@@ -353,12 +362,32 @@ function GenericIndex({
         rowsSelectedRef.current = rowsSelected;
     }, [rowsSelected]);
 
-    const handleCustomAction = async () => {
+    // Helper function to get function config from any of the three possible locations
+    const getFunctionConfig = useCallback(
+        (functionName) => {
+            // Check in priority order:
+            // 1. First check if it exists directly in setting.functions
+            if (setting?.functions?.[functionName]) {
+                return setting.functions[functionName];
+            }
+            // 2. Then check if it exists in config.form.functions
+            if (config?.form?.functions?.[functionName]) {
+                return config.form.functions[functionName];
+            }
+            // 3. Finally check if it exists in config.functions
+            if (config?.functions?.[functionName]) {
+                return config.functions[functionName];
+            }
+            // Return null if not found in any location
+            return null;
+        },
+        [setting, config]
+    );
+
+    const handleCustomAction = useCallback(async () => {
         try {
-            // Get the custom action configuration
-            const customActionConfig = setting?.functions?.customAction
-                ? setting.functions.customAction
-                : config.form.functions.customAction;
+            // Get the custom action configuration using our helper
+            const customActionConfig = getFunctionConfig('customAction');
 
             if (customActionConfig) {
                 // Implementation will be added when needed
@@ -368,14 +397,18 @@ function GenericIndex({
             console.error(err);
             toast.error('An error occurred while performing the custom action');
         }
-    };
+    }, [getFunctionConfig]);
 
     const handleCheckboxUpdate = useCallback(async () => {
         try {
-            const { data, method, message, url } = setting?.functions
-                ?.checkboxUpdate
-                ? setting.functions.checkboxUpdate
-                : config.form.functions.checkboxUpdate;
+            const checkboxUpdateConfig = getFunctionConfig('checkboxUpdate');
+
+            if (!checkboxUpdateConfig) {
+                console.error('checkboxUpdate configuration not found');
+                return;
+            }
+
+            const { data, method, message, url } = checkboxUpdateConfig;
 
             if (!Object.keys(rowsSelectedRef.current).length) {
                 toast.warning(message.warning);
@@ -408,18 +441,18 @@ function GenericIndex({
         } catch (error) {
             console.error(error);
         }
-    }, [
-        setting?.functions?.checkboxUpdate,
-        config.form?.functions?.checkboxUpdate,
-        tableData,
-    ]);
+    }, [getFunctionConfig, tableData]);
 
-    const handleCheckboxDelete = async () => {
+    const handleCheckboxDelete = useCallback(async () => {
         try {
-            const { data, method, message, url } = setting?.functions
-                ?.checkboxDelete
-                ? setting.functions.checkboxDelete
-                : config.form?.functions?.checkboxDelete;
+            const checkboxDeleteConfig = getFunctionConfig('checkboxDelete');
+
+            if (!checkboxDeleteConfig) {
+                console.error('checkboxDelete configuration not found');
+                return;
+            }
+
+            const { data, method, message, url } = checkboxDeleteConfig;
 
             if (!Object.keys(rowsSelectedRef.current).length) {
                 toast.warning(message.warning);
@@ -458,7 +491,7 @@ function GenericIndex({
                 'An error occurred while processing the delete request'
             );
         }
-    };
+    }, [getFunctionConfig, tableData]);
 
     const handleExport = async (e) => {
         try {
@@ -684,48 +717,31 @@ function GenericIndex({
             <Outlet />
 
             <div className={styles.polActions}>
-                {setting.functions?.checkboxUpdate && (
+                {/* Render Update button if checkboxUpdate function is configured in any location */}
+                {getFunctionConfig('checkboxUpdate') && (
                     <button
                         className={styles.btn}
                         onClick={handleCheckboxUpdate}
                     >
-                        {setting.functions.checkboxUpdate.label || 'Update'}
-                    </button>
-                )}
-                {config?.form?.functions?.checkboxUpdate && (
-                    <button
-                        className={styles.btn}
-                        onClick={handleCheckboxUpdate}
-                    >
-                        {config.form.functions.checkboxUpdate.label || 'Update'}
+                        {getFunctionConfig('checkboxUpdate').label || 'Update'}
                     </button>
                 )}
 
-                {setting.functions?.checkboxDelete && (
+                {/* Render Delete button if checkboxDelete function is configured in any location */}
+                {getFunctionConfig('checkboxDelete') && (
                     <button
                         className={styles.btn}
                         onClick={handleCheckboxDelete}
                     >
-                        {setting.functions.checkboxDelete.label || 'Delete'}
-                    </button>
-                )}
-                {config?.form?.functions?.checkboxDelete && (
-                    <button
-                        className={styles.btn}
-                        onClick={handleCheckboxDelete}
-                    >
-                        {config.form.functions.checkboxDelete.label || 'Delete'}
+                        {getFunctionConfig('checkboxDelete').label || 'Delete'}
                     </button>
                 )}
 
-                {setting.functions?.customAction && (
-                    <button className={styles.btn} onClick={handleCustomAction}>
-                        {setting.functions.customAction.label || 'Delete'}
-                    </button>
-                )}
-                {config?.form?.functions?.customAction && (
+                {/* Render Custom Action button if customAction function is configured in any location */}
+                {getFunctionConfig('customAction') && (
                     <button className={styles.btn} onClick={handleCustomAction}>
-                        {config.form.functions.customAction.label || 'Delete'}
+                        {getFunctionConfig('customAction').label ||
+                            'Custom Action'}
                     </button>
                 )}