From 6e3127c3a68b1530b29351a24e5e5ff06f725e0d Mon Sep 17 00:00:00 2001
From: Michael W Spalti <mspalti@gmail.com>
Date: Thu, 12 Sep 2019 16:14:13 -0700
Subject: [PATCH] Setting cache period to zero for all instances where
forceBypassCache was previously true.
---
src/app/core/auth/auth-request.service.ts | 2 ++
src/app/core/data/data.service.ts | 14 +++++++++++++-
src/app/core/submission/submission-rest.service.ts | 3 ++-
.../core/submission/workflowitem-data.service.ts | 1 +
.../core/submission/workspaceitem-data.service.ts | 1 +
src/app/core/tasks/claimed-task-data.service.ts | 2 ++
src/app/core/tasks/pool-task-data.service.ts | 2 ++
7 files changed, 23 insertions(+), 2 deletions(-)
diff --git a/src/app/core/auth/auth-request.service.ts b/src/app/core/auth/auth-request.service.ts
index 713eb8cae8..4c8ce273bd 100644
--- a/src/app/core/auth/auth-request.service.ts
+++ b/src/app/core/auth/auth-request.service.ts
@@ -44,6 +44,7 @@ export class AuthRequestService {
map((endpointURL) => this.getEndpointByMethod(endpointURL, method)),
distinctUntilChanged(),
map((endpointURL: string) => new AuthPostRequest(this.requestService.generateRequestId(), endpointURL, body, options)),
+ map ((request: PostRequest) => request.responseMsToLive = 0),
tap((request: PostRequest) => this.requestService.configure(request)),
mergeMap((request: PostRequest) => this.fetchRequest(request)),
distinctUntilChanged());
@@ -55,6 +56,7 @@ export class AuthRequestService {
map((endpointURL) => this.getEndpointByMethod(endpointURL, method)),
distinctUntilChanged(),
map((endpointURL: string) => new AuthGetRequest(this.requestService.generateRequestId(), endpointURL, options)),
+ map ((request: GetRequest) => request.responseMsToLive = 0),
tap((request: GetRequest) => this.requestService.configure(request)),
mergeMap((request: GetRequest) => this.fetchRequest(request)),
distinctUntilChanged());
diff --git a/src/app/core/data/data.service.ts b/src/app/core/data/data.service.ts
index 1ed3c7a4a1..ae7fccc91b 100644
--- a/src/app/core/data/data.service.ts
+++ b/src/app/core/data/data.service.ts
@@ -49,6 +49,7 @@ export abstract class DataService<T extends CacheableObject> {
protected abstract notificationsService: NotificationsService;
protected abstract http: HttpClient;
protected abstract comparator: ChangeAnalyzer<T>;
+ protected resetMsToLive = false;
public abstract getBrowseEndpoint(options: FindAllOptions, linkPath?: string): Observable<string>
@@ -130,6 +131,9 @@ export abstract class DataService<T extends CacheableObject> {
first((href: string) => hasValue(href)))
.subscribe((href: string) => {
const request = new FindAllRequest(this.requestService.generateRequestId(), href, options);
+ if (this.resetMsToLive) {
+ request.responseMsToLive = 0;
+ }
this.requestService.configure(request);
});
@@ -153,6 +157,9 @@ export abstract class DataService<T extends CacheableObject> {
find((href: string) => hasValue(href)))
.subscribe((href: string) => {
const request = new FindByIDRequest(this.requestService.generateRequestId(), href, id);
+ if (this.resetMsToLive) {
+ request.responseMsToLive = 0;
+ }
this.requestService.configure(request);
});
@@ -160,7 +167,11 @@ export abstract class DataService<T extends CacheableObject> {
}
findByHref(href: string, options?: HttpOptions): Observable<RemoteData<T>> {
- this.requestService.configure(new GetRequest(this.requestService.generateRequestId(), href, null, options));
+ const request = new GetRequest(this.requestService.generateRequestId(), href, null, options);
+ if (this.resetMsToLive) {
+ request.responseMsToLive = 0;
+ }
+ this.requestService.configure(request);
return this.rdbService.buildSingle<T>(href);
}
@@ -191,6 +202,7 @@ export abstract class DataService<T extends CacheableObject> {
first((href: string) => hasValue(href)))
.subscribe((href: string) => {
const request = new FindAllRequest(this.requestService.generateRequestId(), href, options);
+ request.responseMsToLive = 0;
this.requestService.configure(request);
});
diff --git a/src/app/core/submission/submission-rest.service.ts b/src/app/core/submission/submission-rest.service.ts
index 9df4405c07..fb15975caa 100644
--- a/src/app/core/submission/submission-rest.service.ts
+++ b/src/app/core/submission/submission-rest.service.ts
@@ -6,7 +6,7 @@ import { distinctUntilChanged, filter, flatMap, map, mergeMap, tap } from 'rxjs/
import { RequestService } from '../data/request.service';
import { isNotEmpty } from '../../shared/empty.util';
import {
- DeleteRequest,
+ DeleteRequest, GetRequest,
PostRequest,
RestRequest,
SubmissionDeleteRequest,
@@ -109,6 +109,7 @@ export class SubmissionRestService {
filter((href: string) => isNotEmpty(href)),
distinctUntilChanged(),
map((endpointURL: string) => new SubmissionRequest(requestId, endpointURL)),
+ map ((request: RestRequest) => request.responseMsToLive = 0),
tap((request: RestRequest) => this.requestService.configure(request)),
flatMap(() => this.fetchRequest(requestId)),
distinctUntilChanged());
diff --git a/src/app/core/submission/workflowitem-data.service.ts b/src/app/core/submission/workflowitem-data.service.ts
index 6877c3965c..dca10d2b30 100644
--- a/src/app/core/submission/workflowitem-data.service.ts
+++ b/src/app/core/submission/workflowitem-data.service.ts
@@ -20,6 +20,7 @@ import { DSOChangeAnalyzer } from '../data/dso-change-analyzer.service';
@Injectable()
export class WorkflowItemDataService extends DataService<WorkflowItem> {
protected linkPath = 'workflowitems';
+ protected resetMsToLive = true;
constructor(
protected comparator: DSOChangeAnalyzer<WorkflowItem>,
diff --git a/src/app/core/submission/workspaceitem-data.service.ts b/src/app/core/submission/workspaceitem-data.service.ts
index 59f1e78e06..c2b6ab5816 100644
--- a/src/app/core/submission/workspaceitem-data.service.ts
+++ b/src/app/core/submission/workspaceitem-data.service.ts
@@ -20,6 +20,7 @@ import { WorkspaceItem } from './models/workspaceitem.model';
@Injectable()
export class WorkspaceitemDataService extends DataService<WorkspaceItem> {
protected linkPath = 'workspaceitems';
+ protected resetMsToLive = true;
constructor(
protected comparator: DSOChangeAnalyzer<WorkspaceItem>,
diff --git a/src/app/core/tasks/claimed-task-data.service.ts b/src/app/core/tasks/claimed-task-data.service.ts
index a2835dbd1e..aa85b3e8b5 100644
--- a/src/app/core/tasks/claimed-task-data.service.ts
+++ b/src/app/core/tasks/claimed-task-data.service.ts
@@ -22,6 +22,8 @@ import { ProcessTaskResponse } from './models/process-task-response';
@Injectable()
export class ClaimedTaskDataService extends TasksService<ClaimedTask> {
+ protected resetMsToLive = true;
+
/**
* The endpoint link name
*/
diff --git a/src/app/core/tasks/pool-task-data.service.ts b/src/app/core/tasks/pool-task-data.service.ts
index c031451525..8a12af0b68 100644
--- a/src/app/core/tasks/pool-task-data.service.ts
+++ b/src/app/core/tasks/pool-task-data.service.ts
@@ -27,6 +27,8 @@ export class PoolTaskDataService extends TasksService<PoolTask> {
*/
protected linkPath = 'pooltasks';
+ protected resetMsToLive = true;
+
/**
* Initialize instance variables
*
--
GitLab