From 064a5d1dd1fbf08eaa46340e3aea386da04ad97d 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:14:37 +0300
Subject: [PATCH] remove non-async methods.

---
 .../Abp/BlazoriseUI/BlazoriseCrudPageBase.cs     | 16 ----------------
 .../Pages/Identity/RoleManagement.razor          | 10 +++++-----
 .../Pages/Identity/UserManagement.razor          | 14 +++++++-------
 .../Pages/Identity/UserManagement.razor.cs       |  5 ++---
 4 files changed, 14 insertions(+), 31 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 cd877d202d..bd022c903e 100644
--- a/framework/src/Volo.Abp.BlazoriseUI/Volo/Abp/BlazoriseUI/BlazoriseCrudPageBase.cs
+++ b/framework/src/Volo.Abp.BlazoriseUI/Volo/Abp/BlazoriseUI/BlazoriseCrudPageBase.cs
@@ -168,12 +168,6 @@ namespace Volo.Abp.BlazoriseUI
             StateHasChanged();
         }
 
-        protected virtual void OpenCreateModal()
-        {
-            NewEntity = new TCreateInput();
-            CreateModal.Show();
-        }
-
         protected virtual Task OpenCreateModalAsync()
         {
             NewEntity = new TCreateInput();
@@ -181,11 +175,6 @@ namespace Volo.Abp.BlazoriseUI
             return Task.CompletedTask;
         }
 
-        protected virtual void CloseCreateModal()
-        {
-            CreateModal.Hide();
-        }
-
         protected virtual Task CloseCreateModalAsync()
         {
             CreateModal.Hide();
@@ -202,11 +191,6 @@ namespace Volo.Abp.BlazoriseUI
             EditModal.Show();
         }
 
