improve quick search

loresoft · Aug 27, 2024 · b266724 · b266724
1 parent 91bf192
commit b266724
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 6 deletions.
diff --git a/src/LoreSoft.Blazor.Controls/Data/DataGrid.razor.cs b/src/LoreSoft.Blazor.Controls/Data/DataGrid.razor.cs
@@ -96,14 +96,16 @@ protected async Task ApplyFilters()
     }
 
 
-    public async Task QuickSearch(string searchText)
+    public async Task QuickSearch(string searchText, bool clearFilter = false)
     {
-
-        RootQuery.Filters.Clear();
+        if (clearFilter)
+            RootQuery.Filters.Clear();
+        else
+            RootQuery.Filters.RemoveAll(f => f.Id == nameof(QuickSearch));
 
         if (!string.IsNullOrWhiteSpace(searchText))
         {
-            RootQuery.Logic = QueryLogic.Or;
+            var quickSearch = new QueryGroup { Id = nameof(QuickSearch), Logic = QueryLogic.Or };
 
             // all filterable string columns
             foreach (var column in Columns.Where(c => c.Filterable && c.Type == typeof(string)))
@@ -114,8 +116,10 @@ public async Task QuickSearch(string searchText)
                     Operator = QueryOperators.Contains,
                     Value = searchText
                 };
-                RootQuery.Filters.Add(filter);
+                quickSearch.Filters.Add(filter);
             }
+
+            RootQuery.Filters.Add(quickSearch);
         }
 
         await RefreshAsync(true);

diff --git a/src/LoreSoft.Blazor.Controls/Query/QueryGroup.cs b/src/LoreSoft.Blazor.Controls/Query/QueryGroup.cs
@@ -1,4 +1,4 @@
-using System.Text.Json.Serialization;
+using System.Text.Json.Serialization;
 
 namespace LoreSoft.Blazor.Controls;