v13 Property compatability

Author: KevinJump

uSync.Backoffice.Management.Client/assets/src/repository/SyncAction.respositoy.ts

@@ -48,7 +48,7 @@ export class uSyncActionRepository extends UmbControllerBase {
                 action: action,
                 options: {
                     group : group,
-                    force : true,
+                    force : false,
                     clean : false,
                     clientId : clientId,
                     set: 'default'

uSync.Backoffice.Management.Client/assets/src/workspace/views/default/default.element.ts

@@ -104,14 +104,22 @@ export class uSyncDefaultViewElement extends UmbElementMixin(LitElement) {
         });
     }
 
+    _legacyDialogOpened : boolean = false;
+
     async openLegacyModal() {
 
+        if (this._legacyDialogOpened) return;
+        this._legacyDialogOpened = true;
+
         const legacyModal = this.#modalContext?.open(USYNC_LEGACY_MODAL, {
             data : this._legacy
         });
 
-        const data = await legacyModal?.onSubmit();
-        if (!data) return;
+        await legacyModal?.onSubmit().then(function(data) {
+            console.log('data', data);
+        });
+
+        return;
     }
 
 

uSync.Core/Extensions/DictionaryExtensions.cs

@@ -94,4 +94,23 @@ public static IDictionary<TKey, TValue> MergeIgnoreDuplicates<TKey, TValue>(this
 
         return mergedDictionary;
     }
+
+    public static IDictionary<string, TValue> ConvertToCamelCase<TValue>(this IDictionary<string, TValue> originalDictionary)
+        => originalDictionary
+            .ToDictionary(kvp => kvp.Key.ToCamelCase(), kvp => kvp.Value);
+
+    public static string ToCamelCase(this string s)
+    {
+        if (string.IsNullOrWhiteSpace(s))
+        {
+            return string.Empty;
+        }
+
+        if (s.Length == 1)
+        {
+            return s.ToLowerInvariant();
+        }
+
+        return char.ToLowerInvariant(s[0]) + s.Substring(1);
+    }
 }

uSync.Core/Extensions/JsonTextExtensions.cs

@@ -4,6 +4,8 @@
 
 using Umbraco.Extensions;
 
+using uSync.Core.Json;
+
 namespace uSync.Core.Extensions;
 
 /// <summary>
@@ -16,13 +18,15 @@ public static class JsonTextExtensions
         WriteIndented = true,
         PropertyNamingPolicy = JsonNamingPolicy.CamelCase,
         PropertyNameCaseInsensitive = true,
+        TypeInfoResolver = new OrderedPropertiesJsonResolver(),
     };
 
     private static readonly JsonSerializerOptions _flatOptions = new()
     {
         WriteIndented = false,
         PropertyNamingPolicy = JsonNamingPolicy.CamelCase,
         PropertyNameCaseInsensitive = true,
+        TypeInfoResolver = new OrderedPropertiesJsonResolver(),
     };
 
     private static JsonNodeOptions _nodeOptions = new()

uSync.Core/Json/OrderedPropertiesJsonResolver.cs

@@ -0,0 +1,34 @@
+using System.Text.Json;
+using System.Text.Json.Serialization.Metadata;
+
+namespace uSync.Core.Json;
+
+/// <summary>
+///  ordering of the json properties. 
+/// </summary>
+/// <remarks>
+/// <para>
+///  we order json properties because it makes for less changes in the physical files
+/// </para>
+/// <para>
+///  less changes in the files = faster comparison checks.
+/// </para>
+/// </remarks>
+internal class OrderedPropertiesJsonResolver : DefaultJsonTypeInfoResolver
+{
+    public override JsonTypeInfo GetTypeInfo(Type type, JsonSerializerOptions options)
+    {
+        var order = 0;
+
+        JsonTypeInfo typeInfo = base.GetTypeInfo(type, options);
+        if (typeInfo.Kind != JsonTypeInfoKind.Object) return typeInfo;
+
+        foreach(var property in typeInfo.Properties.OrderBy(x => x.Name))
+        {
+            property.Order = order++;
+        }
+
+        return typeInfo;
+    }
+
+}

uSync.Core/Serialization/Serializers/DataTypeSerializer.cs

@@ -166,7 +166,7 @@ private List<uSyncChange> DeserializeConfiguration(IDataType item, XElement node
     {
         var serializer = _configurationSerializers.GetSerializer(item.EditorAlias);
 
-        var config = node.Element("Configuration").ValueOrDefault(string.Empty);
+        var config = node.Element("Config").ValueOrDefault(string.Empty);
         if (string.IsNullOrEmpty(config)) return [];
 
         var changes = new List<uSyncChange>();
@@ -177,6 +177,9 @@ private List<uSyncChange> DeserializeConfiguration(IDataType item, XElement node
             return changes;
         }
 
+        // v8,9,etc configs the properties 
+        dictionaryData = dictionaryData.ConvertToCamelCase();
+
         var importData = serializer == null ? dictionaryData : serializer.GetConfigurationImport(dictionaryData);
 
         if (IsJsonEqual(importData, item.ConfigurationData) is false)
@@ -247,8 +250,11 @@ private XElement SerializeConfiguration(IDataType item)
 
         var exportConfig = serializer == null ? merged : serializer.GetConfigurationExport(merged);
 
-        var json = exportConfig.SerializeJsonString() ?? string.Empty;
-        return new XElement("Configuration", new XCData(json));
+        var json = exportConfig
+            .OrderBy(x => x.Key)
+            .ToDictionary()
+            .SerializeJsonString() ?? string.Empty;
+        return new XElement("Config", new XCData(json));
     }
 
     private static object? TryGetConfigurationObject(IDataType item)

uSync.Core/Serialization/SyncContainerSerializerBase.cs

@@ -27,7 +27,7 @@ public SyncContainerSerializerBase(IEntityService entityService, ILogger<SyncCon
     {
 
         TObject? item = FindItem(node);
-        if (item is null) return Attempt.Succeed(item);
+        if (item is not null) return Attempt.Succeed(item);
 
         logger.LogDebug("FindOrCreate: Creating");
 
@@ -82,9 +82,6 @@ public SyncContainerSerializerBase(IEntityService entityService, ILogger<SyncCon
             }
         }
 
-        if (parent is null || treeItem is null)
-            return Attempt.Fail(item, new KeyNotFoundException("Unable to find parent location for item"));
-
         var itemType = GetItemBaseType(node);
         var alias = node.GetAlias();
 

uSync.Core/Serialization/SyncSerializerRoot.cs

@@ -218,7 +218,7 @@ protected virtual SyncAttempt<TObject> ProcessRename(Guid key, string alias, Ser
 
     public virtual ChangeType IsCurrent(XElement node, SyncSerializerOptions options)
     {
-        XElement current = new("");
+        XElement? current = default;
         var item = FindItem(node);
         if (item != null)
         {

uSync.Core/Tracking/SyncXmlTracker.cs

@@ -65,7 +65,7 @@ public IEnumerable<uSyncChange> GetChanges(XElement target, XElement source, Syn
         if (target.IsEmptyItem())
             return SyncXmlTracker<TObject>.GetEmptyFileChange(target, source).AsEnumerableOfOne();
 
-        if (GetSerializer(target)?.IsValid(target) is true)
+        if (GetSerializer(target)?.IsValid(target) is false)
             return uSyncChange.Error("", "Invalid File", target.Name.LocalName).AsEnumerableOfOne();
 
         var changeType = GetChangeType(target, source, options);