From 749a101bab4f8211be395060e2a00600e9c59f33 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Halil=20=C4=B0brahim=20Kalkan?= <hi_kalkan@yahoo.com>
Date: Sun, 13 Sep 2020 18:23:16 +0300
Subject: [PATCH] Refactor BlazoriseCrudPageBase

---
 .../Abp/BlazoriseUI/BlazoriseCrudPageBase.cs  | 23 ++++++++++---------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/framework/src/Volo.Abp.BlazoriseUI/Volo/Abp/BlazoriseUI/BlazoriseCrudPageBase.cs b/framework/src/Volo.Abp.BlazoriseUI/Volo/Abp/BlazoriseUI/BlazoriseCrudPageBase.cs
index d2a9b009c5..a45d3083db 100644
--- a/framework/src/Volo.Abp.BlazoriseUI/Volo/Abp/BlazoriseUI/BlazoriseCrudPageBase.cs
+++ b/framework/src/Volo.Abp.BlazoriseUI/Volo/Abp/BlazoriseUI/BlazoriseCrudPageBase.cs
@@ -72,13 +72,10 @@ namespace Volo.Abp.BlazoriseUI
         protected int CurrentPage;
         protected string CurrentSorting;
         protected int? TotalCount;
-
-        protected IReadOnlyList<TGetListOutputDto> Entities;
-
+        protected IReadOnlyList<TGetListOutputDto> Entities = Array.Empty<TGetListOutputDto>();
         protected TCreateInput NewEntity;
         protected TKey EditingEntityId;
         protected TUpdateInput EditingEntity;
-
         protected Modal CreateModal;
         protected Modal EditModal;
 
@@ -132,6 +129,14 @@ namespace Volo.Abp.BlazoriseUI
         }
 
         protected virtual async Task GetEntitiesAsync()
+        {
+            var input = await CreateGetListInputAsync();
+            var result = await AppService.GetListAsync(input);
+            Entities = result.Items;
+            TotalCount = (int?) result.TotalCount;
+        }
+
+        protected virtual Task<TGetListInput> CreateGetListInputAsync()
         {
             var input = new TGetListInput();
 
@@ -150,10 +155,7 @@ namespace Volo.Abp.BlazoriseUI
                 limitedResultRequestInput.MaxResultCount = PageSize;
             }
 
-            var result = await AppService.GetListAsync(input);
-
-            Entities = result.Items;
-            TotalCount = (int?) result.TotalCount;
+            return Task.FromResult(input);
         }
 
         protected virtual async Task OnDataGridReadAsync(DataGridReadDataEventArgs<TGetListOutputDto> e)
@@ -162,9 +164,10 @@ namespace Volo.Abp.BlazoriseUI
                 .Where(c => c.Direction != SortDirection.None)
                 .Select(c => c.Field + (c.Direction == SortDirection.Descending ? " DESC" : ""))
                 .JoinAsString(",");
-
             CurrentPage = e.Page - 1;
+
             await GetEntitiesAsync();
+
             StateHasChanged();
         }
 
@@ -184,10 +187,8 @@ namespace Volo.Abp.BlazoriseUI
         protected virtual async Task OpenEditModalAsync(TKey id)
         {
             var entityDto = await AppService.GetAsync(id);
-
             EditingEntityId = id;
             EditingEntity = ObjectMapper.Map<TGetOutputDto, TUpdateInput>(entityDto);
-
             EditModal.Show();
         }