new fix

DevExpress · Dec 12, 2024 · 3bf6c5c · 3bf6c5c
1 parent 568be08
commit 3bf6c5c
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/packages/devextreme/js/__internal/grids/grid_core/filter/m_filter_sync.ts b/packages/devextreme/js/__internal/grids/grid_core/filter/m_filter_sync.ts
@@ -122,9 +122,13 @@ const updateFilterRowCondition = function (columnsController, column, condition)
   const filterValue = condition?.[2];
   const filterOperations = column.filterOperations || column.defaultFilterOperations;
 
-  if ((!filterOperations || filterOperations.indexOf(selectedFilterOperation) >= 0 || selectedFilterOperation === column.defaultFilterOperation)
-          && FILTER_ROW_OPERATIONS.includes(selectedFilterOperation) && filterValue !== null) {
-    if (selectedFilterOperation === column.defaultFilterOperation && !isDefined(column.selectedFilterOperation)) {
+  const selectedOperationExists = filterOperations.indexOf(selectedFilterOperation) >= 0;
+  const defaultOperationSelected = selectedFilterOperation === column.defaultFilterOperation;
+  const builtInOperationSelected = FILTER_ROW_OPERATIONS.includes(selectedFilterOperation);
+  const filterValueNotNullOrEmpty = filterValue !== null && filterValue !== '';
+
+  if ((!filterOperations || selectedOperationExists || defaultOperationSelected) && builtInOperationSelected && filterValueNotNullOrEmpty) {
+    if (defaultOperationSelected && !isDefined(column.selectedFilterOperation)) {
       selectedFilterOperation = column.selectedFilterOperation;
     }
     filterRowOptions = {