diff --git a/Hcs.WebApp/Components/Dialogs/EditUser.razor b/Hcs.WebApp/Components/Dialogs/EditUser.razor index ef27977..3c58a96 100644 --- a/Hcs.WebApp/Components/Dialogs/EditUser.razor +++ b/Hcs.WebApp/Components/Dialogs/EditUser.razor @@ -17,6 +17,11 @@ @errorMessage + + + + + @@ -54,6 +59,8 @@ @code { sealed class InputModel { + public string UserName { get; set; } + public bool RoleDisabled { get; set; } public string RoleId { get; set; } @@ -72,10 +79,7 @@ public required string CurrentUserId { get; set; } [Parameter] - public required string UserId { get; set; } - - [Parameter] - public required string RoleId { get; set; } + public required AppUserWithRole UserWithRole { get; set; } [SupplyParameterFromForm] InputModel Input { get; set; } = new(); @@ -84,8 +88,9 @@ { await base.OnInitializedAsync(); - Input.RoleDisabled = CurrentUserId == UserId; - Input.RoleId = RoleId; + Input.UserName = UserWithRole.User.UserName; + Input.RoleDisabled = CurrentUserId == UserWithRole.User.Id; + Input.RoleId = UserWithRole.Role.Id; roles = await RoleManager.Roles.OrderBy(x => x.Priority).ToListAsync(); } @@ -99,7 +104,7 @@ try { - await UsersService.UpdateUserAsync(UserId, input.RoleId, input.Password); + await UsersService.UpdateUserAsync(UserWithRole.User.Id, input.RoleId, input.Password); DialogService.Close(true); } diff --git a/Hcs.WebApp/Components/Pages/Management/Users.razor b/Hcs.WebApp/Components/Pages/Management/Users.razor index 19969c7..194aef1 100644 --- a/Hcs.WebApp/Components/Pages/Management/Users.razor +++ b/Hcs.WebApp/Components/Pages/Management/Users.razor @@ -110,8 +110,7 @@ new Dictionary() { { nameof(Dialogs.EditUser.CurrentUserId), currentUserId }, - { nameof(Dialogs.EditUser.UserId), userWithRole.User.Id }, - { nameof(Dialogs.EditUser.RoleId), userWithRole.Role.Id } + { nameof(Dialogs.EditUser.UserWithRole), userWithRole } }, new DialogOptions() {