Setting cache period to zero for all instances where forceBypassCache was previously true.

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());

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>,

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>,

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

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
    *