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

Fixed dynamic form to make it work after Angular 6 upgrade

Browse Source
This commit is contained in:
Giuseppe Digilio
2018-12-20 11:09:38 +01:00
parent 3a8411f5f6
commit 1935b61c7e
45 changed files with 633 additions and 294 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -6,7 +6,7 @@ import {
} from 'rxjs';
import { Injectable } from '@angular/core';
import { distinctUntilChanged, flatMap, map, startWith } from 'rxjs/operators';
import { hasValue, hasValueOperator, isEmpty, isNotEmpty } from '../../../shared/empty.util';
import { hasValue, hasValueOperator, isEmpty, isNotEmpty, isNotUndefined } from '../../../shared/empty.util';
import { PaginatedList } from '../../data/paginated-list';
import { RemoteData } from '../../data/remote-data';
import { RemoteDataError } from '../../data/remote-data-error';
@@ -266,8 +266,10 @@ export class RemoteDataBuildService {
map((rd: RemoteData<T[] | PaginatedList<T>>) => {
if (Array.isArray(rd.payload)) {
return Object.assign(rd, { payload: new PaginatedList(pageInfo, rd.payload) })
} else {
} else if (isNotUndefined(rd.payload)) {
return Object.assign(rd, { payload: new PaginatedList(pageInfo, rd.payload.page) });
} else {
return Object.assign(rd, { payload: new PaginatedList(pageInfo, []) });
}
})
);