From 151dba340a1af87fc5993a7acd1d593be835d223 Mon Sep 17 00:00:00 2001
From: Paul Welter <pwelter@loresoft.com>
Date: Mon, 10 Jun 2024 16:01:53 -0500
Subject: [PATCH] add FilterTemplate  to data grid

---
 .../QueryBuilder/Examples/Templates.razor     |  2 +-
 .../Data/DataColumn.cs                        |  3 +++
 .../Data/DataGrid.razor                       |  4 +++-
 .../Extensions/QueryExtensions.cs             | 23 +++++++++++++++++--
 4 files changed, 28 insertions(+), 4 deletions(-)

diff --git a/samples/Sample.Core/Pages/QueryBuilder/Examples/Templates.razor b/samples/Sample.Core/Pages/QueryBuilder/Examples/Templates.razor
index 27dbd08..383d5da 100644
--- a/samples/Sample.Core/Pages/QueryBuilder/Examples/Templates.razor
+++ b/samples/Sample.Core/Pages/QueryBuilder/Examples/Templates.razor
@@ -13,7 +13,7 @@
             <ValueTemplate Context="filter">
                 <select value="@Binding.Format(filter.Value)"
                         @onchange="e => filter.Value = Binding.Convert<string>(e.Value)">
-                    <option>- Select Bank -</option>
+                    <option value="">- Select Bank -</option>
                     <option value="Chase Bank">Chase Bank</option>
                     <option value="Bank of America">Bank of America</option>
                     <option value="Wells Fargo">Wells Fargo</option>
diff --git a/src/LoreSoft.Blazor.Controls/Data/DataColumn.cs b/src/LoreSoft.Blazor.Controls/Data/DataColumn.cs
index 351970f..cbd9c66 100644
--- a/src/LoreSoft.Blazor.Controls/Data/DataColumn.cs
+++ b/src/LoreSoft.Blazor.Controls/Data/DataColumn.cs
@@ -75,6 +75,9 @@ public class DataColumn<TItem> : ComponentBase
     [Parameter]
     public RenderFragment FooterTemplate { get; set; }
 
+    [Parameter]
+    public RenderFragment<QueryFilter> FilterTemplate { get; set; }
+
 
     internal int CurrentSortIndex { get; set; } = -1;
 
diff --git a/src/LoreSoft.Blazor.Controls/Data/DataGrid.razor b/src/LoreSoft.Blazor.Controls/Data/DataGrid.razor
index 088f869..bd9cb5b 100644
--- a/src/LoreSoft.Blazor.Controls/Data/DataGrid.razor
+++ b/src/LoreSoft.Blazor.Controls/Data/DataGrid.razor
@@ -111,7 +111,9 @@
                                         <QueryFields>
                                             @foreach (var column in Columns.Where(c => c.Filterable))
                                             {
-                                                <QueryBuilderField Field="column.Property" Title="@column.HeaderTitle()" />
+                                                <QueryBuilderField Field="column.Property"
+                                                                   Title="@column.HeaderTitle()"
+                                                                   ValueTemplate="@column.FilterTemplate" />
                                             }
                                         </QueryFields>
                                     </QueryBuilder>
diff --git a/src/LoreSoft.Blazor.Controls/Extensions/QueryExtensions.cs b/src/LoreSoft.Blazor.Controls/Extensions/QueryExtensions.cs
index 1209e9a..ba0f6f6 100644
--- a/src/LoreSoft.Blazor.Controls/Extensions/QueryExtensions.cs
+++ b/src/LoreSoft.Blazor.Controls/Extensions/QueryExtensions.cs
@@ -1,10 +1,10 @@
 #nullable enable
 
-using LoreSoft.Blazor.Controls.Utilities;
-
 using System.Linq.Dynamic.Core;
 using System.Text;
 
+using LoreSoft.Blazor.Controls.Utilities;
+
 namespace LoreSoft.Blazor.Controls.Extensions;
 
 public static class QueryExtensions
@@ -62,4 +62,23 @@ public static IQueryable<T> Filter<T>(this IQueryable<T> query, QueryRule filter
 
         return query.Where(predicate, parameters);
     }
+
+    public static DataResult<T> DataQuery<T>(this IQueryable<T> query, DataRequest request)
+    {
+        var filterQuery = query.Filter(request.Query);
+
+        var total = filterQuery.Count();
+
+        if (total == 0)
+            return new DataResult<T>(total, []);
+
+        var sortedQuery = filterQuery.Sort(request.Sorts);
+
+        if (request.Page > 0 && request.PageSize > 0)
+            sortedQuery = sortedQuery.Page(request.Page, request.PageSize);
+
+        var results = sortedQuery.ToList();
+
+        return new DataResult<T>(total, results);
+    }
 }