Add legacy migrators and type resolver to allow importing from Umbraco 7

Author: ronaldbarendse

src/Umbraco.Deploy.Contrib.Connectors/Extensions/ArtifactMigratorCollectionBuilderExtensions.cs

@@ -0,0 +1,58 @@
+using Umbraco.Deploy.Contrib.Migrators.Legacy;
+using Umbraco.Deploy.Migrators;
+
+namespace Umbraco.Extensions
+{
+    public static class ArtifactMigratorCollectionBuilderExtensions
+    {
+        /// <summary>
+        /// Adds the legacy artifact migrators to allow importing from Umbraco 7.
+        /// </summary>
+        /// <param name="artifactMigratorCollectionBuilder">The artifact migrator collection builder.</param>
+        /// <returns>
+        /// The artifact migrator collection builder.
+        /// </returns>
+        public static ArtifactMigratorCollectionBuilder AddLegacyMigrators(this ArtifactMigratorCollectionBuilder artifactMigratorCollectionBuilder)
+            => artifactMigratorCollectionBuilder
+                // Pre-values to configuration
+                .Append<PreValuesDataTypeArtifactJsonMigrator>()
+                // Release/expire dates to schedule
+                .Append<DocumentArtifactJsonMigrator>()
+                // Allowed at root and child content types to permissions
+                .Append<DocumentTypeArtifactJsonMigrator>()
+                .Append<MediaTypeArtifactJsonMigrator>()
+                .Append<MemberTypeArtifactJsonMigrator>()
+                // Data types
+                .Append<CheckBoxListDataTypeArtifactMigrator>()
+                .Append<ColorPickerAliasDataTypeArtifactMigrator>()
+                .Append<ContentPicker2DataTypeArtifactMigrator>()
+                .Append<ContentPickerAliasDataTypeArtifactMigrator>()
+                .Append<DateDataTypeArtifactMigrator>()
+                .Append<DropDownDataTypeArtifactMigrator>()
+                .Append<DropDownFlexibleDataTypeArtifactMigrator>()
+                .Append<DropdownlistMultiplePublishKeysDataTypeArtifactMigrator>()
+                .Append<DropdownlistPublishingKeysDataTypeArtifactMigrator>()
+                .Append<DropDownMultipleDataTypeArtifactMigrator>()
+                .Append<GridDataTypeArtifactMigrator>()
+                .Append<ImageCropperDataTypeArtifactMigrator>()
+                .Append<ListViewDataTypeArtifactMigrator>()
+                .Append<MediaPicker2DataTypeArtifactMigrator>()
+                .Append<MediaPickerDataTypeArtifactMigrator>()
+                .Append<MemberPicker2DataTypeArtifactMigrator>()
+                .Append<MultiNodeTreePicker2DataTypeArtifactMigrator>()
+                .Append<MultiNodeTreePickerDataTypeArtifactMigrator>()
+                .Append<MultipleMediaPickerDataTypeArtifactMigrator>()
+                .Append<NestedContentDataTypeArtifactMigrator>()
+                .Append<NoEditDataTypeArtifactMigrator>()
+                .Append<RadioButtonListDataTypeArtifactMigrator>()
+                .Append<RelatedLinks2DataTypeArtifactMigrator>()
+                .Append<RelatedLinksDataTypeArtifactMigrator>()
+                .Append<TextboxDataTypeArtifactMigrator>()
+                .Append<TextboxMultipleDataTypeArtifactMigrator>()
+                .Append<TinyMCEv3DataTypeArtifactMigrator>()
+                // Property values
+                .Append<CheckBoxListPropertyValueArtifactMigrator>()
+                .Append<DropDownListFlexiblePropertyValueArtifactMigrator>()
+                .Append<RadioButtonListPropertyValueArtifactMigrator>();
+    }
+}

src/Umbraco.Deploy.Contrib.Connectors/Extensions/ArtifactTypeResolverCollectionBuilderExtensions.cs

