From 04f4a2587035f1d1892e946a663071b2f8b6ca13 Mon Sep 17 00:00:00 2001
From: Art Lowel <art@atmire.com>
Date: Wed, 23 Jun 2021 17:28:36 +0200
Subject: [PATCH] fix an issue where the results of a dso-selector wouldn't
 update until you clicked anywhere on the page

---
 .../dso-selector/dso-selector.component.html      |  6 +++---
 .../dso-selector/dso-selector.component.ts        | 15 ++++++++-------
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/src/app/shared/dso-selector/dso-selector/dso-selector.component.html b/src/app/shared/dso-selector/dso-selector/dso-selector.component.html
index 122f37b031..ab2ea6cd8b 100644
--- a/src/app/shared/dso-selector/dso-selector/dso-selector.component.html
+++ b/src/app/shared/dso-selector/dso-selector/dso-selector.component.html
@@ -14,12 +14,12 @@
     [infiniteScrollContainer]="'.scrollable-menu'"
     [fromRoot]="true"
     (scrolled)="onScrollDown()">
-    <ng-container *ngIf="listEntries">
+    <ng-container *ngIf="listEntries$ | async">
       <button class="list-group-item list-group-item-action border-0 disabled"
-              *ngIf="listEntries.length == 0">
+              *ngIf="(listEntries$ | async).length == 0">
         {{'dso-selector.no-results' | translate: { type: typesString } }}
       </button>
-      <button *ngFor="let listEntry of listEntries"
+      <button *ngFor="let listEntry of (listEntries$ | async)"
               class="list-group-item list-group-item-action border-0 list-entry"
               [ngClass]="{'bg-primary': listEntry.indexableObject.id === currentDSOId}"
               title="{{ listEntry.indexableObject.name }}"
diff --git a/src/app/shared/dso-selector/dso-selector/dso-selector.component.ts b/src/app/shared/dso-selector/dso-selector/dso-selector.component.ts
index c62e0df763..ebd9f24b61 100644
--- a/src/app/shared/dso-selector/dso-selector/dso-selector.component.ts
+++ b/src/app/shared/dso-selector/dso-selector/dso-selector.component.ts
@@ -81,7 +81,7 @@ export class DSOSelectorComponent implements OnInit, OnDestroy {
   /**
    * List with search results of DSpace objects for the current query
    */
-  listEntries: SearchResult<DSpaceObject>[] = null;
+  listEntries$: BehaviorSubject<SearchResult<DSpaceObject>[]> = new BehaviorSubject(null);
 
   /**
    * The current page to load
@@ -160,7 +160,7 @@ export class DSOSelectorComponent implements OnInit, OnDestroy {
         this.loading = true;
         if (page === 1) {
           // The first page is loading, this means we should reset the list instead of adding to it
-          this.listEntries = null;
+          this.listEntries$.next(null);
         }
         return this.search(query, page).pipe(
           map((rd) => {
@@ -181,15 +181,16 @@ export class DSOSelectorComponent implements OnInit, OnDestroy {
     ).subscribe((rd) => {
       this.loading = false;
       if (rd.hasSucceeded) {
-        if (hasNoValue(this.listEntries)) {
-          this.listEntries = rd.payload.page;
+        const currentEntries = this.listEntries$.getValue();
+        if (hasNoValue(currentEntries)) {
+          this.listEntries$.next(rd.payload.page);
         } else {
-          this.listEntries.push(...rd.payload.page);
+          this.listEntries$.next([...currentEntries, ...rd.payload.page]);
         }
         // Check if there are more pages available after the current one
-        this.hasNextPage = rd.payload.totalElements > this.listEntries.length;
+        this.hasNextPage = rd.payload.totalElements > this.listEntries$.getValue().length;
       } else {
-        this.listEntries = null;
+        this.listEntries$.next(null);
         this.hasNextPage = false;
       }
     }));