mirror of
https://github.com/DSpace/dspace-angular.git
synced 2025-10-14 05:23:06 +00:00
Merge branch 'response-cache-refactoring' into w2p-55946_Item-mapping-on-item-level
Conflicts: src/app/core/data/data.service.ts src/app/core/data/item-data.service.ts src/app/shared/shared.module.ts src/app/shared/testing/active-router-stub.ts
This commit is contained in:
@@ -32,7 +32,6 @@ import { ObjectCacheService } from './cache/object-cache.service';
|
||||
import { PaginationComponentOptions } from '../shared/pagination/pagination-component-options.model';
|
||||
import { RemoteDataBuildService } from './cache/builders/remote-data-build.service';
|
||||
import { RequestService } from './data/request.service';
|
||||
import { ResponseCacheService } from './cache/response-cache.service';
|
||||
import { EndpointMapResponseParsingService } from './data/endpoint-map-response-parsing.service';
|
||||
import { ServerResponseService } from '../shared/services/server-response.service';
|
||||
import { NativeWindowFactory, NativeWindowService } from '../shared/services/window.service';
|
||||
@@ -104,7 +103,6 @@ const PROVIDERS = [
|
||||
RegistryService,
|
||||
RemoteDataBuildService,
|
||||
RequestService,
|
||||
ResponseCacheService,
|
||||
EndpointMapResponseParsingService,
|
||||
FacetValueResponseParsingService,
|
||||
FacetValueMapResponseParsingService,
|
||||
|
Reference in New Issue
Block a user