chore: update grid batch editing example to 3.0.1

Author: ivanchev

grid/batch-editing/BatchEditing.csproj

@@ -1,12 +1,11 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
-    <LangVersion>7.3</LangVersion>
+    <TargetFramework>net5.0</TargetFramework>
   </PropertyGroup>
 
-  <ItemGroup>
-    <PackageReference Include="Telerik.UI.for.Blazor" Version="2.20.0" />
+  <ItemGroup>
+    <PackageReference Include="Telerik.UI.for.Blazor" Version="3.0.1" />
   </ItemGroup>
 
 </Project>

grid/batch-editing/Data/BatchEditingService.cs

@@ -46,8 +46,8 @@ public Task<List<BatchEditModel>> BatchUpdate(
 
             foreach (BatchEditModel item in insertedItems)
             {
-                item.Id = Data.Last().Id + 1;
-                Data.Add(item);
+                item.Id = Data.Max(item => item.Id) + 1;
+                Data.Insert(0, item);
             }
 
             foreach (BatchEditModel item in updatedItems)

grid/batch-editing/Data/WeatherForecast.cs

@@ -11,16 +11,16 @@
              SelectionMode="@GridSelectionMode.Multiple" @bind-SelectedItems="@SelectedItems">
     <GridToolBar>
         @{
-            if (GridIsDirty())
+            <GridCommandButton Command="Add" Icon="add">Add Employee</GridCommandButton>
+            @if (GridIsDirty)
             {
-                <TelerikButton Icon="save" OnClick="@SaveAllChanges" Primary="true">Save All Changes</TelerikButton>
+                <TelerikButton Icon="save" OnClick="@SaveAllChanges" ThemeColor="@(ThemeConstants.Button.ThemeColor.Primary)">Save All Changes</TelerikButton>
                 <TelerikButton Icon="cancel" OnClick="@RevertAllChanges">Cancel All Changes</TelerikButton>
             }
-            <GridCommandButton Command="Add" Icon="add">Add Employee</GridCommandButton>
             if (SelectedItems.Count() > 0)
             {
                 <TelerikButton Icon="delete" OnClick="@DeleteSelected">Delete Selected</TelerikButton>
-                if (SelectionIsDirty())
+                if (SelectionIsDirty)
                 {
                     <TelerikButton Icon="undo" OnClick="@RevertSelected">Revert Selected</TelerikButton>
                 }
@@ -39,7 +39,7 @@
                     }
                     else if (currItem.IsDeleted)
                     {
-                        <TelerikButton Icon="arrow-up" OnClick="@( () => UndeleteItem(currItem) )">Undelete</TelerikButton>
+                        <TelerikButton Icon="arrow-up" OnClick="@( () => RestoreItem(currItem) )">Restore</TelerikButton>
                     }
                     else if (currItem.IsChanged)
                     {

grid/batch-editing/Data/WeatherForecastService.cs

@@ -16,9 +16,12 @@ public class IndexBase : ComponentBase
         BatchEditingService theService { get; set; }
         public ObservableCollection<BatchEditModel> LocalData { get; set; }
         private List<BatchEditModel> PristineItems { get; set; } = new List<BatchEditModel>();
-
         public IEnumerable<BatchEditModel> SelectedItems { get; set; } = Enumerable.Empty<BatchEditModel>();
 
+        public bool GridIsDirty => LocalData.ToList().Exists(itm => itm.IsDirty);
+
+        public bool SelectionIsDirty => SelectedItems.ToList().Exists(itm => itm.IsDirty);
+
         protected override async Task OnInitializedAsync()
         {
             await FetchData();
@@ -45,15 +48,14 @@ public void EditHandler(GridCommandEventArgs args)
         public void UpdateHandler(GridCommandEventArgs args)
         {
             BatchEditModel item = (BatchEditModel)args.Item;
-            BatchEditModel localItem = GetItemFromCollection(LocalData, item);
 
             if (!item.IsDirty)
             {
-                BatchEditModel pristineItm = GetItemFromCollection(PristineItems, item);
-                if (pristineItm == null)
-                {
+                BatchEditModel pristineItem = GetItemFromCollection(PristineItems, item);
+                if (pristineItem == null)
+                {
                     //add only the first time a field is edited, later it is no longer pristine
-                    PristineItems.Add(localItem);
+                    PristineItems.Add(GetItemFromCollection(LocalData, item));
                 }
             }
 
@@ -64,7 +66,7 @@ public void UpdateHandler(GridCommandEventArgs args)
         public void CreateHandler(GridCommandEventArgs args)
         {
             BatchEditModel item = (BatchEditModel)args.Item;
-            item.Id = LocalData.Count + 1;
+            item.Id = LocalData.Max(model => model.Id) + 1;
             item.IsNew = true;
             LocalData.Insert(0, item);
         }
@@ -78,16 +80,6 @@ public void DeleteHandler(GridCommandEventArgs args)
             //show notification for undelete
         }
 
-        public bool GridIsDirty()
-        {
-            return LocalData.ToList().Exists(itm => itm.IsDirty);
-        }
-
-        public bool SelectionIsDirty()
-        {
-            return SelectedItems.ToList().Exists(itm => itm.IsDirty);
-        }
-
         private void ChangeLocalItem(BatchEditModel item)
         {
             var index = LocalData.ToList().FindIndex(i => i.Id == item.Id);
@@ -112,59 +104,58 @@ public async Task SaveAllChanges()
             LocalData = new ObservableCollection<BatchEditModel>(newData);
         }
 
-        public async Task RevertAllChanges()
+        public void RevertAllChanges()
         {
             for (int i = LocalData.Count - 1; i >= 0; i--)
             {
                 if (LocalData[i].IsDirty)
                 {
-                    await RevertItem(LocalData[i]);
+                    RevertItem(LocalData[i]);
                 }
             }
             StateHasChanged();
         }
 
-        public async Task UndeleteItem(BatchEditModel itmToUndelete)
+        public void RestoreItem(BatchEditModel item)
         {
-            BatchEditModel itm = GetItemFromCollection(LocalData, itmToUndelete);
-            if (itm != null)
+            BatchEditModel localItem = GetItemFromCollection(LocalData, item);
+            if (localItem != null)
             {
-                itm.IsDeleted = false;
+                localItem.IsDeleted = false;
             }
         }
 
-        public async Task RevertItem(BatchEditModel itmToUndelete)
+        public void RevertItem(BatchEditModel item)
         {
-            if (itmToUndelete.IsNew)
+            if (item.IsNew)
             {
-                LocalData.Remove(itmToUndelete);
+                LocalData.Remove(item);
             }
-            if (itmToUndelete.IsDeleted)
+            if (item.IsDeleted)
             {
-                itmToUndelete.IsDeleted = false;
-                ChangeLocalItem(itmToUndelete);
+                item.IsDeleted = false;
+                ChangeLocalItem(item);
             }
-            if (itmToUndelete.IsChanged)
+            if (item.IsChanged)
             {
-                BatchEditModel pristineItem = GetItemFromCollection(PristineItems, itmToUndelete);
+                BatchEditModel pristineItem = GetItemFromCollection(PristineItems, item);
                 if (pristineItem != null)
                 {
-                    itmToUndelete = pristineItem;
-                    ChangeLocalItem(itmToUndelete);
+                    ChangeLocalItem(pristineItem);
                     PristineItems.Remove(pristineItem);
                 }
             }
         }
 
-        public async Task RevertSelected()
+        public void RevertSelected()
         {
             foreach (BatchEditModel item in SelectedItems)
             {
-                await RevertItem(item);
+                RevertItem(item);
             }
         }
 
-        public async Task DeleteItem(BatchEditModel itmToDelete)
+        public void DeleteItem(BatchEditModel itmToDelete)
         {
             BatchEditModel localItem = GetItemFromCollection(LocalData, itmToDelete);
             if (localItem != null)
@@ -184,15 +175,14 @@ public async Task DeleteItem(BatchEditModel itmToDelete)
             }
         }
 
-        public async Task DeleteSelected()
+        public void DeleteSelected()
         {
             foreach (BatchEditModel item in SelectedItems)
             {
-                await DeleteItem(item);
+                DeleteItem(item);
             }
         }
 
-
         private BatchEditModel GetItemFromCollection(IList<BatchEditModel> collection, BatchEditModel itmToFind)
         {
             var index = collection.ToList().FindIndex(i => i.Id == itmToFind.Id);