Merge pull request #222 from Kentico/rls/v1.2.0

release of version 1.2.0
Kentico · Aug 21, 2024 · 9f902dd · 9f902dd
2 parents 5c6f427 + d6e57ab
commit 9f902dd
Show file tree

Hide file tree

Showing 23 changed files with 376 additions and 270 deletions.
diff --git a/KVA/Migration.Toolkit.Source/Handlers/MigrateMediaLibrariesCommandHandler.cs b/KVA/Migration.Toolkit.Source/Handlers/MigrateMediaLibrariesCommandHandler.cs
@@ -17,6 +17,7 @@
 using Migration.Toolkit.KXP.Context;
 using Migration.Toolkit.KXP.Models;
 using Migration.Toolkit.Source.Contexts;
+using Migration.Toolkit.Source.Helpers;
 using Migration.Toolkit.Source.Mappers;
 using Migration.Toolkit.Source.Model;
 
@@ -180,8 +181,34 @@ private async Task RequireMigratedMediaFiles(List<(IMediaLibrary sourceLibrary,
                 if (!toolkitConfiguration.MigrateOnlyMediaFileInfo.GetValueOrDefault(true) &&
                     !string.IsNullOrWhiteSpace(toolkitConfiguration.KxCmsDirPath))
                 {
-                    sourceMediaLibraryPath = Path.Combine(toolkitConfiguration.KxCmsDirPath, ksSite.SiteName, DirMedia, ksMediaLibrary.LibraryFolder);
-                    loadMediaFileData = true;
+                    string? cmsMediaLibrariesFolder = KenticoHelper.GetSettingsKey(modelFacade, ksSite.SiteID, "CMSMediaLibrariesFolder");
+                    if (cmsMediaLibrariesFolder != null)
+                    {
+                        if (Path.IsPathRooted(cmsMediaLibrariesFolder))
+                        {
+                            sourceMediaLibraryPath = Path.Combine(cmsMediaLibrariesFolder, ksSite.SiteName, ksMediaLibrary.LibraryFolder);
+                            loadMediaFileData = true;
+                        }
+                        else
+                        {
+                            if (cmsMediaLibrariesFolder.StartsWith("~/"))
+                            {
+                                string cleared = $"{cmsMediaLibrariesFolder[2..]}".Replace("/", "\\");
+                                sourceMediaLibraryPath = Path.Combine(toolkitConfiguration.KxCmsDirPath, cleared, ksSite.SiteName, ksMediaLibrary.LibraryFolder);
+                                loadMediaFileData = true;
+                            }
+                            else
+                            {
+                                sourceMediaLibraryPath = Path.Combine(toolkitConfiguration.KxCmsDirPath, cmsMediaLibrariesFolder, ksSite.SiteName, ksMediaLibrary.LibraryFolder);
+                                loadMediaFileData = true;
+                            }
+                        }
+                    }
+                    else
+                    {
+                        sourceMediaLibraryPath = Path.Combine(toolkitConfiguration.KxCmsDirPath, ksSite.SiteName, DirMedia, ksMediaLibrary.LibraryFolder);
+                        loadMediaFileData = true;
+                    }
                 }
 
                 var ksMediaFiles = modelFacade.SelectWhere<IMediaFile>("FileLibraryID = @FileLibraryId", new SqlParameter("FileLibraryId", ksMediaLibrary.LibraryID));

diff --git a/KVA/Migration.Toolkit.Source/Handlers/MigratePagesCommandHandler.cs b/KVA/Migration.Toolkit.Source/Handlers/MigratePagesCommandHandler.cs
diff --git a/KVA/Migration.Toolkit.Source/Helpers/KenticoHelper.cs b/KVA/Migration.Toolkit.Source/Helpers/KenticoHelper.cs
@@ -1,4 +1,7 @@
+using System.Globalization;
 using CMS.Helpers;
+using Microsoft.Data.SqlClient;
+using Migration.Toolkit.Source.Model;
 
 namespace Migration.Toolkit.Source.Helpers;
 
@@ -13,4 +16,23 @@ public static void CopyCustomData(ContainerCustomData target, string? sourceXml)
             target.SetValue(columnName, customNodeData.GetValue(columnName));
         }
     }
+
+    public static string? GetSettingsKey(ModelFacade facade, int? siteId, string keyName)
+    {
+        var keys = facade.Select<ICmsSettingsKey>("KeyName = @keyName", "SiteID", new SqlParameter("keyName", keyName)).ToList();
+        return (keys.FirstOrDefault(x => x.SiteID == siteId)
+                ?? keys.FirstOrDefault(x => x.SiteID == null))?.KeyValue;
+    }
+
+    public static T? GetSettingsKey<T>(ModelFacade facade, int? siteId, string keyName) where T : struct, IParsable<T>
+    {
+        var keys = facade.Select<ICmsSettingsKey>("KeyName = @keyName", "SiteID", new SqlParameter("keyName", keyName)).ToList();
+        string? value = (keys.FirstOrDefault(x => x.SiteID == siteId)
+                         ?? keys.FirstOrDefault(x => x.SiteID == null))?.KeyValue;
+
+
+        return T.TryParse(value, CultureInfo.InvariantCulture, out var result)
+            ? result
+            : null;
+    }
 }
