From dd65d88d94a73e3983d658b60cbcb1eb8616f9b2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ahmet=20=C3=87otur?= <ahmet.cotur@hotmail.com>
Date: Mon, 14 Sep 2020 16:47:17 +0300
Subject: [PATCH] fix tab-checkbox problem for user management modals

---
 .../Pages/Identity/UserManagement.razor              |  4 ++--
 .../Pages/Identity/UserManagement.razor.cs           | 12 +++++++++++-
 2 files changed, 13 insertions(+), 3 deletions(-)

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 85f84dc724..dacc975bb0 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
@@ -70,7 +70,7 @@
             <CloseButton Clicked="CloseCreateModalAsync" />
         </ModalHeader>
         <ModalBody>
-            <Tabs SelectedTab="UserInformations">
+            <Tabs @bind-SelectedTab="@_createModalSelectedTab">
                 <Items>
                     <Tab Name="UserInformations">@L["UserInformations"]</Tab>
                     <Tab Name="Roles">@L["Roles"]</Tab>
@@ -141,7 +141,7 @@
         <ModalBody>
             <input type="hidden" name="ConcurrencyStamp" @bind-value="EditingEntity.ConcurrencyStamp" />
 
-            <Tabs SelectedTab="UserInformations">
+            <Tabs @bind-SelectedTab="@_editModalSelectedTab">
                 <Items>
                     <Tab Name="UserInformations">@L["UserInformations"]</Tab>
                     <Tab Name="Roles">@L["Roles"]</Tab>
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 a239764837..e39c9fe567 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
@@ -12,6 +12,8 @@ namespace Volo.Abp.Identity.Blazor.Pages.Identity
     {
         protected const string PermissionProviderName = "U";
 
+        protected const string DefaultSelectedTab = "UserInformations";
+        
         protected PermissionManagementModal PermissionManagementModal;
 
         protected IReadOnlyList<IdentityRoleDto> Roles;
@@ -19,7 +21,11 @@ namespace Volo.Abp.Identity.Blazor.Pages.Identity
         protected AssignedRoleViewModel[] NewUserRoles;
 
         protected AssignedRoleViewModel[] EditUserRoles;
-
+        
+        protected string _createModalSelectedTab = DefaultSelectedTab;
+        
+        protected string _editModalSelectedTab = DefaultSelectedTab;
+        
         public UserManagementBase()
         {
             ObjectMapperContext = typeof(AbpIdentityBlazorModule);
@@ -34,6 +40,8 @@ namespace Volo.Abp.Identity.Blazor.Pages.Identity
 
         protected override Task OpenCreateModalAsync()
         {
+            _createModalSelectedTab = DefaultSelectedTab;
+            
             NewUserRoles = Roles.Select(x => new AssignedRoleViewModel
                             {
                                 Name = x.Name,
@@ -52,6 +60,8 @@ namespace Volo.Abp.Identity.Blazor.Pages.Identity
 
         protected override async Task OpenEditModalAsync(Guid id)
         {
+            _editModalSelectedTab = DefaultSelectedTab;
+            
             var userRoleNames = (await AppService.GetRolesAsync(id)).Items.Select(r => r.Name).ToList();
 
             EditUserRoles = Roles.Select(x => new AssignedRoleViewModel