diff --git a/src/app/access-control/group-registry/groups-registry.component.html b/src/app/access-control/group-registry/groups-registry.component.html
index 7fced71e6f..4135f4cc95 100644
--- a/src/app/access-control/group-registry/groups-registry.component.html
+++ b/src/app/access-control/group-registry/groups-registry.component.html
@@ -33,9 +33,9 @@
-
+
0 && !(searching$ | async)"
+ *ngIf="(pageInfoState$ | async)?.totalElements > 0 && !(loading$ | async)"
[paginationOptions]="config"
[pageInfoState]="pageInfoState$"
[collectionSize]="(pageInfoState$ | async)?.totalElements"
diff --git a/src/app/access-control/group-registry/groups-registry.component.ts b/src/app/access-control/group-registry/groups-registry.component.ts
index 9215399170..f9b8f9f987 100644
--- a/src/app/access-control/group-registry/groups-registry.component.ts
+++ b/src/app/access-control/group-registry/groups-registry.component.ts
@@ -75,7 +75,7 @@ export class GroupsRegistryComponent implements OnInit, OnDestroy {
/**
* A boolean representing if a search is pending
*/
- searching$: BehaviorSubject = new BehaviorSubject(false);
+ loading$: BehaviorSubject = new BehaviorSubject(false);
// Current search in groups registry
currentSearchQuery: string;
@@ -118,7 +118,7 @@ export class GroupsRegistryComponent implements OnInit, OnDestroy {
* @param data Contains query param
*/
search(data: any) {
- this.searching$.next(true);
+ this.loading$.next(true);
if (hasValue(this.searchSub)) {
this.searchSub.unsubscribe();
this.subs = this.subs.filter((sub: Subscription) => sub !== this.searchSub);
@@ -174,7 +174,7 @@ export class GroupsRegistryComponent implements OnInit, OnDestroy {
).subscribe((value: PaginatedList) => {
this.groupsDto$.next(value);
this.pageInfoState$.next(value.pageInfo);
- this.searching$.next(false);
+ this.loading$.next(false);
});
this.subs.push(this.searchSub);