From 81e268cd450c61c4042d86cc06d0ffb2045cbb8e Mon Sep 17 00:00:00 2001
From: akfakmot <akfakmot@gmail.com>
Date: Tue, 4 Feb 2025 17:55:39 +0100
Subject: [PATCH] Upgrade XbyK 30.1.1 + upgrade UMT 3.1.0

Upgrade XbyK 30.1.1 + upgrade UMT 3.1.0
---
 .../Mappers/CmsClassMapper.cs                 | 27 ++++++++++++++++++-
 .../Migration.Tool.Source.csproj              |  2 +-
 .../Migration.Tool.Common.csproj              |  2 +-
 .../Migration.Tool.Core.KX13.csproj           |  2 +-
 .../Migration.Tool.KXP.Api.csproj             |  4 +--
 .../Migration.Tool.KXP.Extensions.csproj      |  8 +++---
 6 files changed, 35 insertions(+), 10 deletions(-)

diff --git a/KVA/Migration.Tool.Source/Mappers/CmsClassMapper.cs b/KVA/Migration.Tool.Source/Mappers/CmsClassMapper.cs
index 3692a248..0f4d9f31 100644
--- a/KVA/Migration.Tool.Source/Mappers/CmsClassMapper.cs
+++ b/KVA/Migration.Tool.Source/Mappers/CmsClassMapper.cs
@@ -159,7 +159,7 @@ protected override DataClassInfo MapInternal(ICmsClass source, DataClassInfo tar
             {
                 target.ClassType = ClassType.FORM;
                 target.ClassContentTypeType = "";
-
+                target = PatchFormDataClassInfo(target);
                 break;
             }
 
@@ -205,6 +205,31 @@ protected override DataClassInfo MapInternal(ICmsClass source, DataClassInfo tar
         return target;
     }
 
+    private DataClassInfo PatchFormDataClassInfo(DataClassInfo target)
+    {
+        var fi = new FormInfo(target.ClassFormDefinition);
+        bool legacyFormat = false;
+        foreach (var item in fi.ItemsList.OfType<FormFieldInfo>())
+        {
+            if (!item.Settings.ContainsKey("componentidentifier"))
+            {
+                legacyFormat = true;
+                item.Settings["componentidentifier"] = Kx13FormComponents.Kentico_TextInput;
+                if (item.Settings.ContainsKey("controlname"))
+                {
+                    item.Settings.Remove("controlname");
+                }
+            }
+        }
+        target.ClassFormDefinition = fi.GetXmlDefinition();
+
+        if (legacyFormat)
+        {
+            logger.LogWarning("Some fields of Form {FormName} have legacy format ClassFormDefinition and were converted to text input. Manual adjustments might be necessary", target.ClassName);
+        }
+        return target;
+    }
+
     public static DataClassInfo PatchDataClassInfo(DataClassInfo dataClass, Dictionary<string, Guid> existingFieldGUIDs, out string? oldPrimaryKeyName, out string? documentNameField)
     {
         oldPrimaryKeyName = null;
diff --git a/KVA/Migration.Tool.Source/Migration.Tool.Source.csproj b/KVA/Migration.Tool.Source/Migration.Tool.Source.csproj
index 20bd9bdf..a1b58aa5 100644
--- a/KVA/Migration.Tool.Source/Migration.Tool.Source.csproj
+++ b/KVA/Migration.Tool.Source/Migration.Tool.Source.csproj
@@ -12,7 +12,7 @@
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="Kentico.Xperience.UMT" Version="3.0.0" />
+        <PackageReference Include="Kentico.Xperience.UMT" Version="3.1.0" />
         <PackageReference Include="MediatR" Version="12.4.1" />
     </ItemGroup>
 
diff --git a/Migration.Tool.Common/Migration.Tool.Common.csproj b/Migration.Tool.Common/Migration.Tool.Common.csproj
index d9b6ceb3..31cf9715 100644
--- a/Migration.Tool.Common/Migration.Tool.Common.csproj
+++ b/Migration.Tool.Common/Migration.Tool.Common.csproj
@@ -17,7 +17,7 @@
 
     <ItemGroup>
         <PackageReference Include="HtmlAgilityPack.NetCore" Version="1.5.0.1" />
-        <PackageReference Include="Kentico.Xperience.UMT" Version="3.0.0" />
+        <PackageReference Include="Kentico.Xperience.UMT" Version="3.1.0" />
         <PackageReference Include="MediatR" Version="12.4.1" />
         <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="8.0.0" />
         <PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.1" />
diff --git a/Migration.Tool.Core.KX13/Migration.Tool.Core.KX13.csproj b/Migration.Tool.Core.KX13/Migration.Tool.Core.KX13.csproj
index 009bf267..b3ef76b8 100644
--- a/Migration.Tool.Core.KX13/Migration.Tool.Core.KX13.csproj
+++ b/Migration.Tool.Core.KX13/Migration.Tool.Core.KX13.csproj
@@ -11,7 +11,7 @@
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="Kentico.Xperience.UMT" Version="3.0.0" />
+        <PackageReference Include="Kentico.Xperience.UMT" Version="3.1.0" />
         <PackageReference Include="MediatR" Version="12.4.1" />
         <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
     </ItemGroup>
diff --git a/Migration.Tool.KXP.Api/Migration.Tool.KXP.Api.csproj b/Migration.Tool.KXP.Api/Migration.Tool.KXP.Api.csproj
index 78a7b602..bfc1f50c 100644
--- a/Migration.Tool.KXP.Api/Migration.Tool.KXP.Api.csproj
+++ b/Migration.Tool.KXP.Api/Migration.Tool.KXP.Api.csproj
@@ -10,8 +10,8 @@
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="Kentico.Xperience.Admin" Version="30.0.0" />
-        <PackageReference Include="Kentico.Xperience.Core" Version="30.0.0" />
+        <PackageReference Include="Kentico.Xperience.Admin" Version="30.1.1" />
+        <PackageReference Include="Kentico.Xperience.Core" Version="30.1.1" />
     </ItemGroup>
 
     <ItemGroup>
diff --git a/Migration.Tool.KXP.Extensions/Migration.Tool.KXP.Extensions.csproj b/Migration.Tool.KXP.Extensions/Migration.Tool.KXP.Extensions.csproj
index 374360e2..3add01f8 100644
--- a/Migration.Tool.KXP.Extensions/Migration.Tool.KXP.Extensions.csproj
+++ b/Migration.Tool.KXP.Extensions/Migration.Tool.KXP.Extensions.csproj
@@ -7,10 +7,10 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Kentico.Xperience.Core" Version="30.0.0" />
-        <PackageReference Include="Kentico.Xperience.WebApp" Version="30.0.0" />
-        <PackageReference Include="Microsoft.AspNetCore.Mvc" Version="2.2.0"/>
-        <PackageReference Include="Microsoft.AspNetCore.Mvc.Core" Version="2.2.5"/>
+        <PackageReference Include="Kentico.Xperience.Core" Version="30.1.1" />
+        <PackageReference Include="Kentico.Xperience.WebApp" Version="30.1.1" />
+        <PackageReference Include="Microsoft.AspNetCore.Mvc" Version="2.3.0" />
+        <PackageReference Include="Microsoft.AspNetCore.Mvc.Core" Version="2.3.0" />
     </ItemGroup>
 
 </Project>