From 36b5f63b4f4185531cfd367348a23d80530bcfaf Mon Sep 17 00:00:00 2001 From: Andy Butland Date: Wed, 6 Aug 2025 11:10:33 +0200 Subject: [PATCH] Ensure block values aren't null before attempting to process them on removal (#19645) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Ensure block values aren't null before attempting to process them on removal. Co-authored-by: Niels Lyngsø --- .../block/property-value-resolver/block-value-resolver.api.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/src/packages/block/block/property-value-resolver/block-value-resolver.api.ts b/src/Umbraco.Web.UI.Client/src/packages/block/block/property-value-resolver/block-value-resolver.api.ts index 47ccbfecfc..e2d3c6dc19 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/block/block/property-value-resolver/block-value-resolver.api.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/block/block/property-value-resolver/block-value-resolver.api.ts @@ -15,13 +15,13 @@ export abstract class UmbBlockValueResolver valuesCallback: (values: Array) => Promise | undefined>, ) { const contentData = await Promise.all( - value.contentData?.map(async (entry) => ({ + (value.contentData ?? []).map(async (entry) => ({ ...entry, values: (await valuesCallback(entry.values)) ?? [], })), ); const settingsData = await Promise.all( - value.settingsData?.map(async (entry) => ({ + (value.settingsData ?? []).map(async (entry) => ({ ...entry, values: (await valuesCallback(entry.values)) ?? [], })),