From 44d18d2fb6a5a94baa7ee849be9d9465f20c1526 Mon Sep 17 00:00:00 2001
From: Kristof De Langhe <kristof.delanghe@atmire.com>
Date: Fri, 16 Nov 2018 15:38:49 +0100
Subject: [PATCH] 55946: Exclude already mapped collections from Map tab

---
 .../item-collection-mapper.component.ts       | 40 +++++++++++++++++--
 1 file changed, 37 insertions(+), 3 deletions(-)

diff --git a/src/app/+item-page/edit-item-page/item-collection-mapper/item-collection-mapper.component.ts b/src/app/+item-page/edit-item-page/item-collection-mapper/item-collection-mapper.component.ts
index 45755a52c0..3ab0d8b516 100644
--- a/src/app/+item-page/edit-item-page/item-collection-mapper/item-collection-mapper.component.ts
+++ b/src/app/+item-page/edit-item-page/item-collection-mapper/item-collection-mapper.component.ts
@@ -20,6 +20,7 @@ import { TranslateService } from '@ngx-translate/core';
 import { NotificationsService } from '../../../shared/notifications/notifications.service';
 import { C } from '@angular/core/src/render3';
 import { DSpaceObjectType } from '../../../core/shared/dspace-object-type.model';
+import { isNotEmpty } from '../../../shared/empty.util';
 
 @Component({
   selector: 'ds-item-collection-mapper',
@@ -82,9 +83,15 @@ export class ItemCollectionMapperComponent implements OnInit {
       map((itemRD: RemoteData<Item>) => itemRD.payload),
       switchMap((item: Item) => this.itemDataService.getMappedCollections(item.id))
     );
-    this.mappingCollectionsRD$ = this.searchOptions$.pipe(
-      switchMap((searchOptions: PaginatedSearchOptions) => {
-        return this.searchService.search(Object.assign(searchOptions, {
+
+    const itemCollectionsAndOptions$ = Observable.combineLatest(
+      this.itemCollectionsRD$,
+      this.searchOptions$
+    );
+    this.mappingCollectionsRD$ = itemCollectionsAndOptions$.pipe(
+      switchMap(([itemCollectionsRD, searchOptions]) => {
+        return this.searchService.search(Object.assign(new PaginatedSearchOptions(searchOptions), {
+          query: this.buildQuery(itemCollectionsRD.payload.page, searchOptions.query),
           dsoType: DSpaceObjectType.COLLECTION
         }));
       }),
@@ -196,4 +203,31 @@ export class ItemCollectionMapperComponent implements OnInit {
     return this.router.url;
   }
 
+  /**
+   * Build a query to exclude collections from
+   * @param collections     The collections their UUIDs
+   * @param query           The query to add to it
+   */
+  buildQuery(collections: Collection[], query: string): string {
+    let result = query;
+    for (const collection of collections) {
+      result = this.addExcludeCollection(collection.id, result);
+    }
+    return result;
+  }
+
+  /**
+   * Add an exclusion of a collection to a query
+   * @param collectionId    The collection's UUID
+   * @param query           The query to add the exclusion to
+   */
+  addExcludeCollection(collectionId: string, query: string): string {
+    const excludeQuery = `-search.resourceid:${collectionId}`;
+    if (isNotEmpty(query)) {
+      return `${query} AND ${excludeQuery}`;
+    } else {
+      return excludeQuery;
+    }
+  }
+
 }