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

Merge remote-tracking branch 'remotes/origin/master' into submission

Browse Source 
# Conflicts:
#	resources/i18n/en.json
#	src/app/core/cache/builders/remote-data-build.service.ts
#	src/app/core/data/request.service.spec.ts
#	src/app/core/data/request.service.ts
This commit is contained in:
Giuseppe Digilio
2019-03-21 15:10:15 +01:00
parent b9bae41935 6aa0ec4427
commit dee38f3043
53 changed files with 1580 additions and 250 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/app/core/cache/builders/remote-data-build.service.ts vendored
View File

@@ -46,13 +46,13 @@ export class RemoteDataBuildService {
const payload$ =
observableCombineLatest(
href$.pipe(
switchMap((href: string) => this.objectCache.getBySelfLink<T>(href)),
switchMap((href: string) => this.objectCache.getObjectBySelfLink<T>(href)),
startWith(undefined)),
requestEntry$.pipe(
getResourceLinksFromResponse(),
switchMap((resourceSelfLinks: string[]) => {
if (isNotEmpty(resourceSelfLinks)) {
return this.objectCache.getBySelfLink<T>(resourceSelfLinks[0]);
return this.objectCache.getObjectBySelfLink<T>(resourceSelfLinks[0]);
} else {
return observableOf(undefined);
}