Merge branch 'master' into resolvers-branch-angular6

Conflicts:
	src/app/core/cache/builders/remote-data-build.service.ts
	src/app/core/metadata/metadata.service.ts
	src/app/core/shared/item.model.ts
	src/app/shared/loading/loading.component.ts
	yarn.lock
This commit is contained in:
lotte
2018-10-31 11:03:09 +01:00
13 changed files with 218 additions and 33 deletions

View File

@@ -59,7 +59,7 @@ export const toDSpaceObjectListRD = () =>
source.pipe(
map((rd: RemoteData<PaginatedList<SearchResult<T>>>) => {
const dsoPage: T[] = rd.payload.page.map((searchResult: SearchResult<T>) => searchResult.dspaceObject);
const payload = Object.assign(rd.payload, { page: dsoPage }) as PaginatedList<T>;
const payload = Object.assign(rd.payload, { page: dsoPage }) as any;
return Object.assign(rd, {payload: payload});
})
);