Merge branch 'main' of https://github.com/Kentico/xperience-by-kentic…

…o-universal-migration-tool into feat/github-actions-pipeline
Kentico · Nov 18, 2024 · 8652396 · 8652396
2 parents 32f1409 + f7f9f03
commit 8652396
Show file tree

Hide file tree

Showing 11 changed files with 781 additions and 839 deletions.
diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -7,9 +7,9 @@
   </PropertyGroup>
   <ItemGroup>
     <PackageVersion Include="coverlet.collector" Version="6.0.2" />
-    <PackageVersion Include="Kentico.Xperience.Core" Version="29.6.0" />
-    <PackageVersion Include="Kentico.Xperience.Admin" Version="29.6.0" />
-    <PackageVersion Include="Kentico.Xperience.ImageProcessing" Version="29.6.0" />
+    <PackageVersion Include="Kentico.Xperience.Core" Version="29.7.0" />
+    <PackageVersion Include="Kentico.Xperience.Admin" Version="29.7.0" />
+    <PackageVersion Include="Kentico.Xperience.ImageProcessing" Version="29.7.0" />
     <PackageVersion Include="Microsoft.Bcl.AsyncInterfaces" Version="9.0.0-rc.1.24431.7" />
     <PackageVersion Include="Microsoft.Extensions.Logging.Console" Version="9.0.0-rc.1.24431.7" />
     <PackageVersion Include="Microsoft.Playwright" Version="1.47.0" />

diff --git a/examples/Kentico.Xperience.UMT.Example.AdminApp/Client/package-lock.json b/examples/Kentico.Xperience.UMT.Example.AdminApp/Client/package-lock.json
diff --git a/examples/Kentico.Xperience.UMT.Example.AdminApp/Client/package.json b/examples/Kentico.Xperience.UMT.Example.AdminApp/Client/package.json
@@ -8,27 +8,27 @@
     "build": "webpack --mode=production"
   },
   "dependencies": {
-    "@kentico/xperience-admin-base": "^29.6.0",
-    "@kentico/xperience-admin-components": "^29.6.0",
+    "@kentico/xperience-admin-base": "^29.7.0",
+    "@kentico/xperience-admin-components": "^29.7.0",
     "copy-webpack-plugin": "^12.0.2",
     "react": "^18.3.1",
     "react-dom": "^18.3.1",
     "sse": "^0.0.8",
     "sse.js": "^2.5.0"
   },
   "devDependencies": {
-    "@babel/core": "^7.25.8",
-    "@babel/plugin-transform-runtime": "^7.25.7",
-    "@babel/preset-env": "^7.25.8",
-    "@babel/preset-react": "^7.25.7",
-    "@babel/preset-typescript": "^7.25.7",
-    "@kentico/xperience-webpack-config": "^29.6.0",
-    "@types/react": "^18.3.11",
+    "@babel/core": "^7.26.0",
+    "@babel/plugin-transform-runtime": "^7.25.9",
+    "@babel/preset-env": "^7.26.0",
+    "@babel/preset-react": "^7.25.9",
+    "@babel/preset-typescript": "^7.26.0",
+    "@kentico/xperience-webpack-config": "^29.7.0",
+    "@types/react": "^18.3.12",
     "@types/react-dom": "^18.3.1",
     "babel-loader": "^9.2.1",
     "css-loader": "^7.1.2",
     "style-loader": "^4.0.0",
-    "webpack": "^5.95.0",
+    "webpack": "^5.96.1",
     "webpack-cli": "^5.1.4",
     "webpack-dev-server": "^5.1.0"
   },

