From bdd1a675f155551e8d776c09e9dab7f49dd0ecd3 Mon Sep 17 00:00:00 2001
From: Marie Verdonck <maria.verdonck@atmire.com>
Date: Mon, 19 Oct 2020 13:01:50 +0200
Subject: [PATCH] 74179: Fix for no result message not shown if no search
 results epeople/group registry

---
 .../epeople-registry/epeople-registry.component.html           | 2 +-
 .../epeople-registry/epeople-registry.component.ts             | 3 ++-
 .../group-registry/groups-registry.component.html              | 2 +-
 .../group-registry/groups-registry.component.ts                | 3 ++-
 4 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/app/+admin/admin-access-control/epeople-registry/epeople-registry.component.html b/src/app/+admin/admin-access-control/epeople-registry/epeople-registry.component.html
index 5cb8e77a3e..f478557e00 100644
--- a/src/app/+admin/admin-access-control/epeople-registry/epeople-registry.component.html
+++ b/src/app/+admin/admin-access-control/epeople-registry/epeople-registry.component.html
@@ -40,7 +40,7 @@
         </form>
 
         <ds-pagination
-          *ngIf="(ePeopleDto$ | async)?.totalElements > 0"
+          *ngIf="(pageInfoState$ | async)?.totalElements > 0"
           [paginationOptions]="config"
           [pageInfoState]="pageInfoState$"
           [collectionSize]="(pageInfoState$ | async)?.totalElements"
diff --git a/src/app/+admin/admin-access-control/epeople-registry/epeople-registry.component.ts b/src/app/+admin/admin-access-control/epeople-registry/epeople-registry.component.ts
index 2f989490a7..fe0503bcd7 100644
--- a/src/app/+admin/admin-access-control/epeople-registry/epeople-registry.component.ts
+++ b/src/app/+admin/admin-access-control/epeople-registry/epeople-registry.component.ts
@@ -141,7 +141,8 @@ export class EPeopleRegistryComponent implements OnInit, OnDestroy {
       currentPage: this.config.currentPage,
       elementsPerPage: this.config.pageSize
     }).subscribe((peopleRD) => {
-        this.ePeople$.next(peopleRD)
+        this.ePeople$.next(peopleRD);
+        this.pageInfoState$.next(peopleRD.payload.pageInfo);
       }
     ));
 
diff --git a/src/app/+admin/admin-access-control/group-registry/groups-registry.component.html b/src/app/+admin/admin-access-control/group-registry/groups-registry.component.html
index 067f59a4c0..2b0c35ea83 100644
--- a/src/app/+admin/admin-access-control/group-registry/groups-registry.component.html
+++ b/src/app/+admin/admin-access-control/group-registry/groups-registry.component.html
@@ -30,7 +30,7 @@
       </form>
 
       <ds-pagination
-        *ngIf="(groupsDto$ | async)?.totalElements > 0"
+        *ngIf="(pageInfoState$ | async)?.totalElements > 0"
         [paginationOptions]="config"
         [pageInfoState]="pageInfoState$"
         [collectionSize]="(pageInfoState$ | async)?.totalElements"
diff --git a/src/app/+admin/admin-access-control/group-registry/groups-registry.component.ts b/src/app/+admin/admin-access-control/group-registry/groups-registry.component.ts
index 3c780f5e29..19967e5d41 100644
--- a/src/app/+admin/admin-access-control/group-registry/groups-registry.component.ts
+++ b/src/app/+admin/admin-access-control/group-registry/groups-registry.component.ts
@@ -110,7 +110,8 @@ export class GroupsRegistryComponent implements OnInit, OnDestroy {
       currentPage: this.config.currentPage,
       elementsPerPage: this.config.pageSize
     }).subscribe((groupsRD: RemoteData<PaginatedList<Group>>) => {
-        this.groups$.next(groupsRD)
+        this.groups$.next(groupsRD);
+        this.pageInfoState$.next(groupsRD.payload.pageInfo);
       }
     ));