@visns-studio/visns-components 5.8.3 → 5.8.4

package/package.json

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

package/src/components/crm/TableFilter.jsx

@@ -411,8 +411,10 @@ function TableFilter({
                           )
                         : [];
 
-                    // Add the new filter
-                    _where.push({ id: filterId, value: filterValue });
+                    // Add the new filter only if both filterId and filterValue have values
+                    if (filterId && filterValue !== '') {
+                        _where.push({ id: filterId, value: filterValue });
+                    }
 
                     updatedSettings = {
                         ...updatedSettings,
@@ -430,19 +432,27 @@ function TableFilter({
                     // Remove any existing filters that might conflict
                     w = w.filter((item) => item.id !== filterId);
 
-                    // Add the new filter
-                    w.push({ id: filterId, value: filterValue });
+                    // Add the new filter only if both filterId and filterValue have values
+                    if (filterId && filterValue !== '') {
+                        w.push({ id: filterId, value: filterValue });
+                    }
 
                     updatedSettings = { ...updatedSettings, where: w };
                 } else {
                     // If neither ajaxSetting.where nor where exists, create a new ajaxSetting
-                    updatedSettings = {
-                        ...settings,
-                        ajaxSetting: {
-                            ...(settings.ajaxSetting || {}),
-                            where: [{ id: filterId, value: filterValue }],
-                        },
-                    };
+                    // Only apply the filter if both filterId and filterValue have values
+                    if (filterId && filterValue !== '') {
+                        updatedSettings = {
+                            ...settings,
+                            ajaxSetting: {
+                                ...(settings.ajaxSetting || {}),
+                                where: [{ id: filterId, value: filterValue }],
+                            },
+                        };
+                    } else {
+                        // If either filterId or filterValue is empty, just copy the existing settings
+                        updatedSettings = { ...settings };
+                    }
                 }
             }
         }