Merge branch 'blazor-ui' of https://github.com/abpframework/abp into blazor-ui

modules/identity/src/Volo.Abp.Identity.Blazor/AbpIdentityBlazorAutoMapperProfile.cs

@@ -7,6 +7,11 @@ namespace Volo.Abp.Identity.Blazor
     {
         public AbpIdentityBlazorAutoMapperProfile()
         {
+            CreateMap<IdentityUserDto, IdentityUserUpdateDto>()
+                .MapExtraProperties()
+                .Ignore(x => x.Password)
+                .Ignore(x => x.RoleNames);
+            
             CreateMap<IdentityRoleDto, IdentityRoleUpdateDto>()
                 .MapExtraProperties();
 

modules/identity/src/Volo.Abp.Identity.Blazor/Pages/Identity/UserManagement.razor

@@ -4,6 +4,7 @@
 @using Microsoft.Extensions.Localization
 @using Volo.Abp.Application.Dtos
 @using Volo.Abp.Identity.Localization
+@using Volo.Abp.PermissionManagement.Blazor.Components
 @inherits BlazorisePageBase<IIdentityUserAppService, IdentityUserDto, Guid, GetIdentityUsersInput, IdentityUserCreateDto, IdentityUserUpdateDto>
 @inject IStringLocalizer<IdentityResource> L
 
@@ -35,6 +36,7 @@
                     </DropdownToggle>
                     <DropdownMenu>
                         <DropdownItem Clicked="() => OpenEditModalAsync(context.As<IdentityUserDto>().Id)">@L["Edit"]</DropdownItem>
+                        <DropdownItem Clicked="() => PermissionManagementModal.OpenAsync(PermissionProviderName,context.As<IdentityUserDto>().Id.ToString())">@L["Permissions"]</DropdownItem>
                         <DropdownDivider/>
                         <DropdownItem Clicked="() => DeleteEntityAsync(context.As<IdentityUserDto>())">@L["Delete"]</DropdownItem>
                     </DropdownMenu>
@@ -89,7 +91,7 @@
                         </Field>
                         <Field>
                             <FieldLabel>@L["DisplayName:Password"]</FieldLabel>
-                            <TextEdit @bind-text="NewEntity.Password" />
+                            <TextEdit Role="TextRole.Password" @bind-text="NewEntity.Password" />
                         </Field>
                         <Field>
                             <FieldLabel>@L["DisplayName:Email"]</FieldLabel>
@@ -107,9 +109,9 @@
                         </Field>
                     </TabPanel>
                     <TabPanel Name="Roles">
-                        @if (NewEntityRoles != null)
+                        @if (NewUserRoles != null)
                         {
-                            @foreach (var role in NewEntityRoles)
+                            @foreach (var role in NewUserRoles)
                             {
                                 <Field>
                                     <input type="hidden" @bind-value="@role.Name" />
@@ -160,7 +162,7 @@
                         </Field>
                         <Field>
                             <FieldLabel>@L["DisplayName:Password"]</FieldLabel>
-                            <TextEdit @bind-text="EditingEntity.Password" />
+                            <TextEdit Role="TextRole.Password" @bind-text="EditingEntity.Password" />
                         </Field>
                         <Field>
                             <FieldLabel>@L["DisplayName:Email"]</FieldLabel>
@@ -178,9 +180,9 @@
                         </Field>
                     </TabPanel>
                     <TabPanel Name="Roles">
-                        @if (EditEntityRoles != null)
+                        @if (EditUserRoles != null)
                         {
-                            @foreach (var role in EditEntityRoles)
+                            @foreach (var role in EditUserRoles)
                             {
                                 <Field>
                                     <input type="hidden" @bind-value="@role.Name" />
@@ -197,4 +199,6 @@
             <Button Color="Color.Primary" Clicked="UpdateEntityAsync">@L["Save"]</Button>
         </ModalFooter>
     </ModalContent>
-</Modal>
+</Modal>
+
+<PermissionManagementModal @ref="PermissionManagementModal"/>

modules/identity/src/Volo.Abp.Identity.Blazor/Pages/Identity/UserManagement.razor.cs

@@ -15,9 +15,9 @@ namespace Volo.Abp.Identity.Blazor.Pages.Identity
 
         protected IReadOnlyList<IdentityRoleDto> Roles;
 
-        protected AssignedRoleViewModel[] NewEntityRoles;
+        protected AssignedRoleViewModel[] NewUserRoles;
         
-        protected AssignedRoleViewModel[] EditEntityRoles;
+        protected AssignedRoleViewModel[] EditUserRoles;
         
         public UserManagement()
         {
@@ -34,7 +34,7 @@ namespace Volo.Abp.Identity.Blazor.Pages.Identity
         protected override void OpenCreateModal()
         {
             
-            NewEntityRoles = Roles.Select(x => new AssignedRoleViewModel
+            NewUserRoles = Roles.Select(x => new AssignedRoleViewModel
                             {
                                 Name = x.Name,
                                 IsAssigned = x.IsDefault
@@ -45,7 +45,7 @@ namespace Volo.Abp.Identity.Blazor.Pages.Identity
 
         protected override Task CreateEntityAsync()
         {
-            NewEntity.RoleNames = NewEntityRoles.Where(x => x.IsAssigned).Select(x => x.Name).ToArray();
+            NewEntity.RoleNames = NewUserRoles.Where(x => x.IsAssigned).Select(x => x.Name).ToArray();
             
             return base.CreateEntityAsync();
         }
@@ -54,7 +54,7 @@ namespace Volo.Abp.Identity.Blazor.Pages.Identity
         {
             var userRoleNames = (await AppService.GetRolesAsync(id)).Items.Select(r => r.Name).ToList();
             
-            EditEntityRoles = Roles.Select(x => new AssignedRoleViewModel
+            EditUserRoles = Roles.Select(x => new AssignedRoleViewModel
                                 {
                                     Name = x.Name,
                                     IsAssigned = userRoleNames.Contains(x.Name)
@@ -65,7 +65,7 @@ namespace Volo.Abp.Identity.Blazor.Pages.Identity
 
         protected override Task UpdateEntityAsync()
         {
-            EditingEntity.RoleNames = EditEntityRoles.Where(x => x.IsAssigned).Select(x => x.Name).ToArray();
+            EditingEntity.RoleNames = EditUserRoles.Where(x => x.IsAssigned).Select(x => x.Name).ToArray();
             
             return base.UpdateEntityAsync();
         }