Merge branch 'v13/dev' into v14/dev

ronaldbarendse · ronaldbarendse · commit 3efb53c9d087 · 2024-10-02T15:26:45.000+02:00
diff --git a/src/Umbraco.Deploy.Contrib/Extensions/ArtifactMigratorCollectionBuilderExtensions.cs b/src/Umbraco.Deploy.Contrib/Extensions/ArtifactMigratorCollectionBuilderExtensions.cs
@@ -26,8 +26,8 @@ public static ArtifactMigratorCollectionBuilder AddLegacyMigrators(this Artifact
             .Append<ContentPicker2DataTypeArtifactMigrator>()
             .Append<ContentPickerAliasDataTypeArtifactMigrator>()
             .Append<DateDataTypeArtifactMigrator>()
+            .Append<DropDownFlexibleDataTypeArtifactMigrator>() // Ensure this is appended before other dropdown migrators to avoid duplicate migration
             .Append<DropDownDataTypeArtifactMigrator>()
-            .Append<DropDownFlexibleDataTypeArtifactMigrator>()
             .Append<DropdownlistMultiplePublishKeysDataTypeArtifactMigrator>()
             .Append<DropdownlistPublishingKeysDataTypeArtifactMigrator>()
             .Append<DropDownMultipleDataTypeArtifactMigrator>()
@@ -42,8 +42,6 @@ public static ArtifactMigratorCollectionBuilder AddLegacyMigrators(this Artifact
             .Append<TextboxDataTypeArtifactMigrator>()
             .Append<TextboxMultipleDataTypeArtifactMigrator>()
             .Append<TinyMCEv3DataTypeArtifactMigrator>()
-            // Property values
-            .Append<CheckBoxListPropertyValueArtifactMigrator>()
-            .Append<DropDownListFlexiblePropertyValueArtifactMigrator>()
-            .Append<RadioButtonListPropertyValueArtifactMigrator>();
+            // Add prefixes to pre-value property editor aliases, triggering property type migrators
+            .Append<PrevalueArtifactMigrator>();
 }
diff --git a/src/Umbraco.Deploy.Contrib/Extensions/PropertyTypeMigratorCollectionBuilderExtensions.cs b/src/Umbraco.Deploy.Contrib/Extensions/PropertyTypeMigratorCollectionBuilderExtensions.cs
@@ -0,0 +1,24 @@
+using Umbraco.Deploy.Contrib.Migrators.Legacy;
+using Umbraco.Deploy.Core.Migrators;
+
+namespace Umbraco.Extensions;
+
+public static class PropertyTypeMigratorCollectionBuilderExtensions
+{
+    /// <summary>
+    /// Adds the legacy property type migrators to allow importing from Umbraco 7.
+    /// </summary>
+    /// <returns>
+    /// The property type migrator collection builder.
+    /// </returns>
+    public static PropertyTypeMigratorCollectionBuilder AddLegacyMigrators(this PropertyTypeMigratorCollectionBuilder propertyTypeMigratorCollectionBuilder)
+        => propertyTypeMigratorCollectionBuilder
+            // Pre-values to a single value or JSON array
+            .Append<CheckBoxListPropertyTypeMigrator>()
+            .Append<DropDownPropertyTypeMigrator>()
+            .Append<DropDownListFlexiblePropertyTypeMigrator>()
+            .Append<DropdownlistMultiplePublishKeysPropertyTypeMigrator>()
+            .Append<DropdownlistPublishingKeysPropertyTypeMigrator>()
+            .Append<DropDownMultiplePropertyTypeMigrator>()
+            .Append<RadioButtonListPropertyTypeMigrator>();
+}
diff --git a/src/Umbraco.Deploy.Contrib/Migrators/Legacy/Content/CheckBoxListPropertyTypeMigrator.cs b/src/Umbraco.Deploy.Contrib/Migrators/Legacy/Content/CheckBoxListPropertyTypeMigrator.cs
@@ -0,0 +1,21 @@
+using Umbraco.Cms.Core;
+using Umbraco.Cms.Core.Serialization;
+
+namespace Umbraco.Deploy.Contrib.Migrators.Legacy;
+
+/// <summary>
+/// Migrates the property value using the <see cref="Constants.PropertyEditors.Aliases.CheckBoxList" /> editor containing prevalues (seperated by <see cref="PrevaluePropertyTypeMigratorBase.Delimiter" />) from Umbraco 7 to a JSON array.
+/// </summary>
+public sealed class CheckBoxListPropertyTypeMigrator : PrevaluePropertyTypeMigratorBase
+{
+    /// <inheritdoc />
+    protected override bool Multiple => true;
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="CheckBoxListPropertyTypeMigrator" /> class.
+    /// </summary>
+    /// <param name="jsonSerializer">The JSON serializer.</param>
+    public CheckBoxListPropertyTypeMigrator(IJsonSerializer jsonSerializer)
+        : base(Constants.PropertyEditors.Aliases.CheckBoxList, jsonSerializer)
+    { }
+}
diff --git a/src/Umbraco.Deploy.Contrib/Migrators/Legacy/Content/CheckBoxListPropertyValueArtifactMigrator.cs b/src/Umbraco.Deploy.Contrib/Migrators/Legacy/Content/CheckBoxListPropertyValueArtifactMigrator.cs
@@ -1,3 +1,4 @@
+using System;
 using Umbraco.Cms.Core;
 using Umbraco.Cms.Core.Serialization;
 using Umbraco.Cms.Core.Services;
@@ -9,6 +10,7 @@ namespace Umbraco.Deploy.Contrib.Migrators.Legacy;
 /// <summary>
 /// Migrates the <see cref="PropertyValueWithSegments" /> using the <see cref="Constants.PropertyEditors.Aliases.CheckBoxList" /> editor from the <see cref="ContentArtifactBase" /> containing prevalues (seperated by <see cref="PrevaluePropertyValueArtifactMigratorBase.Delimiter" />) from Umbraco 7 to a JSON array.
 /// </summary>
+[Obsolete("Migrating property values in an artifact migrator does not support nested/recursive properties. Use the PrevalueArtifactMigrator and CheckBoxListPropertyTypeMigrator instead. This class will be removed in a future version.")]
 public class CheckBoxListPropertyValueArtifactMigrator : PrevaluePropertyValueArtifactMigratorBase
 {
     /// <inheritdoc />
diff --git a/src/Umbraco.Deploy.Contrib/Migrators/Legacy/Content/DropDownListFlexiblePropertyTypeMigrator.cs b/src/Umbraco.Deploy.Contrib/Migrators/Legacy/Content/DropDownListFlexiblePropertyTypeMigrator.cs
@@ -0,0 +1,21 @@
+using Umbraco.Cms.Core;
+using Umbraco.Cms.Core.Serialization;
+
+namespace Umbraco.Deploy.Contrib.Migrators.Legacy;
+
+/// <summary>
+/// Migrates the property value using the <see cref="Constants.PropertyEditors.Aliases.DropDownListFlexible" /> editor containing prevalues (seperated by <see cref="PrevaluePropertyTypeMigratorBase.Delimiter" />) from Umbraco 7 to a JSON array.
+/// </summary>
+public sealed class DropDownListFlexiblePropertyTypeMigrator : PrevaluePropertyTypeMigratorBase
+{
+    /// <inheritdoc />
+    protected override bool Multiple => true;
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="DropDownListFlexiblePropertyTypeMigrator" /> class.
+    /// </summary>
+    /// <param name="jsonSerializer">The JSON serializer.</param>
+    public DropDownListFlexiblePropertyTypeMigrator(IJsonSerializer jsonSerializer)
+        : base(Constants.PropertyEditors.Aliases.DropDownListFlexible, jsonSerializer)
+    { }
+}
diff --git a/src/Umbraco.Deploy.Contrib/Migrators/Legacy/Content/DropDownListFlexiblePropertyValueArtifactMigrator.cs b/src/Umbraco.Deploy.Contrib/Migrators/Legacy/Content/DropDownListFlexiblePropertyValueArtifactMigrator.cs
@@ -1,3 +1,4 @@
+using System;
 using Umbraco.Cms.Core;
 using Umbraco.Cms.Core.Serialization;
 using Umbraco.Cms.Core.Services;
@@ -9,6 +10,7 @@ namespace Umbraco.Deploy.Contrib.Migrators.Legacy;
 /// <summary>
 /// Migrates the <see cref="PropertyValueWithSegments" /> using the <see cref="Constants.PropertyEditors.Aliases.DropDownListFlexible" /> editor from the <see cref="ContentArtifactBase" /> containing prevalues (seperated by <see cref="PrevaluePropertyValueArtifactMigratorBase.Delimiter" />) from Umbraco 7 to a JSON array.
 /// </summary>
+[Obsolete("Migrating property values in an artifact migrator does not support nested/recursive properties. Use the PrevalueArtifactMigrator and DropDownListFlexiblePropertyTypeMigrator instead. This class will be removed in a future version.")]
 public class DropDownListFlexiblePropertyValueArtifactMigrator : PrevaluePropertyValueArtifactMigratorBase
 {
     /// <inheritdoc />
diff --git a/src/Umbraco.Deploy.Contrib/Migrators/Legacy/Content/DropDownMultiplePropertyTypeMigrator.cs b/src/Umbraco.Deploy.Contrib/Migrators/Legacy/Content/DropDownMultiplePropertyTypeMigrator.cs
@@ -0,0 +1,23 @@
+using Umbraco.Cms.Core;
+using Umbraco.Cms.Core.Serialization;
+
+namespace Umbraco.Deploy.Contrib.Migrators.Legacy;
+
+/// <summary>
+/// Migrates the property value from the legacy <see cref="FromEditorAlias" /> editor containing prevalues (seperated by <see cref="PrevaluePropertyTypeMigratorBase.Delimiter" />) from Umbraco 7 to a JSON array.
+/// </summary>
+public sealed class DropDownMultiplePropertyTypeMigrator : PrevaluePropertyTypeMigratorBase
+{
+    private const string FromEditorAlias = "Umbraco.DropDownMultiple";
+
+    /// <inheritdoc />
+    protected override bool Multiple => true;
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="DropDownMultiplePropertyTypeMigrator" /> class.
+    /// </summary>
+    /// <param name="jsonSerializer">The JSON serializer.</param>
+    public DropDownMultiplePropertyTypeMigrator(IJsonSerializer jsonSerializer)
+        : base(FromEditorAlias, Constants.PropertyEditors.Aliases.DropDownListFlexible, jsonSerializer)
+    { }
+}
diff --git a/src/Umbraco.Deploy.Contrib/Migrators/Legacy/Content/DropDownPropertyTypeMigrator.cs b/src/Umbraco.Deploy.Contrib/Migrators/Legacy/Content/DropDownPropertyTypeMigrator.cs
@@ -0,0 +1,23 @@
+using Umbraco.Cms.Core;
+using Umbraco.Cms.Core.Serialization;
+
+namespace Umbraco.Deploy.Contrib.Migrators.Legacy;
+
+/// <summary>
+/// Migrates the property value from the legacy <see cref="FromEditorAlias" /> editor containing prevalues (seperated by <see cref="PrevaluePropertyTypeMigratorBase.Delimiter" />) from Umbraco 7 to a JSON array.
+/// </summary>
+public sealed class DropDownPropertyTypeMigrator : PrevaluePropertyTypeMigratorBase
+{
+    private const string FromEditorAlias = "Umbraco.DropDown";
+
+    /// <inheritdoc />
+    protected override bool Multiple => true;
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="DropDownPropertyTypeMigrator" /> class.
+    /// </summary>
+    /// <param name="jsonSerializer">The JSON serializer.</param>
+    public DropDownPropertyTypeMigrator(IJsonSerializer jsonSerializer)
+        : base(FromEditorAlias, Constants.PropertyEditors.Aliases.DropDownListFlexible, jsonSerializer)
+    { }
+}
diff --git a/src/Umbraco.Deploy.Contrib/Migrators/Legacy/Content/DropdownlistMultiplePublishKeysPropertyTypeMigrator.cs b/src/Umbraco.Deploy.Contrib/Migrators/Legacy/Content/DropdownlistMultiplePublishKeysPropertyTypeMigrator.cs
@@ -0,0 +1,23 @@
+using Umbraco.Cms.Core;
+using Umbraco.Cms.Core.Serialization;
+
+namespace Umbraco.Deploy.Contrib.Migrators.Legacy;
+
+/// <summary>
+/// Migrates the property value from the legacy <see cref="FromEditorAlias" /> editor containing prevalues (seperated by <see cref="PrevaluePropertyTypeMigratorBase.Delimiter" />) from Umbraco 7 to a JSON array.
+/// </summary>
+public sealed class DropdownlistMultiplePublishKeysPropertyTypeMigrator : PrevaluePropertyTypeMigratorBase
+{
+    private const string FromEditorAlias = "Umbraco.DropdownlistMultiplePublishKeys";
+
+    /// <inheritdoc />
+    protected override bool Multiple => true;
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="DropdownlistMultiplePublishKeysPropertyTypeMigrator" /> class.
+    /// </summary>
+    /// <param name="jsonSerializer">The JSON serializer.</param>
+    public DropdownlistMultiplePublishKeysPropertyTypeMigrator(IJsonSerializer jsonSerializer)
+        : base(FromEditorAlias, Constants.PropertyEditors.Aliases.DropDownListFlexible, jsonSerializer)
+    { }
+}
diff --git a/src/Umbraco.Deploy.Contrib/Migrators/Legacy/Content/DropdownlistPublishingKeysPropertyTypeMigrator.cs b/src/Umbraco.Deploy.Contrib/Migrators/Legacy/Content/DropdownlistPublishingKeysPropertyTypeMigrator.cs
@@ -0,0 +1,23 @@
+using Umbraco.Cms.Core;
+using Umbraco.Cms.Core.Serialization;
+
+namespace Umbraco.Deploy.Contrib.Migrators.Legacy;
+
+/// <summary>
+/// Migrates the property value from the legacy <see cref="FromEditorAlias" /> editor containing prevalues (seperated by <see cref="PrevaluePropertyTypeMigratorBase.Delimiter" />) from Umbraco 7 to a JSON array.
+/// </summary>
+public sealed class DropdownlistPublishingKeysPropertyTypeMigrator : PrevaluePropertyTypeMigratorBase
+{
+    private const string FromEditorAlias = "Umbraco.DropdownlistPublishingKeys";
+
+    /// <inheritdoc />
+    protected override bool Multiple => true;
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="DropdownlistPublishingKeysPropertyTypeMigrator" /> class.
+    /// </summary>
+    /// <param name="jsonSerializer">The JSON serializer.</param>
+    public DropdownlistPublishingKeysPropertyTypeMigrator(IJsonSerializer jsonSerializer)
+        : base(FromEditorAlias, Constants.PropertyEditors.Aliases.DropDownListFlexible, jsonSerializer)
+    { }
+}
diff --git a/src/Umbraco.Deploy.Contrib/Migrators/Legacy/Content/PrevalueArtifactMigrator.cs b/src/Umbraco.Deploy.Contrib/Migrators/Legacy/Content/PrevalueArtifactMigrator.cs
@@ -0,0 +1,53 @@
+using System;
+using System.Linq;
+using Umbraco.Cms.Core;
+using Umbraco.Cms.Core.Semver;
+using Umbraco.Deploy.Core.Migrators;
+using Umbraco.Deploy.Infrastructure.Artifacts.Content;
+using Umbraco.Extensions;
+
+namespace Umbraco.Deploy.Contrib.Migrators.Legacy;
+
+/// <summary>
+/// Migrates the <see cref="ContentArtifactBase" /> property editor aliases to add a prefix to Umbraco 7 prevalue editors, triggering property type migrators.
+/// </summary>
+public class PrevalueArtifactMigrator : ArtifactMigratorBase<ContentArtifactBase>
+{
+    internal const string EditorAliasPrefix = "MigratePrevalue.";
+
+    private readonly string[] _editorAliases;
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="PrevalueArtifactMigrator" /> class.
+    /// </summary>
+    public PrevalueArtifactMigrator()
+        : this(
+              Constants.PropertyEditors.Aliases.CheckBoxList,
+              Constants.PropertyEditors.Aliases.DropDownListFlexible,
+              Constants.PropertyEditors.Aliases.RadioButtonList)
+    { }
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="PrevalueArtifactMigrator" /> class.
+    /// </summary>
+    /// <param name="editorAliases">The editor aliases.</param>
+    protected PrevalueArtifactMigrator(params string[] editorAliases)
+    {
+        _editorAliases = editorAliases;
+
+        MaxVersion = new SemVersion(3, 0, 0);
+    }
+
+    /// <inheritdoc />
+    protected override bool CanMigrateType(Type type)
+        => type.Inherits<ContentArtifactBase>();
+
+    /// <inheritdoc />
+    protected override ContentArtifactBase? Migrate(ContentArtifactBase artifact)
+    {
+        // Add prefix to matching property editor aliases
+        artifact.PropertyEditorAliases = artifact.PropertyEditorAliases?.ToDictionary(x => x.Key, x => _editorAliases.Contains(x.Value) ? EditorAliasPrefix + x.Value : x.Value);
+
+        return artifact;
+    }
+}
diff --git a/src/Umbraco.Deploy.Contrib/Migrators/Legacy/Content/PrevaluePropertyTypeMigratorBase.cs b/src/Umbraco.Deploy.Contrib/Migrators/Legacy/Content/PrevaluePropertyTypeMigratorBase.cs
@@ -0,0 +1,65 @@
+using System;
+using System.Collections.Generic;
+using Umbraco.Cms.Core.Deploy;
+using Umbraco.Cms.Core.Models;
+using Umbraco.Cms.Core.Serialization;
+using Umbraco.Deploy.Core.Migrators;
+
+namespace Umbraco.Deploy.Contrib.Migrators.Legacy;
+
+/// <summary>
+/// Migrates the property value containing prevalues (seperated by <see cref="Delimiter" />) from Umbraco 7 to a single value or JSON array.
+/// </summary>
+public abstract class PrevaluePropertyTypeMigratorBase : PropertyTypeMigratorBase
+{
+    private const string EditorAliasPrefix = PrevalueArtifactMigrator.EditorAliasPrefix;
+    private const string Delimiter = ";;";
+
+    private readonly IJsonSerializer _jsonSerializer;
+
+    /// <summary>
+    /// Gets a value indicating whether the property type stores multiple prevalues as a JSON array or single value.
+    /// </summary>
+    /// <value>
+    ///   <c>true</c> if multiple prevalues are stored as a JSON array; otherwise, <c>false</c>.
+    /// </value>
+    protected abstract bool Multiple { get; }
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="PrevaluePropertyTypeMigratorBase" /> class.
+    /// </summary>
+    /// <param name="editorAlias">The editor alias (without the prefix added by <see cref="PrevalueArtifactMigrator" />).</param>
+    /// <param name="jsonSerializer">The JSON serializer.</param>
+    protected PrevaluePropertyTypeMigratorBase(string editorAlias, IJsonSerializer jsonSerializer)
+        : this(EditorAliasPrefix + editorAlias, editorAlias, jsonSerializer)
+    { }
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="PrevaluePropertyTypeMigratorBase" /> class.
+    /// </summary>
+    /// <param name="fromEditorAlias">The editor alias to migrate from.</param>
+    /// <param name="toEditorAlias">The editor alias to migrate to.</param>
+    /// <param name="jsonSerializer">The JSON serializer.</param>
+    protected PrevaluePropertyTypeMigratorBase(string fromEditorAlias, string toEditorAlias, IJsonSerializer jsonSerializer)
+        : base(fromEditorAlias, toEditorAlias)
+        => _jsonSerializer = jsonSerializer;
+
+    /// <inheritdoc />
+    public override object? Migrate(IPropertyType propertyType, object? value, IDictionary<string, string> propertyEditorAliases, IContextCache contextCache)
+    {
+        if (value is not string stringValue)
+        {
+            return null;
+        }
+
+        var values = stringValue.Split(new[] { Delimiter }, StringSplitOptions.RemoveEmptyEntries);
+        if (values.Length == 0)
+        {
+            return null;
+        }
+
+        return Multiple
+            ? _jsonSerializer.Serialize(values)
+            : values[0];
+    }
+}
diff --git a/src/Umbraco.Deploy.Contrib/Migrators/Legacy/Content/PrevaluePropertyValueArtifactMigratorBase.cs b/src/Umbraco.Deploy.Contrib/Migrators/Legacy/Content/PrevaluePropertyValueArtifactMigratorBase.cs
@@ -11,6 +11,7 @@ namespace Umbraco.Deploy.Contrib.Migrators.Legacy;
 /// <summary>
 /// Migrates the <see cref="PropertyValueWithSegments" /> using the specified editor alias from the <see cref="ContentArtifactBase" /> containing prevalues (seperated by <see cref="Delimiter" />) from Umbraco 7 to a single value or JSON array.
 /// </summary>
+[Obsolete("Migrating property values in an artifact migrator does not support nested/recursive properties. Use the PrevalueArtifactMigrator and property type migrators instead. This class will be removed in a future version.")]
 public abstract class PrevaluePropertyValueArtifactMigratorBase : PropertyValueArtifactMigratorBase
 {
     private const string Delimiter = ";;";
diff --git a/src/Umbraco.Deploy.Contrib/Migrators/Legacy/Content/RadioButtonListPropertyTypeMigrator.cs b/src/Umbraco.Deploy.Contrib/Migrators/Legacy/Content/RadioButtonListPropertyTypeMigrator.cs
@@ -0,0 +1,21 @@
+using Umbraco.Cms.Core;
+using Umbraco.Cms.Core.Serialization;
+
+namespace Umbraco.Deploy.Contrib.Migrators.Legacy;
+
+/// <summary>
+/// Migrates the property value using the <see cref="Constants.PropertyEditors.Aliases.RadioButtonList" /> editor containing prevalues (seperated by <see cref="PrevaluePropertyTypeMigratorBase.Delimiter" />) from Umbraco 7 to a single value.
+/// </summary>
+public sealed class RadioButtonListPropertyTypeMigrator : PrevaluePropertyTypeMigratorBase
+{
+    /// <inheritdoc />
+    protected override bool Multiple => false;
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="RadioButtonListPropertyTypeMigrator" /> class.
+    /// </summary>
+    /// <param name="jsonSerializer">The JSON serializer.</param>
+    public RadioButtonListPropertyTypeMigrator(IJsonSerializer jsonSerializer)
+        : base(Constants.PropertyEditors.Aliases.RadioButtonList, jsonSerializer)
+    { }
+}
diff --git a/src/Umbraco.Deploy.Contrib/Migrators/Legacy/Content/RadioButtonListPropertyValueArtifactMigrator.cs b/src/Umbraco.Deploy.Contrib/Migrators/Legacy/Content/RadioButtonListPropertyValueArtifactMigrator.cs
@@ -1,3 +1,4 @@
+using System;
 using Umbraco.Cms.Core;
 using Umbraco.Cms.Core.Serialization;
 using Umbraco.Cms.Core.Services;
@@ -7,8 +8,9 @@
 namespace Umbraco.Deploy.Contrib.Migrators.Legacy;
 
 /// <summary>
-/// Migrates the <see cref="PropertyValueWithSegments" /> using the <see cref="Constants.PropertyEditors.Aliases.RadioButtonList" /> editor from the <see cref="ContentArtifactBase" /> containing prevalues (seperated by <see cref="PrevaluePropertyValueArtifactMigratorBase.Delimiter" />) from Umbraco 7 to a JSON array.
+/// Migrates the <see cref="PropertyValueWithSegments" /> using the <see cref="Constants.PropertyEditors.Aliases.RadioButtonList" /> editor from the <see cref="ContentArtifactBase" /> containing prevalues (seperated by <see cref="PrevaluePropertyValueArtifactMigratorBase.Delimiter" />) from Umbraco 7 to a single value.
 /// </summary>
+[Obsolete("Migrating property values in an artifact migrator does not support nested/recursive properties. Use the PrevalueArtifactMigrator and RadioButtonListPropertyTypeMigrator instead. This class will be removed in a future version.")]
 public class RadioButtonListPropertyValueArtifactMigrator : PrevaluePropertyValueArtifactMigratorBase
 {
     /// <inheritdoc />
