* Block level variance - initial commit * Remove TODOs * Only convert RTEs with blocks * Fix JSON paths for block level property validation * Rename Properties to Values * Correct the JSON path of block level validation errors * Make it possible to skip content migration + ensure backwards compat for the new block format * Partial culture variance publishing at property level * UDI to key conversion for block editors - draft, WIP, do NOT merge 😄 (#16970) * Convert block UDIs to GUIDs * Fix merge * Fix merge issues * Rework nested layout item key parsing for backwards compatibility * Clean-up * Reverse block layout item key calculation * Review * Use IOptions to skip content migrations * Remove "published" from data editor feature naming, as it can be used in other contexts too * Parallel migration * Don't use deprecated constructor * Ensure that layout follows structure for partial publishing * Block Grid element level variance + tests (incl. refactor of element level variation tests) * Rollback unintended changes to Program.cs * Fix bad casing * Minor formatting * RTE element level variance + tests * Remove obsoleted constructors * Use Umbraco.RichText instead of Umbraco.TinyMCE as layout alias for blocks in the RTE * Fix bad merge * Temporary fix for new cache in integration tests * Add EditorAlias to block level properties * Remove the unintended PropertyEditorAlias output for block values * Add EditorAlias to Datatype Item model * Update OpenApi.json * Introduce "expose" for blocks * Strict (explicit) handling for Expose * Improve handling of document and element level variance changes * Refactor variance alignment for published rendering * Block UDI to Key conversion should also register as a conversion * Convert newly added RTE unit test to new RTE blocks format * Minor review changes * Run memory intensive tests on Linux only * Add tests proving that AllowEditInvariantFromNonDefault has effect for block level variance too * Fix the Platform annotations * Removed Platform annotations for tests. * Fix merge * Obsolete old PublishCulture extension * More fixing bad merge --------- Co-authored-by: Niels Lyngsø <niels.lyngso@gmail.com> Co-authored-by: nikolajlauridsen <nikolajlauridsen@protonmail.ch>
173 lines
7.0 KiB
C#
173 lines
7.0 KiB
C#
using Microsoft.AspNetCore.Http;
|
|
using Microsoft.Extensions.DependencyInjection;
|
|
using Moq;
|
|
using NUnit.Framework;
|
|
using Umbraco.Cms.Core;
|
|
using Umbraco.Cms.Core.Cache;
|
|
using Umbraco.Cms.Core.Configuration.Models;
|
|
using Umbraco.Cms.Core.Models;
|
|
using Umbraco.Cms.Core.Models.PublishedContent;
|
|
using Umbraco.Cms.Core.PropertyEditors;
|
|
using Umbraco.Cms.Core.PublishedCache;
|
|
using Umbraco.Cms.Core.Serialization;
|
|
using Umbraco.Cms.Core.Services;
|
|
using Umbraco.Cms.Core.Services.Changes;
|
|
using Umbraco.Cms.Core.Web;
|
|
using Umbraco.Cms.Tests.Common;
|
|
using Umbraco.Cms.Tests.Common.Builders;
|
|
using Umbraco.Cms.Tests.Common.Builders.Extensions;
|
|
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 abstract class BlockEditorElementVariationTestBase : UmbracoIntegrationTest
|
|
{
|
|
protected List<string> TestsRequiringAllowEditInvariantFromNonDefault { get; set; } = new();
|
|
|
|
protected ILanguageService LanguageService => GetRequiredService<ILanguageService>();
|
|
|
|
protected IContentService ContentService => GetRequiredService<IContentService>();
|
|
|
|
protected IContentTypeService ContentTypeService => GetRequiredService<IContentTypeService>();
|
|
|
|
protected PropertyEditorCollection PropertyEditorCollection => GetRequiredService<PropertyEditorCollection>();
|
|
|
|
private IPublishedSnapshotService PublishedSnapshotService => GetRequiredService<IPublishedSnapshotService>();
|
|
|
|
private IUmbracoContextAccessor UmbracoContextAccessor => GetRequiredService<IUmbracoContextAccessor>();
|
|
|
|
private IUmbracoContextFactory UmbracoContextFactory => GetRequiredService<IUmbracoContextFactory>();
|
|
|
|
private IVariationContextAccessor VariationContextAccessor => GetRequiredService<IVariationContextAccessor>();
|
|
|
|
private IDataTypeService DataTypeService => GetRequiredService<IDataTypeService>();
|
|
|
|
private IConfigurationEditorJsonSerializer ConfigurationEditorJsonSerializer => GetRequiredService<IConfigurationEditorJsonSerializer>();
|
|
|
|
protected override void CustomTestSetup(IUmbracoBuilder builder)
|
|
{
|
|
var mockHttpContextAccessor = new Mock<IHttpContextAccessor>();
|
|
var httpContext = new DefaultHttpContext();
|
|
httpContext.Request.Scheme = "http";
|
|
httpContext.Request.Host = new HostString("localhost");
|
|
|
|
mockHttpContextAccessor.SetupGet(x => x.HttpContext).Returns(httpContext);
|
|
|
|
builder.Services.AddUnique<IUmbracoContextAccessor, TestUmbracoContextAccessor>();
|
|
builder.Services.AddUnique(mockHttpContextAccessor.Object);
|
|
builder.AddUmbracoHybridCache();
|
|
builder.AddNuCache();
|
|
|
|
builder.Services.Configure<ContentSettings>(config =>
|
|
config.AllowEditInvariantFromNonDefault = TestsRequiringAllowEditInvariantFromNonDefault.Contains(TestContext.CurrentContext.Test.Name));
|
|
}
|
|
|
|
[SetUp]
|
|
public async Task SetUp() => await LanguageService.CreateAsync(
|
|
new Language("da-DK", "Danish"), Constants.Security.SuperUserKey);
|
|
|
|
protected void PublishContent(IContent content, string[] culturesToPublish)
|
|
{
|
|
var publishResult = ContentService.Publish(content, culturesToPublish);
|
|
Assert.IsTrue(publishResult.Success);
|
|
|
|
ContentCacheRefresher.JsonPayload[] payloads =
|
|
[
|
|
new ContentCacheRefresher.JsonPayload
|
|
{
|
|
ChangeTypes = TreeChangeTypes.RefreshNode,
|
|
Key = content.Key,
|
|
Id = content.Id,
|
|
Blueprint = false
|
|
}
|
|
];
|
|
|
|
PublishedSnapshotService.Notify(payloads, out _, out _);
|
|
}
|
|
|
|
protected IContentType CreateElementType(ContentVariation variation, string alias = "myElementType")
|
|
{
|
|
var elementType = new ContentTypeBuilder()
|
|
.WithAlias(alias)
|
|
.WithName("My Element Type")
|
|
.WithIsElement(true)
|
|
.WithContentVariation(variation)
|
|
.AddPropertyType()
|
|
.WithAlias("invariantText")
|
|
.WithName("Invariant text")
|
|
.WithDataTypeId(Constants.DataTypes.Textbox)
|
|
.WithPropertyEditorAlias(Constants.PropertyEditors.Aliases.TextBox)
|
|
.WithValueStorageType(ValueStorageType.Nvarchar)
|
|
.WithVariations(ContentVariation.Nothing)
|
|
.Done()
|
|
.AddPropertyType()
|
|
.WithAlias("variantText")
|
|
.WithName("Variant text")
|
|
.WithDataTypeId(Constants.DataTypes.Textbox)
|
|
.WithPropertyEditorAlias(Constants.PropertyEditors.Aliases.TextBox)
|
|
.WithValueStorageType(ValueStorageType.Nvarchar)
|
|
.WithVariations(variation)
|
|
.Done()
|
|
.Build();
|
|
ContentTypeService.Save(elementType);
|
|
return elementType;
|
|
}
|
|
|
|
protected IContentType CreateContentType(ContentVariation contentTypeVariation, IDataType blocksEditorDataType, ContentVariation blocksPropertyVariation = ContentVariation.Nothing)
|
|
{
|
|
var contentType = new ContentTypeBuilder()
|
|
.WithAlias("myPage")
|
|
.WithName("My Page")
|
|
.WithContentVariation(contentTypeVariation)
|
|
.AddPropertyType()
|
|
.WithAlias("blocks")
|
|
.WithName("Blocks")
|
|
.WithDataTypeId(blocksEditorDataType.Id)
|
|
.WithVariations(blocksPropertyVariation)
|
|
.Done()
|
|
.Build();
|
|
ContentTypeService.Save(contentType);
|
|
return contentType;
|
|
}
|
|
|
|
protected IPublishedContent GetPublishedContent(Guid key)
|
|
{
|
|
UmbracoContextAccessor.Clear();
|
|
var umbracoContext = UmbracoContextFactory.EnsureUmbracoContext().UmbracoContext;
|
|
var publishedContent = umbracoContext.Content?.GetById(key);
|
|
Assert.IsNotNull(publishedContent);
|
|
|
|
return publishedContent;
|
|
}
|
|
|
|
protected void SetVariationContext(string? culture, string? segment)
|
|
=> VariationContextAccessor.VariationContext = new VariationContext(culture: culture, segment: segment);
|
|
|
|
protected async Task<IDataType> CreateBlockEditorDataType<T>(string propertyEditorAlias, T blocksConfiguration)
|
|
{
|
|
var dataType = new DataType(PropertyEditorCollection[propertyEditorAlias], ConfigurationEditorJsonSerializer)
|
|
{
|
|
ConfigurationData = new Dictionary<string, object> { { "blocks", blocksConfiguration } },
|
|
Name = "My Block Editor",
|
|
DatabaseType = ValueStorageType.Ntext,
|
|
ParentId = Constants.System.Root,
|
|
CreateDate = DateTime.UtcNow
|
|
};
|
|
|
|
await DataTypeService.CreateAsync(dataType, Constants.Security.SuperUserKey);
|
|
return dataType;
|
|
}
|
|
|
|
protected void RefreshContentTypeCache(params IContentType[] contentTypes)
|
|
{
|
|
ContentTypeCacheRefresher.JsonPayload[] payloads = contentTypes
|
|
.Select(contentType => new ContentTypeCacheRefresher.JsonPayload(nameof(IContentType), contentType.Id, ContentTypeChangeTypes.RefreshMain))
|
|
.ToArray();
|
|
|
|
PublishedSnapshotService.Notify(payloads);
|
|
}
|
|
}
|