@@ -0,0 +1,18 @@
+using Umbraco.Deploy.Contrib.Connectors.Serialization;
+using Umbraco.Deploy.Serialization;
+
+namespace Umbraco.Extensions
+{
+    public static class ArtifactTypeResolverCollectionBuilderExtensions
+    {
+        /// <summary>
+        /// Adds the legacy artifact type resolver to allow importing from Umbraco 7.
+        /// </summary>
+        /// <param name="artifactTypeResolverCollectionBuilder">The artifact type resolver collection builder.</param>
+        /// <returns>
+        /// The artifact type resolver collection builder.
+        /// </returns>
+        public static ArtifactTypeResolverCollectionBuilder AddLegacyTypeResolver(this ArtifactTypeResolverCollectionBuilder artifactTypeResolverCollectionBuilder)
+            => artifactTypeResolverCollectionBuilder.Append<LegacyArtifactTypeResolver>();
+    }
+}

src/Umbraco.Deploy.Contrib.Connectors/GridCellValueConnectors/DocTypeGridEditorCellValueConnector.cs

@@ -36,7 +36,10 @@ public sealed override bool IsConnector(string view)
         public sealed override string GetValue(GridValue.GridControl gridControl, ICollection<ArtifactDependency> dependencies, IContextCache contextCache)
         {
             // cancel if there's no values
-            if (gridControl.Value == null || gridControl.Value.HasValues == false) return null;
+            if (gridControl.Value == null || gridControl.Value.HasValues == false)
+            {
+                return null;
+            }
 
             _logger.Debug<DocTypeGridEditorCellValueConnector>($"GetValue - Grid Values: {gridControl.Value}");
 
@@ -116,7 +119,6 @@ public sealed override void SetValue(GridValue.GridControl gridControl, IContext
             _logger.Debug<DocTypeGridEditorCellValueConnector>($"SetValue - GridControlValue - {gridControl.Value}");
 
             var docTypeGridEditorContent = JsonConvert.DeserializeObject<DocTypeGridEditorValue>(gridControl.Value.ToString());
-
             if (docTypeGridEditorContent == null)
             {
                 return;

src/Umbraco.Deploy.Contrib.Connectors/Migrators/Legacy/Content/CheckBoxListPropertyValueArtifactMigrator.cs

@@ -0,0 +1,21 @@
+using Umbraco.Core;
+using Umbraco.Core.Services;
+
+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="Delimiter" />) from Umbraco 7 to a JSON array.
+    /// </summary>
+    public class CheckBoxListPropertyValueArtifactMigrator : PrevaluePropertyValueArtifactMigratorBase
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="CheckBoxListPropertyValueArtifactMigrator" /> class.
+        /// </summary>
+        /// <param name="contentTypeService">The content type service.</param>
+        /// <param name="mediaTypeService">The media type service.</param>
+        /// <param name="memberTypeService">The member type service.</param>
+        public CheckBoxListPropertyValueArtifactMigrator(IContentTypeService contentTypeService, IMediaTypeService mediaTypeService, IMemberTypeService memberTypeService)
+            : base(Constants.PropertyEditors.Aliases.CheckBoxList, contentTypeService, mediaTypeService, memberTypeService)
+        { }
+    }
+}

src/Umbraco.Deploy.Contrib.Connectors/Migrators/Legacy/Content/DocumentArtifactJsonMigrator.cs

