hazza/dspace-angular
1
0
Fork 1
mirror of https://github.com/DSpace/dspace-angular.git synced 2025-10-08 02:24:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix issue where requestservice.getByUUID wouldn't work for requests that were never sent because there was already a copy in the cache

Browse Source
This commit is contained in:
Art Lowel
2020-04-06 16:40:45 +02:00
parent f64eff42f4
commit 2a58f2480a
1 changed files with 23 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3,9 +3,9 @@ import { HttpHeaders } from '@angular/common/http';
import { createSelector, MemoizedSelector, select, Store } from '@ngrx/store'; import { createSelector, MemoizedSelector, select, Store } from '@ngrx/store';
import { Observable, race as observableRace } from 'rxjs'; import { Observable, race as observableRace } from 'rxjs';
import { filter, map, mergeMap, take } from 'rxjs/operators'; import { filter, map, mergeMap, take, switchMap } from 'rxjs/operators';
import { cloneDeep, remove } from 'lodash'; import { cloneDeep, remove } from 'lodash';
import { hasValue, isEmpty, isNotEmpty } from '../../shared/empty.util'; import { hasValue, isEmpty, isNotEmpty, hasValueOperator } 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 { CoreState } from '../core.reducers'; import { CoreState } from '../core.reducers';
@@ -111,13 +111,22 @@ export class RequestService {
*/ */
getByUUID(uuid: string): Observable<RequestEntry> { getByUUID(uuid: string): Observable<RequestEntry> {
return observableRace( return observableRace(
this.store.pipe(select(entryFromUUIDSelector(uuid))), this.store.pipe(
select(entryFromUUIDSelector(uuid)),
hasValueOperator()
),
this.store.pipe( this.store.pipe(
select(originalRequestUUIDFromRequestUUIDSelector(uuid)), select(originalRequestUUIDFromRequestUUIDSelector(uuid)),
mergeMap((originalUUID) => { switchMap((originalUUID) => {
return this.store.pipe(select(entryFromUUIDSelector(originalUUID))) if (hasValue(originalUUID)) {
return this.store.pipe(select(entryFromUUIDSelector(originalUUID)))
} else {
return []
}
}, },
)) ),
hasValueOperator()
)
).pipe( ).pipe(
map((entry: RequestEntry) => { map((entry: RequestEntry) => {
// Headers break after being retrieved from the store (because of lazy initialization) // Headers break after being retrieved from the store (because of lazy initialization)
@@ -137,7 +146,14 @@ export class RequestService {
getByHref(href: string): Observable<RequestEntry> { getByHref(href: string): Observable<RequestEntry> {
return this.store.pipe( return this.store.pipe(
select(uuidFromHrefSelector(href)), select(uuidFromHrefSelector(href)),
mergeMap((uuid: string) => this.getByUUID(uuid)) mergeMap((uuid: string) => {
if (isNotEmpty(uuid)) {
return this.getByUUID(uuid);
}
else {
return [undefined];
}
})
); );
} }