@@ -36,12 +63,59 @@ public class HtmlLocalLinkParserTests
var result = parser.FindUdisFromLocalLinks(input).ToList();
- Assert.AreEqual(2, result.Count);
- Assert.AreEqual(UdiParser.Parse("umb://document/C093961595094900AAF9170DDE6AD442"), result[0]);
- Assert.AreEqual(UdiParser.Parse("umb://document-type/2D692FCB070B4CDA92FB6883FDBFD6E2"), result[1]);
+ Assert.Multiple(() =>
+ {
+ Assert.AreEqual(2, result.Count);
+ Assert.Contains(UdiParser.Parse("umb://document/C093961595094900AAF9170DDE6AD442"), result);
+ Assert.Contains(UdiParser.Parse("umb://document-type/2D692FCB070B4CDA92FB6883FDBFD6E2"), result);
+ });
+ }
+
+ // todo remove at some point and the implementation.
+ [Test]
+ public void Returns_Udis_From_Legacy_And_Current_LocalLinks()
+ {
+ var input = @"
+
+
+hello
+
+
+
+
+media
+
";
+
+ var umbracoContextAccessor = new TestUmbracoContextAccessor();
+ var parser = new HtmlLocalLinkParser(umbracoContextAccessor, Mock.Of
());
+
+ var result = parser.FindUdisFromLocalLinks(input).ToList();
+
+ Assert.Multiple(() =>
+ {
+ Assert.AreEqual(4, result.Count);
+ Assert.Contains(UdiParser.Parse("umb://document/eed5fc6b-96fd-45a5-a0f1-b1adfb483c2f"), result);
+ Assert.Contains(UdiParser.Parse("umb://media/7e21a725-b905-4c5f-86dc-8c41ec116e39"), result);
+ Assert.Contains(UdiParser.Parse("umb://document/C093961595094900AAF9170DDE6AD442"), result);
+ Assert.Contains(UdiParser.Parse("umb://document-type/2D692FCB070B4CDA92FB6883FDBFD6E2"), result);
+ });
}
[TestCase("", "")]
+ // current
+ [TestCase(
+ "world",
+ "world")]
+ [TestCase(
+ "world",
+ "world")]
+ // legacy
[TestCase(
"hello href=\"{localLink:1234}\" world ",
"hello href=\"/my-test-url\" world ")]
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/DeliveryApi/ApiRichTextMarkupParserTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/DeliveryApi/ApiRichTextMarkupParserTests.cs
new file mode 100644
index 0000000000..43ec2136f7
--- /dev/null
+++ b/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/DeliveryApi/ApiRichTextMarkupParserTests.cs
@@ -0,0 +1,200 @@
+using Microsoft.Extensions.Logging;
+using Moq;
+using NUnit.Framework;
+using Umbraco.Cms.Core;
+using Umbraco.Cms.Core.DeliveryApi;
+using Umbraco.Cms.Core.Models.DeliveryApi;
+using Umbraco.Cms.Core.Models.PublishedContent;
+using Umbraco.Cms.Core.PublishedCache;
+using Umbraco.Cms.Infrastructure.DeliveryApi;
+
+namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Infrastructure.DeliveryApi;
+
+[TestFixture]
+public class ApiRichTextMarkupParserTests
+{
+ private Mock _apiContentRouteBuilder;
+ private Mock _apiMediaUrlProvider;
+ private Mock _publishedSnapshotAccessor;
+
+ [Test]
+ public void Can_Parse_Legacy_LocalLinks()
+ {
+ var key1 = Guid.Parse("a1c5d649977f4ea59b1cb26055f3eed3");
+ var data1 = new MockData()
+ .WithKey(key1)
+ .WithRoutePath("/inline/")
+ .WithRouteStartPath("inline");
+
+ var mockData = new Dictionary
+ {
+ { key1, data1 },
+ };
+
+ var parser = BuildDefaultSut(mockData);
+
+ var legacyHtml =
+ "link to another page
";
+
+ var expectedOutput =
+ "link to another page
";
+
+ var parsedHtml = parser.Parse(legacyHtml);
+
+ Assert.AreEqual(expectedOutput, parsedHtml);
+ }
+
+ [Test]
+ public void Can_Parse_LocalLinks()
+ {
+ var key1 = Guid.Parse("eed5fc6b-96fd-45a5-a0f1-b1adfb483c2f");
+ var data1 = new MockData()
+ .WithKey(key1)
+ .WithRoutePath("/self/")
+ .WithRouteStartPath("self");
+
+ var key2 = Guid.Parse("cc143afe-4cbf-46e5-b399-c9f451384373");
+ var data2 = new MockData()
+ .WithKey(key2)
+ .WithRoutePath("/other/")
+ .WithRouteStartPath("other");
+
+ var mockData = new Dictionary
+ {
+ { key1, data1 },
+ { key2, data2 },
+ };
+
+ var parser = BuildDefaultSut(mockData);
+
+ var html =
+ @"Rich text outside of the blocks with a link to itself
+and to the other page
";
+
+ var expectedOutput =
+ @"Rich text outside of the blocks with a link to itself
+and to the other page
";
+
+ var parsedHtml = parser.Parse(html);
+
+ Assert.AreEqual(expectedOutput, parsedHtml);
+ }
+
+ [Test]
+ public void Can_Parse_Legacy_LocalImages()
+ {
+ var key1 = Guid.Parse("395bdc0e8f4d4ad4af7f3a3f6265651e");
+ var data1 = new MockData()
+ .WithKey(key1)
+ .WithMediaUrl("https://localhost:44331/media/bdofwokn/77gtp8fbrxmgkefatp10aw.webp");
+
+ var mockData = new Dictionary
+ {
+ { key1, data1 },
+ };
+ var parser = BuildDefaultSut(mockData);
+
+ var legacyHtml =
+ @"An image
\n![]()
";
+
+ var expectedOutput =
+ @"An image
\n![]()
";
+
+ var parsedHtml = parser.Parse(legacyHtml);
+
+ Assert.AreEqual(expectedOutput, parsedHtml);
+ }
+
+ private ApiRichTextMarkupParser BuildDefaultSut(Dictionary mockData)
+ {
+ var contentCacheMock = new Mock();
+
+ contentCacheMock.Setup(cc => cc.GetById(It.IsAny(), It.IsAny()))
+ .Returns((preview, key) => mockData[key].PublishedContent);
+ contentCacheMock.Setup(cc => cc.GetById(It.IsAny()))
+ .Returns(key => mockData[key].PublishedContent);
+ contentCacheMock.Setup(cc => cc.GetById(It.IsAny(), It.IsAny()))
+ .Returns((preview, udi) => mockData[((GuidUdi)udi).Guid].PublishedContent);
+ contentCacheMock.Setup(cc => cc.GetById(It.IsAny()))
+ .Returns(udi => mockData[((GuidUdi)udi).Guid].PublishedContent);
+
+ var mediaCacheMock = new Mock();
+ mediaCacheMock.Setup(cc => cc.GetById(It.IsAny(), It.IsAny()))
+ .Returns((preview, key) => mockData[key].PublishedContent);
+ mediaCacheMock.Setup(cc => cc.GetById(It.IsAny()))
+ .Returns(key => mockData[key].PublishedContent);
+ mediaCacheMock.Setup(cc => cc.GetById(It.IsAny(), It.IsAny()))
+ .Returns((preview, udi) => mockData[((GuidUdi)udi).Guid].PublishedContent);
+ mediaCacheMock.Setup(cc => cc.GetById(It.IsAny()))
+ .Returns(udi => mockData[((GuidUdi)udi).Guid].PublishedContent);
+
+ var snapshotMock = new Mock();
+ snapshotMock.SetupGet(ss => ss.Content)
+ .Returns(contentCacheMock.Object);
+ snapshotMock.SetupGet(ss => ss.Media)
+ .Returns(mediaCacheMock.Object);
+
+ var snapShot = snapshotMock.Object;
+
+ _publishedSnapshotAccessor = new Mock();
+ _publishedSnapshotAccessor.Setup(psa => psa.TryGetPublishedSnapshot(out snapShot))
+ .Returns(true);
+
+ _apiMediaUrlProvider = new Mock();
+ _apiMediaUrlProvider.Setup(mup => mup.GetUrl(It.IsAny()))
+ .Returns(ipc => mockData[ipc.Key].MediaUrl);
+
+ _apiContentRouteBuilder = new Mock();
+ _apiContentRouteBuilder.Setup(acrb => acrb.Build(It.IsAny(), It.IsAny()))
+ .Returns((content, culture) => mockData[content.Key].ApiContentRoute);
+
+ return new ApiRichTextMarkupParser(
+ _apiContentRouteBuilder.Object,
+ _apiMediaUrlProvider.Object,
+ _publishedSnapshotAccessor.Object,
+ Mock.Of>());
+ }
+
+ private class MockData
+ {
+ private Mock _publishedContentMock = new Mock();
+ private Mock _apiContentRouteMock = new Mock();
+ private Mock _apiContentStartItem = new Mock();
+
+ public IPublishedContent PublishedContent => _publishedContentMock.Object;
+
+ public IApiContentRoute ApiContentRoute => _apiContentRouteMock.Object;
+
+ public string MediaUrl { get; set; } = string.Empty;
+
+ public MockData()
+ {
+ _apiContentRouteMock.SetupGet(r => r.StartItem).Returns(_apiContentStartItem.Object);
+ }
+
+ public MockData WithKey(Guid key)
+ {
+ _publishedContentMock.SetupGet(i => i.Key).Returns(key);
+ _apiContentStartItem.SetupGet(rsi => rsi.Id).Returns(key);
+ return this;
+ }
+
+ public MockData WithRoutePath(string path)
+ {
+ _apiContentRouteMock.SetupGet(r => r.Path).Returns(path);
+ return this;
+ }
+
+ public MockData WithRouteStartPath(string path)
+ {
+ _apiContentStartItem.SetupGet(rsi => rsi.Path).Returns(path);
+ return this;
+ }
+
+ public MockData WithMediaUrl(string url)
+ {
+ MediaUrl = url;
+ return this;
+ }
+ }
+}
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Web.Common/Routing/BackOfficeAreaRoutesTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Web.Common/Routing/BackOfficeAreaRoutesTests.cs
index c444e591ab..e1a0638fc6 100644
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.Web.Common/Routing/BackOfficeAreaRoutesTests.cs
+++ b/tests/Umbraco.Tests.UnitTests/Umbraco.Web.Common/Routing/BackOfficeAreaRoutesTests.cs
@@ -45,7 +45,7 @@ public class BackOfficeAreaRoutesTests
var endpoints = new TestRouteBuilder();
routes.CreateRoutes(endpoints);
- Assert.AreEqual(1, endpoints.DataSources.Count);
+ Assert.AreEqual(2, endpoints.DataSources.Count);
var route = endpoints.DataSources.First();
Assert.AreEqual(2, route.Endpoints.Count);
diff --git a/umbraco.sln b/umbraco.sln
index 1e7a6e3326..59015768a8 100644
--- a/umbraco.sln
+++ b/umbraco.sln
@@ -140,6 +140,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{20CE9C97
ProjectSection(SolutionItems) = preProject
build\azure-pipelines.yml = build\azure-pipelines.yml
build\nightly-build-trigger.yml = build\nightly-build-trigger.yml
+ build\templates\backoffice-install.yml = build\templates\backoffice-install.yml
EndProjectSection
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "csharp-docs", "csharp-docs", "{F2BF84D9-0A14-40AF-A0F3-B9BBBBC16A44}"
diff --git a/version.json b/version.json
index cf30f7b7d2..31fd8e32c7 100644
--- a/version.json
+++ b/version.json
@@ -1,6 +1,6 @@
{
"$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/main/src/NerdBank.GitVersioning/version.schema.json",
- "version": "14.1.0-rc",
+ "version": "14.1.0-rc2",
"assemblyVersion": {
"precision": "build"
},