From ffad45c8fd04bc2275f584b2a2d84e104b29436f Mon Sep 17 00:00:00 2001
From: sergeyteleshev <iamsergeyteleshev@gmail.com>
Date: Wed, 6 Nov 2024 22:38:07 +0100
Subject: [PATCH 1/4] CB-5891 on disable user changes form state according to
 its real state

---
 .../Users/UserForm/AdministrationUserForm.tsx  | 10 +++++++++-
 .../AdministrationUserFormDeleteButton.tsx     | 18 +++++++++++++++---
 2 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/webapp/packages/plugin-authentication-administration/src/Administration/Users/UserForm/AdministrationUserForm.tsx b/webapp/packages/plugin-authentication-administration/src/Administration/Users/UserForm/AdministrationUserForm.tsx
index 89251c7f6e..5441f50984 100644
--- a/webapp/packages/plugin-authentication-administration/src/Administration/Users/UserForm/AdministrationUserForm.tsx
+++ b/webapp/packages/plugin-authentication-administration/src/Administration/Users/UserForm/AdministrationUserForm.tsx
@@ -59,6 +59,10 @@ export const AdministrationUserForm = observer<Props>(function AdministrationUse
     },
   });
 
+  function onDisableUser() {
+    userFormInfoPart.state.enabled = false;
+  }
+
   useAutoLoad(AdministrationUserForm, [userFormInfoPart]);
 
   return (
@@ -77,7 +81,11 @@ export const AdministrationUserForm = observer<Props>(function AdministrationUse
             </Container>
             <Container keepSize noWrap center gap compact>
               {editing && (
-                <AdministrationUserFormDeleteButton userId={userFormInfoPart.initialState.userId} enabled={userFormInfoPart.initialState.enabled} />
+                <AdministrationUserFormDeleteButton
+                  userId={userFormInfoPart.initialState.userId}
+                  enabled={userFormInfoPart.initialState.enabled}
+                  onDisable={onDisableUser}
+                />
               )}
               <Button type="button" disabled={state.isDisabled} mod={['outlined']} onClick={onClose}>
                 {translate('ui_processing_cancel')}
diff --git a/webapp/packages/plugin-authentication-administration/src/Administration/Users/UserForm/AdministrationUserFormDeleteButton.tsx b/webapp/packages/plugin-authentication-administration/src/Administration/Users/UserForm/AdministrationUserFormDeleteButton.tsx
index 0d3fe845ff..7cdfe440ac 100644
--- a/webapp/packages/plugin-authentication-administration/src/Administration/Users/UserForm/AdministrationUserFormDeleteButton.tsx
+++ b/webapp/packages/plugin-authentication-administration/src/Administration/Users/UserForm/AdministrationUserFormDeleteButton.tsx
@@ -8,7 +8,7 @@
 import { UsersResource } from '@cloudbeaver/core-authentication';
 import { Button, type ButtonProps, useTranslate } from '@cloudbeaver/core-blocks';
 import { useService } from '@cloudbeaver/core-di';
-import { CommonDialogService } from '@cloudbeaver/core-dialogs';
+import { CommonDialogService, DialogueStateResult } from '@cloudbeaver/core-dialogs';
 
 import { AdministrationUsersManagementService } from '../../../AdministrationUsersManagementService.js';
 import { DeleteUserDialog } from './DeleteUserDialog.js';
@@ -17,9 +17,15 @@ import { DisableUserDialog } from './DisableUserDialog.js';
 interface Props extends ButtonProps {
   userId: string;
   enabled: boolean;
+  onDisable: VoidFunction;
 }
 
-export const AdministrationUserFormDeleteButton: React.FC<Props> = function AdministrationUserFormDeleteButton({ userId, enabled, ...rest }) {
+export const AdministrationUserFormDeleteButton: React.FC<Props> = function AdministrationUserFormDeleteButton({
+  userId,
+  enabled,
+  onDisable,
+  ...rest
+}) {
   const translate = useTranslate();
   const commonDialogService = useService(CommonDialogService);
   const administrationUsersManagementService = useService(AdministrationUsersManagementService);
@@ -40,10 +46,16 @@ export const AdministrationUserFormDeleteButton: React.FC<Props> = function Admi
 
   async function deleteUser() {
     if (enabled) {
-      await commonDialogService.open(DisableUserDialog, {
+      const result = await commonDialogService.open(DisableUserDialog, {
         userId,
         onDelete: openUserDeleteDialog,
       });
+
+      if (result === DialogueStateResult.Rejected) {
+        return;
+      }
+
+      onDisable();
     } else {
       await openUserDeleteDialog();
     }

From 5cfd7c6e411915d87334cd8fd7f9cf27052e8bd0 Mon Sep 17 00:00:00 2001
From: sergeyteleshev <iamsergeyteleshev@gmail.com>
Date: Thu, 7 Nov 2024 12:08:48 +0100
Subject: [PATCH 2/4] CB-5891 pr fixes

---
 .../Administration/Users/UserForm/AdministrationUserForm.tsx | 2 +-
 .../Administration/Users/UserForm/Info/UserFormInfoPart.ts   | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/webapp/packages/plugin-authentication-administration/src/Administration/Users/UserForm/AdministrationUserForm.tsx b/webapp/packages/plugin-authentication-administration/src/Administration/Users/UserForm/AdministrationUserForm.tsx
index 5441f50984..ccb9430b71 100644
--- a/webapp/packages/plugin-authentication-administration/src/Administration/Users/UserForm/AdministrationUserForm.tsx
+++ b/webapp/packages/plugin-authentication-administration/src/Administration/Users/UserForm/AdministrationUserForm.tsx
@@ -60,7 +60,7 @@ export const AdministrationUserForm = observer<Props>(function AdministrationUse
   });
 
   function onDisableUser() {
-    userFormInfoPart.state.enabled = false;
+    userFormInfoPart.disableUser();
   }
 
   useAutoLoad(AdministrationUserForm, [userFormInfoPart]);
diff --git a/webapp/packages/plugin-authentication-administration/src/Administration/Users/UserForm/Info/UserFormInfoPart.ts b/webapp/packages/plugin-authentication-administration/src/Administration/Users/UserForm/Info/UserFormInfoPart.ts
index b400208c34..57a8ee9fab 100644
--- a/webapp/packages/plugin-authentication-administration/src/Administration/Users/UserForm/Info/UserFormInfoPart.ts
+++ b/webapp/packages/plugin-authentication-administration/src/Administration/Users/UserForm/Info/UserFormInfoPart.ts
@@ -74,6 +74,11 @@ export class UserFormInfoPart extends FormPart<IUserFormInfoState, IUserFormStat
     return this.loaded;
   }
 
+  async disableUser() {
+    this.state.enabled = false;
+    await this.saveChanges();
+  }
+
   override get isChanged(): boolean {
     if (!this.loaded) {
       return false;

From da4d6fb3965d4e621472577a38e1cfba03915383 Mon Sep 17 00:00:00 2001
From: sergeyteleshev <iamsergeyteleshev@gmail.com>
Date: Thu, 7 Nov 2024 13:47:41 +0100
Subject: [PATCH 3/4] CB-5891 cleanup

---
 .../Administration/Users/UserForm/AdministrationUserForm.tsx  | 4 ++--
 .../Users/UserForm/AdministrationUserFormDeleteButton.tsx     | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/webapp/packages/plugin-authentication-administration/src/Administration/Users/UserForm/AdministrationUserForm.tsx b/webapp/packages/plugin-authentication-administration/src/Administration/Users/UserForm/AdministrationUserForm.tsx
index ccb9430b71..352a70a218 100644
--- a/webapp/packages/plugin-authentication-administration/src/Administration/Users/UserForm/AdministrationUserForm.tsx
+++ b/webapp/packages/plugin-authentication-administration/src/Administration/Users/UserForm/AdministrationUserForm.tsx
@@ -59,8 +59,8 @@ export const AdministrationUserForm = observer<Props>(function AdministrationUse
     },
   });
 
-  function onDisableUser() {
-    userFormInfoPart.disableUser();
+  async function onDisableUser() {
+    await userFormInfoPart.disableUser();
   }
 
   useAutoLoad(AdministrationUserForm, [userFormInfoPart]);
diff --git a/webapp/packages/plugin-authentication-administration/src/Administration/Users/UserForm/AdministrationUserFormDeleteButton.tsx b/webapp/packages/plugin-authentication-administration/src/Administration/Users/UserForm/AdministrationUserFormDeleteButton.tsx
index 7cdfe440ac..516976a5c0 100644
--- a/webapp/packages/plugin-authentication-administration/src/Administration/Users/UserForm/AdministrationUserFormDeleteButton.tsx
+++ b/webapp/packages/plugin-authentication-administration/src/Administration/Users/UserForm/AdministrationUserFormDeleteButton.tsx
@@ -17,7 +17,7 @@ import { DisableUserDialog } from './DisableUserDialog.js';
 interface Props extends ButtonProps {
   userId: string;
   enabled: boolean;
-  onDisable: VoidFunction;
+  onDisable: VoidFunction | (() => Promise<void>);
 }
 
 export const AdministrationUserFormDeleteButton: React.FC<Props> = function AdministrationUserFormDeleteButton({
@@ -55,7 +55,7 @@ export const AdministrationUserFormDeleteButton: React.FC<Props> = function Admi
         return;
       }
 
-      onDisable();
+      await onDisable();
     } else {
       await openUserDeleteDialog();
     }

From f2760f4eea3f12565c02cf4b5a2d26815391ea56 Mon Sep 17 00:00:00 2001
From: sergeyteleshev <iamsergeyteleshev@gmail.com>
Date: Thu, 7 Nov 2024 17:10:04 +0100
Subject: [PATCH 4/4] CB-5891 pr fixes

---
 .../Users/UserForm/AdministrationUserForm.tsx     |  6 +-----
 .../AdministrationUserFormDeleteButton.tsx        | 15 +++++----------
 .../Users/UserForm/DisableUserDialog.tsx          |  6 ++----
 .../Users/UserForm/Info/UserFormInfoPart.ts       |  5 ++++-
 4 files changed, 12 insertions(+), 20 deletions(-)

diff --git a/webapp/packages/plugin-authentication-administration/src/Administration/Users/UserForm/AdministrationUserForm.tsx b/webapp/packages/plugin-authentication-administration/src/Administration/Users/UserForm/AdministrationUserForm.tsx
index 352a70a218..19e56943b7 100644
--- a/webapp/packages/plugin-authentication-administration/src/Administration/Users/UserForm/AdministrationUserForm.tsx
+++ b/webapp/packages/plugin-authentication-administration/src/Administration/Users/UserForm/AdministrationUserForm.tsx
@@ -59,10 +59,6 @@ export const AdministrationUserForm = observer<Props>(function AdministrationUse
     },
   });
 
-  async function onDisableUser() {
-    await userFormInfoPart.disableUser();
-  }
-
   useAutoLoad(AdministrationUserForm, [userFormInfoPart]);
 
   return (
@@ -84,7 +80,7 @@ export const AdministrationUserForm = observer<Props>(function AdministrationUse
                 <AdministrationUserFormDeleteButton
                   userId={userFormInfoPart.initialState.userId}
                   enabled={userFormInfoPart.initialState.enabled}
-                  onDisable={onDisableUser}
+                  disableUser={userFormInfoPart.disableUser}
                 />
               )}
               <Button type="button" disabled={state.isDisabled} mod={['outlined']} onClick={onClose}>
diff --git a/webapp/packages/plugin-authentication-administration/src/Administration/Users/UserForm/AdministrationUserFormDeleteButton.tsx b/webapp/packages/plugin-authentication-administration/src/Administration/Users/UserForm/AdministrationUserFormDeleteButton.tsx
index 516976a5c0..8b9368cdcd 100644
--- a/webapp/packages/plugin-authentication-administration/src/Administration/Users/UserForm/AdministrationUserFormDeleteButton.tsx
+++ b/webapp/packages/plugin-authentication-administration/src/Administration/Users/UserForm/AdministrationUserFormDeleteButton.tsx
@@ -8,7 +8,7 @@
 import { UsersResource } from '@cloudbeaver/core-authentication';
 import { Button, type ButtonProps, useTranslate } from '@cloudbeaver/core-blocks';
 import { useService } from '@cloudbeaver/core-di';
-import { CommonDialogService, DialogueStateResult } from '@cloudbeaver/core-dialogs';
+import { CommonDialogService } from '@cloudbeaver/core-dialogs';
 
 import { AdministrationUsersManagementService } from '../../../AdministrationUsersManagementService.js';
 import { DeleteUserDialog } from './DeleteUserDialog.js';
@@ -17,13 +17,13 @@ import { DisableUserDialog } from './DisableUserDialog.js';
 interface Props extends ButtonProps {
   userId: string;
   enabled: boolean;
-  onDisable: VoidFunction | (() => Promise<void>);
+  disableUser: () => Promise<void>;
 }
 
 export const AdministrationUserFormDeleteButton: React.FC<Props> = function AdministrationUserFormDeleteButton({
   userId,
   enabled,
-  onDisable,
+  disableUser,
   ...rest
 }) {
   const translate = useTranslate();
@@ -46,16 +46,11 @@ export const AdministrationUserFormDeleteButton: React.FC<Props> = function Admi
 
   async function deleteUser() {
     if (enabled) {
-      const result = await commonDialogService.open(DisableUserDialog, {
+      await commonDialogService.open(DisableUserDialog, {
         userId,
         onDelete: openUserDeleteDialog,
+        disableUser: disableUser,
       });
-
-      if (result === DialogueStateResult.Rejected) {
-        return;
-      }
-
-      await onDisable();
     } else {
       await openUserDeleteDialog();
     }
diff --git a/webapp/packages/plugin-authentication-administration/src/Administration/Users/UserForm/DisableUserDialog.tsx b/webapp/packages/plugin-authentication-administration/src/Administration/Users/UserForm/DisableUserDialog.tsx
index d15c22da7b..da3dbede95 100644
--- a/webapp/packages/plugin-authentication-administration/src/Administration/Users/UserForm/DisableUserDialog.tsx
+++ b/webapp/packages/plugin-authentication-administration/src/Administration/Users/UserForm/DisableUserDialog.tsx
@@ -7,7 +7,6 @@
  */
 import { observer } from 'mobx-react-lite';
 
-import { UsersResource } from '@cloudbeaver/core-authentication';
 import {
   Button,
   CommonDialogBody,
@@ -18,7 +17,6 @@ import {
   Fill,
   s,
   Text,
-  useResource,
   useS,
   useTranslate,
 } from '@cloudbeaver/core-blocks';
@@ -31,17 +29,17 @@ import classes from './DisableUserDialog.module.css';
 interface IPayload {
   userId: string;
   onDelete: () => void;
+  disableUser: () => Promise<void>;
 }
 
 export const DisableUserDialog: DialogComponent<IPayload> = observer(function DisableUserDialog(props) {
   const translate = useTranslate();
   const styles = useS(classes);
   const notificationService = useService(NotificationService);
-  const usersResource = useResource(DisableUserDialog, UsersResource, null);
 
   async function disableHandler() {
     try {
-      await usersResource.resource.enableUser(props.payload.userId, false);
+      await props.payload.disableUser();
       notificationService.logSuccess({ title: 'authentication_administration_users_disable_user_success', message: props.payload.userId });
       props.resolveDialog();
     } catch (exception: any) {
diff --git a/webapp/packages/plugin-authentication-administration/src/Administration/Users/UserForm/Info/UserFormInfoPart.ts b/webapp/packages/plugin-authentication-administration/src/Administration/Users/UserForm/Info/UserFormInfoPart.ts
index 57a8ee9fab..19b4cb1663 100644
--- a/webapp/packages/plugin-authentication-administration/src/Administration/Users/UserForm/Info/UserFormInfoPart.ts
+++ b/webapp/packages/plugin-authentication-administration/src/Administration/Users/UserForm/Info/UserFormInfoPart.ts
@@ -34,6 +34,8 @@ export class UserFormInfoPart extends FormPart<IUserFormInfoState, IUserFormStat
       teams: [],
       authRole: '',
     });
+
+    this.disableUser = this.disableUser.bind(this);
   }
 
   protected override format(data: IFormState<IUserFormState>, contexts: IExecutionContextProvider<IFormState<IUserFormState>>): void | Promise<void> {
@@ -75,8 +77,9 @@ export class UserFormInfoPart extends FormPart<IUserFormInfoState, IUserFormStat
   }
 
   async disableUser() {
+    await this.usersResource.enableUser(this.state.userId, false, true);
     this.state.enabled = false;
-    await this.saveChanges();
+    this.initialState.enabled = false;
   }
 
   override get isChanged(): boolean {