Merge branch 'v15/dev' into v16/dev

# Conflicts:
#	azure-pipelines.yml
#	version.json

Author: ronaldbarendse

src/Umbraco.Deploy.Contrib/Migrators/DocTypeGridEditorPropertyTypeMigrator.cs

@@ -1,22 +1,23 @@
 using System;
 using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
-using System.Linq;
 using System.Text.Json;
 using System.Text.Json.Nodes;
 using System.Text.Json.Serialization;
 using System.Threading;
 using System.Threading.Tasks;
+using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
-using Newtonsoft.Json;
 using Umbraco.Cms.Core;
+using Umbraco.Cms.Core.DependencyInjection;
 using Umbraco.Cms.Core.Deploy;
 using Umbraco.Cms.Core.Models;
 using Umbraco.Cms.Core.Models.Blocks;
 using Umbraco.Cms.Core.PropertyEditors;
 using Umbraco.Cms.Core.Serialization;
 using Umbraco.Cms.Core.Services;
 using Umbraco.Cms.Core.Strings;
+using Umbraco.Deploy.Core.Migrators;
 using Umbraco.Deploy.Infrastructure.Migrators;
 using Umbraco.Extensions;
 
@@ -27,7 +28,10 @@ namespace Umbraco.Deploy.Contrib.Migrators;
 /// </summary>
 public class DocTypeGridEditorPropertyTypeMigrator : GridPropertyTypeMigrator
 {
+    private readonly ILogger<GridPropertyTypeMigrator> _logger;
     private readonly IJsonSerializer _jsonSerializer;
+    private readonly PropertyTypeMigratorCollection _propertyTypeMigrators;
+    private IDictionary<string, string>? _propertyEditorAliases;
 
     /// <summary>
     /// Initializes a new instance of the <see cref="DocTypeGridEditorPropertyTypeMigrator" /> class.
@@ -38,9 +42,44 @@ public class DocTypeGridEditorPropertyTypeMigrator : GridPropertyTypeMigrator
     /// <param name="shortStringHelper">The short string helper.</param>
     /// <param name="contentTypeService">The content type service.</param>
     /// <param name="mediaService">The media service.</param>
+    [Obsolete("Use the constructor with all parameters. This will be removed in a future version.")]
     public DocTypeGridEditorPropertyTypeMigrator(ILogger<GridPropertyTypeMigrator> logger, IJsonSerializer jsonSerializer, IDataTypeService dataTypeService, IShortStringHelper shortStringHelper, IContentTypeService contentTypeService, IMediaService mediaService)
+        : this(
+              logger,
+              jsonSerializer,
+              dataTypeService,
+              shortStringHelper,
+              contentTypeService,
+              mediaService,
+              StaticServiceProvider.Instance.GetRequiredService<PropertyTypeMigratorCollection>())
+    { }
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="DocTypeGridEditorPropertyTypeMigrator" /> class.
+    /// </summary>
+    /// <param name="logger">The logger.</param>
+    /// <param name="jsonSerializer">The JSON serializer.</param>
+    /// <param name="dataTypeService">The data type service.</param>
+    /// <param name="shortStringHelper">The short string helper.</param>
+    /// <param name="contentTypeService">The content type service.</param>
+    /// <param name="mediaService">The media service.</param>
+    /// <param name="propertyTypeMigrators">The property type migrators.</param>
+    public DocTypeGridEditorPropertyTypeMigrator(ILogger<GridPropertyTypeMigrator> logger, IJsonSerializer jsonSerializer, IDataTypeService dataTypeService, IShortStringHelper shortStringHelper, IContentTypeService contentTypeService, IMediaService mediaService, PropertyTypeMigratorCollection propertyTypeMigrators)
         : base(logger, jsonSerializer, dataTypeService, shortStringHelper, contentTypeService, mediaService)
-        => _jsonSerializer = jsonSerializer;
+    {
+        _logger = logger;
+        _jsonSerializer = jsonSerializer;
+        _propertyTypeMigrators = propertyTypeMigrators;
+    }
+
+    /// <inheritdoc />
+    public override async Task<object?> MigrateAsync(IPropertyType propertyType, object? value, IDictionary<string, string> propertyEditorAliases, IContextCache contextCache, CancellationToken cancellationToken = default)
+    {
+        // Workaround: store property editor aliases for use in MigrateGridControl
+        _propertyEditorAliases = propertyEditorAliases;
+
+        return await base.MigrateAsync(propertyType, value, propertyEditorAliases, contextCache, cancellationToken).ConfigureAwait(false);
+    }
 
     /// <inheritdoc />
     protected override async Task<BlockItemData?> MigrateGridControlAsync(GridValue.GridControl gridControl, BlockGridConfiguration configuration, IContextCache contextCache, CancellationToken cancellationToken = default)
@@ -62,20 +101,38 @@ public DocTypeGridEditorPropertyTypeMigrator(ILogger<GridPropertyTypeMigrator> l
     /// <returns>
     /// A task that represents the asynchronous operation. The task result contains the block item data, or <c>null</c> if migration should be skipped.
     /// </returns>
-    protected virtual async Task<BlockItemData?> MigrateGridControlAsync(DocTypeGridEditorValue value, BlockGridConfiguration configuration, IContextCache contextCache)
+    protected virtual async Task<BlockItemData?> MigrateGridControlAsync(DocTypeGridEditorValue value, BlockGridConfiguration configuration, IContextCache contextCache) // TODO: Add cancellation token
     {
         IContentType contentType = await GetContentTypeAsync(value.ContentTypeAlias, configuration, contextCache).ConfigureAwait(false)
             ?? throw new InvalidOperationException($"Migrating legacy grid failed, because content type with alias '{value.ContentTypeAlias}' could not be found (in the Block Grid configuration).");
 
+        var propertyValues = new List<BlockPropertyValue>(value.Value.Count);
+
+        foreach (IPropertyType propertyType in contentType.CompositionPropertyTypes)
+        {
+            if (value.Value.TryGetValue(propertyType.Alias, out object? propertyValue))
+            {
+                if (_propertyEditorAliases is not null &&
+                    await _propertyTypeMigrators.TryMigrateAsync(propertyType, value, _propertyEditorAliases, contentType.Alias, contextCache).ConfigureAwait(false) is (true, var migratedValue))
+                {
+                    _logger.LogDebug("Migrated nested/recursive property {PropertyTypeAlias} on {ContentTypeAlias} to {PropertyEditorAlias}: {Value}.", propertyType.Alias, contentType.Alias, propertyType.PropertyEditorAlias, migratedValue);
+
+                    propertyValue = migratedValue;
+                }
+
+                propertyValues.Add(new BlockPropertyValue()
+                {
+                    Alias = propertyType.Alias,
+                    Value = propertyValue,
+                });
+            }
+        }
+
         return new BlockItemData()
         {
             Key = value.Id,
             ContentTypeKey = contentType.Key,
-            Values = value.Value.Select(x => new BlockPropertyValue()
-            {
-                Alias = x.Key,
-                Value = x.Value,
-            }).ToList(),
+            Values = propertyValues,
         };
     }
 
@@ -92,9 +149,10 @@ JsonNode jsonNode when jsonNode.GetValue<string>() is string json && json.Detect
 
             return !string.IsNullOrEmpty(docTypeGridEditorValue?.ContentTypeAlias);
         }
-        catch (JsonSerializationException)
+        catch (JsonException)
         {
             docTypeGridEditorValue = null;
+
             return false;
         }
     }