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

Fixed issue that emits successful remote data twice with undefined payload in the first one

Browse Source
This commit is contained in:
Giuseppe Digilio
2020-09-03 14:45:10 +02:00
parent cd6c5b70c8
commit 99c0f6ceaa
1 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,7 +1,7 @@
import { Injectable } from '@angular/core'; import { Injectable } from '@angular/core';
import { combineLatest as observableCombineLatest, Observable, of as observableOf, race as observableRace } from 'rxjs'; import { combineLatest as observableCombineLatest, Observable, of as observableOf, race as observableRace } from 'rxjs';
import { distinctUntilChanged, map, startWith, switchMap } from 'rxjs/operators'; import { distinctUntilChanged, map, startWith, switchMap } from 'rxjs/operators';
import { hasValue, hasValueOperator, isEmpty, isNotEmpty, isNotUndefined } from '../../../shared/empty.util'; import { hasValue, isEmpty, isNotEmpty, isNotUndefined } from '../../../shared/empty.util';
import { createSuccessfulRemoteDataObject$ } from '../../../shared/remote-data.utils'; import { createSuccessfulRemoteDataObject$ } from '../../../shared/remote-data.utils';
import { FollowLinkConfig } from '../../../shared/utils/follow-link-config.model'; import { FollowLinkConfig } from '../../../shared/utils/follow-link-config.model';
import { PaginatedList } from '../../data/paginated-list'; import { PaginatedList } from '../../data/paginated-list';
@@ -68,11 +68,7 @@ export class RemoteDataBuildService {
return fromResponse; return fromResponse;
} }
}), }),
hasValueOperator(), map((obj: T) => hasValue(obj) ? this.linkService.resolveLinks(obj, ...linksToFollow) : undefined),
map((obj: T) =>
this.linkService.resolveLinks(obj, ...linksToFollow)
),
startWith(undefined),
distinctUntilChanged() distinctUntilChanged()
); );
return this.toRemoteDataObservable(requestEntry$, payload$); return this.toRemoteDataObservable(requestEntry$, payload$);
@@ -88,7 +84,7 @@ export class RemoteDataBuildService {
const response = reqEntry ? reqEntry.response : undefined; const response = reqEntry ? reqEntry.response : undefined;
if (hasValue(response)) { if (hasValue(response)) {
isSuccessful = response.statusCode === 204 || isSuccessful = response.statusCode === 204 ||
response.statusCode >= 200 && response.statusCode < 300 && hasValue(payload); response.statusCode >= 200 && response.statusCode < 300 && (hasValue(payload) || responsePending);
const errorMessage = isSuccessful === false ? (response as ErrorResponse).errorMessage : undefined; const errorMessage = isSuccessful === false ? (response as ErrorResponse).errorMessage : undefined;
if (hasValue(errorMessage)) { if (hasValue(errorMessage)) {
error = new RemoteDataError( error = new RemoteDataError(