Skip to content

Fixes save of empty, invariant block list on variant content #18932

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kjac merged 1 commit into from
Apr 4, 2025
Merged

Fixes save of empty, invariant block list on variant content #18932

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions src/Umbraco.Infrastructure/PropertyEditors/BlockValuePropertyValueEditorBase.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -296,6 +296,10 @@ private void MapBlockItemDataFromEditor(List<BlockItemData> items)

TValue? mergedBlockValue =
MergeVariantInvariantPropertyValueTyped(source, target, canUpdateInvariantData, allowedCultures);
if (mergedBlockValue is null)
{
return null;
}

return _jsonSerializer.Serialize(mergedBlockValue);
}
Expand Down
8 changes: 8 additions & 0 deletions ...o.Tests.UnitTests/Umbraco.Core/PropertyEditors/BlockListEditorPropertyValueEditorTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,14 @@ public void Validates_Number_Of_Items_Is_Less_Than_Or_Equal_To_Configured_Max(in
}
}

[Test]
public void MergeVariantInvariantPropertyValue_Can_Merge_Null_Values()
{
var editor = CreateValueEditor();
var result = editor.MergeVariantInvariantPropertyValue(null, null, true, ["en-US"]);
Comment thread
AndyButland marked this conversation as resolved.
Assert.IsNull(result);
}

private static JsonObject CreateBlocksJson(int numberOfBlocks)
{
var layoutItems = new JsonArray();
Expand Down