Merge pull request #257 from Jumoo/dev/variant-migrations

Make it so we can migrate variant properties, (for v8 -> v.x migrations.

uSync.Migrations.Client/wwwroot/App_Plugins/uSyncMigrations/backoffice/uSyncMigrations/dashboard.controller.js

@@ -138,6 +138,7 @@
                     vm.step = 'migrated';
                     vm.migrationResults = result.data;
                     vm.migrationStatus.migrated = true;
+                    vm.migrationStatus.success = result.success;
                     vm.working = false;
                 }, function (error) {
                     vm.state = 'error';

uSync.Migrations.Client/wwwroot/App_Plugins/uSyncMigrations/backoffice/uSyncMigrations/dashboard.html

@@ -227,12 +227,17 @@ <h2><localize key="usyncmigrate_convertTitle"></localize></h2>
 
                         ({{vm.migrationResults.messages.length}} messages returned)
                     </umb-box-content>
+
                 </umb-box>
 
+                <div class="alert alert-danger" ng-if="vm.migrationResults.success == false">
+                    There where one or more errors during the migration.
+                </div>
+
                 <usync-migration-results results="vm.migrationResults"
                                          action="Migration"
                                          is-valid="vm.resultValid"
-                                         show-all="true">
+                                         show-all="vm.migrationResults.success">
                 </usync-migration-results>
             </div>
 

uSync.Migrations.Core/Handlers/Eight/ContentBaseMigrationHandler.cs

@@ -11,6 +11,7 @@
 using uSync.Migrations.Core.Context;
 using uSync.Migrations.Core.Extensions;
 using uSync.Migrations.Core.Handlers.Shared;
+using uSync.Migrations.Core.Migrators.Models;
 using uSync.Migrations.Core.Services;
 
 namespace uSync.Migrations.Core.Handlers.Eight;
@@ -61,4 +62,49 @@ protected override XElement GetBaseXml(XElement source, Guid parent, string cont
         return target;
     }
 
+    protected override IEnumerable<XElement> ConvertPropertyValue(string itemType, string contentType, XElement property, SyncMigrationContext context)
+    {
+        if (property.Elements("Value").Count() > 1)
+        {
+            // variant migration 
+            // variant migration, doesn't support splitting, or variant migrators ! 
+            var editorAlias = context.ContentTypes.GetEditorAliasByTypeAndProperty(contentType, property.Name.LocalName)
+                ?.OriginalEditorAlias ?? string.Empty;
+
+            try
+            {
+                var migrationProperty = new SyncMigrationContentProperty(
+                    contentType, property.Name.LocalName, editorAlias, property.Value);
+
+                var migratedNodes = new XElement(property.Name.LocalName);
+
+                foreach (var node in property.Elements("Value"))
+                {
+
+                    migrationProperty.Value = node.Value;
+                    var migratedValue = MigrateContentValue(migrationProperty, context);
+
+                    var migratedNode = new XElement(node.Name.LocalName, new XCData(migratedValue));
+                    foreach (var attribute in node.Attributes())
+                    {
+                        migratedNode.Add(new XAttribute(attribute.Name.LocalName, attribute.Value));
+                    }
+
+                    migratedNodes.Add(migratedNode);
+
+                }
+
+                return migratedNodes.AsEnumerableOfOne();
+            }
+            catch(Exception ex)
+            {
+                _logger.LogError(ex, "Error trying to migrate variant node values {editor}", editorAlias);
+                throw;
+            }
+        }
+        else
+        {
+            return base.ConvertPropertyValue(itemType, contentType, property, context);
+        }
+    }
 }

uSync.Migrations.Core/Handlers/Eight/DataTypeMigrationHandler.cs

@@ -103,6 +103,9 @@ public IEnumerable<MigrationMessage> Validate(SyncValidationContext validationCo
             try
             {
                 var source = XElement.Load(file);
+                // don't validate the empties
+                if (source.IsEmptyItem()) continue;
+
                 var alias = source.GetAlias();
                 var key = source.GetKey();
                 var editorAlias = GetEditorAlias(source);

uSync.Migrations.Core/Migrators/Models/SyncMigrationContentProperty.cs

@@ -32,7 +32,7 @@ public SyncMigrationContentProperty(
         PropertyAlias = propertyAlias;
     }
 
-    public string? Value { get; private set; }
+    public string? Value { get; set; }
 
 }
 

uSync.Migrations.Migrators/BlockGrid/GridToBlockGridMigrator.cs

@@ -138,13 +138,14 @@ private ILegacyGridEditorsConfig GetGridConfig(SyncMigrationContext context)
             return contentProperty.Value;
         }
 
-        var source = JsonConvert.DeserializeObject<GridValue>(contentProperty.Value);
+        var source = GetGridValueFromString(contentProperty.EditorAlias, contentProperty.Value);
         if (source == null)
         {
             _logger.LogDebug("  Property {alias} is empty", contentProperty.EditorAlias);
             return string.Empty;
         }
 
+
         // For some reason, DTGEs can sometimes end up without a view specified. This should fix it.
         foreach (var section in source.Sections)
         {
@@ -181,5 +182,19 @@ private ILegacyGridEditorsConfig GetGridConfig(SyncMigrationContext context)
 
         return JsonConvert.SerializeObject(blockValue, Formatting.Indented);
     }
+
+
+    private GridValue? GetGridValueFromString(string editorAlias, string value)
+    {
+        try
+        {
+            return JsonConvert.DeserializeObject<GridValue>(value);
+        }
+        catch(Exception ex) 
+        {
+            _logger.LogError(ex, "Error getting grid {alias}", editorAlias);
+            throw;
+        }
+    }
 }