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

cleaned up remotedata for a better separation of concerns, moved statuscode and errormsg in to RemoteDataError object, moved pageInfo to PaginatedList object in the payload

Browse Source
This commit is contained in:
Art Lowel
2017-12-07 11:28:44 +01:00
parent 98a49b3191
commit d775467fcb
17 changed files with 162 additions and 128 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/app/core/data/request.service.ts
View File

@@ -12,7 +12,7 @@ import { ResponseCacheService } from '../cache/response-cache.service';
import { coreSelector, CoreState } from '../core.reducers';
import { keySelector } from '../shared/selectors';
import { RequestConfigureAction, RequestExecuteAction } from './request.actions';
import { RestRequest } from './request.models';
import { RestRequest, RestRequestMethod } from './request.models';
import { RequestEntry, RequestState } from './request.reducer';
@@ -30,11 +30,9 @@ export function requestStateSelector(): MemoizedSelector<CoreState, RequestState
export class RequestService {
private requestsOnTheirWayToTheStore: string[] = [];
constructor(
private objectCache: ObjectCacheService,
private responseCache: ResponseCacheService,
private store: Store<CoreState>
) {
constructor(private objectCache: ObjectCacheService,
private responseCache: ResponseCacheService,
private store: Store<CoreState>) {
}
isPending(href: string): boolean {
@@ -59,6 +57,12 @@ export class RequestService {
}
configure<T extends CacheableObject>(request: RestRequest): void {
if (request.method !== RestRequestMethod.Get || !this.isCachedOrPending(request)) {
this.dispatchRequest(request);
}
}
private isCachedOrPending(request: RestRequest) {
let isCached = this.objectCache.hasBySelfLink(request.href);
if (!isCached && this.responseCache.has(request.href)) {
const [successResponse, errorResponse] = this.responseCache.get(request.href)
@@ -84,11 +88,13 @@ export class RequestService {
const isPending = this.isPending(request.href);
if (!(isCached || isPending)) {
this.store.dispatch(new RequestConfigureAction(request));
this.store.dispatch(new RequestExecuteAction(request.href));
this.trackRequestsOnTheirWayToTheStore(request.href);
}
return isCached || isPending;
}
private dispatchRequest(request: RestRequest) {
this.store.dispatch(new RequestConfigureAction(request));
this.store.dispatch(new RequestExecuteAction(request.href));
this.trackRequestsOnTheirWayToTheStore(request.href);
}
/**