From 6d1e6f90fcad329a8963fef73c2a6ad57b2308bc Mon Sep 17 00:00:00 2001 From: Alexandre Vryghem Date: Mon, 3 Jun 2024 13:50:42 +0200 Subject: [PATCH] 115046: Fixed issue where relationsToItems would never emit when an empty array was passed to it --- .../shared/item-relationships-utils.ts | 23 ++++++++++--------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/src/app/item-page/simple/item-types/shared/item-relationships-utils.ts b/src/app/item-page/simple/item-types/shared/item-relationships-utils.ts index b4c3da2cdc..a3531bda05 100644 --- a/src/app/item-page/simple/item-types/shared/item-relationships-utils.ts +++ b/src/app/item-page/simple/item-types/shared/item-relationships-utils.ts @@ -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'; @@ -46,17 +46,19 @@ export const compareArraysUsingIds = () => /** * 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) => Observable} */ -export const relationsToItems = (thisId: string) => +export const relationsToItems = (thisId: string): (source: Observable) => Observable => (source: Observable): Observable => 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, RemoteData][]) => arr .filter(([leftItem, rightItem]) => leftItem.hasSucceeded && rightItem.hasSucceeded) .map(([leftItem, rightItem]) => { @@ -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) => Observable} */ -export const paginatedRelationsToItems = (thisId: string) => +export const paginatedRelationsToItems = (thisId: string): (source: Observable>>) => Observable>> => (source: Observable>>): Observable>> => source.pipe( getFirstSucceededRemoteData(),