build(deps): bump @umbraco-ui/uui from 1.12.2 to 1.13.0 (#18830)

* Disabled encrypt

* Skips integration tests for SQl Server on releases

* Removed encrypt

build/azure-pipelines.yml

@@ -338,7 +338,9 @@ stages:
       # Integration Tests (SQL Server)
       - job:
         timeoutInMinutes: 120
-        condition: or(eq(stageDependencies.Build.A.outputs['build.NBGV_PublicRelease'], 'True'), ${{parameters.sqlServerIntegrationTests}})
+        # We are currently encountering issues when running SQL Server Linux tests Microsoft.Data.SqlClient.SqlException (0x80131904)
+        # condition: or(eq(stageDependencies.Build.A.outputs['build.NBGV_PublicRelease'], 'True'), ${{parameters.sqlServerIntegrationTests}})
+        condition: eq(${{parameters.sqlServerIntegrationTests}}, True)
         displayName: Integration Tests (SQL Server)
         strategy:
           matrix:

src/Umbraco.Cms.Api.Delivery/Services/RequestPreviewService.cs

@@ -1,4 +1,4 @@
-using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Http;
 using Umbraco.Cms.Core.DeliveryApi;
 
 namespace Umbraco.Cms.Api.Delivery.Services;
@@ -11,5 +11,5 @@ internal sealed class RequestPreviewService : RequestHeaderHandler, IRequestPrev
     }
 
     /// <inheritdoc />
-    public bool IsPreview() => GetHeaderValue("Preview") == "true";
+    public bool IsPreview() => string.Equals(GetHeaderValue("Preview"), "true", StringComparison.OrdinalIgnoreCase);
 }

src/Umbraco.Web.BackOffice/Controllers/MacroRenderingController.cs

@@ -87,7 +87,7 @@ public class MacroRenderingController : UmbracoAuthorizedJsonController
     [HttpGet]
     public async Task<IActionResult> GetMacroResultAsHtmlForEditor(string macroAlias, int pageId,
         [FromQuery] IDictionary<string, object> macroParams) =>
-        await GetMacroResultAsHtml(macroAlias, pageId, macroParams);
+        await GetMacroResultAsHtml(macroAlias, pageId.ToString(), macroParams);
 
     /// <summary>
     ///     Gets a rendered macro as HTML for rendering in the rich text editor.
@@ -98,11 +98,24 @@ public class MacroRenderingController : UmbracoAuthorizedJsonController
     /// <param name="model"></param>
     /// <returns></returns>
     [HttpPost]
+    [NonAction]
+    [Obsolete("This endpoint is no longer used.")]
     public async Task<IActionResult> GetMacroResultAsHtmlForEditor(MacroParameterModel model) =>
+        await GetMacroResultAsHtml(model.MacroAlias, model.PageId.ToString(), model.MacroParams);
+
+    /// <summary>
+    ///     Gets a rendered macro as HTML for rendering in the rich text editor.
+    ///     Using HTTP POST instead of GET allows for more parameters to be passed as it's not dependent on URL-length
+    ///     limitations like GET.
+    ///     The method using GET is kept to maintain backwards compatibility
+    /// </summary>
+    /// <param name="model"></param>
+    /// <returns></returns>
+    [HttpPost]
+    public async Task<IActionResult> GetMacroResultAsHtmlForEditor(MacroParameterModel2 model) =>
         await GetMacroResultAsHtml(model.MacroAlias, model.PageId, model.MacroParams);
 
-    private async Task<IActionResult> GetMacroResultAsHtml(string? macroAlias, int pageId,
-        IDictionary<string, object>? macroParams)
+    private async Task<IActionResult> GetMacroResultAsHtml(string? macroAlias, string pageId, IDictionary<string, object>? macroParams)
     {
         IMacro? m = macroAlias is null ? null : _macroService.GetByAlias(macroAlias);
         if (m == null)
@@ -111,11 +124,11 @@ public class MacroRenderingController : UmbracoAuthorizedJsonController
         }
 
         IUmbracoContext umbracoContext = _umbracoContextAccessor.GetRequiredUmbracoContext();
-        IPublishedContent? publishedContent = umbracoContext.Content?.GetById(true, pageId);
+        IPublishedContent? publishedContent = GetPagePublishedContent(pageId, umbracoContext);
 
         //if it isn't supposed to be rendered in the editor then return an empty string
         //currently we cannot render a macro if the page doesn't yet exist
-        if (pageId == -1 || publishedContent == null || m.DontRender)
+        if (publishedContent == null || m.DontRender)
         {
             //need to create a specific content result formatted as HTML since this controller has been configured
             //with only json formatters.
@@ -149,6 +162,21 @@ public class MacroRenderingController : UmbracoAuthorizedJsonController
         }
     }
 
+    private static IPublishedContent? GetPagePublishedContent(string pageId, IUmbracoContext umbracoContext)
+    {
+        if (int.TryParse(pageId, NumberStyles.Integer, CultureInfo.InvariantCulture, out int pageIdAsInt))
+        {
+            return umbracoContext.Content?.GetById(true, pageIdAsInt);
+        }
+
+        if (Guid.TryParse(pageId, out Guid pageIdAsGuid))
+        {
+            return umbracoContext.Content?.GetById(true, pageIdAsGuid);
+        }
+
+        return null;
+    }
+
     [HttpPost]
     public IActionResult CreatePartialViewMacroWithFile(CreatePartialViewMacroWithFileModel model)
     {
@@ -180,6 +208,7 @@ public class MacroRenderingController : UmbracoAuthorizedJsonController
         return Ok();
     }
 
