diff --git a/apps/red-ui/src/app/modules/admin/screens/user-listing/user-listing-screen.component.html b/apps/red-ui/src/app/modules/admin/screens/user-listing/user-listing-screen.component.html index cf24c64f5..4d0e4604f 100644 --- a/apps/red-ui/src/app/modules/admin/screens/user-listing/user-listing-screen.component.html +++ b/apps/red-ui/src/app/modules/admin/screens/user-listing/user-listing-screen.component.html @@ -52,7 +52,7 @@
diff --git a/apps/red-ui/src/app/modules/admin/screens/user-listing/user-listing-screen.component.ts b/apps/red-ui/src/app/modules/admin/screens/user-listing/user-listing-screen.component.ts index 68dc5f7b2..632debc2f 100644 --- a/apps/red-ui/src/app/modules/admin/screens/user-listing/user-listing-screen.component.ts +++ b/apps/red-ui/src/app/modules/admin/screens/user-listing/user-listing-screen.component.ts @@ -109,8 +109,7 @@ export class UserListingScreenComponent extends ListingComponent implement async toggleActive(user: User) { this._loadingService.start(); - const requestBody = { ...user, roles: user.hasAnyRole ? [] : ['RED_USER'] }; - await firstValueFrom(this._userService.updateProfile(requestBody, user.id)); + await firstValueFrom(this._userService.toggleStatus(user)); await this.#loadData(); } diff --git a/apps/red-ui/src/app/users/user.service.ts b/apps/red-ui/src/app/users/user.service.ts index bf884916f..2640e248e 100644 --- a/apps/red-ui/src/app/users/user.service.ts +++ b/apps/red-ui/src/app/users/user.service.ts @@ -1,6 +1,6 @@ import { inject, Injectable } from '@angular/core'; import { User } from '@red/domain'; -import { IIqserUser, IqserUserService } from '@iqser/common-ui'; +import { IIqserUser, IqserUserService, List, QueryParam } from '@iqser/common-ui'; @Injectable({ providedIn: 'root', @@ -28,6 +28,11 @@ export class UserService extends IqserUserService { return super.getAll(url); } + toggleStatus(user: User) { + const queryParams: List = [{ key: 'isActive', value: !user.active }]; + return this._post(null, `${this._defaultModelPath}/profile/activate/${user.userId}`, queryParams); + } + protected readonly _rolesFilter = (role: string) => role.startsWith('RED_'); } diff --git a/libs/common-ui b/libs/common-ui index 7d5537309..2698e62e4 160000 --- a/libs/common-ui +++ b/libs/common-ui @@ -1 +1 @@ -Subproject commit 7d55373093eeb3301487998fd6a34487d8fc5101 +Subproject commit 2698e62e41a75d0515d6e17ce16dc0a519ee7e3b