Merge pull request #17531 from abpframework/auto-merge/rel-7-3/2159

Merge branch rel-7.4 with rel-7.3

modules/identity/src/Volo.Abp.Identity.Application/Volo/Abp/Identity/IdentityUserAppService.cs

@@ -173,7 +173,10 @@ public class IdentityUserAppService : IdentityAppServiceBase, IIdentityUserAppSe
             (await UserManager.SetPhoneNumberAsync(user, input.PhoneNumber)).CheckErrors();
         }
 
-        (await UserManager.SetLockoutEnabledAsync(user, input.LockoutEnabled)).CheckErrors();
+        if (user.Id != CurrentUser.Id)
+        {
+            (await UserManager.SetLockoutEnabledAsync(user, input.LockoutEnabled)).CheckErrors();
+        }
 
         user.Name = input.Name;
         user.Surname = input.Surname;

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

@@ -129,9 +129,12 @@
                                     <Field>
                                         <Check TValue="bool" @bind-Checked="@NewEntity.IsActive">@L["DisplayName:IsActive"]</Check>
                                     </Field>
-                                    <Field>
+                                    @if (!IsEditCurrentUser)
-                                        <Check TValue="bool" @bind-Checked="@NewEntity.LockoutEnabled">@L["DisplayName:LockoutEnabled"]</Check>
+                                    {
-                                    </Field>
+                                        <Field>
+                                            <Check TValue="bool" @bind-Checked="@NewEntity.LockoutEnabled">@L["DisplayName:LockoutEnabled"]</Check>
+                                        </Field>
+                                    }
                                     <ExtensionProperties TEntityType="IdentityUserCreateDto" TResourceType="IdentityResource" Entity="@NewEntity" LH="@LH" ModalType="ExtensionPropertyModalType.CreateModal" />
                                 </TabPanel>
                                 <TabPanel Name="Roles">

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

@@ -41,6 +41,7 @@ public partial class UserManagement
 
     private List<TableColumn> UserManagementTableColumns => TableColumns.Get<UserManagement>();
     private TextRole _passwordTextRole = TextRole.Password;
+    public bool IsEditCurrentUser { get; set; }
 
     public UserManagement()
     {
@@ -119,7 +120,7 @@ public partial class UserManagement
         try
         {
             EditModalSelectedTab = DefaultSelectedTab;
-
+            IsEditCurrentUser = entity.Id == CurrentUser.Id;
             var userRoleNames = (await AppService.GetRolesAsync(entity.Id)).Items.Select(r => r.Name).ToList();
 
             EditUserRoles = Roles.Select(x => new AssignedRoleViewModel

modules/identity/src/Volo.Abp.Identity.Web/Pages/Identity/Users/EditModal.cshtml

@@ -39,8 +39,10 @@
                         <abp-input asp-for="UserInfo.Email" />
                         <abp-input asp-for="UserInfo.PhoneNumber" />
                         <abp-input asp-for="UserInfo.IsActive" />
-                        <abp-input asp-for="UserInfo.LockoutEnabled" />
+                        @if (!Model.IsEditCurrentUser)
-
+                        {
+                            <abp-input asp-for="UserInfo.LockoutEnabled" />
+                        }
                         @foreach (var propertyInfo in ObjectExtensionManager.Instance.GetProperties<EditModalModel.UserInfoViewModel>())
                         {
                             if (!propertyInfo.Name.EndsWith("_Text"))

modules/identity/src/Volo.Abp.Identity.Web/Pages/Identity/Users/EditModal.cshtml.cs

@@ -24,6 +24,8 @@ public class EditModalModel : IdentityPageModel
 
     protected IIdentityUserAppService IdentityUserAppService { get; }
 
+    public bool IsEditCurrentUser { get; set; }
+
     public EditModalModel(IIdentityUserAppService identityUserAppService)
     {
         IdentityUserAppService = identityUserAppService;
@@ -32,10 +34,9 @@ public class EditModalModel : IdentityPageModel
     public virtual async Task<IActionResult> OnGetAsync(Guid id)
     {
         var user = await IdentityUserAppService.GetAsync(id);
-        
         UserInfo = ObjectMapper.Map<IdentityUserDto, UserInfoViewModel>(user);
-
         Roles = ObjectMapper.Map<IReadOnlyList<IdentityRoleDto>, AssignedRoleViewModel[]>((await IdentityUserAppService.GetAssignableRolesAsync()).Items);
+        IsEditCurrentUser = CurrentUser.Id == id;
 
         var userRoleNames = (await IdentityUserAppService.GetRolesAsync(UserInfo.Id)).Items.Select(r => r.Name).ToList();
         foreach (var role in Roles)

npm/ng-packs/packages/theme-shared/src/lib/handlers/error.handler.ts

@@ -22,7 +22,6 @@ export class ErrorHandler {
   protected readonly routerErrorHandlerService = inject(RouterErrorHandlerService);
   protected readonly httpErrorConfig = inject(HTTP_ERROR_CONFIG);
   protected readonly customErrorHandlers = inject(CUSTOM_ERROR_HANDLERS);
-
   protected readonly defaultHttpErrorHandler = (_, err: HttpErrorResponse) => throwError(() => err);
   protected readonly httpErrorHandler =
     inject(HTTP_ERROR_HANDLER, { optional: true }) || this.defaultHttpErrorHandler;