hazza/dspace-angular
1
0
Fork 1
mirror of https://github.com/DSpace/dspace-angular.git synced 2025-10-16 22:43:03 +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

43
src/app/core/tasks/tasks.service.ts
View File

@@ -1,17 +1,21 @@
import { HttpHeaders } from '@angular/common/http';
import { merge as observableMerge, Observable, of as observableOf } from 'rxjs';
import { distinctUntilChanged, filter, flatMap, map, mergeMap, tap } from 'rxjs/operators';
import { Observable } from 'rxjs';
import { distinctUntilChanged, filter, flatMap, map, tap } from 'rxjs/operators';
import { DataService } from '../data/data.service';
import { DeleteRequest, FindListOptions, PostRequest, TaskDeleteRequest, TaskPostRequest } from '../data/request.models';
import {
DeleteRequest,
PostRequest,
TaskDeleteRequest,
TaskPostRequest
} from '../data/request.models';
import { isNotEmpty } from '../../shared/empty.util';
import { HttpOptions } from '../dspace-rest-v2/dspace-rest-v2.service';
import { HttpOptions } from '../dspace-rest/dspace-rest.service';
import { ProcessTaskResponse } from './models/process-task-response';
import { RemoteDataError } from '../data/remote-data-error';
import { getResponseFromEntry } from '../shared/operators';
import { ErrorResponse, MessageResponse, RestResponse } from '../cache/response.models';
import { getFirstCompletedRemoteData } from '../shared/operators';
import { CacheableObject } from '../cache/object-cache.reducer';
import { RemoteData } from '../data/remote-data';
/**
* An abstract class that provides methods to handle task requests.
@@ -27,23 +31,16 @@ export abstract class TasksService<T extends CacheableObject> extends DataServic
* server response
*/
protected fetchRequest(requestId: string): Observable<ProcessTaskResponse> {
const responses = this.requestService.getByUUID(requestId).pipe(
getResponseFromEntry()
return this.rdbService.buildFromRequestUUID(requestId).pipe(
getFirstCompletedRemoteData(),
map((response: RemoteData<any>) => {
if (response.hasFailed) {
return new ProcessTaskResponse(false, response.statusCode, response.errorMessage)
} else {
return new ProcessTaskResponse(true, response.statusCode);
}
})
);
const errorResponses = responses.pipe(
filter((response: RestResponse) => !response.isSuccessful),
mergeMap((response: ErrorResponse) => observableOf(
new ProcessTaskResponse(
response.isSuccessful,
new RemoteDataError(response.statusCode, response.statusText, response.errorMessage)
))
));
const successResponses = responses.pipe(
filter((response: RestResponse) => response.isSuccessful),
map((response: MessageResponse) => new ProcessTaskResponse(response.isSuccessful)),
distinctUntilChanged()
);
return observableMerge(errorResponses, successResponses);
}
/**