NVSHAS-9566: Removal confirmation dialog is stuck after click OK (Iss…

…ue which is caused by change password scenario)
neuvector · Nov 9, 2024 · 16616c5 · 16616c5
1 parent b9481e5
commit 16616c5
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/admin/webapp/websrc/app/routes/components/users-grid/users-grid.component.ts b/admin/webapp/websrc/app/routes/components/users-grid/users-grid.component.ts
@@ -418,9 +418,10 @@ export class UsersGridComponent implements OnInit {
         take(1),
         switchMap(() => this.settingsService.unlockUser(user)),
         finalize(() => {
+          let userInfo = this.rowData.filter(_user => _user.username === user)[0];
           updateGridData(
             this.rowData,
-            [{ username: user, blocked_for_failed_login: false }],
+            [{ ...userInfo, username: user, blocked_for_failed_login: false }],
             this.gridApi!,
             'username',
             'edit'
@@ -466,10 +467,12 @@ export class UsersGridComponent implements OnInit {
               this.tr.instant('user.resetPassword.RESET_OK')
             );
             resetDialogRef.componentInstance.onNoClick();
+            let userInfo = this.rowData.filter(user => user.username === userForm.username)[0];
             updateGridData(
               this.rowData,
               [
                 {
+                  ...userInfo,
                   username: userForm.username,
                   blocked_for_password_expired: false,
                 },