* insert umb rte block web component in rte * First stab at moving the RTE markup to a nested "markup" property in the property value. * initial work * only rewrite markup * transform RTE into component * parse scope in grid.rte * revert use a fallback instead * block insertion and sync in place * block picker partly impl * remove test of old controller * remove test of old controller * block with block data * proper block with api connection * remove log * styling * Persist blocks data (still a temporary solution) * styling allows for interaction * block actions * tinyMCE styling * paste feature * prevalue display Inline toggle * inline mode in RTE * todo note * fixes wording * preparation for editor communication * remove val-server-match for now * clean up blocks that does not belong in markup * remove blocks not used in the markup * liveEditing * displayAsBlock formatting * clean up * TODO note * Serverside handling for RTE blocks (incl. refactor of Block List and Block Grid) * ensure rich text loads after block editor * trigger resize on block init * Handle RTE blocks output in Delivery API * sanitize ng classes * simplify calls to init blocks * move sanitisation * make validation work * only warn when missing one * clean up * remove validation border as it does not work * more clean up * add unsupported block entry editor * Revert breaking functionality for Block List and Grid * prevent re-inits of blocks * make sure delete blocks triggers an update * Refactor RichTextPropertyIndexValueFactory to index values from blocks + clean up RichTextPropertyEditor dependencies * first working cursor solution * inline element approach * Handle both inline and block level blocks * Fix the RTE block parser regex so it handles multiple inline blocks. * Fix reference and tags tracking, add tests, make the editor backwards compatible and make deploy happy * Use RichTextPropertyEditorHelper serialization in tests * Ensure correct model in Block Grid value converter (incl unit test to prove it) * do not include umbblockpicker in grid * make blocks the new default, instead of macros * only send value of body from DOMParser * Blocks of deleted ElementTypes shows unsupported * do not edit a unsupported block * remove trying to be smart on the init * fix missing culture issue * set dirty * alert when no blocks * Revert "make blocks the new default, instead of macros" This reverts commit 283e8aa473fdfde075197d34aa47e35dfc64a8ae. --------- Co-authored-by: kjac <kja@umbraco.dk>
49 lines
1.7 KiB
C#
49 lines
1.7 KiB
C#
using Moq;
|
|
using NUnit.Framework;
|
|
using Umbraco.Cms.Core;
|
|
using Umbraco.Cms.Core.DeliveryApi;
|
|
using Umbraco.Cms.Core.Logging;
|
|
using Umbraco.Cms.Core.Models.Blocks;
|
|
using Umbraco.Cms.Core.Models.PublishedContent;
|
|
using Umbraco.Cms.Core.PropertyEditors;
|
|
using Umbraco.Cms.Core.PropertyEditors.ValueConverters;
|
|
using Umbraco.Cms.Infrastructure.Serialization;
|
|
|
|
namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.PropertyEditors;
|
|
|
|
[TestFixture]
|
|
public class BlockGridPropertyValueConverterTests : BlockPropertyValueConverterTestsBase<BlockGridConfiguration>
|
|
{
|
|
protected override string PropertyEditorAlias => Constants.PropertyEditors.Aliases.BlockGrid;
|
|
|
|
[Test]
|
|
public void Get_Value_Type()
|
|
{
|
|
var editor = CreateConverter();
|
|
var config = ConfigForSingle();
|
|
var propertyType = GetPropertyType(config);
|
|
|
|
var valueType = editor.GetPropertyValueType(propertyType);
|
|
|
|
// the result is always block grid model
|
|
Assert.AreEqual(typeof(BlockGridModel), valueType);
|
|
}
|
|
|
|
private BlockGridPropertyValueConverter CreateConverter()
|
|
{
|
|
var publishedSnapshotAccessor = GetPublishedSnapshotAccessor();
|
|
var publishedModelFactory = new NoopPublishedModelFactory();
|
|
var editor = new BlockGridPropertyValueConverter(
|
|
Mock.Of<IProfilingLogger>(),
|
|
new BlockEditorConverter(publishedSnapshotAccessor, publishedModelFactory),
|
|
new JsonNetSerializer(),
|
|
new ApiElementBuilder(Mock.Of<IOutputExpansionStrategyAccessor>()));
|
|
return editor;
|
|
}
|
|
|
|
private BlockGridConfiguration ConfigForSingle() => new()
|
|
{
|
|
Blocks = new[] { new BlockGridConfiguration.BlockGridBlockConfiguration { ContentElementTypeKey = ContentKey1 } },
|
|
};
|
|
}
|