From 3aa250b07f99f134cb91b28de6a671e3823896e3 Mon Sep 17 00:00:00 2001
From: Mladen Macanovic <mladen.macanovic@gmail.com>
Date: Fri, 5 Mar 2021 11:58:03 +0100
Subject: [PATCH] InvokeAsync for UiMessageAlert

---
 .../Components/EntityAction.razor.cs          |  9 ++--
 .../Components/UiMessageAlert.razor.cs        | 48 +++++++++++--------
 2 files changed, 35 insertions(+), 22 deletions(-)

diff --git a/framework/src/Volo.Abp.BlazoriseUI/Components/EntityAction.razor.cs b/framework/src/Volo.Abp.BlazoriseUI/Components/EntityAction.razor.cs
index 67d5f39d24..de85dd0131 100644
--- a/framework/src/Volo.Abp.BlazoriseUI/Components/EntityAction.razor.cs
+++ b/framework/src/Volo.Abp.BlazoriseUI/Components/EntityAction.razor.cs
@@ -53,10 +53,13 @@ namespace Volo.Abp.BlazoriseUI.Components
         {
             if (ConfirmationMessage != null)
             {
-                if (await UiMessageService.Confirm(ConfirmationMessage()))
+                await InvokeAsync(async () =>
                 {
-                    await Clicked.InvokeAsync();
-                }
+                    if (await UiMessageService.Confirm(ConfirmationMessage()))
+                    {
+                        await Clicked.InvokeAsync();
+                    }
+                });
             }
             else
             {
diff --git a/framework/src/Volo.Abp.BlazoriseUI/Components/UiMessageAlert.razor.cs b/framework/src/Volo.Abp.BlazoriseUI/Components/UiMessageAlert.razor.cs
index 414745e7a6..50cb9caec8 100644
--- a/framework/src/Volo.Abp.BlazoriseUI/Components/UiMessageAlert.razor.cs
+++ b/framework/src/Volo.Abp.BlazoriseUI/Components/UiMessageAlert.razor.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Generic;
 using System.Text;
 using System.Threading.Tasks;
 using Blazorise;
@@ -87,7 +88,7 @@ namespace Volo.Abp.BlazoriseUI.Components
             UiMessageService.MessageReceived += OnMessageReceived;
         }
 
-        private void OnMessageReceived(object sender, UiMessageEventArgs e)
+        private async void OnMessageReceived(object sender, UiMessageEventArgs e)
         {
             MessageType = e.MessageType;
             Message = e.Message;
@@ -95,7 +96,7 @@ namespace Volo.Abp.BlazoriseUI.Components
             Options = e.Options;
             Callback = e.Callback;
 
-            ModalRef.Show();
+            await InvokeAsync(ModalRef.Show);
         }
 
         public void Dispose()
@@ -106,35 +107,44 @@ namespace Volo.Abp.BlazoriseUI.Components
             }
         }
 
-        protected Task OnOkClicked()
+        protected async Task OnOkClicked()
         {
-            ModalRef.Hide();
+            await InvokeAsync(async () =>
+            {
+                await Okayed.InvokeAsync(null);
 
-            return Okayed.InvokeAsync(null);
+                ModalRef.Hide();
+            });
         }
 
-        protected Task OnConfirmClicked()
+        protected async Task OnConfirmClicked()
         {
-            ModalRef.Hide();
-
-            if (IsConfirmation && Callback != null)
+            await InvokeAsync(async () =>
             {
-                Callback.SetResult(true);
-            }
+                ModalRef.Hide();
+
+                if (IsConfirmation && Callback != null)
+                {
+                    await InvokeAsync(() => Callback.SetResult(true));
+                }
 
-            return Confirmed.InvokeAsync(null);
+                await Confirmed.InvokeAsync(null);
+            });
         }
 
-        protected Task OnCancelClicked()
+        protected async Task OnCancelClicked()
         {
-            ModalRef.Hide();
-
-            if (IsConfirmation && Callback != null)
+            await InvokeAsync(async () =>
             {
-                Callback.SetResult(false);
-            }
+                ModalRef.Hide();
+
+                if (IsConfirmation && Callback != null)
+                {
+                    await InvokeAsync(() => Callback.SetResult(false));
+                }
 
-            return Canceled.InvokeAsync(null);
+                await Canceled.InvokeAsync(null);
+            });
         }
 
         protected virtual void OnModalClosing(ModalClosingEventArgs eventArgs)