Handled necesssary conversion between string and JToken in converting…

… to and from artifacts for nested content complex properties.
umbraco · Jan 11, 2022 · f2e0a55 · f2e0a55
1 parent 1a95a60
commit f2e0a55
Showing 1 changed file with 11 additions and 1 deletion.
diff --git a/src/Umbraco.Deploy.Contrib.Connectors/ValueConnectors/NestedContentValueConnector.cs b/src/Umbraco.Deploy.Contrib.Connectors/ValueConnectors/NestedContentValueConnector.cs
@@ -114,7 +114,12 @@ public string ToArtifact(object value, PropertyType propertyType, ICollection<Ar
 
                     // pass the value, property type and the dependencies collection to the connector to get a "artifact" value
                     var innerValue = row.PropertyValues[key];
-                    object parsedValue = propertyValueConnector.ToArtifact(innerValue, innerPropertyType, dependencies);
+
+                    // connectors are expecting strings, not JTokens
+                    object preparedValue = innerValue is JToken
+                        ? innerValue?.ToString()
+                        : innerValue;
+                    object parsedValue = propertyValueConnector.ToArtifact(preparedValue, innerPropertyType, dependencies);
 
                     // getting Map image value umb://media/43e7401fb3cd48ceaa421df511ec703c to (nothing) - why?!
                     _logger.Debug<NestedContentValueConnector>("Mapped {Key} value '{PropertyValue}' to '{ParsedValue}' using {PropertyValueConnectorType} for {PropertyType}.", key, row.PropertyValues[key], parsedValue, propertyValueConnector.GetType(), innerPropertyType.Alias);
@@ -202,6 +207,11 @@ public object FromArtifact(string value, PropertyType propertyType, object curre
                         {
                             row.PropertyValues[key] = convertedValue.ToString();
                         }
+                        // json strings need to be converted into JTokens
+                        else if (convertedValue is string convertedStringValue && convertedStringValue.DetectIsJson())
+                        {
+                            row.PropertyValues[key] = JToken.Parse(convertedStringValue);
+                        }
                         else
                         {
                             row.PropertyValues[key] = convertedValue;