diff --git a/KVA/Migration.Toolkit.Source/Mappers/ContentItemMapper.cs b/KVA/Migration.Toolkit.Source/Mappers/ContentItemMapper.cs
@@ -7,7 +7,7 @@
 using CMS.FormEngine;
 using CMS.MediaLibrary;
 using CMS.Websites;
-
+using CMS.Websites.Internal;
 using Kentico.Xperience.UMT.Model;
 
 using Microsoft.Extensions.Logging;
@@ -77,12 +77,20 @@ protected override IEnumerable<IUmtModel> MapInternal(CmsTreeMapperSource source
             ContentItemChannelGuid = siteGuid
         };
 
+        var targetWebPage = WebPageItemInfo.Provider.Get()
+            .WhereEquals(nameof(WebPageItemInfo.WebPageItemGUID), contentItemGuid)
+            .FirstOrDefault();
+        string? treePath = targetWebPage?.WebPageItemTreePath;
+
         var websiteChannelInfo = WebsiteChannelInfoProvider.ProviderObject.Get(siteGuid);
         var treePathConvertor = TreePathConvertor.GetSiteConverter(websiteChannelInfo.WebsiteChannelID);
-        (bool treePathIsDifferent, string treePath) = treePathConvertor.ConvertAndEnsureUniqueness(cmsTree.NodeAliasPath).GetAwaiter().GetResult();
-        if (treePathIsDifferent)
+        if (treePath == null)
         {
-            logger.LogInformation($"Original node alias path '{cmsTree.NodeAliasPath}' of '{cmsTree.NodeName}' item was converted to '{treePath}' since the value does not allow original range of allowed characters.");
+            (bool treePathIsDifferent, treePath) = treePathConvertor.ConvertAndEnsureUniqueness(cmsTree.NodeAliasPath).GetAwaiter().GetResult();
+            if (treePathIsDifferent)
+            {
+                logger.LogInformation($"Original node alias path '{cmsTree.NodeAliasPath}' of '{cmsTree.NodeName}' item was converted to '{treePath}' since the value does not allow original range of allowed characters.");
+            }
         }
 
         foreach (var cmsDocument in migratedDocuments)
