V17/rte block import fix (#850)

* Umbraco RC2 - Packag Update

* re-ordered converters incase this is an issue.

* Added more block level mapping to capture the change in the block format inside a RTE Block.

* update client rc2

* Update uSync.Core/Mapping/Mappers/RTEMappers/RTEBlockDataContentMigrator.cs

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

---------

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

Author: KevinJump

uSync.Backoffice.Management.Client/usync-assets/package-lock.json

@@ -58,7 +58,7 @@
 		"@hey-api/client-fetch": "^0.10.0",
 		"@hey-api/openapi-ts": "^0.85.0",
 		"@microsoft/signalr": "^9.0.6",
-		"@umbraco-cms/backoffice": "^17.0.0-rc1",
+		"@umbraco-cms/backoffice": "^17.0.0-rc2",
 		"lit": "^3.2.1",
 		"prettier": "^3.6.2",
 		"typescript": "^5.9.3",

uSync.Backoffice.Management.Client/usync-assets/package.json

@@ -25,10 +25,11 @@ public static class JsonTextExtensions
         Converters =
         {
             new JsonStringEnumConverter(),
-            new JsonObjectConverter(),
-            new JsonBlockValueConverter(),
             new JsonUdiConverter(),
             new JsonUdiRangeConverter(),
+            new JsonObjectConverter(),
+            new JsonBlockValueConverter(),
+
             new JsonBooleanConverter(),
             new JsonXElementConverter(),
             // new JsonBlockListLayoutItemConverter(),

uSync.Core/Extensions/JsonTextExtensions.cs

@@ -43,6 +43,13 @@ public RTEBlockDataContentMigrator(
     /// <inheritdoc />
     public override async Task<string?> GetImportValueAsync(string value, string editorAlias)
     {
+        // Workaround: The nested block layout values won't load if the editor alias is still "Umbraco.TinyMCE".
+        // Expected behavior: The editor should support loading nested block layouts regardless of the alias.
+        // This might be a bug in Umbraco core. As of [2024-06-XX], this issue has/has not been reported to the Umbraco core team.
+        // (If reported, add link: https://github.com/umbraco/Umbraco-CMS/issues/XXXX)
+        // Remove this workaround if/when the core issue is fixed.
+        value = value.Replace("\"Umbraco.TinyMCE\":", $"\"{editorAlias}\":");
+
         if (value.TryDeserialize<RichTextEditorValue>(out RichTextEditorValue? richTextEditorValue) is false || richTextEditorValue is null)
             return await base.GetImportValueAsync(value, editorAlias);
 

uSync.Core/Mapping/Mappers/RTEMappers/RTEBlockDataContentMigrator.cs

@@ -2,7 +2,7 @@
 
 using System.Collections;
 using System.Text.Json.Nodes;
-
+using Umbraco.Cms.Core;
 using Umbraco.Cms.Core.Models;
 using Umbraco.Cms.Core.Models.Blocks;
 using Umbraco.Cms.Core.Services;
@@ -79,6 +79,8 @@ public SyncBlockMapperBase(
 
         foreach (var contentItem in blocks)
         {
+            MigrateBlock(contentItem);
+
             await ProcessBlockData(contentItem, GetValueMethod);
         }
 
@@ -109,6 +111,47 @@ private async Task ProcessBlockData(BlockItemData? blockItem, Func<object?, stri
         }
     }
 
+#pragma warning disable CS0618 // Type or member is obsolete (post v18, we will need to have our own model?)
+    private bool MigrateBlock(BlockItemData? block)
+    {
+        if (block is null) return false;
+
+        bool converted = false;
+        if (block.Values.Count == 0 && block.RawPropertyValues?.Count > 0)
+        {
+            block.Values = SyncBlockMapperBase<TBlockValue>.MigrateBlockRawValues(block.RawPropertyValues);
+            block.RawPropertyValues.Clear();
+            converted = true;
+        }
+
+        if (block.Key == Guid.Empty && block.Udi is GuidUdi guidUdi)
+        {
+            block.Key = guidUdi.Guid;
+            converted = true;
+        }
+
+        block.Udi = null;
+
+        return converted;
+    }
+#pragma warning restore CS0618 // Type or member is obsolete
+
+
+    private static List<BlockPropertyValue> MigrateBlockRawValues(Dictionary<string, object?> rawValues)
+    {
+        var values = new List<BlockPropertyValue>();
+        foreach (var kvp in rawValues)
+        {
+            values.Add(new BlockPropertyValue
+            {
+                Alias = kvp.Key,
+                Value = kvp.Value
+            });
+        }
+        return values;
+    }
+
+
     private async Task<IContentType?> GetContentType(Guid contentTypeKey)
         => await _contentTypeService.GetAsync(contentTypeKey);