@@ -0,0 +1,63 @@
+using System;
+using Newtonsoft.Json.Linq;
+using Semver;
+using Umbraco.Core.Models;
+using Umbraco.Deploy.Artifacts.Content;
+using Umbraco.Deploy.Migrators;
+
+namespace Umbraco.Deploy.Contrib.Migrators.Legacy
+{
+    /// <summary>
+    /// Migrates the <see cref="DocumentArtifact" /> JSON from Umbraco 7 release/expire date to schedule.
+    /// </summary>
+    public class DocumentArtifactJsonMigrator : ArtifactJsonMigratorBase<DocumentArtifact>
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="DocumentArtifactJsonMigrator" /> class.
+        /// </summary>
+        public DocumentArtifactJsonMigrator()
+            => MaxVersion = new SemVersion(3, 0, 0);
+
+        /// <inheritdoc />
+        public override JToken Migrate(JToken artifactJson)
+        {
+            var schedule = new JArray();
+
+            var releaseDate = artifactJson["ReleaseDate"];
+            if (releaseDate != null)
+            {
+                if (DateTime.TryParse(releaseDate.Value<string>(), out var releaseDateValue))
+                {
+                    schedule.Add(new JObject()
+                    {
+                        ["Date"] = releaseDateValue,
+                        ["Culture"] = string.Empty,
+                        ["Action"] = nameof(ContentScheduleAction.Release)
+                    });
+                }
+
+                releaseDate.Remove();
+            }
+
+            var expireDate = artifactJson["ExpireDate"];
+            if (expireDate != null)
+            {
+                if (DateTime.TryParse(expireDate.Value<string>(), out var expireDateValue))
+                {
+                    schedule.Add(new JObject()
+                    {
+                        ["Date"] = expireDateValue,
+                        ["Culture"] = string.Empty,
+                        ["Action"] = nameof(ContentScheduleAction.Expire)
+                    });
+                }
+
+                expireDate.Remove();
+            }
+
+            artifactJson["Schedule"] = schedule;
+
+            return artifactJson;
+        }
+    }
+}

src/Umbraco.Deploy.Contrib.Connectors/Migrators/Legacy/Content/DropDownListFlexiblePropertyValueArtifactMigrator.cs

@@ -0,0 +1,21 @@
+using Umbraco.Core;
+using Umbraco.Core.Services;
+
+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="Delimiter" />) from Umbraco 7 to a JSON array.
+    /// </summary>
+    public class DropDownListFlexiblePropertyValueArtifactMigrator : PrevaluePropertyValueArtifactMigratorBase
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="DropDownListFlexiblePropertyValueArtifactMigrator" /> class.
+        /// </summary>
+        /// <param name="contentTypeService">The content type service.</param>
+        /// <param name="mediaTypeService">The media type service.</param>
+        /// <param name="memberTypeService">The member type service.</param>
+        public DropDownListFlexiblePropertyValueArtifactMigrator(IContentTypeService contentTypeService, IMediaTypeService mediaTypeService, IMemberTypeService memberTypeService)
+            : base(Constants.PropertyEditors.Aliases.DropDownListFlexible, contentTypeService, mediaTypeService, memberTypeService)
+        { }
+    }
+}

src/Umbraco.Deploy.Contrib.Connectors/Migrators/Legacy/Content/PrevaluePropertyValueArtifactMigratorBase.cs

@@ -0,0 +1,31 @@
+using System;
+using Newtonsoft.Json;
+using Semver;
+using Umbraco.Core.Services;
+using Umbraco.Deploy.Migrators;
+
+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 JSON array.
+    /// </summary>
+    public abstract class PrevaluePropertyValueArtifactMigratorBase : PropertyValueArtifactMigratorBase
+    {
+        private const string Delimiter = ";;";
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="PrevaluePropertyValueArtifactMigratorBase" /> class.
+        /// </summary>
+        /// <param name="editorAlias">The editor alias.</param>
+        /// <param name="contentTypeService">The content type service.</param>
+        /// <param name="mediaTypeService">The media type service.</param>
+        /// <param name="memberTypeService">The member type service.</param>
+        public PrevaluePropertyValueArtifactMigratorBase(string editorAlias, IContentTypeService contentTypeService, IMediaTypeService mediaTypeService, IMemberTypeService memberTypeService)
+           : base(editorAlias, contentTypeService, mediaTypeService, memberTypeService)
+           => MaxVersion = new SemVersion(3, 0, 0);
+
+        /// <inheritdoc />
+        protected override string Migrate(string value)
+            => JsonConvert.SerializeObject(value.Split(new[] { Delimiter }, StringSplitOptions.RemoveEmptyEntries));
+    }
+}

