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

Cache redesign part 1, and add support for alternative links

Browse Source
This commit is contained in:
Art Lowel
2020-12-11 14:18:44 +01:00
parent f4853972cc
commit 4e18fa35ca
522 changed files with 7537 additions and 6933 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/app/core/submission/workflowitem-data.service.ts
View File

@@ -16,8 +16,9 @@ import { DSOChangeAnalyzer } from '../data/dso-change-analyzer.service';
import { Observable } from 'rxjs';
import { find, map } from 'rxjs/operators';
import { hasValue } from '../../shared/empty.util';
import { RequestEntry } from '../data/request.reducer';
import { RestResponse } from '../cache/response.models';
import { RemoteData } from '../data/remote-data';
import { NoContent } from '../shared/NoContent.model';
import { getFirstCompletedRemoteData } from '../shared/operators';
/**
* A service that provides methods to make REST requests with workflow items endpoint.
@@ -45,7 +46,7 @@ export class WorkflowItemDataService extends DataService<WorkflowItem> {
* @param id The Workflow Item's id to be removed
* @return an observable that emits true when the deletion was successful, false when it failed
*/
delete(id: string): Observable<RestResponse> {
delete(id: string): Observable<RemoteData<NoContent>> {
return this.deleteWFI(id, true)
}
@@ -55,7 +56,10 @@ export class WorkflowItemDataService extends DataService<WorkflowItem> {
* @return an observable that emits true when sending back the item was successful, false when it failed
*/
sendBack(id: string): Observable<boolean> {
return this.deleteWFI(id, false).pipe(map((response: RestResponse) => response.isSuccessful));
return this.deleteWFI(id, false).pipe(
getFirstCompletedRemoteData(),
map((response: RemoteData<NoContent>) => response.hasSucceeded)
);
}
/**
@@ -65,7 +69,7 @@ export class WorkflowItemDataService extends DataService<WorkflowItem> {
* When true, the workflow item and its item will be permanently expunged on the server
* When false, the workflow item will be removed, but the item will still be available as a workspace item
*/
private deleteWFI(id: string, expunge: boolean): Observable<RestResponse> {
private deleteWFI(id: string, expunge: boolean): Observable<RemoteData<NoContent>> {
const requestId = this.requestService.generateRequestId();
const hrefObs = this.halService.getEndpoint(this.linkPath).pipe(
@@ -81,9 +85,6 @@ export class WorkflowItemDataService extends DataService<WorkflowItem> {
})
).subscribe();
return this.requestService.getByUUID(requestId).pipe(
find((request: RequestEntry) => request.completed),
map((request: RequestEntry) => request.response)
);
return this.rdbService.buildFromRequestUUID(requestId);
}
}