From cf2dcd8030189e0e8ba51dd314c9965cb41b744a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Tesa=C5=99?=
 <33880579+tesar-tech@users.noreply.github.com>
Date: Wed, 26 Feb 2025 18:15:18 +0100
Subject: [PATCH] DataGrid: Removes new rows created when BatchEdit enabled and
 operation canceled (#5990)

* Removes batchItem from filtered data on Cancel.

* fixes EditingBatchEdit.razor to work also with canceling changes

* Formating

---------

Co-authored-by: Mladen Macanovic <mladen.macanovic@gmail.com>
---
 .../Tests/DataGrid/EditingBatchEdit.razor     | 77 ++++++++++---------
 .../Blazorise.DataGrid/DataGrid.razor.cs      |  6 ++
 2 files changed, 45 insertions(+), 38 deletions(-)

diff --git a/Demos/Blazorise.Demo/Pages/Tests/DataGrid/EditingBatchEdit.razor b/Demos/Blazorise.Demo/Pages/Tests/DataGrid/EditingBatchEdit.razor
index 425713ac0b..e788e1650d 100644
--- a/Demos/Blazorise.Demo/Pages/Tests/DataGrid/EditingBatchEdit.razor
+++ b/Demos/Blazorise.Demo/Pages/Tests/DataGrid/EditingBatchEdit.razor
@@ -31,32 +31,36 @@
                           Responsive
                           ShowPager
                           ShowPageSizes
-                           @bind-SelectedRow="@selectedEmployee"
+                          @bind-SelectedRow="@selectedEmployee"
                           Editable
-                           EditMode="@editMode"
+                          EditMode="@editMode"
                           BatchEdit
-                           BatchChange="OnBatchChange"
-                           BatchSaving="OnBatchSaving"
-                           BatchSaved="OnBatchSaved"
-                           BatchEditCellStyling="OnCellBatchEditStyling"
-                           RowBatchEditStyling="(x, y ) => OnRowBatchEditStyling(x,y)"
+                          BatchChange="OnBatchChange"
+                          BatchSaving="OnBatchSaving"
+                          BatchSaved="OnBatchSaved"
+                          BatchEditCellStyling="OnCellBatchEditStyling"
+                          RowBatchEditStyling="( x, y ) => OnRowBatchEditStyling( x, y )"
                           UseValidation
-                           ValidationsSummaryLabel="The following validation errors have occurred..."
+                          ValidationsSummaryLabel="The following validation errors have occurred..."
                           ShowValidationsSummary>
                     <DataGridColumns>
                         <DataGridCommandColumn>
                             <SaveBatchCommandTemplate>
-                                <Button Background=Background.Info Size=Size.Small Clicked="@context.Clicked">Save Changes (@batchQuantity.ToString())</Button>
-                                </SaveBatchCommandTemplate>
-                                <CancelBatchCommandTemplate>
-                                    <Button Background=Background.Light Size=Size.Small Clicked="@context.Clicked">Cancel Changes</Button>
-                                </CancelBatchCommandTemplate>
-                            </DataGridCommandColumn>
-                            <DataGridColumn TextAlignment="TextAlignment.Center" TItem="Employee" Field="@nameof( Employee.Id )" Caption="#" Width="60px" />
-                            <DataGridColumn TItem="Employee" Field="@nameof( Employee.FirstName )" Caption="First Name" Editable />
-                         <DataGridColumn TItem="Employee" Field="@nameof( Employee.LastName )" Caption="Last Name" Editable />
-                         <DataGridColumn TItem="Employee" Field="@nameof( Employee.Email )" Caption="Email" Editable />
-                         <DataGridColumn TItem="Employee" Field="@nameof( Employee.City )" Caption="City" Editable>
+                                <Button Background=Background.Info Size=Size.Small Clicked="@context.Clicked">
+                                    Save Changes (@(dataGridRef?.BatchChanges?.Count ?? 0))
+                                </Button>
+                            </SaveBatchCommandTemplate>
+                            <CancelBatchCommandTemplate>
+                                <Button Background=Background.Light Size=Size.Small Clicked="@context.Clicked">
+                                    Cancel Changes
+                                </Button>
+                            </CancelBatchCommandTemplate>
+                        </DataGridCommandColumn>
+                        <DataGridColumn TextAlignment="TextAlignment.Center" TItem="Employee" Field="@nameof( Employee.Id )" Caption="#" Width="60px" />
+                        <DataGridColumn TItem="Employee" Field="@nameof( Employee.FirstName )" Caption="First Name" Editable />
+                        <DataGridColumn TItem="Employee" Field="@nameof( Employee.LastName )" Caption="Last Name" Editable />
+                        <DataGridColumn TItem="Employee" Field="@nameof( Employee.Email )" Caption="Email" Editable />
+                        <DataGridColumn TItem="Employee" Field="@nameof( Employee.City )" Caption="City" Editable>
                             <CaptionTemplate>
                                 <Icon Name="IconName.City" /> @context.Caption
                             </CaptionTemplate>
@@ -64,27 +68,26 @@
                         <DataGridColumn TItem="Employee" Field="@nameof( Employee.Zip )" Caption="Zip">
                         </DataGridColumn>
                         <DataGridDateColumn TItem="Employee" Field="@nameof( Employee.DateOfBirth )" DisplayFormat="{0:dd.MM.yyyy}" Caption="Date Of Birth" Editable />
-                         <DataGridNumericColumn TItem="Employee" Field="@nameof( Employee.Childrens )" Caption="Childrens" Editable Filterable="false" />
-                         <DataGridSelectColumn TItem="Employee" Field="@nameof( Employee.Gender )" Caption="Gender" Editable Data="EmployeeData.Genders" ValueField="(x) => ((Gender)x).Code" TextField="(x) => ((Gender)x).Description" />
-                         <DataGridColumn TItem="Employee" Field="@nameof( Employee.Salary )" Caption="Salary" Editable Width="140px" DisplayFormat="{0:C}" DisplayFormatProvider="@System.Globalization.CultureInfo.GetCultureInfo("fr-FR")" TextAlignment="TextAlignment.End">
-                         </DataGridColumn>
-                         <DataGridCheckColumn TItem="Employee" Field="@nameof(Employee.IsActive)" Caption="Active" Editable Filterable="false">
-                             <DisplayTemplate>
-                                 <Check TValue="bool" Checked="context.IsActive" Disabled ReadOnly />
-                             </DisplayTemplate>
-                         </DataGridCheckColumn>
-                     </DataGridColumns>
-                 </DataGrid>
-             </CardBody>
-         </Card>
-     </Column>
- </Row>
+                        <DataGridNumericColumn TItem="Employee" Field="@nameof( Employee.Childrens )" Caption="Childrens" Editable Filterable="false" />
+                        <DataGridSelectColumn TItem="Employee" Field="@nameof( Employee.Gender )" Caption="Gender" Editable Data="EmployeeData.Genders" ValueField="( x ) => ( (Gender)x ).Code" TextField="( x ) => ( (Gender)x ).Description" />
+                        <DataGridColumn TItem="Employee" Field="@nameof( Employee.Salary )" Caption="Salary" Editable Width="140px" DisplayFormat="{0:C}" DisplayFormatProvider="@System.Globalization.CultureInfo.GetCultureInfo( "fr-FR" )" TextAlignment="TextAlignment.End">
+                        </DataGridColumn>
+                        <DataGridCheckColumn TItem="Employee" Field="@nameof( Employee.IsActive )" Caption="Active" Editable Filterable="false">
+                            <DisplayTemplate>
+                                <Check TValue="bool" Checked="context.IsActive" Disabled ReadOnly />
+                            </DisplayTemplate>
+                        </DataGridCheckColumn>
+                    </DataGridColumns>
+                </DataGrid>
+            </CardBody>
+        </Card>
+    </Column>
+</Row>
 
- @code {
+@code {
 
     [Inject] EmployeeData EmployeeData { get; set; }
 
-    private int batchQuantity = 0;
     private DataGrid<Employee> dataGridRef;
     private List<Employee> inMemoryData;
     private Employee selectedEmployee;
@@ -99,7 +102,6 @@
     private Task OnBatchChange( DataGridBatchChangeEventArgs<Employee> args )
     {
         Console.WriteLine( "Batch Change" );
-        batchQuantity = dataGridRef.BatchChanges.Count;
         return Task.CompletedTask;
     }
 
@@ -112,7 +114,6 @@
     private Task OnBatchSaved( DataGridBatchSavedEventArgs<Employee> args )
     {
         Console.WriteLine( "Batch Saved" );
-        batchQuantity = 0;
         return Task.CompletedTask;
     }
 
diff --git a/Source/Extensions/Blazorise.DataGrid/DataGrid.razor.cs b/Source/Extensions/Blazorise.DataGrid/DataGrid.razor.cs
index 704ee6fd83..7f19231e3d 100644
--- a/Source/Extensions/Blazorise.DataGrid/DataGrid.razor.cs
+++ b/Source/Extensions/Blazorise.DataGrid/DataGrid.razor.cs
@@ -1405,6 +1405,12 @@ public async Task Cancel()
     {
         if ( BatchEdit )
         {
+            if ( filteredData is ICollection<TItem> data2 )
+            {
+                foreach ( var newItem in batchChanges.Where( x => x.State == DataGridBatchEditItemState.New ) )
+                    data2.Remove( newItem.NewItem );
+            }
+
             batchChanges?.Clear();
         }