hazza/dspace-angular
1
0
Fork 1
mirror of https://github.com/DSpace/dspace-angular.git synced 2025-10-17 23:13:04 +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 
Conflicts:
	src/app/core/data/item-data.service.ts
This commit is contained in:
Kristof De Langhe
2018-11-13 16:03:31 +01:00
parent 9902209fb9 7bd8fae72a
commit 2a4eebcfc4
7 changed files with 101 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/app/+collection-page/collection-item-mapper/collection-item-mapper.component.html
View File

@@ -19,12 +19,12 @@
<ngb-tab title="{{'collection.item-mapper.tabs.browse' | translate}}">
<ng-template ngbTabContent>
<div class="mt-2">
<ds-viewable-collection
[config]="(searchOptions$ | async)?.pagination"
[sortConfig]="(searchOptions$ | async)?.sort"
[objects]="collectionItemsRD$ | async"
[hideGear]="true">
</ds-viewable-collection>
<ds-item-select class="mt-2"
[dsoRD$]="collectionItemsRD$"
[paginationOptions]="(searchOptions$ | async)?.pagination"
[confirmButton]="'collection.item-mapper.remove'"
[hideCollection]="true"
(confirm)="mapItems($event, true)"></ds-item-select>
</div>
</ng-template>
</ngb-tab>

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

