diff --git a/webapp/packages/plugin-authentication/src/Administration/Users/UsersAdministrationController.ts b/webapp/packages/plugin-authentication/src/Administration/Users/UsersAdministrationController.ts index 61bcb07763..3233dc1778 100644 --- a/webapp/packages/plugin-authentication/src/Administration/Users/UsersAdministrationController.ts +++ b/webapp/packages/plugin-authentication/src/Administration/Users/UsersAdministrationController.ts @@ -12,7 +12,7 @@ import { injectable } from '@cloudbeaver/core-di'; import { CommonDialogService, ConfirmationDialog } from '@cloudbeaver/core-dialogs'; import { NotificationService } from '@cloudbeaver/core-events'; import { ErrorDetailsDialog } from '@cloudbeaver/core-notifications'; -import { GQLErrorCatcher } from '@cloudbeaver/core-sdk'; +import { GQLErrorCatcher, resourceKeyList } from '@cloudbeaver/core-sdk'; import { UsersResource } from '../UsersResource'; @@ -85,9 +85,7 @@ export class UsersAdministrationController { return; } - for (const userId of deletionList) { - await this.usersResource.delete(userId); - } + await this.usersResource.delete(resourceKeyList(deletionList)); this.selectedItems.clear(); await this.usersResource.loadAll(); } catch (exception) { diff --git a/webapp/packages/plugin-authentication/src/Administration/UsersResource.ts b/webapp/packages/plugin-authentication/src/Administration/UsersResource.ts index 8c2732d35f..ec6f13f30a 100644 --- a/webapp/packages/plugin-authentication/src/Administration/UsersResource.ts +++ b/webapp/packages/plugin-authentication/src/Administration/UsersResource.ts @@ -157,19 +157,19 @@ export class UsersResource extends CachedMapResource { if (this.isActiveUser(key.list[i])) { throw new Error('You can\'t delete current logged user'); } - this.data.delete(key.list[i]); if (!this.isNew(key.list[i])) { await this.graphQLService.gql.deleteUser({ userId: key.list[i] }); } + this.data.delete(key.list[i]); } } else { if (this.isActiveUser(key)) { throw new Error('You can\'t delete current logged user'); } - this.data.delete(key); if (!this.isNew(key)) { await this.graphQLService.gql.deleteUser({ userId: key }); } + this.data.delete(key); } this.markUpdated(key); this.itemDeleteSubject.next(key);