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

Merge branch 'w2p-55693_Item-mapping-to-collections' into w2p-55946_Item-mapping-on-item-level

Browse Source
This commit is contained in:
Kristof De Langhe
2018-11-13 17:57:55 +01:00
parent 2a4eebcfc4 469b424cfe
commit 31fe5efaa1
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 { CollectionDataService } from '../../core/data/collection-data.service';
import { Item } from '../../core/shared/item.model';
import { hasValue, isNotEmpty } from '../../shared/empty.util';
@Component({
selector: 'ds-collection-item-mapper',
@@ -98,9 +99,8 @@ export class CollectionItemMapperComponent implements OnInit {
);
this.mappingItemsRD$ = collectionAndOptions$.pipe(
switchMap(([collectionRD, options]) => {
return this.searchService.search(Object.assign(options, {
// TODO: Exclude items already mapped to collection without overwriting search query
// query: `-location.coll:\"${collectionRD.payload.id}\"`,
return this.searchService.search(Object.assign(new PaginatedSearchOptions(options), {
query: this.buildQuery(collectionRD.payload.id, options.query),
scope: undefined,
dsoType: DSpaceObjectType.ITEM,
sort: this.defaultSortOptions
@@ -175,4 +175,13 @@ export class CollectionItemMapperComponent implements OnInit {
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;
}
}
}