@@ -339,7 +347,7 @@ private void PatchJsonDefinitions(int sourceSiteId, ref string? pageTemplateConf
         {
             if (pageTemplateConfiguration != null)
             {
-                var pageTemplateConfigurationObj = JsonConvert.DeserializeObject<PageTemplateConfiguration>(pageTemplateConfiguration);
+                var pageTemplateConfigurationObj = JsonConvert.DeserializeObject<Services.Model.PageTemplateConfiguration>(pageTemplateConfiguration);
                 if (pageTemplateConfigurationObj?.Identifier != null)
                 {
                     logger.LogTrace("Walk page template configuration {Identifier}", pageTemplateConfigurationObj.Identifier);
@@ -829,11 +837,18 @@ private void WalkProperties(int siteId, JObject properties, List<EditingFormCont
 
                     switch (oldFormComponent)
                     {
-                        // case Kx13FormComponents.Kentico_PathSelector:
-                        // {
-                        //     // new PathSelectorItem()
-                        //     break;
-                        // }
+                        case Kx13FormComponents.Kentico_PathSelector:
+                        {
+                            if (value?.ToObject<List<PathSelectorItem>>() is { Count: > 0 } items)
+                            {
+                                properties[key] = JToken.FromObject(items.Select(x => new Kentico.Components.Web.Mvc.FormComponents.PathSelectorItem
+                                {
+                                    TreePath = x.NodeAliasPath
+                                }).ToList());
+                            }
+
+                            break;
+                        }
                         case Kx13FormComponents.Kentico_AttachmentSelector when newFormComponent == FormComponents.AdminAssetSelectorComponent:
                         {
                             if (value?.ToObject<List<AttachmentSelectorItem>>() is { Count: > 0 } items)

diff --git a/KVA/Migration.Toolkit.Source/Mappers/PageTemplateConfigurationMapper.cs b/KVA/Migration.Toolkit.Source/Mappers/PageTemplateConfigurationMapper.cs
@@ -179,6 +179,18 @@ private void WalkProperties(int siteId, JObject properties, List<EditingFormCont
 
                     switch (oldFormComponent)
                     {
+                        case Kx13FormComponents.Kentico_PathSelector:
+                        {
+                            if (value?.ToObject<List<PathSelectorItem>>() is { Count: > 0 } items)
+                            {
+                                properties[key] = JToken.FromObject(items.Select(x => new Kentico.Components.Web.Mvc.FormComponents.PathSelectorItem
+                                {
+                                    TreePath = x.NodeAliasPath
+                                }).ToList());
+                            }
+
+                            break;
+                        }
                         case Kx13FormComponents.Kentico_AttachmentSelector when newFormComponent == FormComponents.AdminAssetSelectorComponent:
                         {
                             if (value?.ToObject<List<AttachmentSelectorItem>>() is { Count: > 0 } items)

diff --git a/KVA/Migration.Toolkit.Source/Migration.Toolkit.Source.csproj b/KVA/Migration.Toolkit.Source/Migration.Toolkit.Source.csproj
@@ -13,8 +13,8 @@
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="Kentico.Xperience.UMT" Version="1.2.0" />
-        <PackageReference Include="MediatR" Version="12.3.0"/>
+        <PackageReference Include="Kentico.Xperience.UMT" Version="1.4.0" />
+        <PackageReference Include="MediatR" Version="12.4.0" />
     </ItemGroup>
 
     <PropertyGroup>

diff --git a/KVA/Migration.Toolkit.Source/Services/Model/PathSelectorItem.cs b/KVA/Migration.Toolkit.Source/Services/Model/PathSelectorItem.cs
@@ -0,0 +1,15 @@
+using Newtonsoft.Json;
+
+namespace Migration.Toolkit.Source.Services.Model;
+
+//
+// Summary:
+//     Represents an item for a path selector.
+public class PathSelectorItem
+{
+    //
+    // Summary:
+    //     Node Alias Path of a page.
+    [JsonProperty("nodeAliasPath")]
+    public string? NodeAliasPath { get; set; }
+}
diff --git a/Migration.Toolkit.CLI/Migration.Toolkit.CLI.csproj b/Migration.Toolkit.CLI/Migration.Toolkit.CLI.csproj
@@ -18,7 +18,7 @@
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="MediatR" Version="12.3.0"/>
+        <PackageReference Include="MediatR" Version="12.4.0" />
         <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="8.0.0"/>
         <PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.0"/>
         <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="8.0.0"/>

diff --git a/Migration.Toolkit.Common/Migration.Toolkit.Common.csproj b/Migration.Toolkit.Common/Migration.Toolkit.Common.csproj
@@ -16,8 +16,8 @@
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="Kentico.Xperience.UMT" Version="1.2.0" />
-        <PackageReference Include="MediatR" Version="12.3.0"/>
+        <PackageReference Include="Kentico.Xperience.UMT" Version="1.4.0" />
+        <PackageReference Include="MediatR" Version="12.4.0" />
         <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="8.0.0"/>
         <PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.0"/>
         <PackageReference Include="Newtonsoft.Json" Version="13.0.3"/>

diff --git a/Migration.Toolkit.Core.K11/Migration.Toolkit.Core.K11.csproj b/Migration.Toolkit.Core.K11/Migration.Toolkit.Core.K11.csproj
@@ -8,7 +8,7 @@
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="MediatR" Version="12.3.0"/>
+        <PackageReference Include="MediatR" Version="12.4.0" />
         <PackageReference Include="Newtonsoft.Json" Version="13.0.3"/>
     </ItemGroup>
 

diff --git a/Migration.Toolkit.Core.KX12/Migration.Toolkit.Core.KX12.csproj b/Migration.Toolkit.Core.KX12/Migration.Toolkit.Core.KX12.csproj
@@ -8,7 +8,7 @@
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="MediatR" Version="12.3.0"/>
+        <PackageReference Include="MediatR" Version="12.4.0" />
         <PackageReference Include="Newtonsoft.Json" Version="13.0.3"/>
     </ItemGroup>
 

diff --git a/Migration.Toolkit.Core.KX13/Migration.Toolkit.Core.KX13.csproj b/Migration.Toolkit.Core.KX13/Migration.Toolkit.Core.KX13.csproj
@@ -12,8 +12,8 @@
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="Kentico.Xperience.UMT" Version="1.2.0" />
-        <PackageReference Include="MediatR" Version="12.3.0"/>
+        <PackageReference Include="Kentico.Xperience.UMT" Version="1.4.0" />
+        <PackageReference Include="MediatR" Version="12.4.0" />
         <PackageReference Include="Newtonsoft.Json" Version="13.0.3"/>
     </ItemGroup>
 

diff --git a/Migration.Toolkit.K11/Migration.Toolkit.K11.csproj b/Migration.Toolkit.K11/Migration.Toolkit.K11.csproj
@@ -20,12 +20,12 @@
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.6">
+        <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.8">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
-        <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.6"/>
-        <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="8.0.6">
+        <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.8" />
+        <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="8.0.8">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>

diff --git a/Migration.Toolkit.KX12/Migration.Toolkit.KX12.csproj b/Migration.Toolkit.KX12/Migration.Toolkit.KX12.csproj
@@ -20,12 +20,12 @@
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.6">
+        <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.8">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
-        <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.6"/>
-        <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="8.0.6">
+        <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.8" />
+        <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="8.0.8">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>

diff --git a/Migration.Toolkit.KX13/Migration.Toolkit.KX13.csproj b/Migration.Toolkit.KX13/Migration.Toolkit.KX13.csproj
@@ -1,12 +1,12 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <ItemGroup>
-        <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.6">
+        <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.8">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
-        <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.6"/>
-        <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="8.0.6">
+        <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.8" />
+        <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="8.0.8">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>