From d76b7a6b38ddfd50e5a3322da237d95328698819 Mon Sep 17 00:00:00 2001
From: Ilkay Ilknur <ilkay@ilkayilknur.com>
Date: Tue, 23 Mar 2021 19:04:39 +0300
Subject: [PATCH] change page toolbar call order.

---
 .../Layout/PageHeader.razor.cs                   | 14 +++++++++++---
 .../src/Volo.Abp.BlazoriseUI/AbpCrudPageBase.cs  | 16 ++++++++++++++--
 2 files changed, 25 insertions(+), 5 deletions(-)

diff --git a/framework/src/Volo.Abp.AspNetCore.Components.Web.Theming/Layout/PageHeader.razor.cs b/framework/src/Volo.Abp.AspNetCore.Components.Web.Theming/Layout/PageHeader.razor.cs
index aa547bba98..365df5f713 100644
--- a/framework/src/Volo.Abp.AspNetCore.Components.Web.Theming/Layout/PageHeader.razor.cs
+++ b/framework/src/Volo.Abp.AspNetCore.Components.Web.Theming/Layout/PageHeader.razor.cs
@@ -1,4 +1,5 @@
-using Microsoft.AspNetCore.Components;
+using System;
+using Microsoft.AspNetCore.Components;
 using System.Collections.Generic;
 using System.Threading.Tasks;
 using Volo.Abp.AspNetCore.Components.Web.Theming.PageToolbars;
@@ -39,12 +40,14 @@ namespace Volo.Abp.AspNetCore.Components.Web.Theming.Layout
             ToolbarItemRenders = new List<RenderFragment>();
         }
 
-        protected override async Task OnInitializedAsync()
+        protected override async Task OnParametersSetAsync()
         {
+            await base.OnParametersSetAsync();
             if (Toolbar!=null)
             {
+                Console.WriteLine("Toolbar is not null");
                 var toolbarItems = await PageToolbarManager.GetItemsAsync(Toolbar);
-
+                Console.WriteLine($"Toolbar item count:{toolbarItems.Length}");
                 ToolbarItemRenders.Clear();
 
                 foreach (var item in toolbarItems)
@@ -66,5 +69,10 @@ namespace Volo.Abp.AspNetCore.Components.Web.Theming.Layout
                 }
             }
         }
+
+        protected override async Task OnInitializedAsync()
+        {
+            await base.OnInitializedAsync();
+        }
     }
 }
diff --git a/framework/src/Volo.Abp.BlazoriseUI/AbpCrudPageBase.cs b/framework/src/Volo.Abp.BlazoriseUI/AbpCrudPageBase.cs
index e97c8bf805..6ce4a10a53 100644
--- a/framework/src/Volo.Abp.BlazoriseUI/AbpCrudPageBase.cs
+++ b/framework/src/Volo.Abp.BlazoriseUI/AbpCrudPageBase.cs
@@ -217,10 +217,21 @@ namespace Volo.Abp.BlazoriseUI
             await SetPermissionsAsync();
             await SetEntityActionsAsync();
             await SetTableColumnsAsync();
-            await SetToolbarItemsAsync();
-            await SetBreadcrumbItemsAsync();
+            await InvokeAsync(StateHasChanged);
+        }
+
+        protected override async Task OnAfterRenderAsync(bool firstRender)
+        {
+            if (firstRender)
+            {
+                await base.OnAfterRenderAsync(firstRender);
+                await SetToolbarItemsAsync();
+                await SetBreadcrumbItemsAsync();
+            }
         }
 
+
+
         protected virtual async Task SetPermissionsAsync()
         {
             if (CreatePolicyName != null)
@@ -477,6 +488,7 @@ namespace Volo.Abp.BlazoriseUI
 
                 await AppService.DeleteAsync(entity.Id);
                 await GetEntitiesAsync();
+                await InvokeAsync(StateHasChanged);
             }
             catch (Exception ex)
             {