diff --git a/examples/Kentico.Xperience.UMT.Example.AdminApp/packages.lock.json b/examples/Kentico.Xperience.UMT.Example.AdminApp/packages.lock.json
@@ -4,12 +4,12 @@
     "net8.0": {
       "Kentico.Xperience.Admin": {
         "type": "Direct",
-        "requested": "[29.6.0, )",
-        "resolved": "29.6.0",
-        "contentHash": "IdMfZnQsQ/UUr2I9l+BDoDolcpgJJlL5M8pn+FfQe+M+OB3BU8+YtSb8aX1/t9P+0MQe93+ZKd+rqtoLH3z/Qg==",
+        "requested": "[29.7.0, )",
+        "resolved": "29.7.0",
+        "contentHash": "mISIyMsPBfv/6a7X/9pSF2YSyct2VTRKd7WNjDIvZIUZJnS6YAgiya2qhdTGU7G+6Bo59MjCDfccV2B3TOan6w==",
         "dependencies": {
           "Kentico.Aira.Client": "1.0.25",
-          "Kentico.Xperience.WebApp": "[29.6.0]",
+          "Kentico.Xperience.WebApp": "[29.7.0]",
           "Microsoft.AspNetCore.SpaServices.Extensions": "6.0.35",
           "Microsoft.Extensions.FileProviders.Embedded": "6.0.35"
         }
@@ -355,14 +355,14 @@
       },
       "Kentico.Xperience.WebApp": {
         "type": "Transitive",
-        "resolved": "29.6.0",
-        "contentHash": "+PYDWuRZy307D1cdG7eUtjocM6dkvomBrimkIGSRtyus8NZxeAddTv+KWUH5iONRYS+EnLkIdDnUOWjZ3hWwRA==",
+        "resolved": "29.7.0",
+        "contentHash": "mAz+ipB+lEKxr4AETZJFlhzOJRXyJ7YCfOROpl1GSVuqgWf1PKxhDWRZtYKx/Dv1bbFKyJ2RBn18FK3hA12IjQ==",
         "dependencies": {
           "CommandLineParser": "2.9.1",
           "HotChocolate.AspNetCore": "13.9.14",
           "HotChocolate.Data": "13.9.14",
           "HtmlSanitizer": "8.1.870",
-          "Kentico.Xperience.Core": "[29.6.0]",
+          "Kentico.Xperience.Core": "[29.7.0]",
           "Microsoft.Extensions.Caching.Memory": "6.0.2",
           "Microsoft.Extensions.FileProviders.Embedded": "6.0.35"
         }
@@ -822,15 +822,15 @@
       "kentico.xperience.umt": {
         "type": "Project",
         "dependencies": {
-          "Kentico.Xperience.Core": "[29.6.0, )",
+          "Kentico.Xperience.Core": "[29.7.0, )",
           "Microsoft.Bcl.AsyncInterfaces": "[9.0.0-rc.1.24431.7, )"
         }
       },
       "Kentico.Xperience.Core": {
         "type": "CentralTransitive",
-        "requested": "[29.6.0, )",
-        "resolved": "29.6.0",
-        "contentHash": "Fk747GoKKzc3nr7JYiyvQvbVjGS/wVX7TKjRgmf8PiFUVrquBeTJWQH1p0rm8hvJH7dwG6lkxw2lV7YLOl5suQ==",
+        "requested": "[29.7.0, )",
+        "resolved": "29.7.0",
+        "contentHash": "9rJYLckkygRJCAKEA0Mz+OqtWMhV9dDXi542kbfKZPSd4E4wHpdyqbO7plQtIakO40cjAt5or/GTsOBjvzT59g==",
         "dependencies": {
           "AngleSharp": "0.17.1",
           "MailKit": "4.8.0",

diff --git a/examples/Kentico.Xperience.UMT.Example.Console/packages.lock.json b/examples/Kentico.Xperience.UMT.Example.Console/packages.lock.json
@@ -4,13 +4,13 @@
     "net8.0": {
       "Kentico.Xperience.ImageProcessing": {
         "type": "Direct",
-        "requested": "[29.6.0, )",
-        "resolved": "29.6.0",
-        "contentHash": "ibFiR8pRTruXbpMb0RDStBevobzo7j4bwCZEbTxY5iHhsLTfuPLKZLlI/m2OLiGDrU3OVFDHWe4HhJtnNtETrA==",
+        "requested": "[29.7.0, )",
+        "resolved": "29.7.0",
+        "contentHash": "v5ScXaFGp+0PoyDo97Jgs9H6Tjl0ZVbGX1epWPqz7ENbmqf0IyhhiYjMYK7PVZknxV3CzKnqE2zXeFkWVzB8Dw==",
         "dependencies": {
-          "Kentico.Xperience.Core": "29.6.0",
-          "SkiaSharp": "2.88.8",
-          "SkiaSharp.NativeAssets.Linux.NoDependencies": "2.88.8"
+          "Kentico.Xperience.Core": "29.7.0",
+          "SkiaSharp": "2.88.9",
+          "SkiaSharp.NativeAssets.Linux.NoDependencies": "2.88.9"
         }
       },
       "Microsoft.Extensions.Configuration.Json": {
@@ -406,30 +406,30 @@
       },
       "SkiaSharp": {
         "type": "Transitive",
-        "resolved": "2.88.8",
-        "contentHash": "bRkp3uKp5ZI8gXYQT57uKwil1uobb2p8c69n7v5evlB/2JNcMAXVcw9DZAP5Ig3WSvgzGm2YSn27UVeOi05NlA==",
+        "resolved": "2.88.9",
+        "contentHash": "3MD5VHjXXieSHCleRLuaTXmL2pD0mB7CcOB1x2kA1I4bhptf4e3R27iM93264ZYuAq6mkUyX5XbcxnZvMJYc1Q==",
         "dependencies": {
-          "SkiaSharp.NativeAssets.Win32": "2.88.8",
-          "SkiaSharp.NativeAssets.macOS": "2.88.8"
+          "SkiaSharp.NativeAssets.Win32": "2.88.9",
+          "SkiaSharp.NativeAssets.macOS": "2.88.9"
         }
       },
       "SkiaSharp.NativeAssets.Linux.NoDependencies": {
         "type": "Transitive",
-        "resolved": "2.88.8",
-        "contentHash": "/DoKtdyvRgCC5GR/SH+ps3ZiOjmf0BYpAyrhWQELFOO1hdcqddrDVJjDNCOJ41vV+NlS5b3kcDoZZ7jLhFjyXg==",
+        "resolved": "2.88.9",
+        "contentHash": "ZA9syMvIuoqxPhyFTgde/bNV6VMdeYT9gRdNQT5O+ZjPK+a/nVkKRrqBbn7EVA7XQiW+xIycyT4gW/sea9eh+w==",
         "dependencies": {
-          "SkiaSharp": "2.88.8"
+          "SkiaSharp": "2.88.9"
         }
       },
       "SkiaSharp.NativeAssets.macOS": {
         "type": "Transitive",
-        "resolved": "2.88.8",
-        "contentHash": "6Kn5TSkKlfyS6azWHF3Jk2sW5C4jCE5uSshM/5AbfFrR+5n6qM5XEnz9h4VaVl7LTxBvHvMkuPb/3bpbq0vxTw=="
+        "resolved": "2.88.9",
+        "contentHash": "Nv5spmKc4505Ep7oUoJ5vp3KweFpeNqxpyGDWyeEPTX2uR6S6syXIm3gj75dM0YJz7NPvcix48mR5laqs8dPuA=="
       },
       "SkiaSharp.NativeAssets.Win32": {
         "type": "Transitive",
-        "resolved": "2.88.8",
-        "contentHash": "O9QXoWEXA+6cweR4h3BOnwMz+pO9vL9mXdjLrpDd0w1QzCgWmLQBxa1VgySDITiH7nQndrDG1h6937zm9pLj1Q=="
+        "resolved": "2.88.9",
+        "contentHash": "wb2kYgU7iy84nQLYZwMeJXixvK++GoIuECjU4ECaUKNuflyRlJKyiRhN1MAHswvlvzuvkrjRWlK0Za6+kYQK7w=="
       },
       "System.Buffers": {
         "type": "Transitive",
@@ -587,21 +587,21 @@
       "kentico.xperience.umt": {
         "type": "Project",
         "dependencies": {
-          "Kentico.Xperience.Core": "[29.6.0, )",
+          "Kentico.Xperience.Core": "[29.7.0, )",
           "Microsoft.Bcl.AsyncInterfaces": "[9.0.0-rc.1.24431.7, )"
         }
       },
       "kentico.xperience.umt.examples": {
         "type": "Project",
         "dependencies": {
-          "Kentico.Xperience.UMT": "[1.8.0, )"
+          "Kentico.Xperience.UMT": "[1.9.0, )"
         }
       },
       "Kentico.Xperience.Core": {
         "type": "CentralTransitive",
-        "requested": "[29.6.0, )",
-        "resolved": "29.6.0",
-        "contentHash": "Fk747GoKKzc3nr7JYiyvQvbVjGS/wVX7TKjRgmf8PiFUVrquBeTJWQH1p0rm8hvJH7dwG6lkxw2lV7YLOl5suQ==",
+        "requested": "[29.7.0, )",
+        "resolved": "29.7.0",
+        "contentHash": "9rJYLckkygRJCAKEA0Mz+OqtWMhV9dDXi542kbfKZPSd4E4wHpdyqbO7plQtIakO40cjAt5or/GTsOBjvzT59g==",
         "dependencies": {
           "AngleSharp": "0.17.1",
           "MailKit": "4.8.0",

diff --git a/examples/Kentico.Xperience.UMT.Examples/packages.lock.json b/examples/Kentico.Xperience.UMT.Examples/packages.lock.json
@@ -477,15 +477,15 @@
       "kentico.xperience.umt": {
         "type": "Project",
         "dependencies": {
-          "Kentico.Xperience.Core": "[29.6.0, )",
+          "Kentico.Xperience.Core": "[29.7.0, )",
           "Microsoft.Bcl.AsyncInterfaces": "[9.0.0-rc.1.24431.7, )"
         }
       },
       "Kentico.Xperience.Core": {
         "type": "CentralTransitive",
-        "requested": "[29.6.0, )",
-        "resolved": "29.6.0",
-        "contentHash": "Fk747GoKKzc3nr7JYiyvQvbVjGS/wVX7TKjRgmf8PiFUVrquBeTJWQH1p0rm8hvJH7dwG6lkxw2lV7YLOl5suQ==",
+        "requested": "[29.7.0, )",
+        "resolved": "29.7.0",
+        "contentHash": "9rJYLckkygRJCAKEA0Mz+OqtWMhV9dDXi542kbfKZPSd4E4wHpdyqbO7plQtIakO40cjAt5or/GTsOBjvzT59g==",
         "dependencies": {
           "AngleSharp": "0.17.1",
           "MailKit": "4.8.0",

diff --git a/src/Kentico.Xperience.UMT/packages.lock.json b/src/Kentico.Xperience.UMT/packages.lock.json
@@ -4,9 +4,9 @@
     "net8.0": {
       "Kentico.Xperience.Core": {
         "type": "Direct",
-        "requested": "[29.6.0, )",
-        "resolved": "29.6.0",
-        "contentHash": "Fk747GoKKzc3nr7JYiyvQvbVjGS/wVX7TKjRgmf8PiFUVrquBeTJWQH1p0rm8hvJH7dwG6lkxw2lV7YLOl5suQ==",
+        "requested": "[29.7.0, )",
+        "resolved": "29.7.0",
+        "contentHash": "9rJYLckkygRJCAKEA0Mz+OqtWMhV9dDXi542kbfKZPSd4E4wHpdyqbO7plQtIakO40cjAt5or/GTsOBjvzT59g==",
         "dependencies": {
           "AngleSharp": "0.17.1",
           "MailKit": "4.8.0",

diff --git a/tests/Kentico.Xperience.UMT.Tests/Tests/Tests_02_ChannelTests.cs b/tests/Kentico.Xperience.UMT.Tests/Tests/Tests_02_ChannelTests.cs
@@ -79,8 +79,6 @@ public async Task Test00400_New_Page_Create_And_Delete_Succeeds()
 
             await Page.GetByTestId("ArticleText").FillAsync("Text on\nmultiple\nlines".Replace("\n", Environment.NewLine));
 
-            await Page.GetByTestId("file-input-upload").SetInputFilesAsync(Path.Combine(Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location)!, "Resources", "kentico_brand.png"));
-
             await Page.GetByTestId("button-select-web-page").ClickAsync();
             await Page.GetByTestId("table-row").Nth(1).ClickAsync();
             await Page.GetByTestId("confirm-action").ClickAsync();

diff --git a/tests/Kentico.Xperience.UMT.Tests/Tests/Tests_03_ContentHubTests.cs b/tests/Kentico.Xperience.UMT.Tests/Tests/Tests_03_ContentHubTests.cs
@@ -45,8 +45,8 @@ public async Task Test00300_Draft_And_Scheduled_Items_Present()
             await Page.GetByLabel("All content items").ClickAsync();
             await Debounce();
 
-            await Assertions.Expect(Page.GetByTestId("table-row").Filter(new LocatorFilterOptions { HasText = "Draft (Initial)" })).ToBeVisibleAsync();
-            await Assertions.Expect(Page.GetByTestId("table-row").Filter(new LocatorFilterOptions { HasText = "Scheduled" })).ToBeVisibleAsync();
+            await Assertions.Expect(Page.GetByTestId("table-row").Filter(new LocatorFilterOptions { HasText = "Draft (Initial)" })).Not.ToHaveCountAsync(0);
+            await Assertions.Expect(Page.GetByTestId("table-row").Filter(new LocatorFilterOptions { HasText = "Scheduled" })).Not.ToHaveCountAsync(0);
         }
 
         [Test]

diff --git a/tests/Kentico.Xperience.UMT.Tests/Tests/Tests_04_MediaLibrary.cs b/tests/Kentico.Xperience.UMT.Tests/Tests/Tests_04_MediaLibrary.cs
@@ -20,7 +20,7 @@ public async Task Test00100_Expected_Library_Structure_Was_Created()
         }
 
         [Test]
-        public async Task Test00200_Subfolder_Contains_2_Images()
+        public async Task Test00200_Subfolder_Contains_Image()
         {
             await OpenAdminApplication("Media libraries");
 
@@ -33,34 +33,31 @@ public async Task Test00200_Subfolder_Contains_2_Images()
             await childFolder.ClickAsync();
             await Debounce();
 
-            await Assertions.Expect(Page.GetByTestId("asset-tile-preview")).ToHaveCountAsync(2);
+            await Assertions.Expect(Page.GetByTestId("asset-tile-preview")).ToHaveCountAsync(1);
         }
 
         [Test]
-        public async Task Test00300_Subfolder_Images_Can_Be_Explored()
+        public async Task Test00300_Subfolder_Image_Can_Be_Explored()
         {
-            for (int i = 0; i < 2; i++)
-            {
-                await OpenAdminApplication("Media libraries");
+            await OpenAdminApplication("Media libraries");
 
-                await Page.GetByTestId("table-row").ClickAsync();     // also checks that an item exists
-                await Debounce();
+            await Page.GetByTestId("table-row").ClickAsync();     // also checks that an item exists
+            await Debounce();
 
-                var topFolder = Page.GetByRole(AriaRole.Treeitem).Nth(0);
-                var childFolder = topFolder.GetByRole(AriaRole.Treeitem).Nth(0);
+            var topFolder = Page.GetByRole(AriaRole.Treeitem).Nth(0);
+            var childFolder = topFolder.GetByRole(AriaRole.Treeitem).Nth(0);
 
-                await childFolder.ClickAsync();
-                await Debounce();
+            await childFolder.ClickAsync();
+            await Debounce();
 
-                await Page.GetByTestId("asset-tile-preview").Nth(i).ClickAsync();
-                await Assertions.Expect(Page.GetByTestId("FileName")).Not.ToBeEmptyAsync();
-                await Assertions.Expect(Page.GetByTestId("FileTitle")).Not.ToBeEmptyAsync();
+            await Page.GetByTestId("asset-tile-preview").Nth(0).ClickAsync();
+            await Assertions.Expect(Page.GetByTestId("FileName")).Not.ToBeEmptyAsync();
+            await Assertions.Expect(Page.GetByTestId("FileTitle")).Not.ToBeEmptyAsync();
 
-                string imageURL = $"{BaseURL}{await Page.GetByTestId("MediaFileURL").Locator("a").GetAttributeAsync("href")}";
-                var response = await new HttpClient().GetAsync(imageURL);
+            string imageURL = $"{BaseURL}{await Page.GetByTestId("MediaFileURL").Locator("a").GetAttributeAsync("href")}";
+            var response = await new HttpClient().GetAsync(imageURL);
 
-                Assert.That(response.IsSuccessStatusCode && response.Content.Headers.ContentType!.MediaType!.StartsWith("image"));
-            }
+            Assert.That(response.IsSuccessStatusCode && response.Content.Headers.ContentType!.MediaType!.StartsWith("image"));
         }
     }
 }
diff --git a/utils/Kentico.Xperience.UMT.DocUtils/packages.lock.json b/utils/Kentico.Xperience.UMT.DocUtils/packages.lock.json
@@ -936,21 +936,21 @@
       "kentico.xperience.umt": {
         "type": "Project",
         "dependencies": {
-          "Kentico.Xperience.Core": "[29.6.0, )",
+          "Kentico.Xperience.Core": "[29.7.0, )",
           "Microsoft.Bcl.AsyncInterfaces": "[9.0.0-rc.1.24431.7, )"
         }
       },
       "kentico.xperience.umt.examples": {
         "type": "Project",
         "dependencies": {
-          "Kentico.Xperience.UMT": "[1.8.0, )"
+          "Kentico.Xperience.UMT": "[1.9.0, )"
         }
       },
       "Kentico.Xperience.Core": {
         "type": "CentralTransitive",
-        "requested": "[29.6.0, )",
-        "resolved": "29.6.0",
-        "contentHash": "Fk747GoKKzc3nr7JYiyvQvbVjGS/wVX7TKjRgmf8PiFUVrquBeTJWQH1p0rm8hvJH7dwG6lkxw2lV7YLOl5suQ==",
+        "requested": "[29.7.0, )",
+        "resolved": "29.7.0",
+        "contentHash": "9rJYLckkygRJCAKEA0Mz+OqtWMhV9dDXi542kbfKZPSd4E4wHpdyqbO7plQtIakO40cjAt5or/GTsOBjvzT59g==",
         "dependencies": {
           "AngleSharp": "0.17.1",
           "MailKit": "4.8.0",