Merge remote-tracking branch 'origin/v13/dev' into v14/dev
# Conflicts: # build/azure-pipelines.yml # src/Umbraco.Core/Constants-Configuration.cs # src/Umbraco.Core/DependencyInjection/UmbracoBuilder.Configuration.cs # src/Umbraco.Core/Factories/IDatabaseSettingsFactory.cs # src/Umbraco.Core/Factories/IInstallSettingsFactory.cs # src/Umbraco.Core/Factories/IUpgradeSettingsFactory.cs # src/Umbraco.Core/Factories/InstallSettingsFactory.cs # src/Umbraco.Core/Factories/UpgradeSettingsFactory.cs # src/Umbraco.Core/Factories/UserSettingsFactory.cs # src/Umbraco.Core/Installer/IInstallStep.cs # src/Umbraco.Core/Installer/IUpgradeStep.cs # src/Umbraco.Core/Installer/NewInstallStepCollection.cs # src/Umbraco.Core/Installer/NewInstallStepCollectionBuilder.cs # src/Umbraco.Core/Installer/Steps/FilePermissionsStep.cs # src/Umbraco.Core/Installer/Steps/RestartRuntimeStep.cs # src/Umbraco.Core/Installer/Steps/TelemetryIdentifierStep.cs # src/Umbraco.Core/Installer/UpgradeStepCollection.cs # src/Umbraco.Core/Installer/UpgradeStepCollectionBuilder.cs # src/Umbraco.Core/Models/Blocks/RichTextBlockLayoutItem.cs # src/Umbraco.Core/Models/Blocks/RichTextEditorBlockDataConverter.cs # src/Umbraco.Core/Models/Configuration/NewBackOfficeSettings.cs # src/Umbraco.Core/Models/Configuration/NewBackOfficeSettingsValidator.cs # src/Umbraco.Core/Models/Installer/ConsentLevelModel.cs # src/Umbraco.Core/Models/Installer/DatabaseInstallData.cs # src/Umbraco.Core/Models/Installer/DatabaseSettingsModel.cs # src/Umbraco.Core/Models/Installer/InstallData.cs # src/Umbraco.Core/Models/Installer/InstallSettingsModel.cs # src/Umbraco.Core/Models/Installer/PasswordSettingsModel.cs # src/Umbraco.Core/Models/Installer/UpgradeSettingsModel.cs # src/Umbraco.Core/Models/Installer/UserInstallData.cs # src/Umbraco.Core/Models/Installer/UserSettingsModel.cs # src/Umbraco.Core/Models/OutOfDateType.cs # src/Umbraco.Core/PaginationHelper.cs # src/Umbraco.Core/Services/Installer/IInstallService.cs # src/Umbraco.Core/Services/Installer/IUpgradeService.cs # src/Umbraco.Core/Services/Installer/InstallService.cs # src/Umbraco.Core/Services/Installer/UpgradeService.cs # src/Umbraco.Infrastructure/DependencyInjection/UmbracoBuilder.Repositories.cs # src/Umbraco.Infrastructure/Factories/Installer/DatabaseSettingsFactory.cs # src/Umbraco.Infrastructure/Installer/Steps/CreateUserStep.cs # src/Umbraco.Infrastructure/Installer/Steps/DatabaseConfigureStep.cs # src/Umbraco.Infrastructure/Installer/Steps/DatabaseInstallStep.cs # src/Umbraco.Infrastructure/Installer/Steps/DatabaseUpgradeStep.cs # src/Umbraco.Infrastructure/Installer/Steps/RegisterInstallCompleteStep.cs # src/Umbraco.Infrastructure/Migrations/Upgrade/UmbracoPlan.cs # src/Umbraco.Infrastructure/Models/Blocks/BlockEditorDataConverter.cs # src/Umbraco.Infrastructure/PropertyEditors/BlockEditorPropertyValueEditor.cs # src/Umbraco.Infrastructure/PropertyEditors/BlockEditorValidator.cs # src/Umbraco.Infrastructure/PropertyEditors/BlockEditorValues.cs # src/Umbraco.Infrastructure/PropertyEditors/RichTextPropertyEditor.cs # src/Umbraco.Infrastructure/PropertyEditors/ValueConverters/BlockGridPropertyValueConverter.cs # src/Umbraco.Infrastructure/PropertyEditors/ValueConverters/BlockListPropertyValueConverter.cs # src/Umbraco.Infrastructure/PropertyEditors/ValueConverters/BlockPropertyValueConverterBase.cs # src/Umbraco.Infrastructure/Security/IBackOfficeApplicationManager.cs # src/Umbraco.Infrastructure/Services/IIndexingRebuilderService.cs # src/Umbraco.Infrastructure/Services/IndexingRebuilderService.cs # src/Umbraco.New.Cms.Core/Umbraco.New.Cms.Core.csproj # src/Umbraco.New.Cms.Infrastructure/Umbraco.New.Cms.Infrastructure.csproj # src/Umbraco.New.Cms.Web.Common/Umbraco.New.Cms.Web.Common.csproj # tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/content.spec.ts # tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Login/login.spec.ts # tests/Umbraco.Tests.UnitTests/Umbraco.Core/PropertyEditors/BlockListPropertyValueConverterTests.cs # version.json
This commit is contained in:
Bjarke Berg
@@ -0,0 +1,179 @@
|
||||
using NUnit.Framework;
|
||||
using Umbraco.Cms.Core;
|
||||
using Umbraco.Cms.Core.Models;
|
||||
using Umbraco.Cms.Core.Models.Blocks;
|
||||
using Umbraco.Cms.Core.PropertyEditors;
|
||||
using Umbraco.Cms.Core.Serialization;
|
||||
using Umbraco.Cms.Core.Services;
|
||||
using Umbraco.Cms.Tests.Common.Builders;
|
||||
using Umbraco.Cms.Tests.Common.Testing;
|
||||
using Umbraco.Cms.Tests.Integration.Testing;
|
||||
|
||||
namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.PropertyEditors;
|
||||
|
||||
[TestFixture]
|
||||
[UmbracoTest(Database = UmbracoTestOptions.Database.NewSchemaPerTest)]
|
||||
public class RichTextPropertyEditorTests : UmbracoIntegrationTest
|
||||
{
|
||||
private IContentTypeService ContentTypeService => GetRequiredService<IContentTypeService>();
|
||||
|
||||
private IContentService ContentService => GetRequiredService<IContentService>();
|
||||
|
||||
private IDataTypeService DataTypeService => GetRequiredService<IDataTypeService>();
|
||||
|
||||
private IJsonSerializer JsonSerializer => GetRequiredService<IJsonSerializer>();
|
||||
|
||||
[Test]
|
||||
public void Can_Use_Markup_String_As_Value()
|
||||
{
|
||||
var contentType = ContentTypeBuilder.CreateTextPageContentType("myContentType");
|
||||
contentType.AllowedTemplates = Enumerable.Empty<ITemplate>();
|
||||
ContentTypeService.Save(contentType);
|
||||
|
||||
var dataType = DataTypeService.GetDataType(contentType.PropertyTypes.First(propertyType => propertyType.Alias == "bodyText").DataTypeId)!;
|
||||
var editor = dataType.Editor!;
|
||||
var valueEditor = editor.GetValueEditor();
|
||||
|
||||
const string markup = "<p>This is some markup</p>";
|
||||
|
||||
var content = ContentBuilder.CreateTextpageContent(contentType, "My Content", -1);
|
||||
content.Properties["bodyText"]!.SetValue(markup);
|
||||
ContentService.Save(content);
|
||||
|
||||
var toEditor = valueEditor.ToEditor(content.Properties["bodyText"]);
|
||||
var richTextEditorValue = toEditor as RichTextEditorValue;
|
||||
|
||||
Assert.IsNotNull(richTextEditorValue);
|
||||
Assert.AreEqual(markup, richTextEditorValue.Markup);
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void Can_Use_RichTextEditorValue_As_Value()
|
||||
{
|
||||
var contentType = ContentTypeBuilder.CreateTextPageContentType("myContentType");
|
||||
contentType.AllowedTemplates = Enumerable.Empty<ITemplate>();
|
||||
ContentTypeService.Save(contentType);
|
||||
|
||||
var dataType = DataTypeService.GetDataType(contentType.PropertyTypes.First(propertyType => propertyType.Alias == "bodyText").DataTypeId)!;
|
||||
var editor = dataType.Editor!;
|
||||
var valueEditor = editor.GetValueEditor();
|
||||
|
||||
const string markup = "<p>This is some markup</p>";
|
||||
var propertyValue = RichTextPropertyEditorHelper.SerializeRichTextEditorValue(new RichTextEditorValue { Markup = markup, Blocks = null }, JsonSerializer);
|
||||
|
||||
var content = ContentBuilder.CreateTextpageContent(contentType, "My Content", -1);
|
||||
content.Properties["bodyText"]!.SetValue(propertyValue);
|
||||
ContentService.Save(content);
|
||||
|
||||
var toEditor = valueEditor.ToEditor(content.Properties["bodyText"]);
|
||||
var richTextEditorValue = toEditor as RichTextEditorValue;
|
||||
|
||||
Assert.IsNotNull(richTextEditorValue);
|
||||
Assert.AreEqual(markup, richTextEditorValue.Markup);
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void Can_Track_Block_References()
|
||||
{
|
||||
var elementType = ContentTypeBuilder.CreateAllTypesContentType("myElementType", "My Element Type");
|
||||
elementType.IsElement = true;
|
||||
ContentTypeService.Save(elementType);
|
||||
|
||||
var contentType = ContentTypeBuilder.CreateTextPageContentType("myContentType");
|
||||
contentType.AllowedTemplates = Enumerable.Empty<ITemplate>();
|
||||
ContentTypeService.Save(contentType);
|
||||
|
||||
var pickedContent = ContentBuilder.CreateTextpageContent(contentType, "My Content", -1);
|
||||
ContentService.Save(pickedContent);
|
||||
|
||||
var dataType = DataTypeService.GetDataType(contentType.PropertyTypes.First(propertyType => propertyType.Alias == "bodyText").DataTypeId)!;
|
||||
var editor = dataType.Editor!;
|
||||
var valueEditor = (BlockValuePropertyValueEditorBase)editor.GetValueEditor();
|
||||
|
||||
var elementId = Guid.NewGuid();
|
||||
var propertyValue = RichTextPropertyEditorHelper.SerializeRichTextEditorValue(
|
||||
new RichTextEditorValue
|
||||
{
|
||||
Markup = @$"<p>This is some markup</p><umb-rte-block data-content-udi=""umb://element/{elementId:N}""><!--Umbraco-Block--></umb-rte-block>",
|
||||
Blocks = JsonSerializer.Deserialize<BlockValue>($$"""
|
||||
{
|
||||
"layout": {
|
||||
"Umbraco.TinyMCE": [{
|
||||
"contentUdi": "umb://element/{{elementId:N}}"
|
||||
}
|
||||
]
|
||||
},
|
||||
"contentData": [{
|
||||
"contentTypeKey": "{{elementType.Key:B}}",
|
||||
"udi": "umb://element/{{elementId:N}}",
|
||||
"contentPicker": "umb://document/{{pickedContent.Key:N}}"
|
||||
}
|
||||
],
|
||||
"settingsData": []
|
||||
}
|
||||
""")
|
||||
},
|
||||
JsonSerializer);
|
||||
|
||||
var content = ContentBuilder.CreateTextpageContent(contentType, "My Content", -1);
|
||||
content.Properties["bodyText"]!.SetValue(propertyValue);
|
||||
ContentService.Save(content);
|
||||
|
||||
var references = valueEditor.GetReferences(content.GetValue("bodyText")).ToArray();
|
||||
Assert.AreEqual(1, references.Length);
|
||||
var reference = references.First();
|
||||
Assert.AreEqual(Constants.Conventions.RelationTypes.RelatedDocumentAlias, reference.RelationTypeAlias);
|
||||
Assert.AreEqual(pickedContent.GetUdi(), reference.Udi);
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void Can_Track_Block_Tags()
|
||||
{
|
||||
var elementType = ContentTypeBuilder.CreateAllTypesContentType("myElementType", "My Element Type");
|
||||
elementType.IsElement = true;
|
||||
ContentTypeService.Save(elementType);
|
||||
|
||||
var contentType = ContentTypeBuilder.CreateTextPageContentType("myContentType");
|
||||
contentType.AllowedTemplates = Enumerable.Empty<ITemplate>();
|
||||
ContentTypeService.Save(contentType);
|
||||
|
||||
var dataType = DataTypeService.GetDataType(contentType.PropertyTypes.First(propertyType => propertyType.Alias == "bodyText").DataTypeId)!;
|
||||
var editor = dataType.Editor!;
|
||||
var valueEditor = (BlockValuePropertyValueEditorBase)editor.GetValueEditor();
|
||||
|
||||
var elementId = Guid.NewGuid();
|
||||
var propertyValue = RichTextPropertyEditorHelper.SerializeRichTextEditorValue(
|
||||
new RichTextEditorValue
|
||||
{
|
||||
Markup = @$"<p>This is some markup</p><umb-rte-block data-content-udi=""umb://element/{elementId:N}""><!--Umbraco-Block--></umb-rte-block>",
|
||||
Blocks = JsonSerializer.Deserialize<BlockValue>($$"""
|
||||
{
|
||||
"layout": {
|
||||
"Umbraco.TinyMCE": [{
|
||||
"contentUdi": "umb://element/{{elementId:N}}"
|
||||
}
|
||||
]
|
||||
},
|
||||
"contentData": [{
|
||||
"contentTypeKey": "{{elementType.Key:B}}",
|
||||
"udi": "umb://element/{{elementId:N}}",
|
||||
"tags": "['Tag One', 'Tag Two', 'Tag Three']"
|
||||
}
|
||||
],
|
||||
"settingsData": []
|
||||
}
|
||||
""")
|
||||
},
|
||||
JsonSerializer);
|
||||
|
||||
var content = ContentBuilder.CreateTextpageContent(contentType, "My Content", -1);
|
||||
content.Properties["bodyText"]!.SetValue(propertyValue);
|
||||
ContentService.Save(content);
|
||||
|
||||
var tags = valueEditor.GetTags(content.GetValue("bodyText"), null, null).ToArray();
|
||||
Assert.AreEqual(3, tags.Length);
|
||||
Assert.IsNotNull(tags.Single(tag => tag.Text == "Tag One"));
|
||||
Assert.IsNotNull(tags.Single(tag => tag.Text == "Tag Two"));
|
||||
Assert.IsNotNull(tags.Single(tag => tag.Text == "Tag Three"));
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user