From 69a9e41bed294f13682c64c7618a95e8cadaa726 Mon Sep 17 00:00:00 2001
From: Giuseppe <giuseppe.digilio@gmail.com>
Date: Fri, 2 Nov 2018 13:33:09 +0100
Subject: [PATCH] Fixed issue that doesn't trigger an update on search in
 submission collection dropdown

---
 .../submission-form-collection.component.html |   9 +-
 .../submission-form-collection.component.ts   | 120 +++++++++++-------
 2 files changed, 81 insertions(+), 48 deletions(-)

diff --git a/src/app/submission/form/collection/submission-form-collection.component.html b/src/app/submission/form/collection/submission-form-collection.component.html
index ebfd81233e..4f027c90c5 100644
--- a/src/app/submission/form/collection/submission-form-collection.component.html
+++ b/src/app/submission/form/collection/submission-form-collection.component.html
@@ -1,12 +1,13 @@
 <div>
-  <div ngbDropdown #collectionControls="ngbDropdown" class="btn-group input-group">
+  <div ngbDropdown #collectionControls="ngbDropdown" class="btn-group input-group" (openChange)="toggled($event)">
     <div class="input-group-prepend">
       <span id="collectionControlsMenuLabel" class="input-group-text">Collection</span>
     </div>
     <button aria-describedby="collectionControlsMenuLabel"
             id="collectionControlsMenuButton"
             class="btn btn-outline-primary"
-            (click)="onClose($event)"
+            (blur)="onClose()"
+            (click)="onClose()"
             [disabled]="disabled"
             ngbDropdownToggle>
       <span *ngIf="disabled"><i class='fa fa-circle-o-notch fa-spin'></i></span>
@@ -24,8 +25,8 @@
       </div>
       <div class="dropdown-divider"></div>
       <div class="scrollable-menu" aria-labelledby="dropdownMenuButton" (scroll)="onScroll($event)">
-        <button class="dropdown-item disabled" *ngIf="searchListCollection.length == 0">No results found</button>
-        <button class="dropdown-item collection-item" *ngFor="let listItem of searchListCollection" (click)="onSelect(listItem)" title="{{ listItem.collection.name }}">
+        <button class="dropdown-item disabled" *ngIf="(searchListCollection$ | async).length == 0">No results found</button>
+        <button class="dropdown-item collection-item" *ngFor="let listItem of (searchListCollection$ | async)" (click)="onSelect(listItem)" title="{{ listItem.collection.name }}">
           <ul class="list-unstyled mb-0">
             <li class="list-item text-truncate text-secondary" *ngFor="let item of listItem.communities" >{{ item.name}} <i class="fa fa-level-down" aria-hidden="true"></i></li>
             <li class="list-item text-truncate text-primary font-weight-bold">{{ listItem.collection.name}}</li>
diff --git a/src/app/submission/form/collection/submission-form-collection.component.ts b/src/app/submission/form/collection/submission-form-collection.component.ts
index a6eff3bdb6..52eee7e2a1 100644
--- a/src/app/submission/form/collection/submission-form-collection.component.ts
+++ b/src/app/submission/form/collection/submission-form-collection.component.ts
@@ -26,6 +26,29 @@ import { JsonPatchOperationsService } from '../../../core/json-patch/json-patch-
 import { SubmitDataResponseDefinitionObject } from '../../../core/shared/submit-data-response-definition.model';
 import { SubmissionService } from '../../submission.service';
 import { SubmissionObject } from '../../../core/submission/models/submission-object.model';
