Skip to content

Commit

Permalink
115046: Fixed issue where relationsToItems would never emit when an e…
Browse files Browse the repository at this point in the history
…mpty array was passed to it
  • Loading branch information
alexandrevryghem committed Jun 3, 2024
1 parent 8ee3750 commit 6d1e6f9
Showing 1 changed file with 12 additions and 11 deletions.
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { combineLatest as observableCombineLatest, Observable, zip as observableZip } from 'rxjs';
import { combineLatest as observableCombineLatest, Observable, of as observableOf, zip as observableZip } from 'rxjs';
import { distinctUntilChanged, map, mergeMap, switchMap } from 'rxjs/operators';
import { PaginatedList } from '../../../../core/data/paginated-list.model';
import { RemoteData } from '../../../../core/data/remote-data';
Expand Down Expand Up @@ -46,17 +46,19 @@ export const compareArraysUsingIds = <T extends { id: string }>() =>
/**
* Operator for turning a list of relationships into a list of the relevant items
* @param {string} thisId The item's id of which the relations belong to
* @returns {(source: Observable<Relationship[]>) => Observable<Item[]>}
*/
export const relationsToItems = (thisId: string) =>
export const relationsToItems = (thisId: string): (source: Observable<Relationship[]>) => Observable<Item[]> =>
(source: Observable<Relationship[]>): Observable<Item[]> =>
source.pipe(
mergeMap((rels: Relationship[]) =>
observableZip(
...rels.map((rel: Relationship) => observableCombineLatest(rel.leftItem, rel.rightItem))
)
),
map((arr) =>
mergeMap((relationships: Relationship[]) => {
if (relationships.length === 0) {
return observableOf([]);
}
return observableZip(
...relationships.map((rel: Relationship) => observableCombineLatest([rel.leftItem, rel.rightItem])),
);
}),
map((arr: [RemoteData<Item>, RemoteData<Item>][]) =>
arr
.filter(([leftItem, rightItem]) => leftItem.hasSucceeded && rightItem.hasSucceeded)
.map(([leftItem, rightItem]) => {
Expand All @@ -75,9 +77,8 @@ export const relationsToItems = (thisId: string) =>
* Operator for turning a paginated list of relationships into a paginated list of the relevant items
* The result is wrapped in the original RemoteData and PaginatedList
* @param {string} thisId The item's id of which the relations belong to
* @returns {(source: Observable<Relationship[]>) => Observable<Item[]>}
*/
export const paginatedRelationsToItems = (thisId: string) =>
export const paginatedRelationsToItems = (thisId: string): (source: Observable<RemoteData<PaginatedList<Relationship>>>) => Observable<RemoteData<PaginatedList<Item>>> =>
(source: Observable<RemoteData<PaginatedList<Relationship>>>): Observable<RemoteData<PaginatedList<Item>>> =>
source.pipe(
getFirstSucceededRemoteData(),
Expand Down

0 comments on commit 6d1e6f9

Please sign in to comment.