From cf44419a889eba851791f8873fbed5a452d751e3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adina=20=C8=9Aeudan?= <adina@devplant.ro>
Date: Tue, 10 Aug 2021 18:09:00 +0300
Subject: [PATCH] Fixed can delete selected users

---
 .../screens/user-listing/user-listing-screen.component.ts    | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

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 95a6cded1..783f2c31c 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
@@ -19,7 +19,6 @@ import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker';
     providers: [...DefaultListingServices]
 })
 export class UserListingScreenComponent extends ListingComponent<UserWrapper> implements OnInit {
-    protected readonly _primaryKey = 'id';
     readonly translations = rolesTranslations;
     readonly iconButtonTypes = IconButtonTypes;
     readonly circleButtonTypes = CircleButtonTypes;
@@ -32,9 +31,9 @@ export class UserListingScreenComponent extends ListingComponent<UserWrapper> im
         { label: _('user-listing.table-col-names.active'), class: 'flex-center' },
         { label: _('user-listing.table-col-names.roles') }
     ];
-
     collapsedDetails = false;
     chartData: DoughnutChartConfig[] = [];
+    protected readonly _primaryKey = 'id';
     @ViewChildren(InitialsAvatarComponent)
     private readonly _avatars: QueryList<InitialsAvatarComponent>;
 
@@ -52,7 +51,7 @@ export class UserListingScreenComponent extends ListingComponent<UserWrapper> im
 
     private get _canDeleteSelected$(): Observable<boolean> {
         const entities$ = this.entitiesService.selected$;
-        return entities$.pipe(map(all => all.indexOf(this.currentUser) === -1));
+        return entities$.pipe(map(all => !all.find(u => u.id === this.currentUser.id)));
     }
 
     async ngOnInit() {