From 8db9fc3f17c571bf2cb77e37f2fd0a5b2c3ad801 Mon Sep 17 00:00:00 2001
From: Vladimir Enchev <vladimir.enchev@gmail.com>
Date: Tue, 1 Aug 2023 11:08:49 +0300
Subject: [PATCH] other filtering demos improved to respect auto-filter setting
 in template filters

---
 RadzenBlazorDemos/Pages/DataFilterLoadData.razor | 16 ++++++++++++++--
 RadzenBlazorDemos/Pages/DataFilterOData.razor    | 16 ++++++++++++++--
 2 files changed, 28 insertions(+), 4 deletions(-)

diff --git a/RadzenBlazorDemos/Pages/DataFilterLoadData.razor b/RadzenBlazorDemos/Pages/DataFilterLoadData.razor
index 24d1737ac02..0b741b76b34 100644
--- a/RadzenBlazorDemos/Pages/DataFilterLoadData.razor
+++ b/RadzenBlazorDemos/Pages/DataFilterLoadData.razor
@@ -9,14 +9,14 @@
     <RadzenStack Orientation="Orientation.Horizontal" Gap="0.5rem" AlignItems="AlignItems.Center" Class="rz-p-4 rz-border-radius-1" Style="border: var(--rz-grid-cell-border);">
         <RadzenCheckBox @bind-Value="@auto" Name="auto" />
         <RadzenLabel Text="Auto filter" Component="auto" Class="rz-me-6" />
-        <RadzenButton Text="Apply Filter" Click="@(args => dataFilter.Filter())" Disabled="@auto" Size="ButtonSize.Small" />
+        <RadzenButton Text="Apply Filter" Click="@ApplyFilter" Disabled="@auto" Size="ButtonSize.Small" />
     </RadzenStack>
 
     <RadzenDataFilter @ref="dataFilter" Auto=auto Data="@orders" TItem="Order" ViewChanged=@(view => ordersGrid.Reload())>
         <Properties>
             <RadzenDataFilterProperty TItem="Order" Property="OrderID" Title="Order ID" />
             <RadzenDataFilterProperty TItem="Order" Property="Employee.LastName" Title="Employee Last Name" />
-            <MyCustomEnumerableDataFilterProperty TItem="Order" Property="Employee.Title" Title="Employee Title" FilterValue="@selectedTitles"
+            <MyCustomEnumerableDataFilterProperty TItem="Order" Property="Employee.Title" Title="Employee Title" FilterValue="@finalSelectedTitles"
                                                     Type="typeof(IEnumerable<string>)" FilterOperator="FilterOperator.Contains">
                 <FilterTemplate>
                     <RadzenDropDown @bind-Value=@selectedTitles Style="width:100%;"
@@ -69,6 +69,7 @@
 
     List<string> titles = new List<string> { "Sales Representative", "Vice President, Sales", "Sales Manager", "Inside Sales Coordinator" };
     IEnumerable<string> selectedTitles;
+    IEnumerable<string> finalSelectedTitles;
 
     async Task OnSelectedTitlesChange(object value)
     {
@@ -77,9 +78,20 @@
             selectedTitles = null;
         }
 
+        if (auto)
+        {
+            finalSelectedTitles = selectedTitles;
+        }
+
         await ordersGrid.FirstPage();
     }
 
+    async Task ApplyFilter()
+    {
+        finalSelectedTitles = selectedTitles;
+        await dataFilter.Filter();
+    }
+
     protected override async Task OnAfterRenderAsync(bool firstRender)
     {
         await base.OnAfterRenderAsync(firstRender);
diff --git a/RadzenBlazorDemos/Pages/DataFilterOData.razor b/RadzenBlazorDemos/Pages/DataFilterOData.razor
index dacbce9ccff..382ad0df91d 100644
--- a/RadzenBlazorDemos/Pages/DataFilterOData.razor
+++ b/RadzenBlazorDemos/Pages/DataFilterOData.razor
@@ -8,14 +8,14 @@
     <RadzenStack Orientation="Orientation.Horizontal" Gap="0.5rem" AlignItems="AlignItems.Center" Class="rz-p-4 rz-border-radius-1" Style="border: var(--rz-grid-cell-border);">
         <RadzenCheckBox @bind-Value="@auto" Name="auto" />
         <RadzenLabel Text="Auto filter" Component="auto" Class="rz-me-6" />
-        <RadzenButton Text="Apply Filter" Click="@(args => dataFilter.Filter())" Disabled="@auto" Size="ButtonSize.Small" />
+        <RadzenButton Text="Apply Filter" Click="@ApplyFilter" Disabled="@auto" Size="ButtonSize.Small" />
     </RadzenStack>
 
     <RadzenDataFilter @ref="dataFilter" Auto=auto Data="@orders" TItem="Order" ViewChanged=@(view => ordersGrid.Reload())>
         <Properties>
             <RadzenDataFilterProperty TItem="Order" Property="OrderID" Title="Order ID" />
             <RadzenDataFilterProperty TItem="Order" Property="Employee.LastName" Title="Employee Last Name" />
-            <MyCustomEnumerableDataFilterProperty TItem="Order" Property="Employee.Title" Title="Employee Title" FilterValue="@selectedTitles"
+            <MyCustomEnumerableDataFilterProperty TItem="Order" Property="Employee.Title" Title="Employee Title" FilterValue="@finalSelectedTitles"
                                                     Type="typeof(IEnumerable<string>)" FilterOperator="FilterOperator.Contains">
                 <FilterTemplate>
                     <RadzenDropDown @bind-Value=@selectedTitles Style="width:100%;"
@@ -68,6 +68,7 @@
 
     List<string> titles = new List<string> { "Sales Representative", "Vice President, Sales", "Sales Manager", "Inside Sales Coordinator" };
     IEnumerable<string> selectedTitles;
+    IEnumerable<string> finalSelectedTitles;
 
     async Task OnSelectedTitlesChange(object value)
     {
@@ -76,9 +77,20 @@
             selectedTitles = null;
         }
 
+        if (auto)
+        {
+            finalSelectedTitles = selectedTitles;
+        }
+
         await ordersGrid.FirstPage();
     }
 
+    async Task ApplyFilter()
+    {
+        finalSelectedTitles = selectedTitles;
+        await dataFilter.Filter();
+    }
+
     protected override async Task OnAfterRenderAsync(bool firstRender)
     {
         await base.OnAfterRenderAsync(firstRender);