Merge pull request #14 from umbraco/temp-deploy-476

deploy-476 Nested content transfer issue

Author: mikkelhm

src/Umbraco.Deploy.Contrib.Connectors/GridCellValueConnectors/LeBlenderGridCellValueConnector.cs

@@ -19,6 +19,8 @@ public class LeBlenderGridCellValueConnector : GridCellValueConnectorBase
         private readonly IMacroParser _macroParser;
         private readonly Lazy<ValueConnectorCollection> _valueConnectorsLazy;
 
+        internal static string MockPropertyTypeAlias = "mockLeBlenderPropertyTypeAlias";
+
         public LeBlenderGridCellValueConnector(IDataTypeService dataTypeService, IMacroParser macroParser, Lazy<ValueConnectorCollection> valueConnectors)
         {
             if (dataTypeService == null) throw new ArgumentNullException(nameof(dataTypeService));
@@ -193,7 +195,7 @@ public override void SetValue(GridValue.GridControl control, Property property)
                         continue;
                     }
 
-                    var propertyType = new PropertyType(dataType.PropertyEditorAlias, dataType.DatabaseType, "mockPropertyTypeAlias");
+                    var propertyType = new PropertyType(dataType.PropertyEditorAlias, dataType.DatabaseType, MockPropertyTypeAlias);
                     propertyType.DataTypeDefinitionId = dataType.Id;
                     // get the value connector for the property type
                     var propValueConnector = ValueConnectors.Get(propertyType);

src/Umbraco.Deploy.Contrib.Connectors/ValueConnectors/ArchetypeValueConnector.cs

@@ -19,6 +19,7 @@ public class ArchetypeValueConnector : IValueConnector
         private readonly Lazy<ValueConnectorCollection> _valueConnectorsLazy;
         public virtual IEnumerable<string> PropertyEditorAliases => new[] {"Imulus.Archetype"};
 
+        internal static string MockPropertyTypeAlias = "mockArchetypePropertyTypeAlias";
         private ValueConnectorCollection ValueConnectors => _valueConnectorsLazy.Value;
 
         public ArchetypeValueConnector(IDataTypeService dataTypeService, IMacroParser macroParser, Lazy<ValueConnectorCollection> valueConnectors)
@@ -181,7 +182,7 @@ public void SetValue(IContentBase content, string alias, string value)
                 }
 
                 // if the macro parser didn't convert the value then try to find a value connector that can and convert it
-                var propertyType = new PropertyType(dataType.PropertyEditorAlias, dataType.DatabaseType, "mockPropertyTypeAlias");
+                var propertyType = new PropertyType(dataType.PropertyEditorAlias, dataType.DatabaseType, MockPropertyTypeAlias);
                 propertyType.DataTypeDefinitionId = dataType.Id;
                 var propValueConnector = ValueConnectors.Get(propertyType);
                 var mockProperty = new Property(propertyType);

src/Umbraco.Deploy.Contrib.Connectors/ValueConnectors/NestedContentValueConnector.cs

@@ -8,6 +8,7 @@
 using Umbraco.Core.Logging;
 using Umbraco.Core.Models;
 using Umbraco.Core.Services;
+using Umbraco.Deploy.Contrib.Connectors.GridCellValueConnectors;
 using Umbraco.Deploy.ValueConnectors;
 
 namespace Umbraco.Deploy.Contrib.Connectors.ValueConnectors
@@ -246,8 +247,12 @@ public void SetValue(IContentBase content, string alias, string value)
                 }
             }
 
-            // NestedContent does not use formatting when serializing JSON values
-            if (nestedContent.Length == 1)
+            // This statement checks whether we have a single item being stored - and if this is stored inside a LeBlender value.
+            // For some reason, LeBlender does not store an array of one object (like normal Nested Content would do) if the Nested
+            // Content is inside a LeBlender property. Instead it simply stores an object - therefore we need to save single items
+            // using JObject instead of JArray, if the current operation is being run from within a wrapping LeBlender property.
+            // Note: NestedContent does not use formatting when serializing JSON values.
+            if (nestedContent.Length == 1 && content.Properties[0]?.Alias == LeBlenderGridCellValueConnector.MockPropertyTypeAlias)
                 value = JObject.FromObject(nestedContent.FirstOrDefault()).ToString(Formatting.None);
             else
                 value = JArray.FromObject(nestedContent).ToString(Formatting.None);

src/Umbraco.Deploy.Contrib.Connectors/ValueConnectors/VortoValueConnector.cs

@@ -19,6 +19,8 @@ public class VortoValueConnector : IValueConnector
         private readonly IDataTypeService _dataTypeService;
         private readonly Lazy<ValueConnectorCollection> _valueConnectorsLazy;
 
+        internal static string MockPropertyTypeAlias = "mockVortoPropertyTypeAlias";
+
         public VortoValueConnector(IDataTypeService dataTypeService, Lazy<ValueConnectorCollection> valueConnectors)
         {
             if (dataTypeService == null) throw new ArgumentNullException(nameof(dataTypeService));
@@ -154,7 +156,7 @@ public void SetValue(IContentBase content, string alias, string value)
             if (wrappedDataType == null)
                 throw new InvalidOperationException($"Could not resolve the datatype used inside the Vorto property: {alias}");
 
-            var propertyType = new PropertyType(wrappedDataType, "mockPropertyType");
+            var propertyType = new PropertyType(wrappedDataType, MockPropertyTypeAlias);
             var valueConnector = ValueConnectors.Get(propertyType);
 
             // iterate values for each language