Netcore: migrate more unittests (#8939)
* Migrated unit tests * Migrated CoreThings tests Signed-off-by: Bjarke Berg <mail@bergmania.dk> * Migrated Property Editor unit tests Signed-off-by: Bjarke Berg <mail@bergmania.dk> * Migrated CoreXml tests Signed-off-by: Bjarke Berg <mail@bergmania.dk> * Moved more tests Signed-off-by: Bjarke Berg <mail@bergmania.dk> * revert some IsSZArray test code Signed-off-by: Bjarke Berg <mail@bergmania.dk> * Renamed bad named test Signed-off-by: Bjarke Berg <mail@bergmania.dk> * removed unnecessary file mentions in csproj file Signed-off-by: Bjarke Berg <mail@bergmania.dk> Co-authored-by: Elitsa Marinovska <elm@umbraco.dk>
This commit is contained in:
Bjarke Berg
202
src/Umbraco.Infrastructure/Compose/BlockEditorComponent.cs
Normal file
202
src/Umbraco.Infrastructure/Compose/BlockEditorComponent.cs
Normal file
@@ -0,0 +1,202 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using Newtonsoft.Json;
|
||||
using Newtonsoft.Json.Linq;
|
||||
using Umbraco.Core;
|
||||
using Umbraco.Core.Composing;
|
||||
using Umbraco.Core.Models.Blocks;
|
||||
using Umbraco.Core.PropertyEditors;
|
||||
|
||||
namespace Umbraco.Web.Compose
|
||||
{
|
||||
/// <summary>
|
||||
/// A component for Block editors used to bind to events
|
||||
/// </summary>
|
||||
public class BlockEditorComponent : IComponent
|
||||
{
|
||||
private ComplexPropertyEditorContentEventHandler _handler;
|
||||
private readonly BlockListEditorDataConverter _converter = new BlockListEditorDataConverter();
|
||||
|
||||
public void Initialize()
|
||||
{
|
||||
_handler = new ComplexPropertyEditorContentEventHandler(
|
||||
Constants.PropertyEditors.Aliases.BlockList,
|
||||
ReplaceBlockListUdis);
|
||||
}
|
||||
|
||||
public void Terminate() => _handler?.Dispose();
|
||||
|
||||
private string ReplaceBlockListUdis(string rawJson, bool onlyMissingUdis)
|
||||
{
|
||||
// the block editor doesn't ever have missing UDIs so when this is true there's nothing to process
|
||||
if (onlyMissingUdis) return rawJson;
|
||||
|
||||
return ReplaceBlockListUdis(rawJson, null);
|
||||
}
|
||||
|
||||
// internal for tests
|
||||
internal string ReplaceBlockListUdis(string rawJson, Func<Guid> createGuid = null)
|
||||
{
|
||||
// used so we can test nicely
|
||||
if (createGuid == null)
|
||||
createGuid = () => Guid.NewGuid();
|
||||
|
||||
if (string.IsNullOrWhiteSpace(rawJson) || !rawJson.DetectIsJson())
|
||||
return rawJson;
|
||||
|
||||
// Parse JSON
|
||||
// This will throw a FormatException if there are null UDIs (expected)
|
||||
var blockListValue = _converter.Deserialize(rawJson);
|
||||
|
||||
UpdateBlockListRecursively(blockListValue, createGuid);
|
||||
|
||||
return JsonConvert.SerializeObject(blockListValue.BlockValue);
|
||||
}
|
||||
|
||||
private void UpdateBlockListRecursively(BlockEditorData blockListData, Func<Guid> createGuid)
|
||||
{
|
||||
var oldToNew = new Dictionary<Udi, Udi>();
|
||||
MapOldToNewUdis(oldToNew, blockListData.BlockValue.ContentData, createGuid);
|
||||
MapOldToNewUdis(oldToNew, blockListData.BlockValue.SettingsData, createGuid);
|
||||
|
||||
for (var i = 0; i < blockListData.References.Count; i++)
|
||||
{
|
||||
var reference = blockListData.References[i];
|
||||
var hasContentMap = oldToNew.TryGetValue(reference.ContentUdi, out var contentMap);
|
||||
Udi settingsMap = null;
|
||||
var hasSettingsMap = reference.SettingsUdi != null && oldToNew.TryGetValue(reference.SettingsUdi, out settingsMap);
|
||||
|
||||
if (hasContentMap)
|
||||
{
|
||||
// replace the reference
|
||||
blockListData.References.RemoveAt(i);
|
||||
blockListData.References.Insert(i, new ContentAndSettingsReference(contentMap, hasSettingsMap ? settingsMap : null));
|
||||
}
|
||||
}
|
||||
|
||||
// build the layout with the new UDIs
|
||||
var layout = (JArray)blockListData.Layout;
|
||||
layout.Clear();
|
||||
foreach (var reference in blockListData.References)
|
||||
{
|
||||
layout.Add(JObject.FromObject(new BlockListLayoutItem
|
||||
{
|
||||
ContentUdi = reference.ContentUdi,
|
||||
SettingsUdi = reference.SettingsUdi
|
||||
}));
|
||||
}
|
||||
|
||||
|
||||
RecursePropertyValues(blockListData.BlockValue.ContentData, createGuid);
|
||||
RecursePropertyValues(blockListData.BlockValue.SettingsData, createGuid);
|
||||
}
|
||||
|
||||
private void RecursePropertyValues(IEnumerable<BlockItemData> blockData, Func<Guid> createGuid)
|
||||
{
|
||||
foreach (var data in blockData)
|
||||
{
|
||||
// check if we need to recurse (make a copy of the dictionary since it will be modified)
|
||||
foreach (var propertyAliasToBlockItemData in new Dictionary<string, object>(data.RawPropertyValues))
|
||||
{
|
||||
if (propertyAliasToBlockItemData.Value is JToken jtoken)
|
||||
{
|
||||
if (ProcessJToken(jtoken, createGuid, out var result))
|
||||
{
|
||||
// need to re-save this back to the RawPropertyValues
|
||||
data.RawPropertyValues[propertyAliasToBlockItemData.Key] = result;
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
var asString = propertyAliasToBlockItemData.Value?.ToString();
|
||||
|
||||
if (asString != null && asString.DetectIsJson())
|
||||
{
|
||||
// this gets a little ugly because there could be some other complex editor that contains another block editor
|
||||
// and since we would have no idea how to parse that, all we can do is try JSON Path to find another block editor
|
||||
// of our type
|
||||
var json = JToken.Parse(asString);
|
||||
if (ProcessJToken(json, createGuid, out var result))
|
||||
{
|
||||
// need to re-save this back to the RawPropertyValues
|
||||
data.RawPropertyValues[propertyAliasToBlockItemData.Key] = result;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private bool ProcessJToken(JToken json, Func<Guid> createGuid, out JToken result)
|
||||
{
|
||||
var updated = false;
|
||||
result = json;
|
||||
|
||||
// select all tokens (flatten)
|
||||
var allProperties = json.SelectTokens("$..*").Select(x => x.Parent as JProperty).WhereNotNull().ToList();
|
||||
foreach (var prop in allProperties)
|
||||
{
|
||||
if (prop.Name == Constants.PropertyEditors.Aliases.BlockList)
|
||||
{
|
||||
// get it's parent 'layout' and it's parent's container
|
||||
var layout = prop.Parent?.Parent as JProperty;
|
||||
if (layout != null && layout.Parent is JObject layoutJson)
|
||||
{
|
||||
// recurse
|
||||
var blockListValue = _converter.ConvertFrom(layoutJson);
|
||||
UpdateBlockListRecursively(blockListValue, createGuid);
|
||||
|
||||
// set new value
|
||||
if (layoutJson.Parent != null)
|
||||
{
|
||||
// we can replace the object
|
||||
layoutJson.Replace(JObject.FromObject(blockListValue.BlockValue));
|
||||
updated = true;
|
||||
}
|
||||
else
|
||||
{
|
||||
// if there is no parent it means that this json property was the root, in which case we just return
|
||||
result = JObject.FromObject(blockListValue.BlockValue);
|
||||
return true;
|
||||
}
|
||||
}
|
||||
}
|
||||
else if (prop.Name != "layout" && prop.Name != "contentData" && prop.Name != "settingsData" && prop.Name != "contentTypeKey")
|
||||
{
|
||||
// this is an arbitrary property that could contain a nested complex editor
|
||||
var propVal = prop.Value?.ToString();
|
||||
// check if this might contain a nested Block Editor
|
||||
if (!propVal.IsNullOrWhiteSpace() && propVal.DetectIsJson() && propVal.InvariantContains(Constants.PropertyEditors.Aliases.BlockList))
|
||||
{
|
||||
if (_converter.TryDeserialize(propVal, out var nestedBlockData))
|
||||
{
|
||||
// recurse
|
||||
UpdateBlockListRecursively(nestedBlockData, createGuid);
|
||||
// set the value to the updated one
|
||||
prop.Value = JObject.FromObject(nestedBlockData.BlockValue);
|
||||
updated = true;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return updated;
|
||||
}
|
||||
|
||||
private void MapOldToNewUdis(Dictionary<Udi, Udi> oldToNew, IEnumerable<BlockItemData> blockData, Func<Guid> createGuid)
|
||||
{
|
||||
foreach (var data in blockData)
|
||||
{
|
||||
// This should never happen since a FormatException will be thrown if one is empty but we'll keep this here
|
||||
if (data.Udi == null)
|
||||
throw new InvalidOperationException("Block data cannot contain a null UDI");
|
||||
|
||||
// replace the UDIs
|
||||
var newUdi = GuidUdi.Create(Constants.UdiEntityType.Element, createGuid());
|
||||
oldToNew[data.Udi] = newUdi;
|
||||
data.Udi = newUdi;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
12
src/Umbraco.Infrastructure/Compose/BlockEditorComposer.cs
Normal file
12
src/Umbraco.Infrastructure/Compose/BlockEditorComposer.cs
Normal file
@@ -0,0 +1,12 @@
|
||||
using Umbraco.Core;
|
||||
using Umbraco.Core.Composing;
|
||||
|
||||
namespace Umbraco.Web.Compose
|
||||
{
|
||||
/// <summary>
|
||||
/// A composer for Block editors to run a component
|
||||
/// </summary>
|
||||
[RuntimeLevel(MinLevel = RuntimeLevel.Run)]
|
||||
public class BlockEditorComposer : ComponentComposer<BlockEditorComponent>, ICoreComposer
|
||||
{ }
|
||||
}
|
||||
@@ -0,0 +1,85 @@
|
||||
using System;
|
||||
using System.Linq;
|
||||
using Newtonsoft.Json.Linq;
|
||||
using Umbraco.Core;
|
||||
using Umbraco.Core.Composing;
|
||||
using Umbraco.Core.PropertyEditors;
|
||||
using Umbraco.Web.PropertyEditors;
|
||||
|
||||
namespace Umbraco.Web.Compose
|
||||
{
|
||||
|
||||
/// <summary>
|
||||
/// A component for NestedContent used to bind to events
|
||||
/// </summary>
|
||||
public class NestedContentPropertyComponent : IComponent
|
||||
{
|
||||
private ComplexPropertyEditorContentEventHandler _handler;
|
||||
|
||||
public void Initialize()
|
||||
{
|
||||
_handler = new ComplexPropertyEditorContentEventHandler(
|
||||
Constants.PropertyEditors.Aliases.NestedContent,
|
||||
CreateNestedContentKeys);
|
||||
}
|
||||
|
||||
public void Terminate() => _handler?.Dispose();
|
||||
|
||||
private string CreateNestedContentKeys(string rawJson, bool onlyMissingKeys) => CreateNestedContentKeys(rawJson, onlyMissingKeys, null);
|
||||
|
||||
// internal for tests
|
||||
internal string CreateNestedContentKeys(string rawJson, bool onlyMissingKeys, Func<Guid> createGuid = null)
|
||||
{
|
||||
// used so we can test nicely
|
||||
if (createGuid == null)
|
||||
createGuid = () => Guid.NewGuid();
|
||||
|
||||
if (string.IsNullOrWhiteSpace(rawJson) || !rawJson.DetectIsJson())
|
||||
return rawJson;
|
||||
|
||||
// Parse JSON
|
||||
var complexEditorValue = JToken.Parse(rawJson);
|
||||
|
||||
UpdateNestedContentKeysRecursively(complexEditorValue, onlyMissingKeys, createGuid);
|
||||
|
||||
return complexEditorValue.ToString();
|
||||
}
|
||||
|
||||
private void UpdateNestedContentKeysRecursively(JToken json, bool onlyMissingKeys, Func<Guid> createGuid)
|
||||
{
|
||||
// check if this is NC
|
||||
var isNestedContent = json.SelectTokens($"$..['{NestedContentPropertyEditor.ContentTypeAliasPropertyKey}']", false).Any();
|
||||
|
||||
// select all values (flatten)
|
||||
var allProperties = json.SelectTokens("$..*").OfType<JValue>().Select(x => x.Parent as JProperty).WhereNotNull().ToList();
|
||||
foreach (var prop in allProperties)
|
||||
{
|
||||
if (prop.Name == NestedContentPropertyEditor.ContentTypeAliasPropertyKey)
|
||||
{
|
||||
// get it's sibling 'key' property
|
||||
var ncKeyVal = prop.Parent["key"] as JValue;
|
||||
if ((onlyMissingKeys && ncKeyVal == null) || (!onlyMissingKeys && ncKeyVal != null))
|
||||
{
|
||||
// create or replace
|
||||
prop.Parent["key"] = createGuid().ToString();
|
||||
}
|
||||
}
|
||||
else if (!isNestedContent || prop.Name != "key")
|
||||
{
|
||||
// this is an arbitrary property that could contain a nested complex editor
|
||||
var propVal = prop.Value?.ToString();
|
||||
// check if this might contain a nested NC
|
||||
if (!propVal.IsNullOrWhiteSpace() && propVal.DetectIsJson() && propVal.InvariantContains(NestedContentPropertyEditor.ContentTypeAliasPropertyKey))
|
||||
{
|
||||
// recurse
|
||||
var parsed = JToken.Parse(propVal);
|
||||
UpdateNestedContentKeysRecursively(parsed, onlyMissingKeys, createGuid);
|
||||
// set the value to the updated one
|
||||
prop.Value = parsed.ToString();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,12 @@
|
||||
using Umbraco.Core;
|
||||
using Umbraco.Core.Composing;
|
||||
|
||||
namespace Umbraco.Web.Compose
|
||||
{
|
||||
/// <summary>
|
||||
/// A composer for nested content to run a component
|
||||
/// </summary>
|
||||
[RuntimeLevel(MinLevel = RuntimeLevel.Run)]
|
||||
public class NestedContentPropertyComposer : ComponentComposer<NestedContentPropertyComponent>, ICoreComposer
|
||||
{ }
|
||||
}
|
||||
Reference in New Issue
Block a user