+import { Observable } from 'rxjs/Observable';
+import {
+  debounceTime,
+  distinctUntilChanged,
+  filter,
+  first,
+  flatMap,
+  map,
+  mergeMap,
+  reduce,
+  startWith,
+  tap
+} from 'rxjs/operators';
+
+interface CollectionListEntryItem {
+  id: string;
+  name: string;
+}
+
+interface CollectionListEntry {
+  communities: CollectionListEntryItem[],
+  collection: CollectionListEntryItem
+}
 
 @Component({
   selector: 'ds-submission-form-collection',
@@ -44,10 +67,9 @@ export class SubmissionFormCollectionComponent implements OnChanges, OnInit {
   @Output() collectionChange: EventEmitter<Workspaceitem> = new EventEmitter<Workspaceitem>();
 
   public disabled = true;
-  public listCollection = [];
   public model: any;
-  public searchField: FormControl;
-  public searchListCollection = [];
+  public searchField: FormControl = new FormControl();
+  public searchListCollection$: Observable<CollectionListEntry[]>;
   public selectedCollectionId: string;
   public selectedCollectionName: string;
 
@@ -81,68 +103,71 @@ export class SubmissionFormCollectionComponent implements OnChanges, OnInit {
 
   ngOnChanges(changes: SimpleChanges) {
     if (hasValue(changes.currentCollectionId)
-      && hasValue(changes.currentCollectionId.currentValue)
-      && !isNotEmpty(this.listCollection)) {
+      && hasValue(changes.currentCollectionId.currentValue)) {
+
       this.selectedCollectionId = this.currentCollectionId;
       // @TODO replace with search/top browse endpoint
       // @TODO implement community/subcommunity hierarchy
-      this.subs.push(this.communityDataService.findAll()
-        .filter((communities: RemoteData<PaginatedList<Community>>) => isNotEmpty(communities.payload))
-        .first()
-        .switchMap((communities: RemoteData<PaginatedList<Community>>) => communities.payload.page)
-        .subscribe((communityData: Community) => {
-
-          this.subs.push(communityData.collections
-            .filter((collections: RemoteData<PaginatedList<Collection>>) => !collections.isResponsePending && collections.hasSucceeded)
-            .first()
-            .switchMap((collections: RemoteData<PaginatedList<Collection>>) => collections.payload.page)
-            .filter((collectionData: Collection) => isNotEmpty(collectionData))
-            .subscribe((collectionData: Collection) => {
+      const listCollection$ = this.communityDataService.findAll().pipe(
+        filter((communities: RemoteData<PaginatedList<Community>>) => isNotEmpty(communities.payload)),
+        first(),
+        mergeMap((communities: RemoteData<PaginatedList<Community>>) => communities.payload.page),
+        flatMap((communityData: Community) => {
+          return communityData.collections.pipe(
+            filter((collections: RemoteData<PaginatedList<Collection>>) => !collections.isResponsePending && collections.hasSucceeded),
+            first(),
+            mergeMap((collections: RemoteData<PaginatedList<Collection>>) => collections.payload.page),
+            filter((collectionData: Collection) => isNotEmpty(collectionData)),
+            tap((collectionData: Collection) => {
               if (collectionData.id === this.selectedCollectionId) {
                 this.selectedCollectionName = collectionData.name;
               }
-              const collectionEntry = {
-                communities: [{id: communityData.id, name: communityData.name}],
-                collection: {id: collectionData.id, name: collectionData.name}
-              };
-              this.listCollection.push(collectionEntry);
-              this.searchListCollection.push(collectionEntry);
-              this.disabled = false;
-              this.cdr.detectChanges();
+            }),
+            map((collectionData: Collection) => ({
+              communities: [{id: communityData.id, name: communityData.name}],
+              collection: {id: collectionData.id, name: collectionData.name}
             }))
-        }));
+          );
+        }),
+        reduce((acc: any, value: any) => [...acc, ...value], []),
+        tap((list: CollectionListEntry[]) => {
+          if (isNotEmpty(list)) {
+            this.disabled = false;
+          }
+        }),
+        startWith([])
+      );
+
+      const searchTerm$ = this.searchField.valueChanges.pipe(
+        debounceTime(200),
+        distinctUntilChanged(),
+        startWith('')
+      );
+
+      this.searchListCollection$ = Observable.combineLatest(searchTerm$, listCollection$)
+        .map(([searchTerm, listCollection]) => {
+          if (searchTerm === '' || isNullOrUndefined(searchTerm)) {
+            return listCollection;
+          } else {
+            return listCollection.filter((v) => v.collection.name.toLowerCase().indexOf(searchTerm.toLowerCase()) > -1).slice(0, 5)
+          }
+        });
     }
   }
 
   ngOnInit() {
     this.pathCombiner = new JsonPatchOperationPathCombiner('sections', 'collection');
-    this.searchField = new FormControl();
-    this.searchField.valueChanges
-      .debounceTime(200)
-      .distinctUntilChanged()
-      .subscribe((term) => {
-        this.search(term);
-      });
   }
 
   ngOnDestroy(): void {
     this.subs.filter((sub) => hasValue(sub)).forEach((sub) => sub.unsubscribe());
   }
 
-  search(text: string) {
-    if (text === '' || isNullOrUndefined(text)) {
-      this.searchListCollection = this.listCollection;
-    } else {
-      this.searchListCollection = this.listCollection.filter((v) => v.collection.name.toLowerCase().indexOf(text.toLowerCase()) > -1).slice(0, 5);
-    }
-  }
-
   onSelect(event) {
     this.searchField.reset();
-    this.searchListCollection = this.listCollection;
     this.disabled = true;
     this.operationsBuilder.replace(this.pathCombiner.getPath(), event.collection.id, true);
-    this.operationsService.jsonPatchByResourceID(
+    this.subs.push(this.operationsService.jsonPatchByResourceID(
       this.submissionService.getSubmissionObjectLinkName(),
       this.submissionId,
       'sections',
@@ -155,9 +180,16 @@ export class SubmissionFormCollectionComponent implements OnChanges, OnInit {
         this.disabled = false;
         this.cdr.detectChanges();
       })
+    );
   }
 
-  onClose(event) {
+  onClose() {
     this.searchField.reset();
   }
+
+  toggled(isOpen: boolean) {
+    if (!isOpen) {
+      this.searchField.reset();
+    }
+  }
 }