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

Replaced deprecated rxjs flatMap operator

Browse Source
This commit is contained in:
Giuseppe Digilio
2020-11-23 15:38:02 +01:00
parent 44a65c7a23
commit 9f5204992d
21 changed files with 90 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/app/core/shared/operators.ts
View File

@@ -1,6 +1,6 @@
import { Router, UrlTree } from '@angular/router';
import { Observable, combineLatest as observableCombineLatest } from 'rxjs';
import { filter, find, flatMap, map, switchMap, take, tap } from 'rxjs/operators';
import { combineLatest as observableCombineLatest, Observable } from 'rxjs';
import { filter, find, map, mergeMap, switchMap, take, tap } from 'rxjs/operators';
import { hasValue, hasValueOperator, isNotEmpty } from '../../shared/empty.util';
import { SearchResult } from '../../shared/search/search-result.model';
import { DSOSuccessResponse, RestResponse } from '../cache/response.models';
@@ -23,14 +23,14 @@ import { getEndUserAgreementPath } from '../../info/info-routing-paths';
export const getRequestFromRequestHref = (requestService: RequestService) =>
(source: Observable<string>): Observable<RequestEntry> =>
source.pipe(
flatMap((href: string) => requestService.getByHref(href)),
mergeMap((href: string) => requestService.getByHref(href)),
hasValueOperator()
);
export const getRequestFromRequestUUID = (requestService: RequestService) =>
(source: Observable<string>): Observable<RequestEntry> =>
source.pipe(
flatMap((uuid: string) => requestService.getByUUID(uuid)),
mergeMap((uuid: string) => requestService.getByUUID(uuid)),
hasValueOperator()
);