fixes for conflicts with master

src/app/+item-page/edit-item-page/item-delete/item-delete.component.spec.ts

@@ -2,7 +2,6 @@ import {async, ComponentFixture, TestBed} from '@angular/core/testing';
 import { Item } from '../../../core/shared/item.model';
 import { RouterStub } from '../../../shared/testing/router-stub';
 import { of as observableOf } from 'rxjs';
-import {RestResponse} from '../../../core/cache/response-cache.models';
 import { RemoteData } from '../../../core/data/remote-data';
 import { NotificationsServiceStub } from '../../../shared/testing/notifications-service-stub';
 import { CommonModule } from '@angular/common';
@@ -17,6 +16,7 @@ import {CUSTOM_ELEMENTS_SCHEMA} from '@angular/core';
 import { By } from '@angular/platform-browser';
 import { ItemDeleteComponent } from './item-delete.component';
 import { getItemEditPath } from '../../item-page-routing.module';
+import { RestResponse } from '../../../core/cache/response.models';
 
 let comp: ItemDeleteComponent;
 let fixture: ComponentFixture<ItemDeleteComponent>;

src/app/+item-page/edit-item-page/item-delete/item-delete.component.ts

@@ -1,8 +1,8 @@
 import { Component } from '@angular/core';
 import { first } from 'rxjs/operators';
-import {RestResponse} from '../../../core/cache/response-cache.models';
 import { AbstractSimpleItemActionComponent } from '../simple-item-action/abstract-simple-item-action.component';
 import { getItemEditPath } from '../../item-page-routing.module';
