@visns-studio/visns-components 5.10.4 → 5.10.6

package/package.json

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

package/src/components/crm/DataGrid.jsx

@@ -3027,11 +3027,18 @@ const DataGrid = forwardRef(
             <>
                 {/* Top container with search, action buttons, and auto-refresh */}
                 {/* Only show top container if there are controls to display */}
-                {(!form.searchDisable ||
-                    !form.createDisable ||
-                    (!shouldRelocateAutoRefresh() &&
-                        ajaxSetting &&
-                        ajaxSetting.autoRefresh !== undefined)) && (
+                {(() => {
+                    const hasSearchOrCreate = !form.searchDisable || !form.createDisable;
+                    const hasAutoRefresh = !shouldRelocateAutoRefresh() && ajaxSetting && ajaxSetting.autoRefresh !== undefined;
+                    
+                    // If DataGridSearch would return null (both search and create disabled), 
+                    // only show container if there are other controls besides auto-refresh
+                    if (form.searchDisable === true && form.createDisable === true) {
+                        return false; // Hide AutoRefreshControls when it would be the only control
+                    }
+                    
+                    return hasSearchOrCreate || hasAutoRefresh;
+                })() && (
                     <div className={styles.dataGridTopContainer}>
                         <div className={styles.dataGridTopLeftContainer}>
                             <DataGridSearch

package/src/components/crm/Form.jsx

@@ -819,11 +819,12 @@ function Form({
                                 : null;
 
                             // Check if formData[item.id] is null, undefined, or an empty string AND there's no auto value
-                            if (!formData[item.id] && !autoValue) {
+                            // Note: 0 is considered a valid value for dropdowns/options
+                            if ((formData[item.id] === null || formData[item.id] === undefined || formData[item.id] === '') && !autoValue) {
                                 // Check for required_check dependency
                                 if (
                                     item.required_check &&
-                                    !formData[item.required_check]
+                                    (formData[item.required_check] === null || formData[item.required_check] === undefined || formData[item.required_check] === '')
                                 ) {
                                     validation += `${item.label} is a required field.<br/>`;
                                     _inputClass[item.id] = styles.inputError;
@@ -837,7 +838,7 @@ function Form({
                         } else if (
                             item.required_rely &&
                             formData[item.required_rely] &&
-                            !formData[item.id]
+                            (formData[item.id] === null || formData[item.id] === undefined || formData[item.id] === '')
                         ) {
                             // Check if the dependent required field is empty when it should be filled
                             validation += `${item.label} is a required field.<br/>`;

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

@@ -1740,10 +1740,43 @@ function GenericIndex({
 
             const date = moment().format('YYYYMMDD');
 
+            // Process the export payload
+            let payload = {};
+            if (config.export.payload) {
+                payload = { ...config.export.payload };
+                
+                // Process special values in the payload
+                Object.keys(payload).forEach(key => {
+                    if (payload[key] === 'currentActive()') {
+                        // Get the current active filter value
+                        const activeFilter = subnav?.find(filter => {
+                            if (filter.isParent) {
+                                return filter.children && filter.children.some(child => child.show);
+                            }
+                            return filter.show === true;
+                        });
+
+                        if (activeFilter) {
+                            if (activeFilter.isParent && activeFilter.children && activeFilter.children.length > 0) {
+                                // If it's a parent filter, get the active child's value
+                                const activeChild = activeFilter.children.find(child => child.show);
+                                payload[key] = activeChild ? activeChild.value || activeChild.id : '';
+                            } else {
+                                // For non-parent filters, use the filter's value or id
+                                payload[key] = activeFilter.value || activeFilter.id;
+                            }
+                        } else {
+                            // If no active filter is found, set to empty string
+                            payload[key] = '';
+                        }
+                    }
+                });
+            }
+
             const res = await Download(
                 config.export.url,
                 config.export.method,
-                {}
+                payload
             );
 
             if (res.data.error) {