src/Umbraco.Deploy.Contrib.Connectors/Migrators/Legacy/Content/RadioButtonListPropertyValueArtifactMigrator.cs

@@ -0,0 +1,21 @@
+using Umbraco.Core;
+using Umbraco.Core.Services;
+
+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="Delimiter" />) from Umbraco 7 to a JSON array.
+    /// </summary>
+    public class RadioButtonListPropertyValueArtifactMigrator : PrevaluePropertyValueArtifactMigratorBase
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="RadioButtonListPropertyValueArtifactMigrator" /> class.
+        /// </summary>
+        /// <param name="contentTypeService">The content type service.</param>
+        /// <param name="mediaTypeService">The media type service.</param>
+        /// <param name="memberTypeService">The member type service.</param>
+        public RadioButtonListPropertyValueArtifactMigrator(IContentTypeService contentTypeService, IMediaTypeService mediaTypeService, IMemberTypeService memberTypeService)
+            : base(Constants.PropertyEditors.Aliases.RadioButtonList, contentTypeService, mediaTypeService, memberTypeService)
+        { }
+    }
+}

src/Umbraco.Deploy.Contrib.Connectors/Migrators/Legacy/ContentType/ContentTypeArtifactJsonMigratorBase.cs

@@ -0,0 +1,47 @@
+using Newtonsoft.Json.Linq;
+using Semver;
+using Umbraco.Deploy.Artifacts.ContentType;
+using Umbraco.Deploy.Migrators;
+
+namespace Umbraco.Deploy.Contrib.Migrators.Legacy
+{
+    /// <summary>
+    /// Migrates the <typeparamref name="T"/> JSON from Umbraco 7 allowed at root and child content types to permissions.
+    /// </summary>
+    /// <typeparam name="T">The content type artifact.</typeparam>
+    public abstract class ContentTypeArtifactJsonMigratorBase<T> : ArtifactJsonMigratorBase<T>
+        where T : ContentTypeArtifactBase
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ContentTypeArtifactJsonMigratorBase{T}" /> class.
+        /// </summary>
+        public ContentTypeArtifactJsonMigratorBase()
+            => MaxVersion = new SemVersion(3, 0, 0);
+
+        /// <inheritdoc />
+        public override JToken Migrate(JToken artifactJson)
+        {
+            var permissions = new JObject();
+
+            var allowedAtRoot = artifactJson["AllowedAtRoot"];
+            if (allowedAtRoot != null)
+            {
+                permissions["AllowedAtRoot"] = allowedAtRoot.Value<bool>();
+
+                allowedAtRoot.Remove();
+            }
+
+            var allowedChildContentTypes = artifactJson["AllowedChildContentTypes"];
+            if (allowedChildContentTypes != null)
+            {
+                permissions["AllowedChildContentTypes"] = allowedChildContentTypes;
+
+                allowedChildContentTypes.Remove();
+            }
+
+            artifactJson["Permissions"] = permissions;
+
+            return artifactJson;
+        }
+    }
+}

src/Umbraco.Deploy.Contrib.Connectors/Migrators/Legacy/ContentType/DocumentTypeArtifactJsonMigrator.cs

@@ -0,0 +1,10 @@
+using Umbraco.Deploy.Artifacts.ContentType;
+
+namespace Umbraco.Deploy.Contrib.Migrators.Legacy
+{
+    /// <summary>
+    /// Migrates the <see cref="DocumentTypeArtifact" /> JSON from Umbraco 7 allowed at root and child content types to permissions.
+    /// </summary>
+    public class DocumentTypeArtifactJsonMigrator : ContentTypeArtifactJsonMigratorBase<DocumentTypeArtifact>
+    { }
+}