-        protected virtual void CloseEditModal()
-        {
-            EditModal.Hide();
-        }
-
         protected virtual Task CloseEditModalAsync()
         {
             EditModal.Hide();
diff --git a/modules/identity/src/Volo.Abp.Identity.Blazor/Pages/Identity/RoleManagement.razor b/modules/identity/src/Volo.Abp.Identity.Blazor/Pages/Identity/RoleManagement.razor
index 7693f9df56..a31dba0b81 100644
--- a/modules/identity/src/Volo.Abp.Identity.Blazor/Pages/Identity/RoleManagement.razor
+++ b/modules/identity/src/Volo.Abp.Identity.Blazor/Pages/Identity/RoleManagement.razor
@@ -15,7 +15,7 @@
     </Column>
     <Column ColumnSize="ColumnSize.Is6">
         <Paragraph Alignment="TextAlignment.Right">
-            <Button Color="Color.Primary" Clicked="OpenCreateModal">@L["NewRole"]</Button>
+            <Button Color="Color.Primary" Clicked="OpenCreateModalAsync">@L["NewRole"]</Button>
         </Paragraph>
     </Column>
 </Row>
@@ -65,7 +65,7 @@
     <ModalContent IsCentered="true">
         <ModalHeader>
             <ModalTitle>@L["NewRole"]</ModalTitle>
-            <CloseButton Clicked="CloseCreateModal" />
+            <CloseButton Clicked="CloseCreateModalAsync" />
         </ModalHeader>
         <ModalBody>
             <Field>
@@ -78,7 +78,7 @@
             </Field>
         </ModalBody>
         <ModalFooter>
-            <Button Color="Color.Secondary" Clicked="CloseCreateModal">@L["Cancel"]</Button>
+            <Button Color="Color.Secondary" Clicked="CloseCreateModalAsync">@L["Cancel"]</Button>
             <Button Color="Color.Primary" Clicked="CreateEntityAsync">@L["Save"]</Button>
         </ModalFooter>
     </ModalContent>
@@ -90,7 +90,7 @@
     <ModalContent IsCentered="true">
         <ModalHeader>
             <ModalTitle>Edit role</ModalTitle>
-            <CloseButton Clicked="CloseEditModal" />
+            <CloseButton Clicked="CloseEditModalAsync" />
         </ModalHeader>
         <ModalBody>
             <input type="hidden" name="ConcurrencyStamp" @bind-value="EditingEntity.ConcurrencyStamp" />
@@ -104,7 +104,7 @@
             </Field>
         </ModalBody>
         <ModalFooter>
-            <Button Color="Color.Secondary" Clicked="CloseEditModal">@L["Cancel"]</Button>
+            <Button Color="Color.Secondary" Clicked="CloseEditModalAsync">@L["Cancel"]</Button>
             <Button Color="Color.Primary" Clicked="UpdateEntityAsync">@L["Save"]</Button>
         </ModalFooter>
     </ModalContent>
diff --git a/modules/identity/src/Volo.Abp.Identity.Blazor/Pages/Identity/UserManagement.razor b/modules/identity/src/Volo.Abp.Identity.Blazor/Pages/Identity/UserManagement.razor
index 15086dc7fb..39a58ad3c3 100644
--- a/modules/identity/src/Volo.Abp.Identity.Blazor/Pages/Identity/UserManagement.razor
+++ b/modules/identity/src/Volo.Abp.Identity.Blazor/Pages/Identity/UserManagement.razor
@@ -15,7 +15,7 @@
     </Column>
     <Column ColumnSize="ColumnSize.Is6">
         <Paragraph Alignment="TextAlignment.Right">
-            <Button Color="Color.Primary" Clicked="OpenCreateModal">@L["NewUser"]</Button>
+            <Button Color="Color.Primary" Clicked="OpenCreateModalAsync">@L["NewUser"]</Button>
         </Paragraph>
     </Column>
 </Row>
@@ -67,7 +67,7 @@
     <ModalContent IsCentered="true">
         <ModalHeader>
             <ModalTitle>@L["NewUser"]</ModalTitle>
-            <CloseButton Clicked="CloseCreateModal" />
+            <CloseButton Clicked="CloseCreateModalAsync" />
         </ModalHeader>
         <ModalBody>
             <Tabs SelectedTab="UserInformations">
@@ -124,7 +124,7 @@
             </Tabs>
         </ModalBody>
         <ModalFooter>
-            <Button Color="Color.Secondary" Clicked="CloseCreateModal">@L["Cancel"]</Button>
+            <Button Color="Color.Secondary" Clicked="CloseCreateModalAsync">@L["Cancel"]</Button>
             <Button Color="Color.Primary" Clicked="CreateEntityAsync">@L["Save"]</Button>
         </ModalFooter>
     </ModalContent>
@@ -136,11 +136,11 @@
     <ModalContent IsCentered="true">
         <ModalHeader>
             <ModalTitle>role</ModalTitle>
-            <CloseButton Clicked="CloseEditModal" />
+            <CloseButton Clicked="CloseEditModalAsync" />
         </ModalHeader>
         <ModalBody>
             <input type="hidden" name="ConcurrencyStamp" @bind-value="EditingEntity.ConcurrencyStamp" />
-            
+
             <Tabs SelectedTab="UserInformations">
                 <Items>
                     <Tab Name="UserInformations">@L["UserInformations"]</Tab>
@@ -195,10 +195,10 @@
             </Tabs>
         </ModalBody>
         <ModalFooter>
-            <Button Color="Color.Secondary" Clicked="CloseEditModal">@L["Cancel"]</Button>
+            <Button Color="Color.Secondary" Clicked="CloseEditModalAsync">@L["Cancel"]</Button>
             <Button Color="Color.Primary" Clicked="UpdateEntityAsync">@L["Save"]</Button>
         </ModalFooter>
     </ModalContent>
 </Modal>
 
-<PermissionManagementModal @ref="PermissionManagementModal"/>
\ No newline at end of file
+<PermissionManagementModal @ref="PermissionManagementModal"/>
diff --git a/modules/identity/src/Volo.Abp.Identity.Blazor/Pages/Identity/UserManagement.razor.cs b/modules/identity/src/Volo.Abp.Identity.Blazor/Pages/Identity/UserManagement.razor.cs
index 4eb013a96e..a239764837 100644
--- a/modules/identity/src/Volo.Abp.Identity.Blazor/Pages/Identity/UserManagement.razor.cs
+++ b/modules/identity/src/Volo.Abp.Identity.Blazor/Pages/Identity/UserManagement.razor.cs
@@ -32,16 +32,15 @@ namespace Volo.Abp.Identity.Blazor.Pages.Identity
             Roles = (await AppService.GetAssignableRolesAsync()).Items;
         }
 
-        protected override void OpenCreateModal()
+        protected override Task OpenCreateModalAsync()
         {
-
             NewUserRoles = Roles.Select(x => new AssignedRoleViewModel
                             {
                                 Name = x.Name,
                                 IsAssigned = x.IsDefault
                             }).ToArray();
 
-            base.OpenCreateModal();
+            return base.OpenCreateModalAsync();
         }
 
         protected override Task CreateEntityAsync()