52a3e285a9
# Conflicts: # src/Umbraco.Core/Composing/CompositionExtensions/Services.cs # src/Umbraco.Core/Constants-AppSettings.cs # src/Umbraco.Core/Dashboards/ContentDashboardSettings.cs # src/Umbraco.Core/Dashboards/IContentDashboardSettings.cs # src/Umbraco.Core/Manifest/ManifestParser.cs # src/Umbraco.Core/Manifest/PackageManifest.cs # src/Umbraco.Core/Migrations/Install/DatabaseDataCreator.cs # src/Umbraco.Core/Migrations/Upgrade/UmbracoPlan.cs # src/Umbraco.Core/Models/PropertyTagsExtensions.cs # src/Umbraco.Core/PropertyEditors/ComplexPropertyEditorContentEventHandler.cs # src/Umbraco.Core/PropertyEditors/ConfigurationEditor.cs # src/Umbraco.Core/PropertyEditors/DataValueEditor.cs # src/Umbraco.Core/PropertyEditors/ValueConverters/ImageCropperValue.cs # src/Umbraco.Core/Serialization/JsonToStringConverter.cs # src/Umbraco.Core/Sync/ApplicationUrlHelper.cs # src/Umbraco.Core/Telemetry/ITelemetryService.cs # src/Umbraco.Core/Telemetry/Models/PackageTelemetry.cs # src/Umbraco.Core/Telemetry/Models/TelemetryReportData.cs # src/Umbraco.Core/Telemetry/TelemetryService.cs # src/Umbraco.Tests/Manifest/ManifestParserTests.cs # src/Umbraco.Tests/PropertyEditors/BlockEditorComponentTests.cs # src/Umbraco.Tests/PropertyEditors/ImageCropperTest.cs # src/Umbraco.Tests/PropertyEditors/NestedContentPropertyComponentTests.cs # src/Umbraco.Tests/Web/Controllers/AuthenticationControllerTests.cs # src/Umbraco.Tests/Web/Controllers/UsersControllerTests.cs # src/Umbraco.Web.UI.Client/src/common/resources/entity.resource.js # src/Umbraco.Web.UI/Umbraco/config/lang/da.xml # src/Umbraco.Web.UI/Umbraco/config/lang/en.xml # src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml # src/Umbraco.Web.UI/web.Template.config # src/Umbraco.Web/BatchedDatabaseServerMessenger.cs # src/Umbraco.Web/Cache/DistributedCacheBinder.cs # src/Umbraco.Web/Compose/BlockEditorComponent.cs # src/Umbraco.Web/Compose/NestedContentPropertyComponent.cs # src/Umbraco.Web/Editors/AuthenticationController.cs # src/Umbraco.Web/Editors/ContentTypeController.cs # src/Umbraco.Web/Editors/DashboardController.cs # src/Umbraco.Web/Editors/EntityController.cs # src/Umbraco.Web/Editors/UsersController.cs # src/Umbraco.Web/PropertyEditors/BlockEditorPropertyEditor.cs # src/Umbraco.Web/PropertyEditors/ColorPickerConfigurationEditor.cs # src/Umbraco.Web/PropertyEditors/GridPropertyEditor.cs # src/Umbraco.Web/PropertyEditors/ImageCropperPropertyEditor.cs # src/Umbraco.Web/PropertyEditors/ImageCropperPropertyValueEditor.cs # src/Umbraco.Web/PropertyEditors/MediaPicker3PropertyEditor.cs # src/Umbraco.Web/PropertyEditors/MultiUrlPickerValueEditor.cs # src/Umbraco.Web/PropertyEditors/MultipleTextStringPropertyEditor.cs # src/Umbraco.Web/PropertyEditors/MultipleValueEditor.cs # src/Umbraco.Web/PropertyEditors/NestedContentPropertyEditor.cs # src/Umbraco.Web/PropertyEditors/RichTextPropertyEditor.cs # src/Umbraco.Web/PropertyEditors/TagsPropertyEditor.cs # src/Umbraco.Web/Telemetry/ReportSiteTask.cs # src/Umbraco.Web/Telemetry/TelemetryComponent.cs # src/Umbraco.Web/Trees/ContentTreeController.cs # src/Umbraco.Web/Umbraco.Web.csproj # src/Umbraco.Web/WebApi/EnableDetailedErrorsAttribute.cs
407 lines
14 KiB
C#
407 lines
14 KiB
C#
// Copyright (c) Umbraco.
|
|
// See LICENSE for more details.
|
|
|
|
using System;
|
|
using Newtonsoft.Json;
|
|
using Newtonsoft.Json.Linq;
|
|
using NUnit.Framework;
|
|
using Umbraco.Cms.Core.PropertyEditors;
|
|
|
|
namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.PropertyEditors
|
|
{
|
|
[TestFixture]
|
|
public class NestedContentPropertyComponentTests
|
|
{
|
|
private static void AreEqualJson(string expected, string actual)
|
|
{
|
|
Assert.AreEqual(JToken.Parse(expected), JToken.Parse(actual));
|
|
}
|
|
|
|
[Test]
|
|
public void Invalid_Json()
|
|
{
|
|
var component = new NestedContentPropertyHandler();
|
|
|
|
Assert.DoesNotThrow(() => component.CreateNestedContentKeys("this is not json", true));
|
|
}
|
|
|
|
[Test]
|
|
public void No_Nesting()
|
|
{
|
|
Guid[] guids = new[] { Guid.NewGuid(), Guid.NewGuid() };
|
|
var guidCounter = 0;
|
|
Guid GuidFactory() => guids[guidCounter++];
|
|
|
|
var json = @"[
|
|
{""key"":""04a6dba8-813c-4144-8aca-86a3f24ebf08"",""name"":""Item 1"",""ncContentTypeAlias"":""nested"",""text"":""woot""},
|
|
{""key"":""d8e214d8-c5a5-4b45-9b51-4050dd47f5fa"",""name"":""Item 2"",""ncContentTypeAlias"":""nested"",""text"":""zoot""}
|
|
]";
|
|
var expected = json
|
|
.Replace("04a6dba8-813c-4144-8aca-86a3f24ebf08", guids[0].ToString())
|
|
.Replace("d8e214d8-c5a5-4b45-9b51-4050dd47f5fa", guids[1].ToString());
|
|
|
|
var component = new NestedContentPropertyHandler();
|
|
var actual = component.CreateNestedContentKeys(json, false, GuidFactory);
|
|
|
|
AreEqualJson(expected, actual);
|
|
}
|
|
|
|
[Test]
|
|
public void One_Level_Nesting_Unescaped()
|
|
{
|
|
Guid[] guids = new[] { Guid.NewGuid(), Guid.NewGuid(), Guid.NewGuid(), Guid.NewGuid() };
|
|
var guidCounter = 0;
|
|
Guid GuidFactory() => guids[guidCounter++];
|
|
|
|
var json = @"[{
|
|
""key"": ""04a6dba8-813c-4144-8aca-86a3f24ebf08"",
|
|
""name"": ""Item 1"",
|
|
""ncContentTypeAlias"": ""text"",
|
|
""text"": ""woot""
|
|
}, {
|
|
""key"": ""d8e214d8-c5a5-4b45-9b51-4050dd47f5fa"",
|
|
""name"": ""Item 2"",
|
|
""ncContentTypeAlias"": ""list"",
|
|
""text"": ""zoot"",
|
|
""subItems"": [{
|
|
""key"": ""dccf550c-3a05-469e-95e1-a8f560f788c2"",
|
|
""name"": ""Item 1"",
|
|
""ncContentTypeAlias"": ""text"",
|
|
""text"": ""woot""
|
|
}, {
|
|
""key"": ""fbde4288-8382-4e13-8933-ed9c160de050"",
|
|
""name"": ""Item 2"",
|
|
""ncContentTypeAlias"": ""text"",
|
|
""text"": ""zoot""
|
|
}]
|
|
}]";
|
|
|
|
var expected = json
|
|
.Replace("04a6dba8-813c-4144-8aca-86a3f24ebf08", guids[0].ToString())
|
|
.Replace("d8e214d8-c5a5-4b45-9b51-4050dd47f5fa", guids[1].ToString())
|
|
.Replace("dccf550c-3a05-469e-95e1-a8f560f788c2", guids[2].ToString())
|
|
.Replace("fbde4288-8382-4e13-8933-ed9c160de050", guids[3].ToString());
|
|
|
|
var component = new NestedContentPropertyHandler();
|
|
var actual = component.CreateNestedContentKeys(json, false, GuidFactory);
|
|
|
|
AreEqualJson(expected, actual);
|
|
}
|
|
|
|
[Test]
|
|
public void One_Level_Nesting_Escaped()
|
|
{
|
|
Guid[] guids = new[] { Guid.NewGuid(), Guid.NewGuid(), Guid.NewGuid(), Guid.NewGuid() };
|
|
var guidCounter = 0;
|
|
Guid GuidFactory() => guids[guidCounter++];
|
|
|
|
// we need to ensure the escaped json is consistent with how it will be re-escaped after parsing
|
|
// and this is how to do that, the result will also include quotes around it.
|
|
var subJsonEscaped = JsonConvert.ToString(JToken.Parse(@"
|
|
[{
|
|
""key"": ""dccf550c-3a05-469e-95e1-a8f560f788c2"",
|
|
""name"": ""Item 1"",
|
|
""ncContentTypeAlias"": ""text"",
|
|
""text"": ""woot""
|
|
}, {
|
|
""key"": ""fbde4288-8382-4e13-8933-ed9c160de050"",
|
|
""name"": ""Item 2"",
|
|
""ncContentTypeAlias"": ""text"",
|
|
""text"": ""zoot""
|
|
}
|
|
]").ToString(Formatting.None));
|
|
|
|
var json = @"[{
|
|
""key"": ""04a6dba8-813c-4144-8aca-86a3f24ebf08"",
|
|
""name"": ""Item 1"",
|
|
""ncContentTypeAlias"": ""text"",
|
|
""text"": ""woot""
|
|
}, {
|
|
""key"": ""d8e214d8-c5a5-4b45-9b51-4050dd47f5fa"",
|
|
""name"": ""Item 2"",
|
|
""ncContentTypeAlias"": ""list"",
|
|
""text"": ""zoot"",
|
|
""subItems"":" + subJsonEscaped + @"
|
|
}
|
|
]";
|
|
|
|
var expected = json
|
|
.Replace("04a6dba8-813c-4144-8aca-86a3f24ebf08", guids[0].ToString())
|
|
.Replace("d8e214d8-c5a5-4b45-9b51-4050dd47f5fa", guids[1].ToString())
|
|
.Replace("dccf550c-3a05-469e-95e1-a8f560f788c2", guids[2].ToString())
|
|
.Replace("fbde4288-8382-4e13-8933-ed9c160de050", guids[3].ToString());
|
|
|
|
var component = new NestedContentPropertyHandler();
|
|
var actual = component.CreateNestedContentKeys(json, false, GuidFactory);
|
|
|
|
AreEqualJson(expected, actual);
|
|
}
|
|
|
|
[Test]
|
|
public void Nested_In_Complex_Editor_Escaped()
|
|
{
|
|
Guid[] guids = new[] { Guid.NewGuid(), Guid.NewGuid(), Guid.NewGuid(), Guid.NewGuid() };
|
|
var guidCounter = 0;
|
|
Guid GuidFactory() => guids[guidCounter++];
|
|
|
|
// we need to ensure the escaped json is consistent with how it will be re-escaped after parsing
|
|
// and this is how to do that, the result will also include quotes around it.
|
|
var subJsonEscaped = JsonConvert.ToString(JToken.Parse(@"[{
|
|
""key"": ""dccf550c-3a05-469e-95e1-a8f560f788c2"",
|
|
""name"": ""Item 1"",
|
|
""ncContentTypeAlias"": ""text"",
|
|
""text"": ""woot""
|
|
}, {
|
|
""key"": ""fbde4288-8382-4e13-8933-ed9c160de050"",
|
|
""name"": ""Item 2"",
|
|
""ncContentTypeAlias"": ""text"",
|
|
""text"": ""zoot""
|
|
}
|
|
]").ToString(Formatting.None));
|
|
|
|
// Complex editor such as the grid
|
|
var complexEditorJsonEscaped = @"{
|
|
""name"": ""1 column layout"",
|
|
""sections"": [
|
|
{
|
|
""grid"": ""12"",
|
|
""rows"": [
|
|
{
|
|
""name"": ""Article"",
|
|
""id"": ""b4f6f651-0de3-ef46-e66a-464f4aaa9c57"",
|
|
""areas"": [
|
|
{
|
|
""grid"": ""4"",
|
|
""controls"": [
|
|
{
|
|
""value"": ""I am quote"",
|
|
""editor"": {
|
|
""alias"": ""quote"",
|
|
""view"": ""textstring""
|
|
},
|
|
""styles"": null,
|
|
""config"": null
|
|
}],
|
|
""styles"": null,
|
|
""config"": null
|
|
},
|
|
{
|
|
""grid"": ""8"",
|
|
""controls"": [
|
|
{
|
|
""value"": ""Header"",
|
|
""editor"": {
|
|
""alias"": ""headline"",
|
|
""view"": ""textstring""
|
|
},
|
|
""styles"": null,
|
|
""config"": null
|
|
},
|
|
{
|
|
""value"": " + subJsonEscaped + @",
|
|
""editor"": {
|
|
""alias"": ""madeUpNestedContent"",
|
|
""view"": ""madeUpNestedContentInGrid""
|
|
},
|
|
""styles"": null,
|
|
""config"": null
|
|
}],
|
|
""styles"": null,
|
|
""config"": null
|
|
}],
|
|
""styles"": null,
|
|
""config"": null
|
|
}]
|
|
}]
|
|
}";
|
|
|
|
var json = @"[{
|
|
""key"": ""04a6dba8-813c-4144-8aca-86a3f24ebf08"",
|
|
""name"": ""Item 1"",
|
|
""ncContentTypeAlias"": ""text"",
|
|
""text"": ""woot""
|
|
}, {
|
|
""key"": ""d8e214d8-c5a5-4b45-9b51-4050dd47f5fa"",
|
|
""name"": ""Item 2"",
|
|
""ncContentTypeAlias"": ""list"",
|
|
""text"": ""zoot"",
|
|
""subItems"":" + complexEditorJsonEscaped + @"
|
|
}
|
|
]";
|
|
|
|
var expected = json
|
|
.Replace("04a6dba8-813c-4144-8aca-86a3f24ebf08", guids[0].ToString())
|
|
.Replace("d8e214d8-c5a5-4b45-9b51-4050dd47f5fa", guids[1].ToString())
|
|
.Replace("dccf550c-3a05-469e-95e1-a8f560f788c2", guids[2].ToString())
|
|
.Replace("fbde4288-8382-4e13-8933-ed9c160de050", guids[3].ToString());
|
|
|
|
var component = new NestedContentPropertyHandler();
|
|
var actual = component.CreateNestedContentKeys(json, false, GuidFactory);
|
|
|
|
AreEqualJson(expected, actual);
|
|
}
|
|
|
|
[Test]
|
|
public void No_Nesting_Generates_Keys_For_Missing_Items()
|
|
{
|
|
Guid[] guids = new[] { Guid.NewGuid() };
|
|
var guidCounter = 0;
|
|
Guid GuidFactory() => guids[guidCounter++];
|
|
|
|
var json = @"[
|
|
{""key"":""04a6dba8-813c-4144-8aca-86a3f24ebf08"",""name"":""Item 1 my key wont change"",""ncContentTypeAlias"":""nested"",""text"":""woot""},
|
|
{""name"":""Item 2 was copied and has no key prop"",""ncContentTypeAlias"":""nested"",""text"":""zoot""}
|
|
]";
|
|
|
|
var component = new NestedContentPropertyHandler();
|
|
var result = component.CreateNestedContentKeys(json, true, GuidFactory);
|
|
|
|
// Ensure the new GUID is put in a key into the JSON
|
|
Assert.IsTrue(result.Contains(guids[0].ToString()));
|
|
|
|
// Ensure that the original key is NOT changed/modified & still exists
|
|
Assert.IsTrue(result.Contains("04a6dba8-813c-4144-8aca-86a3f24ebf08"));
|
|
}
|
|
|
|
[Test]
|
|
public void One_Level_Nesting_Escaped_Generates_Keys_For_Missing_Items()
|
|
{
|
|
Guid[] guids = new[] { Guid.NewGuid(), Guid.NewGuid(), Guid.NewGuid() };
|
|
var guidCounter = 0;
|
|
Guid GuidFactory() => guids[guidCounter++];
|
|
|
|
// we need to ensure the escaped json is consistent with how it will be re-escaped after parsing
|
|
// and this is how to do that, the result will also include quotes around it.
|
|
var subJsonEscaped = JsonConvert.ToString(JToken.Parse(@"[{
|
|
""name"": ""Item 1"",
|
|
""ncContentTypeAlias"": ""text"",
|
|
""text"": ""woot""
|
|
}, {
|
|
""name"": ""Nested Item 2 was copied and has no key"",
|
|
""ncContentTypeAlias"": ""text"",
|
|
""text"": ""zoot""
|
|
}
|
|
]").ToString(Formatting.None));
|
|
|
|
var json = @"[{
|
|
""name"": ""Item 1 was copied and has no key"",
|
|
""ncContentTypeAlias"": ""text"",
|
|
""text"": ""woot""
|
|
}, {
|
|
""key"": ""d8e214d8-c5a5-4b45-9b51-4050dd47f5fa"",
|
|
""name"": ""Item 2"",
|
|
""ncContentTypeAlias"": ""list"",
|
|
""text"": ""zoot"",
|
|
""subItems"":" + subJsonEscaped + @"
|
|
}
|
|
]";
|
|
|
|
var component = new NestedContentPropertyHandler();
|
|
var result = component.CreateNestedContentKeys(json, true, GuidFactory);
|
|
|
|
// Ensure the new GUID is put in a key into the JSON for each item
|
|
Assert.IsTrue(result.Contains(guids[0].ToString()));
|
|
Assert.IsTrue(result.Contains(guids[1].ToString()));
|
|
Assert.IsTrue(result.Contains(guids[2].ToString()));
|
|
}
|
|
|
|
[Test]
|
|
public void Nested_In_Complex_Editor_Escaped_Generates_Keys_For_Missing_Items()
|
|
{
|
|
Guid[] guids = new[] { Guid.NewGuid(), Guid.NewGuid() };
|
|
var guidCounter = 0;
|
|
Guid GuidFactory() => guids[guidCounter++];
|
|
|
|
// we need to ensure the escaped json is consistent with how it will be re-escaped after parsing
|
|
// and this is how to do that, the result will also include quotes around it.
|
|
var subJsonEscaped = JsonConvert.ToString(JToken.Parse(@"[{
|
|
""key"": ""dccf550c-3a05-469e-95e1-a8f560f788c2"",
|
|
""name"": ""Item 1"",
|
|
""ncContentTypeAlias"": ""text"",
|
|
""text"": ""woot""
|
|
}, {
|
|
""name"": ""Nested Item 2 was copied and has no key"",
|
|
""ncContentTypeAlias"": ""text"",
|
|
""text"": ""zoot""
|
|
}
|
|
]").ToString(Formatting.None));
|
|
|
|
// Complex editor such as the grid
|
|
var complexEditorJsonEscaped = @"{
|
|
""name"": ""1 column layout"",
|
|
""sections"": [
|
|
{
|
|
""grid"": ""12"",
|
|
""rows"": [
|
|
{
|
|
""name"": ""Article"",
|
|
""id"": ""b4f6f651-0de3-ef46-e66a-464f4aaa9c57"",
|
|
""areas"": [
|
|
{
|
|
""grid"": ""4"",
|
|
""controls"": [
|
|
{
|
|
""value"": ""I am quote"",
|
|
""editor"": {
|
|
""alias"": ""quote"",
|
|
""view"": ""textstring""
|
|
},
|
|
""styles"": null,
|
|
""config"": null
|
|
}],
|
|
""styles"": null,
|
|
""config"": null
|
|
},
|
|
{
|
|
""grid"": ""8"",
|
|
""controls"": [
|
|
{
|
|
""value"": ""Header"",
|
|
""editor"": {
|
|
""alias"": ""headline"",
|
|
""view"": ""textstring""
|
|
},
|
|
""styles"": null,
|
|
""config"": null
|
|
},
|
|
{
|
|
""value"": " + subJsonEscaped + @",
|
|
""editor"": {
|
|
""alias"": ""madeUpNestedContent"",
|
|
""view"": ""madeUpNestedContentInGrid""
|
|
},
|
|
""styles"": null,
|
|
""config"": null
|
|
}],
|
|
""styles"": null,
|
|
""config"": null
|
|
}],
|
|
""styles"": null,
|
|
""config"": null
|
|
}]
|
|
}]
|
|
}";
|
|
|
|
var json = @"[{
|
|
""key"": ""04a6dba8-813c-4144-8aca-86a3f24ebf08"",
|
|
""name"": ""Item 1"",
|
|
""ncContentTypeAlias"": ""text"",
|
|
""text"": ""woot""
|
|
}, {
|
|
""name"": ""Item 2 was copied and has no key"",
|
|
""ncContentTypeAlias"": ""list"",
|
|
""text"": ""zoot"",
|
|
""subItems"":" + complexEditorJsonEscaped + @"
|
|
}
|
|
]";
|
|
|
|
var component = new NestedContentPropertyHandler();
|
|
var result = component.CreateNestedContentKeys(json, true, GuidFactory);
|
|
|
|
// Ensure the new GUID is put in a key into the JSON for each item
|
|
Assert.IsTrue(result.Contains(guids[0].ToString()));
|
|
Assert.IsTrue(result.Contains(guids[1].ToString()));
|
|
}
|
|
}
|
|
}
|