yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Adds tests for settings and changes to strongly typed guid

Browse Source
This commit is contained in:
Shannon
2020-07-21 16:24:48 +10:00
parent a194d1db4a
commit 5bc80e2d84
4 changed files with 75 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/Umbraco.Web/PropertyEditors/BlockListConfiguration.cs
View File

@@ -27,11 +27,12 @@ namespace Umbraco.Web.PropertyEditors
[JsonProperty("thumbnail")]
public string Thumbnail { get; set; }
// TODO: This is named inconsistently in JS but renaming it needs to be done in quite a lot of places, this should be contentElementTypeKey
[JsonProperty("contentTypeKey")]
public Guid Key { get; set; }
public Guid ContentElementTypeKey { get; set; }
[JsonProperty("settingsElementTypeKey")]
public string SettingsElementTypeKey { get; set; }
public Guid? SettingsElementTypeKey { get; set; }
[JsonProperty("view")]
public string View { get; set; }

15
src/Umbraco.Web/PropertyEditors/ValueConverters/BlockListPropertyValueConverter.cs
View File

@@ -51,7 +51,7 @@ namespace Umbraco.Web.PropertyEditors.ValueConverters
{
var configuration = propertyType.DataType.ConfigurationAs<BlockListConfiguration>();
var contentTypes = configuration.Blocks;
var contentTypeMap = contentTypes.ToDictionary(x => x.Key);
var contentElementTypeMap = contentTypes.ToDictionary(x => x.ContentElementTypeKey);
var contentPublishedElements = new Dictionary<Guid, IPublishedElement>();
var settingsPublishedElements = new Dictionary<Guid, IPublishedElement>();
@@ -100,12 +100,19 @@ namespace Umbraco.Web.PropertyEditors.ValueConverters
if (!contentData.ContentType.TryGetKey(out var contentTypeKey))
throw new InvalidOperationException("The content type was not of type " + typeof(IPublishedContentType2));
if (!contentTypeMap.TryGetValue(contentTypeKey, out var blockConfig))
if (!contentElementTypeMap.TryGetValue(contentTypeKey, out var blockConfig))
continue;
// this can happen if they have a settings type, save content, remove the settings type, and display the front-end page before saving the content again
if (settingsData != null && string.IsNullOrWhiteSpace(blockConfig.SettingsElementTypeKey))
settingsData = null;
// we also ensure that the content type's match since maybe the settings type has been changed after this has been persisted.
if (settingsData != null)
{
if (!settingsData.ContentType.TryGetKey(out var settingsElementTypeKey))
throw new InvalidOperationException("The settings element type was not of type " + typeof(IPublishedContentType2));
if (!blockConfig.SettingsElementTypeKey.HasValue || settingsElementTypeKey != blockConfig.SettingsElementTypeKey)
settingsData = null;
}
var layoutRef = new BlockListLayoutReference(contentGuidUdi, contentData, settingGuidUdi, settingsData);
layout.Add(layoutRef);