1be503e71f
* 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>
85 lines
2.2 KiB
C#
85 lines
2.2 KiB
C#
namespace Umbraco.Cms.Core.Models.Blocks;
|
|
|
|
public abstract class BlockLayoutItemBase : IBlockLayoutItem
|
|
{
|
|
private Guid? _contentKey;
|
|
private Guid? _settingsKey;
|
|
|
|
private Udi? _contentUdi;
|
|
private Udi? _settingsUdi;
|
|
|
|
[Obsolete("Use ContentKey instead. Will be removed in V18.")]
|
|
public Udi? ContentUdi
|
|
{
|
|
get => _contentUdi;
|
|
set
|
|
{
|
|
if (_contentKey is not null)
|
|
{
|
|
return;
|
|
}
|
|
|
|
_contentUdi = value;
|
|
_contentKey = (value as GuidUdi)?.Guid;
|
|
}
|
|
}
|
|
|
|
[Obsolete("Use SettingsKey instead. Will be removed in V18.")]
|
|
public Udi? SettingsUdi
|
|
{
|
|
get => _settingsUdi;
|
|
set
|
|
{
|
|
if (_settingsKey is not null)
|
|
{
|
|
return;
|
|
}
|
|
|
|
_settingsUdi = value;
|
|
_settingsKey = (value as GuidUdi)?.Guid;
|
|
}
|
|
}
|
|
|
|
public Guid ContentKey
|
|
{
|
|
get => _contentKey ?? throw new InvalidOperationException("ContentKey has not yet been initialized");
|
|
set => _contentKey = value;
|
|
}
|
|
|
|
public Guid? SettingsKey
|
|
{
|
|
get => _settingsKey;
|
|
set => _settingsKey = value;
|
|
}
|
|
|
|
protected BlockLayoutItemBase()
|
|
{ }
|
|
|
|
[Obsolete("Use constructor that accepts GUIDs instead. Will be removed in V18.")]
|
|
protected BlockLayoutItemBase(Udi contentUdi)
|
|
: this((contentUdi as GuidUdi)?.Guid ?? throw new ArgumentException(nameof(contentUdi)))
|
|
{
|
|
}
|
|
|
|
[Obsolete("Use constructor that accepts GUIDs instead. Will be removed in V18.")]
|
|
protected BlockLayoutItemBase(Udi contentUdi, Udi settingsUdi)
|
|
: this(
|
|
(contentUdi as GuidUdi)?.Guid ?? throw new ArgumentException(nameof(contentUdi)),
|
|
(settingsUdi as GuidUdi)?.Guid ?? throw new ArgumentException(nameof(settingsUdi)))
|
|
{
|
|
}
|
|
|
|
protected BlockLayoutItemBase(Guid contentKey)
|
|
{
|
|
ContentKey = contentKey;
|
|
ContentUdi = new GuidUdi(Constants.UdiEntityType.Element, contentKey);
|
|
}
|
|
|
|
protected BlockLayoutItemBase(Guid contentKey, Guid settingsKey)
|
|
: this(contentKey)
|
|
{
|
|
SettingsKey = settingsKey;
|
|
SettingsUdi = new GuidUdi(Constants.UdiEntityType.Element, settingsKey);
|
|
}
|
|
}
|