hazza/dspace-angular
1
0
Fork 1
mirror of https://github.com/DSpace/dspace-angular.git synced 2025-10-18 15:33:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

solved conflicts with master

Browse Source
This commit is contained in:
lotte
2019-03-21 16:16:24 +01:00
parent 23a1e6bce5
commit d820991beb
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/app/core/data/request.service.ts
View File

@@ -7,9 +7,8 @@ import { AppState } from '../../app.reducer';
import { hasValue, isNotEmpty } from '../../shared/empty.util'; import { hasValue, isNotEmpty } from '../../shared/empty.util';
import { CacheableObject } from '../cache/object-cache.reducer'; import { CacheableObject } from '../cache/object-cache.reducer';
import { ObjectCacheService } from '../cache/object-cache.service'; import { ObjectCacheService } from '../cache/object-cache.service';
import { coreSelector, CoreState } from '../core.reducers'; import { CoreState } from '../core.reducers';
import { IndexName, IndexState, MetaIndexState } from '../index/index.reducer'; import { IndexName, IndexState, MetaIndexState } from '../index/index.reducer';
import { pathSelector } from '../shared/selectors';
import { import {
originalRequestUUIDFromRequestUUIDSelector, originalRequestUUIDFromRequestUUIDSelector,
requestIndexSelector, requestIndexSelector,
@@ -27,6 +26,7 @@ import { RequestEntry, RequestState } from './request.reducer';
import { CommitSSBAction } from '../cache/server-sync-buffer.actions'; import { CommitSSBAction } from '../cache/server-sync-buffer.actions';
import { RestRequestMethod } from './rest-request-method'; import { RestRequestMethod } from './rest-request-method';
import { AddToIndexAction, RemoveFromIndexBySubstringAction } from '../index/index.actions'; import { AddToIndexAction, RemoveFromIndexBySubstringAction } from '../index/index.actions';
import { coreSelector } from '../core.selectors';
const requestCacheSelector = createSelector( const requestCacheSelector = createSelector(
coreSelector, coreSelector,