+    [Obsolete("This model is no longer used and has been replaced with MacroParameterModel2 that changes the type of the PageId property.")]
     public class MacroParameterModel
     {
         public string? MacroAlias { get; set; }
@@ -187,6 +216,13 @@ public class MacroRenderingController : UmbracoAuthorizedJsonController
         public IDictionary<string, object>? MacroParams { get; set; }
     }
 
+    public class MacroParameterModel2
+    {
+        public string? MacroAlias { get; set; }
+        public string PageId { get; set; } = string.Empty;
+        public IDictionary<string, object>? MacroParams { get; set; }
+    }
+
     public class CreatePartialViewMacroWithFileModel
     {
         public string? Filename { get; set; }

src/Umbraco.Web.BackOffice/Trees/StaticFilesTreeController.cs

@@ -98,16 +98,6 @@ public class StaticFilesTreeController : TreeController
 
     private void AddPhysicalFiles(string path, FormCollection queryStrings, TreeNodeCollection nodes)
     {
-        IEnumerable<string> files = _fileSystem.GetFiles(path)
-            .Where(x => x.StartsWith(AppPlugins) || x.StartsWith(Webroot));
-
-        foreach (var file in files)
-        {
-            var name = Path.GetFileName(file);
-            TreeNode node = CreateTreeNode(WebUtility.UrlEncode(file), path, queryStrings, name, Constants.Icons.DefaultIcon, false);
-            nodes.Add(node);
-        }
-
         IEnumerable<string> directories = _fileSystem.GetDirectories(path);
 
         foreach (var directory in directories)
@@ -117,6 +107,16 @@ public class StaticFilesTreeController : TreeController
             TreeNode node = CreateTreeNode(WebUtility.UrlEncode(directory), path, queryStrings, name, Constants.Icons.Folder, hasChildren);
             nodes.Add(node);
         }
+
+        IEnumerable<string> files = _fileSystem.GetFiles(path)
+            .Where(x => x.StartsWith(AppPlugins) || x.StartsWith(Webroot));
+
+        foreach (var file in files)
+        {
+            var name = Path.GetFileName(file);
+            TreeNode node = CreateTreeNode(WebUtility.UrlEncode(file), path, queryStrings, name, Constants.Icons.DefaultIcon, false);
+            nodes.Add(node);
+        }
     }
 
     private void AddWebRootFiles(string path, FormCollection queryStrings, TreeNodeCollection nodes)

src/Umbraco.Web.UI.Client/package.json

@@ -19,8 +19,8 @@
   },
   "dependencies": {
     "@microsoft/signalr": "8.0.7",
-    "@umbraco-ui/uui": "1.12.2",
-    "@umbraco-ui/uui-css": "1.12.1",
+    "@umbraco-ui/uui": "1.13.0",
+    "@umbraco-ui/uui-css": "1.13.0",
     "ace-builds": "1.31.1",
     "angular": "1.8.3",
     "angular-animate": "1.8.3",

src/Umbraco.Web.UI.Login/package.json

@@ -1,29 +1,29 @@
 {
-	"name": "login",
-	"private": true,
+  "name": "login",
+  "private": true,
   "type": "module",
-	"scripts": {
-		"dev": "vite",
-		"build": "tsc && vite build",
-		"watch": "tsc && vite build --watch",
-		"preview": "vite preview"
-	},
-    "engines": {
-      "node": ">=20.8",
-      "npm": ">=10.1"
-    },
-	"dependencies": {
-		"lit": "^3.1.2",
-		"msw": "^2.2.0",
-		"rxjs": "^7.8.1"
+  "scripts": {
+    "dev": "vite",
+    "build": "tsc && vite build",
+    "watch": "tsc && vite build --watch",
+    "preview": "vite preview"
   },
-	"devDependencies": {
-    "@umbraco-ui/uui": "1.12.2",
-    "@umbraco-ui/uui-css": "1.12.1",
-		"typescript": "^5.3.3",
-		"vite": "^5.1.7"
-	},
-	"msw": {
-		"workerDirectory": "public"
-	}
+  "engines": {
+    "node": ">=20.8",
+    "npm": ">=10.1"
+  },
+  "dependencies": {
+    "lit": "^3.1.2",
+    "msw": "^2.2.0",
+    "rxjs": "^7.8.1"
+  },
+  "devDependencies": {
+    "@umbraco-ui/uui": "1.13.0",
+    "@umbraco-ui/uui-css": "1.13.0",
+    "typescript": "^5.3.3",
+    "vite": "^5.1.7"
+  },
+  "msw": {
+    "workerDirectory": "public"
+  }
 }

tests/Umbraco.Tests.UnitTests/Umbraco.Cms.Api.Delivery/Services/RequestPreviewServiceTests.cs

@@ -0,0 +1,31 @@
+using Microsoft.AspNetCore.Http;
+using Moq;
+using NUnit.Framework;
+using Umbraco.Cms.Api.Delivery.Services;
+
+namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Cms.Api.Delivery.Services;
+
+[TestFixture]
+public class RequestPreviewServiceTests
+{
+    [TestCase(null, false)]
+    [TestCase("", false)]
+    [TestCase("false", false)]
+    [TestCase("true", true)]
+    [TestCase("True", true)]
+    public void IsPreview_Returns_Expected_Result(string? headerValue, bool expected)
+    {
+        var httpContext = new DefaultHttpContext();
+        httpContext.Request.Headers["Preview"] = headerValue;
+
+        var httpContextAccessorMock = new Mock<IHttpContextAccessor>();
+        httpContextAccessorMock
+            .Setup(x => x.HttpContext)
+            .Returns(httpContext);
+        var sut = new RequestPreviewService(httpContextAccessorMock.Object);
+
+        var result = sut.IsPreview();
+
+        Assert.AreEqual(expected, result);
+    }
+}