Update the logic for repetable strings. (#508)

KevinJump · Jul 19, 2023 · b1ad552 · b1ad552
1 parent 676da8f
commit b1ad552
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 3 deletions.
diff --git a/uSync.Core/Mapping/Mappers/RepeatableValueMapper.cs b/uSync.Core/Mapping/Mappers/RepeatableValueMapper.cs
@@ -1,5 +1,8 @@
-using Umbraco.Cms.Core;
+using Newtonsoft.Json;
+
+using Umbraco.Cms.Core;
 using Umbraco.Cms.Core.Services;
+using Umbraco.Extensions;
 
 namespace uSync.Core.Mapping
 {
@@ -14,12 +17,26 @@ public RepeatableValueMapper(IEntityService entityService)
 
         public override string Name => "Repeatable Text Mapper";
 
-        public override string[] Editors => new string[] { 
+        public override string[] Editors => new string[] {
             Constants.PropertyEditors.Aliases.MultipleTextstring
         };
 
         public override string GetImportValue(string value, string editorAlias)
         {
+            if (value.DetectIsJson())
+            {
+                try
+                {
+                    var result = JsonConvert.SerializeObject(JsonConvert.DeserializeObject<object>(value));
+                    return result;
+                }
+                catch
+                {
+                    return value;
+                }
+            }
+
+
             if (!value.Contains('\r'))
             {
                 return value.Replace("\n", "\r\n");

diff --git a/uSync.Core/Mapping/SyncNestedValueMapperBase.cs b/uSync.Core/Mapping/SyncNestedValueMapperBase.cs
@@ -52,7 +52,8 @@ protected JObject GetImportProperties(JObject item, IContentType docType)
                     if (value != null)
                     {
                         var mappedVal = mapperCollection.Value.GetImportValue(value.ToString(), property.PropertyEditorAlias);
-                        item[property.Alias] = mappedVal?.ToString() ?? null; // .GetJsonTokenValue();
+                        item[property.Alias] = // mappedVal?.ToString() ?? null;
+                                               mappedVal?.ToString().GetJsonTokenValue() ?? null;
                     }
                 }
             }