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

Merged submission module code

Browse Source
This commit is contained in:
Giuseppe
2018-07-26 18:36:36 +02:00
parent b6e4e2562d
commit 6f60cd68e2
179 changed files with 9143 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,6 +1,8 @@
import { Injectable } from '@angular/core';
import { createSelector, MemoizedSelector, Store } from '@ngrx/store';
import { MemoizedSelector, Store } from '@ngrx/store';
import { remove } from 'lodash';
import { Observable } from 'rxjs/Observable';
import { hasValue } from '../../shared/empty.util';
@@ -67,12 +69,28 @@ export class RequestService {
.flatMap((uuid: string) => this.getByUUID(uuid));
}
// TODO to review "overrideRequest" param when https://github.com/DSpace/dspace-angular/issues/217 will be fixed
private clearRequestsOnTheirWayToTheStore(href) {
this.getByHref(href)
.take(1)
.subscribe((re: RequestEntry) => {
if (!hasValue(re)) {
this.responseCache.remove(href);
} else if (!re.responsePending) {
this.responseCache.remove(href);
remove(this.requestsOnTheirWayToTheStore, (item) => item === href);
}
});
}
// TODO to review "forceBypassCache" param when https://github.com/DSpace/dspace-angular/issues/217 will be fixed
configure<T extends CacheableObject>(request: RestRequest, forceBypassCache: boolean = false): void {
const isGetRequest = request.method === RestRequestMethod.Get;
if (!isGetRequest || !this.isCachedOrPending(request) || forceBypassCache) {
if (forceBypassCache) {
this.clearRequestsOnTheirWayToTheStore(request.href);
}
if (!isGetRequest || !this.isCachedOrPending(request) || (forceBypassCache && !this.isPending(request))) {
this.dispatchRequest(request);
if (isGetRequest && !forceBypassCache) {
if (isGetRequest) {
this.trackRequestsOnTheirWayToTheStore(request);
}
}
@@ -121,7 +139,7 @@ export class RequestService {
*/
private trackRequestsOnTheirWayToTheStore(request: GetRequest) {
this.requestsOnTheirWayToTheStore = [...this.requestsOnTheirWayToTheStore, request.href];
this.store.select(this.entryFromUUIDSelector(request.href))
this.getByHref(request.href)
.filter((re: RequestEntry) => hasValue(re))
.take(1)
.subscribe((re: RequestEntry) => {