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

90252: Fix invalidateByHref not emitting

Browse Source
This commit is contained in:
Yura Bondarenko
2022-04-20 13:21:37 +02:00
parent be488c04bb
commit a041368019
1 changed files with 10 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/app/core/data/data.service.ts
View File

@@ -600,16 +600,13 @@ export abstract class DataService<T extends CacheableObject> implements UpdateDa
const done$ = new AsyncSubject<boolean>();
this.objectCache.getByHref(href).pipe(
switchMap((oce: ObjectCacheEntry) => observableFrom(oce.requestUUIDs)),
mergeMap((requestUUID: string) => this.requestService.setStaleByUUID(requestUUID)),
toArray(),
map((areRequestsStale: boolean[]) => areRequestsStale.every(Boolean)),
distinctUntilChanged(),
).subscribe((done: boolean) => {
if (done) {
done$.next(true);
done$.complete();
}
switchMap((oce: ObjectCacheEntry) => observableFrom(oce.requestUUIDs).pipe(
mergeMap((requestUUID: string) => this.requestService.setStaleByUUID(requestUUID)),
toArray(),
)),
).subscribe(() => {
done$.next(true);
done$.complete();
});
return done$;
@@ -667,11 +664,9 @@ export abstract class DataService<T extends CacheableObject> implements UpdateDa
return [true];
}
})
).subscribe((invalidated: boolean) => {
if (invalidated) {
invalidated$.next(true);
invalidated$.complete();
}
).subscribe(() => {
invalidated$.next(true);
invalidated$.complete();
});
return combineLatest([response$, invalidated$]).pipe(