@@ -17,6 +17,8 @@ import { NotificationsService } from '../../shared/notifications/notifications.s
import { ItemDataService } from '../../core/data/item-data.service';
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';
@Component({
selector: 'ds-collection-item-mapper',
@@ -67,6 +69,7 @@ export class CollectionItemMapperComponent implements OnInit {
private searchService: SearchService,
private notificationsService: NotificationsService,
private itemDataService: ItemDataService,
private collectionDataService: CollectionDataService,
private translateService: TranslateService) {
}
@@ -88,17 +91,16 @@ export class CollectionItemMapperComponent implements OnInit {
);
this.collectionItemsRD$ = collectionAndOptions$.pipe(
switchMap(([collectionRD, options]) => {
return this.searchService.search(Object.assign(options, {
scope: collectionRD.payload.id,
dsoType: DSpaceObjectType.ITEM,
return this.collectionDataService.getMappedItems(collectionRD.payload.id, Object.assign(options, {
sort: this.defaultSortOptions
}));
}),
toDSpaceObjectListRD()
}))
})
);
this.mappingItemsRD$ = this.searchOptions$.pipe(
flatMap((options: PaginatedSearchOptions) => {
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}\"`,
scope: undefined,
dsoType: DSpaceObjectType.ITEM,
sort: this.defaultSortOptions
@@ -109,23 +111,30 @@ export class CollectionItemMapperComponent implements OnInit {
}
/**
* Map the selected items to the collection and display notifications
* @param {string[]} ids The list of item UUID's to map to the collection
* Map/Unmap the selected items to the collection and display notifications
* @param ids The list of item UUID's to map/unmap to the collection
* @param remove Whether or not it's supposed to remove mappings
*/
mapItems(ids: string[]) {
mapItems(ids: string[], remove?: boolean) {
const responses$ = this.collectionRD$.pipe(
getSucceededRemoteData(),
map((collectionRD: RemoteData<Collection>) => collectionRD.payload.id),
switchMap((collectionId: string) => Observable.combineLatest(ids.map((id: string) => this.itemDataService.mapToCollection(id, collectionId))))
switchMap((collectionId: string) =>
Observable.combineLatest(ids.map((id: string) =>
remove ? this.itemDataService.removeMappingFromCollection(id, collectionId) : this.itemDataService.mapToCollection(id, collectionId)
))
)
);
const messageInsertion = remove ? 'unmap' : 'map';
responses$.subscribe((responses: RestResponse[]) => {
const successful = responses.filter((response: RestResponse) => response.isSuccessful);
const unsuccessful = responses.filter((response: RestResponse) => !response.isSuccessful);
if (successful.length > 0) {
const successMessages = Observable.combineLatest(
this.translateService.get('collection.item-mapper.notifications.success.head'),
this.translateService.get('collection.item-mapper.notifications.success.content', { amount: successful.length })
this.translateService.get(`collection.item-mapper.notifications.${messageInsertion}.success.head`),
this.translateService.get(`collection.item-mapper.notifications.${messageInsertion}.success.content`, { amount: successful.length })
);
successMessages.subscribe(([head, content]) => {
@@ -134,8 +143,8 @@ export class CollectionItemMapperComponent implements OnInit {
}
if (unsuccessful.length > 0) {
const unsuccessMessages = Observable.combineLatest(
this.translateService.get('collection.item-mapper.notifications.error.head'),
this.translateService.get('collection.item-mapper.notifications.error.content', { amount: unsuccessful.length })
this.translateService.get(`collection.item-mapper.notifications.${messageInsertion}.error.head`),
this.translateService.get(`collection.item-mapper.notifications.${messageInsertion}.error.content`, { amount: unsuccessful.length })
);
unsuccessMessages.subscribe(([head, content]) => {

47
src/app/core/data/collection-data.service.ts
View File

@@ -1,6 +1,5 @@
import { Inject, Injectable } from '@angular/core';
import { Injectable } from '@angular/core';
import { Store } from '@ngrx/store';
import { GLOBAL_CONFIG, GlobalConfig } from '../../../config';
import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
import { NormalizedCollection } from '../cache/models/normalized-collection.model';
import { ObjectCacheService } from '../cache/object-cache.service';
@@ -11,6 +10,20 @@ import { ComColDataService } from './comcol-data.service';
import { CommunityDataService } from './community-data.service';
import { RequestService } from './request.service';
import { HALEndpointService } from '../shared/hal-endpoint.service';
import { Observable } from 'rxjs/Observable';
import { RemoteData } from './remote-data';
import { PaginatedList } from './paginated-list';
import { distinctUntilChanged, map } from 'rxjs/operators';
import { hasValue, isNotEmptyOperator } from '../../shared/empty.util';
import { GetRequest } from './request.models';
import {
configureRequest
} from '../shared/operators';
import { PaginatedSearchOptions } from '../../+search-page/paginated-search-options.model';
import { GenericConstructor } from '../shared/generic-constructor';
import { ResponseParsingService } from './parsing.service';
import { DSpaceObject } from '../shared/dspace-object.model';
import { DSOResponseParsingService } from './dso-response-parsing.service';
@Injectable()
export class CollectionDataService extends ComColDataService<NormalizedCollection, Collection> {
@@ -27,4 +40,34 @@ export class CollectionDataService extends ComColDataService<NormalizedCollectio
) {
super();
}
getMappingItemsEndpoint(collectionId): Observable<string> {
return this.halService.getEndpoint(this.linkPath).pipe(
map((endpoint: string) => this.getFindByIDHref(endpoint, collectionId)),
map((endpoint: string) => `${endpoint}/mappingItems`)
);
}
getMappedItems(collectionId: string, searchOptions?: PaginatedSearchOptions): Observable<RemoteData<PaginatedList<DSpaceObject>>> {
const href$ = this.getMappingItemsEndpoint(collectionId).pipe(
isNotEmptyOperator(),
distinctUntilChanged(),
map((endpoint: string) => hasValue(searchOptions) ? searchOptions.toRestUrl(endpoint) : endpoint)
);
href$.pipe(
map((endpoint: string) => {
const request = new GetRequest(this.requestService.generateRequestId(), endpoint);
return Object.assign(request, {
getResponseParser(): GenericConstructor<ResponseParsingService> {
return DSOResponseParsingService;
}
});
}),
configureRequest(this.requestService)
).subscribe();
return this.rdbService.buildList(href$);
}
}

1
src/app/shared/object-collection/object-collection.component.ts
View File

@@ -75,6 +75,7 @@ export class ObjectCollectionComponent implements OnChanges, OnInit {
this.currentMode = params.view;
}
});
console.log(this.objects);
}
/**

4
src/app/shared/object-select/item-select/item-select.component.html
View File

@@ -11,7 +11,7 @@
<thead>
<tr>
<th></th>
<th scope="col">{{'item.select.table.collection' | translate}}</th>
<th *ngIf="!hideCollection" scope="col">{{'item.select.table.collection' | translate}}</th>
<th scope="col">{{'item.select.table.author' | translate}}</th>
<th scope="col">{{'item.select.table.title' | translate}}</th>
</tr>
@@ -19,7 +19,7 @@
<tbody>
<tr *ngFor="let item of itemsRD?.payload?.page">
<td><input class="item-checkbox" [ngModel]="getSelected(item.id) | async" (change)="switch(item.id)" type="checkbox" name="{{item.id}}"></td>
<td><a [routerLink]="['/items', item.id]">{{(item.owningCollection | async)?.payload?.name}}</a></td>
<td *ngIf="!hideCollection"><a [routerLink]="['/items', item.id]">{{(item.owningCollection | async)?.payload?.name}}</a></td>
<td><a *ngIf="item.filterMetadata(['dc.contributor.author', 'dc.creator', 'dc.contributor.*']).length > 0" [routerLink]="['/items', item.id]">{{item.filterMetadata(['dc.contributor.author', 'dc.creator', 'dc.contributor.*'])[0].value}}</a></td>
<td><a [routerLink]="['/items', item.id]">{{item.findMetadata("dc.title")}}</a></td>
</tr>

3
src/app/shared/object-select/object-select/object-select.component.ts
View File

@@ -30,6 +30,9 @@ export abstract class ObjectSelectComponent<TDomain> implements OnInit, OnDestro
@Input()
confirmButton: string;
@Input()
hideCollection = false;
/**
* EventEmitter to return the selected UUIDs when the confirm button is pressed
* @type {EventEmitter<string[]>}