Ensure block values aren't null before attempting to process them on removal #19645
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
There was a problem hiding this comment.
Pull Request Overview
This PR introduces guard clauses to prevent null values in block content and settings data when processing block removal.
- Uses nullish coalescing (??) to provide defaults for contentData and settingsData
- Ensures the mapping functions always operate on an array
| @@ -15,13 +15,13 @@ export abstract class UmbBlockValueResolver<ValueType> | |||
| valuesCallback: (values: Array<UmbBlockDataValueModel>) => Promise<Array<UmbBlockDataValueModel> | undefined>, | |||
| ) { | |||
| const contentData = await Promise.all( | |||
| value.contentData?.map(async (entry) => ({ | |||
| (value.contentData ?? []).map(async (entry) => ({ | |||
There was a problem hiding this comment.
[nitpick] Consider extracting the common mapping logic for both contentData and settingsData into a helper function to reduce duplication and improve maintainability.
Copilot uses AI. Check for mistakes.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Prerequisites
Resolves: #19602
Description
Note that I couldn't replicate the reported issue, though as noted, it has come from an upgraded site so perhaps there are situations where the block content or settings data is undefined in older versions that we don't expect now.
The fix suggested on the reported issue looks reasonable to me and hence I've applied. Seems sensible as a guard against a null value here.
Testing
Verify that blocks can continue to be be removed from a block list and the document saved.