hazza/dspace-angular
1
0
Fork 1
mirror of https://github.com/DSpace/dspace-angular.git synced 2025-10-07 10:04:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

55693: Map tab excludes already mapped items

Browse Source
This commit is contained in:
Kristof De Langhe
2018-11-13 17:50:02 +01:00
parent 7bd8fae72a
commit 469b424cfe
1 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/app/+collection-page/collection-item-mapper/collection-item-mapper.component.ts
View File

@@ -19,6 +19,7 @@ import { RestResponse } from '../../core/cache/response-cache.models';
import { TranslateService } from '@ngx-translate/core'; import { TranslateService } from '@ngx-translate/core';
import { CollectionDataService } from '../../core/data/collection-data.service'; import { CollectionDataService } from '../../core/data/collection-data.service';
import { Item } from '../../core/shared/item.model'; import { Item } from '../../core/shared/item.model';
import { hasValue, isNotEmpty } from '../../shared/empty.util';
@Component({ @Component({
selector: 'ds-collection-item-mapper', selector: 'ds-collection-item-mapper',
@@ -98,9 +99,8 @@ export class CollectionItemMapperComponent implements OnInit {
); );
this.mappingItemsRD$ = collectionAndOptions$.pipe( this.mappingItemsRD$ = collectionAndOptions$.pipe(
switchMap(([collectionRD, options]) => { switchMap(([collectionRD, options]) => {
return this.searchService.search(Object.assign(options, { return this.searchService.search(Object.assign(new PaginatedSearchOptions(options), {
// TODO: Exclude items already mapped to collection without overwriting search query query: this.buildQuery(collectionRD.payload.id, options.query),
// query: `-location.coll:\"${collectionRD.payload.id}\"`,
scope: undefined, scope: undefined,
dsoType: DSpaceObjectType.ITEM, dsoType: DSpaceObjectType.ITEM,
sort: this.defaultSortOptions sort: this.defaultSortOptions
@@ -175,4 +175,13 @@ export class CollectionItemMapperComponent implements OnInit {
return this.router.url; return this.router.url;
} }
buildQuery(collectionId: string, query: string): string {
const excludeColQuery = `-location.coll:\"${collectionId}\"`;
if (isNotEmpty(query)) {
return `${excludeColQuery} AND ${query}`;
} else {
return excludeColQuery;
}
}
} }