From 34defdc5cd6e7360c6bed25fe235756c0a0ed91c 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/submission/submission-rest.service.ts | 4 ++++
src/app/core/submission/workflowitem-data.service.ts | 4 ++++
src/app/core/submission/workspaceitem-data.service.ts | 4 ++++
src/app/core/tasks/claimed-task-data.service.ts | 4 ++++
src/app/core/tasks/pool-task-data.service.ts | 5 +++++
5 files changed, 21 insertions(+)
diff --git a/src/app/core/submission/submission-rest.service.ts b/src/app/core/submission/submission-rest.service.ts
index 58aa507314..22594e134d 100644
--- a/src/app/core/submission/submission-rest.service.ts
+++ b/src/app/core/submission/submission-rest.service.ts
@@ -109,10 +109,14 @@ export class SubmissionRestService {
filter((href: string) => isNotEmpty(href)),
distinctUntilChanged(),
map((endpointURL: string) => new SubmissionRequest(requestId, endpointURL)),
+<<<<<<< HEAD
map ((request: RestRequest) => {
request.responseMsToLive = 0;
return request;
}),
+=======
+ map ((request: RestRequest) => request.responseMsToLive = 0),
+>>>>>>> Setting cache period to zero for all instances where forceBypassCache was previously true.
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 218de9c81a..4e65b5c58c 100644
--- a/src/app/core/submission/workflowitem-data.service.ts
+++ b/src/app/core/submission/workflowitem-data.service.ts
@@ -20,7 +20,11 @@ import { DSOChangeAnalyzer } from '../data/dso-change-analyzer.service';
@Injectable()
export class WorkflowItemDataService extends DataService<WorkflowItem> {
protected linkPath = 'workflowitems';
+<<<<<<< HEAD
protected responseMsToLive = 0;
+=======
+ protected resetMsToLive = true;
+>>>>>>> Setting cache period to zero for all instances where forceBypassCache was previously 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 70e07edd5e..4bf44e8764 100644
--- a/src/app/core/submission/workspaceitem-data.service.ts
+++ b/src/app/core/submission/workspaceitem-data.service.ts
@@ -20,7 +20,11 @@ import { WorkspaceItem } from './models/workspaceitem.model';
@Injectable()
export class WorkspaceitemDataService extends DataService<WorkspaceItem> {
protected linkPath = 'workspaceitems';
+<<<<<<< HEAD
protected responseMsToLive = 0;
+=======
+ protected resetMsToLive = true;
+>>>>>>> Setting cache period to zero for all instances where forceBypassCache was previously 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 fecffaabe1..5af62318d3 100644
--- a/src/app/core/tasks/claimed-task-data.service.ts
+++ b/src/app/core/tasks/claimed-task-data.service.ts
@@ -22,7 +22,11 @@ import { ProcessTaskResponse } from './models/process-task-response';
@Injectable()
export class ClaimedTaskDataService extends TasksService<ClaimedTask> {
+<<<<<<< HEAD
protected responseMsToLive = 0;
+=======
+ protected resetMsToLive = true;
+>>>>>>> Setting cache period to zero for all instances where forceBypassCache was previously 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 a04c0b20ea..6ceb3915de 100644
--- a/src/app/core/tasks/pool-task-data.service.ts
+++ b/src/app/core/tasks/pool-task-data.service.ts
@@ -27,11 +27,16 @@ export class PoolTaskDataService extends TasksService<PoolTask> {
*/
protected linkPath = 'pooltasks';
+<<<<<<< HEAD
<<<<<<< HEAD
protected responseMsToLive = 0;
=======
>>>>>>> Refactored to remove forceBypassCache param from requestService and from data service classes.
+=======
+ protected resetMsToLive = true;
+
+>>>>>>> Setting cache period to zero for all instances where forceBypassCache was previously true.
/**
* Initialize instance variables
*
--
GitLab