From ff6cde76dfb1bc459ac61a13166788137869f50c Mon Sep 17 00:00:00 2001
From: Santiago Tettamanti <santi.tettamanti96@gmail.com>
Date: Thu, 16 Dec 2021 10:32:04 -0300
Subject: [PATCH] Fix to collection selection window not loading successfully.

	In collection dropdown component, moved the return statement that returned the collection list outside the condition that checks if it's the final page
---
 .../collection-dropdown.component.html        |  6 ++---
 .../collection-dropdown.component.ts          | 24 +++++++++----------
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/src/app/shared/collection-dropdown/collection-dropdown.component.html b/src/app/shared/collection-dropdown/collection-dropdown.component.html
index 831c70ad11..87337d9084 100644
--- a/src/app/shared/collection-dropdown/collection-dropdown.component.html
+++ b/src/app/shared/collection-dropdown/collection-dropdown.component.html
@@ -11,8 +11,8 @@
      aria-labelledby="dropdownMenuButton"
      (scroll)="onScroll($event)"
      infiniteScroll
-     [infiniteScrollDistance]="5"
-     [infiniteScrollThrottle]="300"
+     [infiniteScrollDistance]="1.5"
+     [infiniteScrollThrottle]="0"
      [infiniteScrollUpDistance]="1.5"
      [fromRoot]="true"
      [scrollWindow]="false"
@@ -21,7 +21,7 @@
   <button class="dropdown-item disabled" *ngIf="searchListCollection?.length == 0 && !(isLoading | async)">
     {{'submission.sections.general.no-collection' | translate}}
   </button>
-  <ng-container *ngIf="searchListCollection?.length > 0 && !(isLoading | async)">
+  <ng-container *ngIf="searchListCollection?.length > 0">
     <button *ngFor="let listItem of searchListCollection"
             class="dropdown-item collection-item"
             title="{{ listItem.collection.name }}"
diff --git a/src/app/shared/collection-dropdown/collection-dropdown.component.ts b/src/app/shared/collection-dropdown/collection-dropdown.component.ts
index d7a341d9b6..f39e836361 100644
--- a/src/app/shared/collection-dropdown/collection-dropdown.component.ts
+++ b/src/app/shared/collection-dropdown/collection-dropdown.component.ts
@@ -223,20 +223,20 @@ export class CollectionDropdownComponent implements OnInit, OnDestroy {
         switchMap((collectionsRD: RemoteData<PaginatedList<Collection>>) => {
           this.searchComplete.emit();
           if (collectionsRD.hasSucceeded && collectionsRD.payload.totalElements > 0) {
-            if ( (this.searchListCollection.length + findOptions.elementsPerPage) >= collectionsRD.payload.totalElements ) {
+            if (this.searchListCollection.length >= collectionsRD.payload.totalElements) {
               this.hasNextPage = false;
-              this.emitSelectionEvents(collectionsRD);
-              return observableFrom(collectionsRD.payload.page).pipe(
-                mergeMap((collection: Collection) => collection.parentCommunity.pipe(
-                  getFirstSucceededRemoteDataPayload(),
-                  map((community: Community) => ({
-                      communities: [{ id: community.id, name: community.name }],
-                      collection: { id: collection.id, uuid: collection.id, name: collection.name }
-                    })
-                  ))),
-                reduce((acc: any, value: any) => [...acc, value], []),
-              );
             }
+            this.emitSelectionEvents(collectionsRD);
+            return observableFrom(collectionsRD.payload.page).pipe(
+              mergeMap((collection: Collection) => collection.parentCommunity.pipe(
+                getFirstSucceededRemoteDataPayload(),
+                map((community: Community) => ({
+                    communities: [{ id: community.id, name: community.name }],
+                    collection: { id: collection.id, uuid: collection.id, name: collection.name }
+                  })
+                ))),
+              reduce((acc: any, value: any) => [...acc, value], []),
+            );
           } else {
             this.hasNextPage = false;
             return observableOf([]);