From f33f391eb39ef7e918899e23a77b656ad54cda7b Mon Sep 17 00:00:00 2001
From: Danilo Di Nuzzo <danilo.dinuzzo@r-dev.it>
Date: Thu, 18 Jun 2020 10:23:56 +0200
Subject: [PATCH] [CTS-3090] - fix pagination

---
 .../collection-dropdown.component.ts                  | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/src/app/shared/collection-dropdown/collection-dropdown.component.ts b/src/app/shared/collection-dropdown/collection-dropdown.component.ts
index fb044ce073..0986badf45 100644
--- a/src/app/shared/collection-dropdown/collection-dropdown.component.ts
+++ b/src/app/shared/collection-dropdown/collection-dropdown.component.ts
@@ -2,7 +2,7 @@ import { Component, OnInit, HostListener, ChangeDetectorRef, OnDestroy, Output,
 import { FormControl } from '@angular/forms';
 import { Observable, Subscription, BehaviorSubject } from 'rxjs';
 import { hasValue } from '../empty.util';
-import { map, mergeMap, startWith, debounceTime, distinctUntilChanged, switchMap, merge, scan } from 'rxjs/operators';
+import { map, mergeMap, startWith, debounceTime, distinctUntilChanged, switchMap, merge, scan, reduce } from 'rxjs/operators';
 import { RemoteData } from 'src/app/core/data/remote-data';
 import { FindListOptions } from 'src/app/core/data/request.models';
 import { PaginatedList } from 'src/app/core/data/paginated-list';
@@ -92,8 +92,6 @@ export class CollectionDropdownComponent implements OnInit, OnDestroy {
    */
   currentQuery: string;
 
-  hideLoaderWhenUnsubscribed$ = new Observable(() => () => this.hideShowLoader(false) );
-
   constructor(
     private changeDetectorRef: ChangeDetectorRef,
     private collectionDataService: CollectionDataService,
@@ -121,7 +119,7 @@ export class CollectionDropdownComponent implements OnInit, OnDestroy {
    */
   ngOnInit() {
     this.subs.push(this.searchField.valueChanges.pipe(
-        debounceTime(300),
+        debounceTime(500),
         distinctUntilChanged(),
         startWith('')
       ).subscribe(
@@ -195,9 +193,8 @@ export class CollectionDropdownComponent implements OnInit, OnDestroy {
             collection: { id: collection.id, uuid: collection.id, name: collection.name }
           })
         ))),
-        scan((acc: any, value: any) => [...acc, ...value], []),
-        startWith([]),
-        merge(this.hideLoaderWhenUnsubscribed$)
+        reduce((acc: any, value: any) => [...acc, ...value], []),
+        startWith([])
         );
     this.subs.push(this.searchListCollection$.subscribe(
       (next) => { this.searchListCollection.push(...next); }, undefined,