+import { RestResponse } from '../../../core/cache/response.models';
 
 @Component({
   selector: 'ds-item-delete',

src/app/+item-page/edit-item-page/item-private/item-private.component.spec.ts

@@ -2,7 +2,6 @@ import {async, ComponentFixture, TestBed} from '@angular/core/testing';
 import {Item} from '../../../core/shared/item.model';
 import {RouterStub} from '../../../shared/testing/router-stub';
 import {of as observableOf} from 'rxjs';
-import {RestResponse} from '../../../core/cache/response-cache.models';
 import {RemoteData} from '../../../core/data/remote-data';
 import {NotificationsServiceStub} from '../../../shared/testing/notifications-service-stub';
 import {CommonModule} from '@angular/common';
@@ -16,6 +15,7 @@ import {NotificationsService} from '../../../shared/notifications/notifications.
 import {CUSTOM_ELEMENTS_SCHEMA} from '@angular/core';
 import {By} from '@angular/platform-browser';
 import {ItemPrivateComponent} from './item-private.component';
+import { RestResponse } from '../../../core/cache/response.models';
 
 let comp: ItemPrivateComponent;
 let fixture: ComponentFixture<ItemPrivateComponent>;

src/app/+item-page/edit-item-page/item-private/item-private.component.ts

@@ -1,9 +1,9 @@
 import { Component } from '@angular/core';
 import { first } from 'rxjs/operators';
-import {RestResponse} from '../../../core/cache/response-cache.models';
 import { AbstractSimpleItemActionComponent } from '../simple-item-action/abstract-simple-item-action.component';
 import { RemoteData } from '../../../core/data/remote-data';
 import { Item } from '../../../core/shared/item.model';
+import { RestResponse } from '../../../core/cache/response.models';
 
 @Component({
   selector: 'ds-item-private',

src/app/+item-page/edit-item-page/item-public/item-public.component.spec.ts

@@ -2,7 +2,6 @@ import {async, ComponentFixture, TestBed} from '@angular/core/testing';
 import { Item } from '../../../core/shared/item.model';
 import { RouterStub } from '../../../shared/testing/router-stub';
 import { of as observableOf } from 'rxjs';
-import {RestResponse} from '../../../core/cache/response-cache.models';
 import { RemoteData } from '../../../core/data/remote-data';
 import { NotificationsServiceStub } from '../../../shared/testing/notifications-service-stub';
 import { CommonModule } from '@angular/common';
@@ -16,6 +15,7 @@ import {NotificationsService} from '../../../shared/notifications/notifications.
 import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
 import { By } from '@angular/platform-browser';
 import { ItemPublicComponent } from './item-public.component';
+import { RestResponse } from '../../../core/cache/response.models';
 
 let comp: ItemPublicComponent;
 let fixture: ComponentFixture<ItemPublicComponent>;

src/app/+item-page/edit-item-page/item-public/item-public.component.ts

@@ -1,9 +1,9 @@
 import { Component } from '@angular/core';
 import { first } from 'rxjs/operators';
-import {RestResponse} from '../../../core/cache/response-cache.models';
 import { AbstractSimpleItemActionComponent } from '../simple-item-action/abstract-simple-item-action.component';
 import { RemoteData } from '../../../core/data/remote-data';
 import { Item } from '../../../core/shared/item.model';
+import { RestResponse } from '../../../core/cache/response.models';
 
 @Component({
   selector: 'ds-item-public',

src/app/+item-page/edit-item-page/item-reinstate/item-reinstate.component.spec.ts

@@ -2,7 +2,6 @@ import {async, ComponentFixture, TestBed} from '@angular/core/testing';
 import { Item } from '../../../core/shared/item.model';
 import { RouterStub } from '../../../shared/testing/router-stub';
 import { of as observableOf } from 'rxjs';
-import {RestResponse} from '../../../core/cache/response-cache.models';
 import { RemoteData } from '../../../core/data/remote-data';
 import { NotificationsServiceStub } from '../../../shared/testing/notifications-service-stub';
 import { CommonModule } from '@angular/common';
@@ -16,6 +15,7 @@ import {NotificationsService} from '../../../shared/notifications/notifications.
 import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
 import { By } from '@angular/platform-browser';
 import { ItemReinstateComponent } from './item-reinstate.component';
+import { RestResponse } from '../../../core/cache/response.models';
 
 let comp: ItemReinstateComponent;
 let fixture: ComponentFixture<ItemReinstateComponent>;

src/app/+item-page/edit-item-page/item-reinstate/item-reinstate.component.ts

@@ -1,9 +1,9 @@
 import { Component } from '@angular/core';
 import { first } from 'rxjs/operators';
-import {RestResponse} from '../../../core/cache/response-cache.models';
 import { AbstractSimpleItemActionComponent } from '../simple-item-action/abstract-simple-item-action.component';
 import { RemoteData } from '../../../core/data/remote-data';
 import { Item } from '../../../core/shared/item.model';
+import { RestResponse } from '../../../core/cache/response.models';
 
 @Component({
   selector: 'ds-item-reinstate',

src/app/+item-page/edit-item-page/item-withdraw/item-withdraw.component.spec.ts

@@ -2,7 +2,6 @@ import {async, ComponentFixture, TestBed} from '@angular/core/testing';
 import { Item } from '../../../core/shared/item.model';
 import { RouterStub } from '../../../shared/testing/router-stub';
 import { of as observableOf } from 'rxjs';
-import {RestResponse} from '../../../core/cache/response-cache.models';
 import { RemoteData } from '../../../core/data/remote-data';
 import { NotificationsServiceStub } from '../../../shared/testing/notifications-service-stub';
 import { CommonModule } from '@angular/common';
@@ -16,6 +15,7 @@ import {NotificationsService} from '../../../shared/notifications/notifications.
 import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
 import { ItemWithdrawComponent } from './item-withdraw.component';
 import { By } from '@angular/platform-browser';
+import { RestResponse } from '../../../core/cache/response.models';
 
 let comp: ItemWithdrawComponent;
 let fixture: ComponentFixture<ItemWithdrawComponent>;

src/app/+item-page/edit-item-page/item-withdraw/item-withdraw.component.ts

@@ -1,9 +1,9 @@
 import { Component } from '@angular/core';
 import { first } from 'rxjs/operators';
-import {RestResponse} from '../../../core/cache/response-cache.models';
 import { AbstractSimpleItemActionComponent } from '../simple-item-action/abstract-simple-item-action.component';
 import { RemoteData } from '../../../core/data/remote-data';
 import { Item } from '../../../core/shared/item.model';
+import { RestResponse } from '../../../core/cache/response.models';
 
 @Component({
   selector: 'ds-item-withdraw',

src/app/+item-page/edit-item-page/simple-item-action/abstract-simple-item-action.component.spec.ts

@@ -14,9 +14,9 @@ import {ItemDataService} from '../../../core/data/item-data.service';
 import { RemoteData } from '../../../core/data/remote-data';
 import { AbstractSimpleItemActionComponent } from './abstract-simple-item-action.component';
 import { By } from '@angular/platform-browser';
-import {RestResponse} from '../../../core/cache/response-cache.models';
 import { of as observableOf } from 'rxjs';
 import { getItemEditPath } from '../../item-page-routing.module';
+import { RestResponse } from '../../../core/cache/response.models';
 
 /**
  * Test component that implements the AbstractSimpleItemActionComponent used to test the

src/app/+item-page/edit-item-page/simple-item-action/abstract-simple-item-action.component.ts

@@ -8,9 +8,9 @@ import {RemoteData} from '../../../core/data/remote-data';
 import {Observable} from 'rxjs';
 import {getSucceededRemoteData} from '../../../core/shared/operators';
 import {first, map} from 'rxjs/operators';
-import {RestResponse} from '../../../core/cache/response-cache.models';
 import {findSuccessfulAccordingTo} from '../edit-item-operators';
 import {getItemEditPath} from '../../item-page-routing.module';
+import { RestResponse } from '../../../core/cache/response.models';
 
 /**
  * Component to render and handle simple item edit actions such as withdrawal and reinstatement.

src/app/core/auth/auth-request.service.ts

@@ -25,8 +25,6 @@ export class AuthRequestService {
   protected fetchRequest(request: RestRequest): Observable<any> {
     return this.requestService.getByUUID(request.uuid).pipe(
       getResponseFromEntry(),
-      // TODO to review when https://github.com/DSpace/dspace-angular/issues/217 will be fixed
-      // tap(() => this.responseCache.remove(request.href)),
       mergeMap((response) => {
         if (response.isSuccessful && isNotEmpty(response)) {
           return observableOf((response as AuthStatusResponse).response);

src/app/core/data/item-data.service.spec.ts

@@ -14,6 +14,8 @@ import { RestResponse } from '../cache/response.models';
 import { NotificationsService } from '../../shared/notifications/notifications.service';
 import { NormalizedObjectBuildService } from '../cache/builders/normalized-object-build.service';
 import { HttpClient } from '@angular/common/http';
+import { RequestEntry } from './request.reducer';
+import { of as observableOf } from 'rxjs';
 
 describe('ItemDataService', () => {
   let scheduler: TestScheduler;
@@ -25,6 +27,11 @@ describe('ItemDataService', () => {
     },
     configure(request: RestRequest) {
       // Do nothing
+    },
+    getByHref(requestHref: string) {
+      const responseCacheEntry = new RequestEntry();
+      responseCacheEntry.response = new RestResponse(true, '200');
+      return observableOf(responseCacheEntry);
     }
   } as RequestService;
   const rdbService = {} as RemoteDataBuildService;