From 97e0c79d94b762d6731fdb1000209f84f9659b52 Mon Sep 17 00:00:00 2001
From: Andy Butland <abutland73@gmail.com>
Date: Thu, 2 Oct 2025 20:10:16 +0200
Subject: [PATCH 001/155] Caching: Fixes regression of the caching of null
 representations for missing dictionary items (closes #20336 for 16) (#20349)

* Ports fix to regression of the caching of null representations for missing dictionary items.

* Fixed error raised in code review.

---------

Co-authored-by: Kenn Jacobsen <kja@umbraco.dk>
---
 src/Umbraco.Core/Cache/AppCacheExtensions.cs  |  38 ++++-
 .../Repositories/DictionaryRepositoryTest.cs  | 145 +++++++++++++++++-
 2 files changed, 176 insertions(+), 7 deletions(-)

diff --git a/src/Umbraco.Core/Cache/AppCacheExtensions.cs b/src/Umbraco.Core/Cache/AppCacheExtensions.cs
index 480b677f2459..32c1b772f014 100644
--- a/src/Umbraco.Core/Cache/AppCacheExtensions.cs
+++ b/src/Umbraco.Core/Cache/AppCacheExtensions.cs
@@ -41,27 +41,39 @@ public static void InsertCacheItem<T>(
     public static T? GetCacheItem<T>(this IAppCache provider, string cacheKey)
     {
         var result = provider.Get(cacheKey);
-        if (IsRetrievedItemNull(result))
+        if (result == null)
         {
             return default;
         }
 
+        // If we've retrieved the specific string that represents null in the cache, return it only if we are requesting it (via a typed request for a string).
+        // Otherwise consider it a null value.
+        if (RetrievedNullRepresentationInCache(result))
+        {
+            return RequestedNullRepresentationInCache<T>() ? (T)result : default;
+        }
+
         return result.TryConvertTo<T>().Result;
     }
 
     public static T? GetCacheItem<T>(this IAppCache provider, string cacheKey, Func<T> getCacheItem)
     {
         var result = provider.Get(cacheKey, () => getCacheItem());
-        if (IsRetrievedItemNull(result))
+        if (result == null)
         {
             return default;
         }
 
+        // If we've retrieved the specific string that represents null in the cache, return it only if we are requesting it (via a typed request for a string).
+        // Otherwise consider it a null value.
+        if (RetrievedNullRepresentationInCache(result))
+        {
+            return RequestedNullRepresentationInCache<T>() ? (T)result : default;
+        }
+
         return result.TryConvertTo<T>().Result;
     }
 
-    private static bool IsRetrievedItemNull(object? result) => result is null or (object)Cms.Core.Constants.Cache.NullRepresentationInCache;
-
     public static async Task<T?> GetCacheItemAsync<T>(
         this IAppPolicyCache provider,
         string cacheKey,
@@ -77,9 +89,25 @@ public static void InsertCacheItem<T>(
             provider.Insert(cacheKey, () => result, timeout, isSliding);
         }
 
-        return result == null ? default : result.TryConvertTo<T>().Result;
+        if (result == null)
+        {
+            return default;
+        }
+
+        // If we've retrieved the specific string that represents null in the cache, return it only if we are requesting it (via a typed request for a string).
+        // Otherwise consider it a null value.
+        if (RetrievedNullRepresentationInCache(result))
+        {
+            return RequestedNullRepresentationInCache<T>() ? (T)result : default;
+        }
+
+        return result.TryConvertTo<T>().Result;
     }
 
+    private static bool RetrievedNullRepresentationInCache(object result) => result == (object)Cms.Core.Constants.Cache.NullRepresentationInCache;
+
+    private static bool RequestedNullRepresentationInCache<T>() => typeof(T) == typeof(string);
+
     public static async Task InsertCacheItemAsync<T>(
         this IAppPolicyCache provider,
         string cacheKey,
diff --git a/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/DictionaryRepositoryTest.cs b/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/DictionaryRepositoryTest.cs
index cb3414ad3aad..acdda16406a5 100644
--- a/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/DictionaryRepositoryTest.cs
+++ b/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/DictionaryRepositoryTest.cs
@@ -1,13 +1,16 @@
 // Copyright (c) Umbraco.
 // See LICENSE for more details.
 
-using System.Collections.Generic;
-using System.Linq;
+using Microsoft.Extensions.Logging;
+using Moq;
 using NUnit.Framework;
 using Umbraco.Cms.Core;
+using Umbraco.Cms.Core.Cache;
 using Umbraco.Cms.Core.Models;
 using Umbraco.Cms.Core.Persistence.Repositories;
 using Umbraco.Cms.Core.Services;
+using Umbraco.Cms.Infrastructure.Persistence.Repositories.Implement;
+using Umbraco.Cms.Infrastructure.Scoping;
 using Umbraco.Cms.Tests.Common.Testing;
 using Umbraco.Cms.Tests.Integration.Testing;
 
@@ -22,6 +25,16 @@ internal sealed class DictionaryRepositoryTest : UmbracoIntegrationTest
 
     private IDictionaryRepository CreateRepository() => GetRequiredService<IDictionaryRepository>();
 
+    private IDictionaryRepository CreateRepositoryWithCache(AppCaches cache) =>
+
+        // Create a repository with a real runtime cache.
+        new DictionaryRepository(
+            GetRequiredService<IScopeAccessor>(),
+            cache,
+            GetRequiredService<ILogger<DictionaryRepository>>(),
+            GetRequiredService<ILoggerFactory>(),
+            GetRequiredService<ILanguageRepository>());
+
     [Test]
     public async Task Can_Perform_Get_By_Key_On_DictionaryRepository()
     {
@@ -396,6 +409,134 @@ public void Can_Perform_GetDictionaryItemKeyMap_On_DictionaryRepository()
         }
     }
 
+    [Test]
+    public void Can_Perform_Cached_Request_For_Existing_Value_By_Key_On_DictionaryRepository_With_Cache()
+    {
+        var cache = AppCaches.Create(Mock.Of<IRequestCache>());
+        var repository = CreateRepositoryWithCache(cache);
+
+        using (ScopeProvider.CreateScope())
+        {
+            var dictionaryItem = repository.Get("Read More");
+
+            Assert.AreEqual("Read More", dictionaryItem.Translations.Single(x => x.LanguageIsoCode == "en-US").Value);
+        }
+
+        // Modify the value directly in the database. This won't be reflected in the repository cache and hence if the cache
+        // is working as expected we should get the same value as above.
+        using (var scope = ScopeProvider.CreateScope())
+        {
+            scope.Database.Execute("UPDATE cmsLanguageText SET value = 'Read More (updated)' WHERE value = 'Read More' and LanguageId = 1");
+            scope.Complete();
+        }
+
+        using (ScopeProvider.CreateScope())
+        {
+            var dictionaryItem = repository.Get("Read More");
+
+            Assert.AreEqual("Read More", dictionaryItem.Translations.Single(x => x.LanguageIsoCode == "en-US").Value);
+        }
+
+        cache.IsolatedCaches.ClearCache<IDictionaryItem>();
+        using (ScopeProvider.CreateScope())
+        {
+            var dictionaryItem = repository.Get("Read More");
+
+            Assert.AreEqual("Read More (updated)", dictionaryItem.Translations.Single(x => x.LanguageIsoCode == "en-US").Value);
+        }
+    }
+
+    [Test]
+    public void Can_Perform_Cached_Request_For_NonExisting_Value_By_Key_On_DictionaryRepository_With_Cache()
+    {
+        var cache = AppCaches.Create(Mock.Of<IRequestCache>());
+        var repository = CreateRepositoryWithCache(cache);
+
+        using (ScopeProvider.CreateScope())
+        {
+            var dictionaryItem = repository.Get("Read More Updated");
+
+            Assert.IsNull(dictionaryItem);
+        }
+
+        // Modify the value directly in the database such that it now exists. This won't be reflected in the repository cache and hence if the cache
+        // is working as expected we should get the same null value as above.
+        using (var scope = ScopeProvider.CreateScope())
+        {
+            scope.Database.Execute("UPDATE cmsDictionary SET [key] = 'Read More Updated' WHERE [key] = 'Read More'");
+            scope.Complete();
+        }
+
+        using (ScopeProvider.CreateScope())
+        {
+            var dictionaryItem = repository.Get("Read More Updated");
+
+            Assert.IsNull(dictionaryItem);
+        }
+
+        cache.IsolatedCaches.ClearCache<IDictionaryItem>();
+        using (ScopeProvider.CreateScope())
+        {
+            var dictionaryItem = repository.Get("Read More Updated");
+
+            Assert.IsNotNull(dictionaryItem);
+        }
+    }
+
+    [Test]
+    public void Cannot_Perform_Cached_Request_For_Existing_Value_By_Key_On_DictionaryRepository_Without_Cache()
+    {
+        var repository = CreateRepository();
+
+        using (ScopeProvider.CreateScope())
+        {
+            var dictionaryItem = repository.Get("Read More");
+
+            Assert.AreEqual("Read More", dictionaryItem.Translations.Single(x => x.LanguageIsoCode == "en-US").Value);
+        }
+
+        // Modify the value directly in the database. As we don't have caching enabled on the repository we should get the new value.
+        using (var scope = ScopeProvider.CreateScope())
+        {
+            scope.Database.Execute("UPDATE cmsLanguageText SET value = 'Read More (updated)' WHERE value = 'Read More' and LanguageId = 1");
+            scope.Complete();
+        }
+
+        using (ScopeProvider.CreateScope())
+        {
+            var dictionaryItem = repository.Get("Read More");
+
+            Assert.AreEqual("Read More (updated)", dictionaryItem.Translations.Single(x => x.LanguageIsoCode == "en-US").Value);
+        }
+    }
+
+    [Test]
+    public void Cannot_Perform_Cached_Request_For_NonExisting_Value_By_Key_On_DictionaryRepository_Without_Cache()
+    {
+        var repository = CreateRepository();
+
+        using (ScopeProvider.CreateScope())
+        {
+            var dictionaryItem = repository.Get("Read More Updated");
+
+            Assert.IsNull(dictionaryItem);
+        }
+
+        // Modify the value directly in the database such that it now exists. As we don't have caching enabled on the repository we should get the new value.
+        using (var scope = ScopeProvider.CreateScope())
+        {
+            scope.Database.Execute("UPDATE cmsDictionary SET [key] = 'Read More Updated' WHERE [key] = 'Read More'");
+            scope.Complete();
+        }
+
+        using (ScopeProvider.CreateScope())
+        {
+            var dictionaryItem = repository.Get("Read More Updated");
+
+            Assert.IsNotNull(dictionaryItem);
+        }
+    }
+
     public async Task CreateTestData()
     {
         var languageService = GetRequiredService<ILanguageService>();

From d9592aa26d99d0c8298c218414e12ea479c5afa1 Mon Sep 17 00:00:00 2001
From: Andy Butland <abutland73@gmail.com>
Date: Thu, 2 Oct 2025 21:16:25 +0200
Subject: [PATCH 002/155] Bumped version to 16.3.0-rc2.

---
 version.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/version.json b/version.json
index 0b4f9c3997a6..a3c728eba2e7 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": "16.3.0-rc",
+  "version": "16.3.0-rc2",
   "assemblyVersion": {
     "precision": "build"
   },

From bfd2594c7be86295f46ae5022498b7dd1e6d87db Mon Sep 17 00:00:00 2001
From: Andy Butland <abutland73@gmail.com>
Date: Mon, 6 Oct 2025 21:20:16 +0200
Subject: [PATCH 003/155] Hybrid cache: Check for `ContentCacheNode` instead of
 object on exists for hybrid cache to ensure correct deserialization (closes
 #20352) (#20383)

Checked for ContentCacheNode instead of object on exists for hybrid cache to ensure correct deserialization.

(cherry picked from commit 184c17e2c8a5f45557bfe66ee1444793a55d46d0)
---
 .../Extensions/HybridCacheExtensions.cs             |  4 ++--
 .../Services/DocumentCacheService.cs                |  4 ++--
 .../Services/MediaCacheService.cs                   |  4 ++--
 .../Extensions/HybridCacheExtensionsTests.cs        | 13 +++++++------
 4 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/src/Umbraco.PublishedCache.HybridCache/Extensions/HybridCacheExtensions.cs b/src/Umbraco.PublishedCache.HybridCache/Extensions/HybridCacheExtensions.cs
index 427bc67d3f52..ee1b7aefda05 100644
--- a/src/Umbraco.PublishedCache.HybridCache/Extensions/HybridCacheExtensions.cs
+++ b/src/Umbraco.PublishedCache.HybridCache/Extensions/HybridCacheExtensions.cs
@@ -17,9 +17,9 @@ internal static class HybridCacheExtensions
     /// Hat-tip: https://github.com/dotnet/aspnetcore/discussions/57191
     /// Will never add or alter the state of any items in the cache.
     /// </remarks>
-    public static async Task<bool> ExistsAsync(this Microsoft.Extensions.Caching.Hybrid.HybridCache cache, string key)
+    public static async Task<bool> ExistsAsync<T>(this Microsoft.Extensions.Caching.Hybrid.HybridCache cache, string key)
     {
-        (bool exists, _) = await TryGetValueAsync<object>(cache, key);
+        (bool exists, _) = await TryGetValueAsync<T>(cache, key);
         return exists;
     }
 
diff --git a/src/Umbraco.PublishedCache.HybridCache/Services/DocumentCacheService.cs b/src/Umbraco.PublishedCache.HybridCache/Services/DocumentCacheService.cs
index 2d41bc0a1261..1675cb05cfb2 100644
--- a/src/Umbraco.PublishedCache.HybridCache/Services/DocumentCacheService.cs
+++ b/src/Umbraco.PublishedCache.HybridCache/Services/DocumentCacheService.cs
@@ -205,7 +205,7 @@ public async Task SeedAsync(CancellationToken cancellationToken)
 
                 var cacheKey = GetCacheKey(key, false);
 
-                var existsInCache = await _hybridCache.ExistsAsync(cacheKey);
+                var existsInCache = await _hybridCache.ExistsAsync<ContentCacheNode>(cacheKey);
                 if (existsInCache is false)
                 {
                     uncachedKeys.Add(key);
@@ -278,7 +278,7 @@ public async Task<bool> HasContentByIdAsync(int id, bool preview = false)
             return false;
         }
 
-        return await _hybridCache.ExistsAsync(GetCacheKey(keyAttempt.Result, preview));
+        return await _hybridCache.ExistsAsync<ContentCacheNode>(GetCacheKey(keyAttempt.Result, preview));
     }
 
     public async Task RefreshContentAsync(IContent content)
diff --git a/src/Umbraco.PublishedCache.HybridCache/Services/MediaCacheService.cs b/src/Umbraco.PublishedCache.HybridCache/Services/MediaCacheService.cs
index 29095b1d0433..65b8f91945a5 100644
--- a/src/Umbraco.PublishedCache.HybridCache/Services/MediaCacheService.cs
+++ b/src/Umbraco.PublishedCache.HybridCache/Services/MediaCacheService.cs
@@ -133,7 +133,7 @@ public async Task<bool> HasContentByIdAsync(int id)
             return false;
         }
 
-        return await _hybridCache.ExistsAsync($"{keyAttempt.Result}");
+        return await _hybridCache.ExistsAsync<ContentCacheNode>($"{keyAttempt.Result}");
     }
 
     public async Task RefreshMediaAsync(IMedia media)
@@ -170,7 +170,7 @@ public async Task SeedAsync(CancellationToken cancellationToken)
 
                 var cacheKey = GetCacheKey(key, false);
 
-                var existsInCache = await _hybridCache.ExistsAsync(cacheKey);
+                var existsInCache = await _hybridCache.ExistsAsync<ContentCacheNode>(cacheKey);
                 if (existsInCache is false)
                 {
                     uncachedKeys.Add(key);
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.PublishedCache.HybridCache/Extensions/HybridCacheExtensionsTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.PublishedCache.HybridCache/Extensions/HybridCacheExtensionsTests.cs
index 27e0cb0d0ad5..152fe28b4ef6 100644
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.PublishedCache.HybridCache/Extensions/HybridCacheExtensionsTests.cs
+++ b/tests/Umbraco.Tests.UnitTests/Umbraco.PublishedCache.HybridCache/Extensions/HybridCacheExtensionsTests.cs
@@ -1,6 +1,7 @@
 using Microsoft.Extensions.Caching.Hybrid;
 using Moq;
 using NUnit.Framework;
+using Umbraco.Cms.Infrastructure.HybridCache;
 using Umbraco.Cms.Infrastructure.HybridCache.Extensions;
 
 namespace Umbraco.Cms.Tests.UnitTests.Umbraco.PublishedCache.HybridCache.Extensions;
@@ -27,20 +28,20 @@ public async Task ExistsAsync_WhenKeyExists_ShouldReturnTrue()
     {
         // Arrange
         string key = "test-key";
-        var expectedValue = "test-value";
+        var expectedValue = new ContentCacheNode { Id = 1234 };
 
         _cacheMock
             .Setup(cache => cache.GetOrCreateAsync(
                 key,
                 null!,
-                It.IsAny<Func<object, CancellationToken, ValueTask<object>>>(),
+                It.IsAny<Func<object, CancellationToken, ValueTask<ContentCacheNode>>>(),
                 It.IsAny<HybridCacheEntryOptions>(),
                 null,
                 CancellationToken.None))
             .ReturnsAsync(expectedValue);
 
         // Act
-        var exists = await HybridCacheExtensions.ExistsAsync(_cacheMock.Object, key);
+        var exists = await HybridCacheExtensions.ExistsAsync<ContentCacheNode>(_cacheMock.Object, key);
 
         // Assert
         Assert.IsTrue(exists);
@@ -56,14 +57,14 @@ public async Task ExistsAsync_WhenKeyDoesNotExist_ShouldReturnFalse()
             .Setup(cache => cache.GetOrCreateAsync(
                 key,
                 null!,
-                It.IsAny<Func<object, CancellationToken, ValueTask<object>>>(),
+                It.IsAny<Func<object, CancellationToken, ValueTask<ContentCacheNode>>>(),
                 It.IsAny<HybridCacheEntryOptions>(),
                 null,
                 CancellationToken.None))
             .Returns((
                 string key,
                 object? state,
-                Func<object, CancellationToken, ValueTask<object>> factory,
+                Func<object, CancellationToken, ValueTask<ContentCacheNode>> factory,
                 HybridCacheEntryOptions? options,
                 IEnumerable<string>? tags,
                 CancellationToken token) =>
@@ -72,7 +73,7 @@ public async Task ExistsAsync_WhenKeyDoesNotExist_ShouldReturnFalse()
             });
 
         // Act
-        var exists = await HybridCacheExtensions.ExistsAsync(_cacheMock.Object, key);
+        var exists = await HybridCacheExtensions.ExistsAsync<ContentCacheNode>(_cacheMock.Object, key);
 
         // Assert
         Assert.IsFalse(exists);

From 629e9051870ba4cd5e5e539b96fae91e0cd628a2 Mon Sep 17 00:00:00 2001
From: Nikolaj Geisle <70372949+Zeegaan@users.noreply.github.com>
Date: Mon, 6 Oct 2025 21:21:14 +0200
Subject: [PATCH 004/155] Bump version

---
 version.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/version.json b/version.json
index a3c728eba2e7..cf259974301b 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": "16.3.0-rc2",
+  "version": "16.3.0-rc3",
   "assemblyVersion": {
     "precision": "build"
   },

From b036eb3a759ba1972b3b0e8e0a6b234f98b1e8ae Mon Sep 17 00:00:00 2001
From: Andy Butland <abutland73@gmail.com>
Date: Wed, 8 Oct 2025 07:56:49 +0200
Subject: [PATCH 005/155] Performance: Added request cache to media type
 retrieval in media picker validation (#20405)

* Added request cache to media type retrieval in media picker validation.

* Applied suggestions from code review.
---
 .../MediaPicker3PropertyEditor.cs             | 26 +++++++++++++++----
 ...ataValueReferenceFactoryCollectionTests.cs |  3 ++-
 .../MediaPicker3ValueEditorValidationTests.cs |  3 ++-
 3 files changed, 25 insertions(+), 7 deletions(-)

diff --git a/src/Umbraco.Infrastructure/PropertyEditors/MediaPicker3PropertyEditor.cs b/src/Umbraco.Infrastructure/PropertyEditors/MediaPicker3PropertyEditor.cs
index ae43c493efaf..26efa02f1029 100644
--- a/src/Umbraco.Infrastructure/PropertyEditors/MediaPicker3PropertyEditor.cs
+++ b/src/Umbraco.Infrastructure/PropertyEditors/MediaPicker3PropertyEditor.cs
@@ -82,7 +82,8 @@ public MediaPicker3PropertyValueEditor(
             IDataTypeConfigurationCache dataTypeReadCache,
             ILocalizedTextService localizedTextService,
             IMediaTypeService mediaTypeService,
-            IMediaNavigationQueryService mediaNavigationQueryService)
+            IMediaNavigationQueryService mediaNavigationQueryService,
+            AppCaches appCaches)
             : base(shortStringHelper, jsonSerializer, ioHelper, attribute)
         {
             _jsonSerializer = jsonSerializer;
@@ -95,7 +96,7 @@ public MediaPicker3PropertyValueEditor(
             var validators = new TypedJsonValidatorRunner<List<MediaWithCropsDto>, MediaPicker3Configuration>(
                 jsonSerializer,
                 new MinMaxValidator(localizedTextService),
-                new AllowedTypeValidator(localizedTextService, mediaTypeService, _mediaService),
+                new AllowedTypeValidator(localizedTextService, mediaTypeService, _mediaService, appCaches),
                 new StartNodeValidator(localizedTextService, mediaNavigationQueryService));
 
             Validators.Add(validators);
@@ -401,18 +402,22 @@ public IEnumerable<ValidationResult> Validate(
         /// </summary>
         internal sealed class AllowedTypeValidator : ITypedJsonValidator<List<MediaWithCropsDto>, MediaPicker3Configuration>
         {
+            private const string MediaTypeCacheKeyFormat = nameof(AllowedTypeValidator) + "_MediaTypeKey_{0}";
+
             private readonly ILocalizedTextService _localizedTextService;
             private readonly IMediaTypeService _mediaTypeService;
             private readonly IMediaService _mediaService;
+            private readonly AppCaches _appCaches;
 
             /// <summary>
             /// Initializes a new instance of the <see cref="AllowedTypeValidator"/> class.
             /// </summary>
-            public AllowedTypeValidator(ILocalizedTextService localizedTextService, IMediaTypeService mediaTypeService, IMediaService mediaService)
+            public AllowedTypeValidator(ILocalizedTextService localizedTextService, IMediaTypeService mediaTypeService, IMediaService mediaService, AppCaches appCaches)
             {
                 _localizedTextService = localizedTextService;
                 _mediaTypeService = mediaTypeService;
                 _mediaService = mediaService;
+                _appCaches = appCaches;
             }
 
             /// <inheritdoc/>
@@ -452,9 +457,20 @@ public IEnumerable<ValidationResult> Validate(
 
                 foreach (var typeAlias in distinctTypeAliases)
                 {
-                    IMediaType? type = _mediaTypeService.Get(typeAlias);
+                    // Cache media type lookups since the same media type is likely to be used multiple times in validation,
+                    // particularly if we have multiple languages and blocks.
+                    var cacheKey = string.Format(MediaTypeCacheKeyFormat, typeAlias);
+                    string? typeKey = _appCaches.RequestCache.GetCacheItem<string?>(cacheKey);
+                    if (typeKey is null)
+                    {
+                        typeKey = _mediaTypeService.Get(typeAlias)?.Key.ToString();
+                        if (typeKey is not null)
+                        {
+                            _appCaches.RequestCache.Set(cacheKey, typeKey);
+                        }
+                    }
 
-                    if (type is null || allowedTypes.Contains(type.Key.ToString()) is false)
+                    if (typeKey is null || allowedTypes.Contains(typeKey) is false)
                     {
                         return
                         [
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/PropertyEditors/DataValueReferenceFactoryCollectionTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/PropertyEditors/DataValueReferenceFactoryCollectionTests.cs
index 953301f74f50..a5fed60fec25 100644
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/PropertyEditors/DataValueReferenceFactoryCollectionTests.cs
+++ b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/PropertyEditors/DataValueReferenceFactoryCollectionTests.cs
@@ -41,7 +41,8 @@ public class DataValueReferenceFactoryCollectionTests
                  Mock.Of<IDataTypeConfigurationCache>(),
                  Mock.Of<ILocalizedTextService>(),
                  Mock.Of<IMediaTypeService>(),
-                 Mock.Of<IMediaNavigationQueryService>()));
+                 Mock.Of<IMediaNavigationQueryService>(),
+                 AppCaches.Disabled));
 
     private IIOHelper IOHelper { get; } = Mock.Of<IIOHelper>();
 
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/PropertyEditors/MediaPicker3ValueEditorValidationTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/PropertyEditors/MediaPicker3ValueEditorValidationTests.cs
index 6816b1761504..8bd7f3b18790 100644
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/PropertyEditors/MediaPicker3ValueEditorValidationTests.cs
+++ b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/PropertyEditors/MediaPicker3ValueEditorValidationTests.cs
@@ -218,7 +218,8 @@ private static (MediaPicker3PropertyEditor.MediaPicker3PropertyValueEditor Value
             Mock.Of<IDataTypeConfigurationCache>(),
             Mock.Of<ILocalizedTextService>(),
             mediaTypeServiceMock.Object,
-            mediaNavigationQueryServiceMock.Object)
+            mediaNavigationQueryServiceMock.Object,
+            AppCaches.Disabled)
         {
             ConfigurationObject = new MediaPicker3Configuration()
         };

From dab9df3f1089f8144614bc1f5465b91fff84c0c4 Mon Sep 17 00:00:00 2001
From: Andy Butland <abutland73@gmail.com>
Date: Wed, 8 Oct 2025 07:59:10 +0200
Subject: [PATCH 006/155] Bumped version to 16.3.0-rc4.

---
 version.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/version.json b/version.json
index cf259974301b..cd1e47b49d76 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": "16.3.0-rc3",
+  "version": "16.3.0-rc4",
   "assemblyVersion": {
     "precision": "build"
   },

From d6ce8d91a9370cd70483182a5c8f830b6afcbf2b Mon Sep 17 00:00:00 2001
From: Engiber Lozada <89547469+engijlr@users.noreply.github.com>
Date: Wed, 8 Oct 2025 20:24:58 +0200
Subject: [PATCH 007/155] PropertyType workspace: layout & labeling adjustments
 (#20131)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Property workspace update

* Fixed error with updating the properties

* Unused variable

* Added data-mark to description textarea

* make select 100% width

* tiny appearance-option style adjustments

* Make placeholder property inside the input-with-alias optional

* Moving variations and member type option to their own boxes

---------

Co-authored-by: Mads Rasmussen <madsr@hey.com>
Co-authored-by: Niels Lyngsø <nsl@umbraco.dk>
Co-authored-by: Niels Lyngsø <niels.lyngso@gmail.com>
---
 .../src/assets/lang/en.ts                     |   4 +
 .../src/assets/lang/es.ts                     |   9 +
 ...roperty-workspace-view-settings.element.ts | 389 ++++++++----------
 .../input-with-alias.element.ts               |   7 +-
 .../property-layout.element.ts                |   6 +-
 .../package-lock.json                         |  52 +--
 .../Umbraco.Tests.AcceptanceTest/package.json |   4 +-
 .../Content/ContentWithImageCropper.spec.ts   |   3 +-
 .../Settings/PartialView/PartialView.spec.ts  |   3 +-
 9 files changed, 224 insertions(+), 253 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/assets/lang/en.ts b/src/Umbraco.Web.UI.Client/src/assets/lang/en.ts
index 9d1074a2d5d6..e134a06692b7 100644
--- a/src/Umbraco.Web.UI.Client/src/assets/lang/en.ts
+++ b/src/Umbraco.Web.UI.Client/src/assets/lang/en.ts
@@ -849,6 +849,7 @@ export default {
 		delete: 'Delete',
 		deleted: 'Deleted',
 		deleting: 'Deleting...',
+		description: 'Description',
 		design: 'Design',
 		details: 'Details',
 		dictionary: 'Dictionary',
@@ -923,6 +924,7 @@ export default {
 		pleasewait: 'One moment please...',
 		previous: 'Previous',
 		properties: 'Properties',
+		propertyEditor: 'Property editor',
 		readMore: 'Read more',
 		rebuild: 'Rebuild',
 		reciept: 'Email to receive form data',
@@ -2197,9 +2199,11 @@ export default {
 		validateAsEmail: 'Validate as an email address',
 		validateAsNumber: 'Validate as a number',
 		validateAsUrl: 'Validate as a URL',
+		validationPattern: 'Validation pattern',
 		enterCustomValidation: '...or enter a custom validation',
 		fieldIsMandatory: 'Field is mandatory',
 		mandatoryMessage: 'Enter a custom validation error message (optional)',
+		mandatoryMessageLabel: 'Feedback message',
 		validationRegExp: 'Enter a regular expression',
 		validationRegExpMessage: 'Enter a custom validation error message (optional)',
 		minCount: 'You need to add at least',
diff --git a/src/Umbraco.Web.UI.Client/src/assets/lang/es.ts b/src/Umbraco.Web.UI.Client/src/assets/lang/es.ts
index 581c8b1a7c2b..06c9716958f9 100644
--- a/src/Umbraco.Web.UI.Client/src/assets/lang/es.ts
+++ b/src/Umbraco.Web.UI.Client/src/assets/lang/es.ts
@@ -481,6 +481,7 @@ export default {
 		deleted: 'Borrado',
 		deleting: 'Borrando...',
 		design: 'Diseño',
+		description: 'Descripción',
 		dictionary: 'Diccionario',
 		dimensions: 'Dimensiones',
 		dividerPosition: (value: string | number) => `Divisor en ${value}%`,
@@ -525,6 +526,7 @@ export default {
 		off: 'Desactivado',
 		ok: 'OK',
 		open: 'Abrir',
+		options: 'Opciones',
 		on: 'Activado',
 		or: 'o',
 		orderBy: 'Ordenar por',
@@ -533,6 +535,7 @@ export default {
 		pleasewait: 'Un momento por favor...',
 		previous: 'Anterior',
 		properties: 'Propiedades',
+		propertyEditor: 'Editor de propiedades',
 		reciept: 'Mail para recibir los datos del formulario',
 		recycleBin: 'Papelera',
 		recycleBinEmpty: 'Tu papelera está vacía',
@@ -1153,6 +1156,9 @@ export default {
 		memberCanEdit: 'Miembro puede editar',
 		showOnMemberProfile: 'Mostrar en perfil de miembro',
 		tabHasNoSortOrder: 'pestaña no tiene orden',
+		displaySettingsHeadline: 'Apariencia',
+		displaySettingsLabelOnLeft: 'Etiqueta a la izquierda',
+		displaySettingsLabelOnTop: 'Etiqueta arriba (ancho completo)',
 	},
 	languages: {
 		addLanguage: 'Agregar idioma',
@@ -1377,9 +1383,12 @@ export default {
 		validateAsEmail: 'Validar como email',
 		validateAsNumber: 'Validar como número',
 		validateAsUrl: 'Validar como URL',
+		validationPattern: 'Patrón de validación',
 		enterCustomValidation: '...o introduce tu propia validación',
+		customValidation: 'Validación personalizada',
 		fieldIsMandatory: 'Campo obligatorio',
 		validationRegExp: 'Introduce una expresión regular',
+		mandatoryMessageLabel: 'Mensaje de validación',
 		minCount: 'Necesitas añadir al menos',
 		maxCount: 'Sólo puedes tener',
 		items: 'elementos',
diff --git a/src/Umbraco.Web.UI.Client/src/packages/content/property-type/workspace/views/settings/property-workspace-view-settings.element.ts b/src/Umbraco.Web.UI.Client/src/packages/content/property-type/workspace/views/settings/property-workspace-view-settings.element.ts
index b12707f699a3..b7bd7940791f 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/content/property-type/workspace/views/settings/property-workspace-view-settings.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/content/property-type/workspace/views/settings/property-workspace-view-settings.element.ts
@@ -1,18 +1,13 @@
 import { UMB_PROPERTY_TYPE_WORKSPACE_CONTEXT } from '../../../index.js';
-import { css, html, customElement, state, nothing, query } from '@umbraco-cms/backoffice/external/lit';
-import { generateAlias } from '@umbraco-cms/backoffice/utils';
-import { umbBindToValidation } from '@umbraco-cms/backoffice/validation';
+import { css, html, customElement, state, nothing } from '@umbraco-cms/backoffice/external/lit';
+import { UMB_VALIDATION_EMPTY_LOCALIZATION_KEY, umbBindToValidation } from '@umbraco-cms/backoffice/validation';
 import { UmbLitElement, umbFocus } from '@umbraco-cms/backoffice/lit-element';
 import { UmbTextStyles } from '@umbraco-cms/backoffice/style';
 import { UMB_CONTENT_TYPE_WORKSPACE_CONTEXT } from '@umbraco-cms/backoffice/content-type';
 import type { UmbPropertyTypeScaffoldModel } from '@umbraco-cms/backoffice/content-type';
 import type { UmbWorkspaceViewElement } from '@umbraco-cms/backoffice/workspace';
-import type {
-	UUIBooleanInputEvent,
-	UUIInputEvent,
-	UUIInputLockElement,
-	UUISelectEvent,
-} from '@umbraco-cms/backoffice/external/uui';
+import type { UUIBooleanInputEvent, UUIInputEvent, UUISelectEvent } from '@umbraco-cms/backoffice/external/uui';
+import type { UmbInputWithAliasElement } from '@umbraco-cms/backoffice/components';
 
 @customElement('umb-property-type-workspace-view-settings')
 export class UmbPropertyTypeWorkspaceViewSettingsElement extends UmbLitElement implements UmbWorkspaceViewElement {
@@ -46,40 +41,25 @@ export class UmbPropertyTypeWorkspaceViewSettingsElement extends UmbLitElement i
 	@state()
 	private _data?: UmbPropertyTypeScaffoldModel;
 
-	@state()
-	private _aliasLocked = true;
-
-	@state()
-	private _autoGenerateAlias = true;
-
 	@state()
 	private _contentTypeVariesByCulture?: boolean;
 
 	@state()
 	private _contentTypeVariesBySegment?: boolean;
 
-	@query('#alias-input')
-	private _aliasInput!: UUIInputLockElement;
-
 	@state()
 	private _entityType?: string;
 
+	@state()
+	private _isNew?: boolean;
+
 	constructor() {
 		super();
 
 		this.consumeContext(UMB_PROPERTY_TYPE_WORKSPACE_CONTEXT, (instance) => {
 			this.#context = instance;
-			this.observe(
-				instance?.data,
-				(data) => {
-					if (!this._data && data?.alias) {
-						// Initial. Loading existing property
-						this._autoGenerateAlias = false;
-					}
-					this._data = data;
-				},
-				'observeData',
-			);
+			this.observe(instance?.data, (data) => (this._data = data), 'observeData');
+			this.observe(instance?.isNew, (isNew) => (this._isNew = isNew), '_observeIsNew');
 		});
 
 		this.consumeContext(UMB_CONTENT_TYPE_WORKSPACE_CONTEXT, (instance) => {
@@ -99,19 +79,6 @@ export class UmbPropertyTypeWorkspaceViewSettingsElement extends UmbLitElement i
 		this.#context?.updateData(partialValue);
 	}
 
-	#onNameChange(event: UUIInputEvent) {
-		this.updateValue({ name: event.target.value.toString() });
-		if (this._aliasLocked && this._autoGenerateAlias) {
-			this.updateValue({ alias: generateAlias(this._data?.name ?? '') });
-		}
-	}
-
-	#onAliasChange() {
-		// TODO: Why can I not get the correct value via event? Is it an issue in uui library too?
-		const alias = generateAlias(this._aliasInput.value.toString());
-		this.updateValue({ alias });
-	}
-
 	#onDescriptionChange(event: UUIInputEvent) {
 		this.updateValue({ description: event.target.value.toString() });
 	}
@@ -166,16 +133,6 @@ export class UmbPropertyTypeWorkspaceViewSettingsElement extends UmbLitElement i
 		this.updateValue({ isSensitive: e.target.checked });
 	}
 
-	#onToggleAliasLock() {
-		this._aliasLocked = !this._aliasLocked;
-		if (this._aliasLocked && !this._data?.alias) {
-			// Reenable auto-generate if alias is empty and locked.
-			this._autoGenerateAlias = true;
-		} else {
-			this._autoGenerateAlias = false;
-		}
-	}
-
 	#onCustomValidationChange(event: UUISelectEvent) {
 		const value = event.target.value.toString();
 		const regEx = value !== '!NOVALIDATION!' ? value : null;
@@ -217,134 +174,137 @@ export class UmbPropertyTypeWorkspaceViewSettingsElement extends UmbLitElement i
 		this.updateValue({ variesBySegment: !sharedAcrossSegments });
 	}
 
+	#onNameAndAliasChange(event: InputEvent & { target: UmbInputWithAliasElement }) {
+		const name = event.target.value ?? '';
+		const alias = event.target.alias ?? '';
+		this.updateValue({ name, alias });
+	}
+
 	override render() {
 		if (!this._data) return;
 		return html`
 			<uui-box class="uui-text">
-				<div class="container">
-					<umb-form-validation-message>
-						<uui-input
-							id="name-input"
-							data-mark="input:entity-name"
-							name="name"
-							label=${this.localize.term('placeholders_entername')}
-							placeholder=${this.localize.term('placeholders_entername')}
-							.value=${this._data?.name}
-							@input=${this.#onNameChange}
-							required
-							${umbBindToValidation(this, '$.name')}
-							${umbFocus()}>
-							<!-- TODO: validation for bad characters -->
-						</uui-input>
-					</umb-form-validation-message>
-					<umb-form-validation-message>
-						<uui-input-lock
-							id="alias-input"
-							name="alias"
-							label=${this.localize.term('placeholders_enterAlias')}
-							placeholder=${this.localize.term('placeholders_enterAlias')}
-							.value=${this._data?.alias}
-							?locked=${this._aliasLocked}
-							required
-							${umbBindToValidation(this, '$.alias')}
-							@input=${this.#onAliasChange}
-							@lock-change=${this.#onToggleAliasLock}>
-						</uui-input-lock>
-					</umb-form-validation-message>
+				<umb-property-layout label=${this.localize.term('general_name')} orientation="vertical" mandatory>
+					<umb-input-with-alias
+						id="name-input"
+						data-mark="input:entity-name"
+						name="name"
+						slot="editor"
+						required
+						.value=${this._data?.name ?? ''}
+						.alias=${this._data?.alias ?? ''}
+						?auto-generate-alias=${this._isNew}
+						@change=${this.#onNameAndAliasChange}
+						${umbBindToValidation(this, '$.name', this._data?.name)}
+						${umbFocus()}>
+					</umb-input-with-alias>
+				</umb-property-layout>
+
+				<umb-property-layout label=${this.localize.term('general_description')} orientation="vertical">
 					<uui-textarea
 						id="description-input"
+						data-mark="input:entity-description"
+						slot="editor"
 						name="description"
 						@input=${this.#onDescriptionChange}
-						label=${this.localize.term('placeholders_enterDescription')}
-						placeholder=${this.localize.term('placeholders_enterDescription')}
 						.value=${this._data?.description}
 						auto-height></uui-textarea>
-				</div>
-				<umb-form-validation-message>
+				</umb-property-layout>
+
+				<umb-property-layout label=${this.localize.term('general_propertyEditor')} orientation="vertical" mandatory>
 					<umb-data-type-flow-input
+						slot="editor"
+						id="data-type-input"
 						.value=${this._data?.dataType?.unique ?? ''}
 						@change=${this.#onDataTypeIdChange}
 						required
 						${umbBindToValidation(this, '$.dataType.unique')}></umb-data-type-flow-input>
-				</umb-form-validation-message>
-				<hr />
-				<div class="container">
-					<b><umb-localize key="validation_validation">Validation</umb-localize></b>
-					${this.#renderMandatory()}
-					<p style="margin-bottom: 0">
-						<umb-localize key="validation_customValidation">Custom validation</umb-localize>
-					</p>
-					${this.#renderCustomValidation()}
-				</div>
-				${this.#renderVariationControls()}
-				<umb-property-layout label="#contentTypeEditor_displaySettingsHeadline" orientation="vertical">
-					<div id="appearances" slot="editor">${this.#renderAlignLeftIcon()} ${this.#renderAlignTopIcon()}</div>
 				</umb-property-layout>
+			</uui-box>
+
+			<uui-box class="uui-text">
+				<umb-localize key="validation_validation" slot="headline">Validation</umb-localize>
+				${this.#renderMandatory()} ${this.#renderCustomValidation()}</uui-box
+			>
 
-				${this.#renderMemberTypeOptions()}
+			${this.#renderVariationControls()}
+
+			<uui-box class="uui-text">
+				<umb-localize key="contentTypeEditor_displaySettingsHeadline" slot="headline">Appearance</umb-localize>
+				<umb-property-layout orientation="vertical">
+					<div id="appearances" slot="editor">${this.#renderAlignLeftIcon()} ${this.#renderAlignTopIcon()}</div>
+				</umb-property-layout>
 			</uui-box>
+
+			${this.#renderMemberTypeOptions()}
 		`;
 	}
 
 	#renderMemberTypeOptions() {
 		if (this._entityType !== 'member-type') return nothing;
-		return html` <hr />
-			<div class="container">
-				<b style="margin-bottom: var(--uui-size-space-3)">
-					<umb-localize key="general_options">Options</umb-localize>
-				</b>
-				<div class="options">
+		return html` <uui-box class="uui-text">
+			<div class="options">
+				<umb-property-layout orientation="vertical">
 					<uui-toggle
+						slot="editor"
 						?checked=${this._data?.visibility?.memberCanView}
 						@change=${this.#onToggleShowOnMemberProfile}
 						label=${this.localize.term('contentTypeEditor_showOnMemberProfile')}></uui-toggle>
-					<small>
+					<small slot="description">
 						<umb-localize key="contentTypeEditor_showOnMemberProfileDescription">
 							Allow this property value to be displayed on the member profile page
 						</umb-localize>
 					</small>
+				</umb-property-layout>
 
+				<umb-property-layout orientation="vertical">
 					<uui-toggle
+						slot="editor"
 						?checked=${this._data?.visibility?.memberCanEdit}
 						@change=${this.#onToggleMemberCanEdit}
 						label=${this.localize.term('contentTypeEditor_memberCanEdit')}></uui-toggle>
-					<small>
+					<small slot="description">
 						<umb-localize key="contentTypeEditor_memberCanEditDescription">
 							Allow this property value to be edited by the member on their profile page
 						</umb-localize>
 					</small>
+				</umb-property-layout>
 
+				<umb-property-layout orientation="vertical">
 					<uui-toggle
+						slot="editor"
 						?checked=${this._data?.isSensitive}
 						@change=${this.#onToggleIsSensitiveData}
 						label=${this.localize.term('contentTypeEditor_isSensitiveData')}></uui-toggle>
-					<small>
+					<small slot="description">
 						<umb-localize key="contentTypeEditor_isSensitiveDataDescription">
 							Hide this property value from content editors that don't have access to view sensitive information
 						</umb-localize>
 					</small>
-				</div>
-			</div>`;
+				</umb-property-layout>
+			</div>
+		</uui-box>`;
 	}
 
 	#renderAlignLeftIcon() {
-		return html`<button
-			type="button"
-			@click=${this.#setAppearanceNormal}
-			class="appearance left ${this._data?.appearance?.labelOnTop ? '' : 'selected'}">
-			<svg width="200" height="48" viewBox="0 0 200 60" fill="none" xmlns="http://www.w3.org/2000/svg">
-				<rect width="94" height="14" rx="6" fill="currentColor" />
-				<rect y="22" width="64" height="9" rx="4" fill="currentColor" fill-opacity="0.4" />
-				<rect x="106" width="94" height="60" rx="5" fill="currentColor" fill-opacity="0.4" />
-			</svg>
-			<label class="appearance-label">
+		return html`<div class="appearance-option">
+			<button
+				type="button"
+				@click=${this.#setAppearanceNormal}
+				class="appearance left ${this._data?.appearance?.labelOnTop ? '' : 'selected'}">
+				<svg width="200" height="48" viewBox="0 0 200 60" fill="none" xmlns="http://www.w3.org/2000/svg">
+					<rect width="94" height="14" rx="6" fill="currentColor" />
+					<rect y="22" width="64" height="9" rx="4" fill="currentColor" fill-opacity="0.4" />
+					<rect x="106" width="94" height="60" rx="5" stroke="currentColor" fill-opacity="0.4" />
+				</svg></button
+			><label class="appearance-label">
 				<umb-localize key="contentTypeEditor_displaySettingsLabelOnLeft">Label to the left</umb-localize>
 			</label>
-		</button>`;
+		</div>`;
 	}
 
 	#renderAlignTopIcon() {
-		return html`
+		return html`<div class="appearance-option">
 			<button
 				type="button"
 				@click=${this.#setAppearanceTop}
@@ -352,71 +312,81 @@ export class UmbPropertyTypeWorkspaceViewSettingsElement extends UmbLitElement i
 				<svg width="140" height="48" viewBox="0 0 140 60" fill="none" xmlns="http://www.w3.org/2000/svg">
 					<rect width="90" height="14" rx="6" fill="currentColor" />
 					<rect y="22" width="64" height="9" rx="4" fill="currentColor" fill-opacity="0.4" />
-					<rect y="42" width="140" height="36" rx="5" fill="currentColor" fill-opacity="0.4" />
-				</svg>
-				<label class="appearance-label">
-					<umb-localize key="contentTypeEditor_displaySettingsLabelOnTop">Label above (full-width)</umb-localize>
-				</label>
-			</button>
-		`;
+					<rect y="42" width="140" height="36" rx="5" stroke="currentColor" fill-opacity="0.4" />
+				</svg></button
+			><label class="appearance-label">
+				<umb-localize key="contentTypeEditor_displaySettingsLabelOnTop">Label above (full-width)</umb-localize>
+			</label>
+		</div> `;
 	}
 
 	#renderMandatory() {
-		return html`<div style="display: flex; justify-content: space-between">
-				<label for="mandatory">
-					<umb-localize key="validation_fieldIsMandatory">Field is mandatory</umb-localize>
-				</label>
+		return html`<umb-property-layout orientation="vertical">
 				<uui-toggle
 					@change=${this.#onMandatoryChange}
 					id="mandatory"
 					.checked=${this._data?.validation?.mandatory ?? false}
-					slot="editor"></uui-toggle>
-			</div>
+					slot="editor"
+					><umb-localize key="validation_fieldIsMandatory">Field is mandatory</umb-localize></uui-toggle
+				></umb-property-layout
+			>
+
 			${this._data?.validation?.mandatory
-				? html`<uui-input
-						name="mandatory-message"
-						value=${this._data.validation?.mandatoryMessage ?? ''}
-						@change=${this.#onMandatoryMessageChange}
-						style="margin-top: var(--uui-size-space-1)"
-						id="mandatory-message"
-						placeholder=${this.localize.term('validation_mandatoryMessage')}
-						label=${this.localize.term('validation_mandatoryMessage')}></uui-input>`
-				: ''}`;
+				? html`<umb-property-layout label="#validation_mandatoryMessageLabel" orientation="vertical"
+						><uui-input
+							name="mandatory-message"
+							slot="editor"
+							value=${this._data.validation?.mandatoryMessage ?? ''}
+							@change=${this.#onMandatoryMessageChange}
+							style="margin-top: var(--uui-size-space-1)"
+							id="mandatory-message"
+							placeholder=${this.localize.string(UMB_VALIDATION_EMPTY_LOCALIZATION_KEY)}
+							label=${this.localize.term('validation_mandatoryMessage')}></uui-input
+					></umb-property-layout>`
+				: ''} `;
 	}
 
 	#renderCustomValidation() {
-		return html`<uui-select
-				style="margin-top: var(--uui-size-space-1)"
-				@change=${this.#onCustomValidationChange}
-				.options=${this._customValidationOptions}></uui-select>
+		return html`<umb-property-layout orientation="vertical" label=${this.localize.term('validation_customValidation')}
+				><uui-select
+					slot="editor"
+					@change=${this.#onCustomValidationChange}
+					.options=${this._customValidationOptions}></uui-select
+			></umb-property-layout>
 
 			${this._data?.validation?.regEx !== null
-				? html`
-						<uui-input
-							name="pattern"
-							style="margin-bottom: var(--uui-size-space-1); margin-top: var(--uui-size-space-5);"
-							@change=${this.#onValidationRegExChange}
-							placeholder=${this.localize.term('validation_validationRegExp')}
-							label=${this.localize.term('validation_validationRegExp')}
-							.value=${this._data?.validation?.regEx ?? ''}></uui-input>
-						<uui-textarea
-							name="pattern-message"
-							@change=${this.#onValidationMessageChange}
-							placeholder=${this.localize.term('validation_validationRegExpMessage')}
-							label=${this.localize.term('validation_validationRegExpMessage')}
-							.value=${this._data?.validation?.regExMessage ?? ''}></uui-textarea>
-					`
-				: nothing} `;
+				? html`<umb-property-layout orientation="vertical" label=${this.localize.term('validation_validationPattern')}>
+							<uui-input
+								name="pattern"
+								slot="editor"
+								@change=${this.#onValidationRegExChange}
+								placeholder=${this.localize.term('validation_validationRegExp')}
+								label=${this.localize.term('validation_validationRegExp')}
+								.value=${this._data?.validation?.regEx ?? ''}></uui-input
+						></umb-property-layout>
+						<umb-property-layout label="#validation_mandatoryMessageLabel" orientation="vertical"
+							><uui-textarea
+								name="pattern-message"
+								slot="editor"
+								@change=${this.#onValidationMessageChange}
+								placeholder=${this.localize.term('validation_invalidPattern')}
+								label=${this.localize.term('validation_validationRegExpMessage')}
+								.value=${this._data?.validation?.regExMessage ?? ''}></uui-textarea
+						></umb-property-layout> `
+				: nothing}`;
 	}
 
 	#renderVariationControls() {
 		return this._contentTypeVariesByCulture || this._contentTypeVariesBySegment
-			? html` <umb-property-layout label="#contentTypeEditor_variantsHeading" orientation="vertical">
-					<umb-stack slot="editor" look="compact">
-						${this._contentTypeVariesByCulture ? this.#renderVaryByCulture() : nothing}
-						${this._contentTypeVariesBySegment ? this.#renderVaryBySegment() : nothing}
-					</umb-stack>
-				</umb-property-layout>`
+			? html` <uui-box class="uui-text">
+					<umb-localize key="contentTypeEditor_variantsHeading" slot="headline">Variation</umb-localize
+					><umb-property-layout orientation="vertical">
+						<umb-stack slot="editor" look="compact">
+							${this._contentTypeVariesByCulture ? this.#renderVaryByCulture() : nothing}
+							${this._contentTypeVariesBySegment ? this.#renderVaryBySegment() : nothing}
+						</umb-stack>
+					</umb-property-layout></uui-box
+				>`
 			: '';
 	}
 
@@ -426,7 +396,7 @@ export class UmbPropertyTypeWorkspaceViewSettingsElement extends UmbLitElement i
 				<uui-toggle
 					@change=${this.#onShareAcrossCulturesChange}
 					.checked=${!(this._data?.variesByCulture ?? false)}
-					label="Shared across cultures"></uui-toggle>
+					label=${this.localize.term('contentTypeEditor_cultureInvariantLabel')}></uui-toggle>
 			</div>
 		`;
 	}
@@ -437,7 +407,7 @@ export class UmbPropertyTypeWorkspaceViewSettingsElement extends UmbLitElement i
 				<uui-toggle
 					@change=${this.#onShareAcrossSegmentsChange}
 					.checked=${!(this._data?.variesBySegment ?? false)}
-					label="Shared across segments"></uui-toggle>
+					label=${this.localize.term('contentTypeEditor_segmentInvariantLabel')}></uui-toggle>
 			</div>
 		`;
 	}
@@ -446,40 +416,31 @@ export class UmbPropertyTypeWorkspaceViewSettingsElement extends UmbLitElement i
 		UmbTextStyles,
 		css`
 			:host {
-				display: block;
+				display: flex;
+				flex-direction: column;
+				gap: var(--uui-size-layout-1);
 				padding: var(--uui-size-layout-1);
 			}
-			#alias-input,
-			#label-input,
-			#description-input {
-				width: 100%;
+			umb-property-layout[orientation='vertical'] {
+				padding: var(--uui-size-space-2) 0;
 			}
 
-			#alias-input {
-				border-color: transparent;
-				background: var(--uui-color-surface);
+			umb-property-layout:first-of-type {
+				padding-top: 0;
 			}
-
-			#label-input {
-				font-weight: bold; /* TODO: UUI Input does not support bold text yet */
-				--uui-input-border-color: transparent;
-			}
-			#label-input input {
-				font-weight: bold;
-				--uui-input-border-color: transparent;
+			umb-property-layout:last-of-type {
+				padding-bottom: 0;
 			}
 
-			#description-input {
-				--uui-textarea-border-color: transparent;
-				font-weight: 0.5rem; /* TODO: Cant change font size of UUI textarea yet */
+			uui-select {
+				width: 100%;
 			}
 
 			#appearances {
 				display: flex;
-				gap: var(--uui-size-layout-1);
-				max-width: 350px;
-				margin: 0 auto;
+				gap: var(--uui-size-space-4);
 			}
+
 			.appearance {
 				position: relative;
 				display: flex;
@@ -493,37 +454,44 @@ export class UmbPropertyTypeWorkspaceViewSettingsElement extends UmbLitElement i
 				justify-content: space-between;
 				gap: var(--uui-size-space-3);
 			}
+
+			.appearance-option {
+				display: flex;
+				width: 100%;
+				flex-direction: column;
+				gap: var(--uui-size-space-2);
+			}
+
 			.appearance-label {
 				font-size: 0.8rem;
 				line-height: 1;
-				font-weight: bold;
+				text-align: center;
 				pointer-events: none;
 			}
-			.appearance.left {
-				flex-grow: 1;
-			}
-			.appearance.top {
-				flex-shrink: 1;
-			}
+
 			.appearance svg {
 				display: flex;
 				width: 100%;
 				color: var(--uui-color-text);
 			}
+
 			.appearance:not(.selected):hover {
 				border-color: var(--uui-color-border-emphasis);
 				cursor: pointer;
 				opacity: 1;
 			}
+
 			.appearance.selected {
 				background-color: var(--uui-color-surface);
 				border-color: var(--uui-color-selected);
 				color: var(--uui-color-selected);
 				opacity: 1;
 			}
+
 			.appearance.selected svg {
 				color: var(--uui-color-selected);
 			}
+
 			.appearance.selected::after {
 				content: '';
 				position: absolute;
@@ -532,30 +500,19 @@ export class UmbPropertyTypeWorkspaceViewSettingsElement extends UmbLitElement i
 				opacity: 0.1;
 				background-color: var(--uui-color-selected);
 			}
-			hr {
-				border: none;
-				border-top: 1px solid var(--uui-color-divider);
-				margin-top: var(--uui-size-space-6);
-				margin-bottom: var(--uui-size-space-5);
-			}
+
 			uui-input {
 				width: 100%;
 			}
+
 			uui-input:focus-within {
 				z-index: 1;
 			}
-			uui-input-lock:focus-within {
-				z-index: 1;
-			}
+
 			.container {
 				display: flex;
 				flex-direction: column;
 			}
-			uui-form,
-			form {
-				display: block;
-				height: 100%;
-			}
 		`,
 	];
 }
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/components/input-with-alias/input-with-alias.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/components/input-with-alias/input-with-alias.element.ts
index 4e8094719bc7..50818ac19c38 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/components/input-with-alias/input-with-alias.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/components/input-with-alias/input-with-alias.element.ts
@@ -1,4 +1,4 @@
-import { css, customElement, html, property, state } from '@umbraco-cms/backoffice/external/lit';
+import { css, customElement, html, ifDefined, property, state } from '@umbraco-cms/backoffice/external/lit';
 import { generateAlias } from '@umbraco-cms/backoffice/utils';
 import { UmbChangeEvent } from '@umbraco-cms/backoffice/event';
 import { UMB_VALIDATION_EMPTY_LOCALIZATION_KEY, UmbFormControlMixin } from '@umbraco-cms/backoffice/validation';
@@ -13,6 +13,9 @@ export class UmbInputWithAliasElement extends UmbFormControlMixin<string, typeof
 	@property({ type: String })
 	label: string = '';
 
+	@property({ type: String })
+	placeholder?: string;
+
 	@property({ type: String, reflect: false })
 	alias = '';
 
@@ -101,7 +104,7 @@ export class UmbInputWithAliasElement extends UmbFormControlMixin<string, typeof
 		return html`
 			<uui-input
 				id="name"
-				placeholder=${nameLabel}
+				placeholder=${ifDefined(this.placeholder)}
 				label=${nameLabel}
 				.value=${this.value}
 				@input=${this.#onNameChange}
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property/components/property-layout/property-layout.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/property/components/property-layout/property-layout.element.ts
index 772c20852069..9d7828b01826 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/property/components/property-layout/property-layout.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/property/components/property-layout/property-layout.element.ts
@@ -104,17 +104,13 @@ export class UmbPropertyLayoutElement extends UmbLitElement {
 				display: grid;
 				grid-template-columns: 200px minmax(0, 1fr);
 				column-gap: var(--uui-size-layout-2);
-				border-bottom: 1px solid var(--uui-color-divider);
 				padding: var(--uui-size-layout-1) 0;
 			}
 
-			:host(:last-of-type) {
-				border-bottom: none;
-			}
-
 			:host > div {
 				grid-column: span 2;
 			}
+
 			/*@container (width > 600px) {*/
 			:host(:not([orientation='vertical'])) > div {
 				grid-column: span 1;
diff --git a/tests/Umbraco.Tests.AcceptanceTest/package-lock.json b/tests/Umbraco.Tests.AcceptanceTest/package-lock.json
index b1e7b97b7a08..d6c157d75fd8 100644
--- a/tests/Umbraco.Tests.AcceptanceTest/package-lock.json
+++ b/tests/Umbraco.Tests.AcceptanceTest/package-lock.json
@@ -8,13 +8,13 @@
       "hasInstallScript": true,
       "dependencies": {
         "@umbraco/json-models-builders": "^2.0.40",
-        "@umbraco/playwright-testhelpers": "^16.0.50",
+        "@umbraco/playwright-testhelpers": "^17.0.0-beta.1",
         "camelize": "^1.0.0",
         "dotenv": "^16.3.1",
         "node-fetch": "^2.6.7"
       },
       "devDependencies": {
-        "@playwright/test": "^1.50",
+        "@playwright/test": "1.50",
         "@types/node": "^20.9.0",
         "prompt": "^1.2.0",
         "tslib": "^2.4.0",
@@ -32,13 +32,13 @@
       }
     },
     "node_modules/@playwright/test": {
-      "version": "1.50.0",
-      "resolved": "https://registry.npmjs.org/@playwright/test/-/test-1.50.0.tgz",
-      "integrity": "sha512-ZGNXbt+d65EGjBORQHuYKj+XhCewlwpnSd/EDuLPZGSiEWmgOJB5RmMCCYGy5aMfTs9wx61RivfDKi8H/hcMvw==",
+      "version": "1.50.1",
+      "resolved": "https://registry.npmjs.org/@playwright/test/-/test-1.50.1.tgz",
+      "integrity": "sha512-Jii3aBg+CEDpgnuDxEp/h7BimHcUTDlpEtce89xEumlJ5ef2hqepZ+PWp1DDpYC/VO9fmWVI1IlEaoI5fK9FXQ==",
       "dev": true,
       "license": "Apache-2.0",
       "dependencies": {
-        "playwright": "1.50.0"
+        "playwright": "1.50.1"
       },
       "bin": {
         "playwright": "cli.js"
@@ -48,13 +48,13 @@
       }
     },
     "node_modules/@types/node": {
-      "version": "20.17.9",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-20.17.9.tgz",
-      "integrity": "sha512-0JOXkRyLanfGPE2QRCwgxhzlBAvaRdCNMcvbd7jFfpmD4eEXll7LRwy5ymJmyeZqk7Nh7eD2LeUyQ68BbndmXw==",
+      "version": "20.19.19",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-20.19.19.tgz",
+      "integrity": "sha512-pb1Uqj5WJP7wrcbLU7Ru4QtA0+3kAXrkutGiD26wUKzSMgNNaPARTUDQmElUXp64kh3cWdou3Q0C7qwwxqSFmg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "undici-types": "~6.19.2"
+        "undici-types": "~6.21.0"
       }
     },
     "node_modules/@umbraco/json-models-builders": {
@@ -67,9 +67,9 @@
       }
     },
     "node_modules/@umbraco/playwright-testhelpers": {
-      "version": "16.0.50",
-      "resolved": "https://registry.npmjs.org/@umbraco/playwright-testhelpers/-/playwright-testhelpers-16.0.50.tgz",
-      "integrity": "sha512-2tHQUdv8lCV4O47hGMvyC+JJfG4//fSSE/gUOVfFNDEHzhU5mSZ8f9oGKob8XOv2RB7ynZFYtIIxEMZIWrGFDA==",
+      "version": "17.0.0-beta.1",
+      "resolved": "https://registry.npmjs.org/@umbraco/playwright-testhelpers/-/playwright-testhelpers-17.0.0-beta.1.tgz",
+      "integrity": "sha512-EhS4j5ARDcR3tI7ArTmLuBHW+e49qyWq3Ts8ckCXvFjkPgR3u/Z5JPOIFWUZ+rTahNZi3axs3i+dVcWWA4Fyjw==",
       "license": "MIT",
       "dependencies": {
         "@umbraco/json-models-builders": "2.0.40",
@@ -112,9 +112,9 @@
       }
     },
     "node_modules/dotenv": {
-      "version": "16.4.7",
-      "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-16.4.7.tgz",
-      "integrity": "sha512-47qPchRCykZC03FhkYAhrvwU4xDBFIj1QPqaarj6mdM/hgUzfPHcpkHJOn3mJAufFeeAxAzeGsr5X0M4k6fLZQ==",
+      "version": "16.6.1",
+      "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-16.6.1.tgz",
+      "integrity": "sha512-uBq4egWHTcTt33a72vpSG0z3HnPuIl6NqYcTrKEg2azoEyl2hpW0zqlxysq2pK9HlDIHyHyakeYaYnSAwd8bow==",
       "license": "BSD-2-Clause",
       "engines": {
         "node": ">=12"
@@ -189,13 +189,13 @@
       }
     },
     "node_modules/playwright": {
-      "version": "1.50.0",
-      "resolved": "https://registry.npmjs.org/playwright/-/playwright-1.50.0.tgz",
-      "integrity": "sha512-+GinGfGTrd2IfX1TA4N2gNmeIksSb+IAe589ZH+FlmpV3MYTx6+buChGIuDLQwrGNCw2lWibqV50fU510N7S+w==",
+      "version": "1.50.1",
+      "resolved": "https://registry.npmjs.org/playwright/-/playwright-1.50.1.tgz",
+      "integrity": "sha512-G8rwsOQJ63XG6BbKj2w5rHeavFjy5zynBA9zsJMMtBoe/Uf757oG12NXz6e6OirF7RCrTVAKFXbLmn1RbL7Qaw==",
       "dev": true,
       "license": "Apache-2.0",
       "dependencies": {
-        "playwright-core": "1.50.0"
+        "playwright-core": "1.50.1"
       },
       "bin": {
         "playwright": "cli.js"
@@ -208,9 +208,9 @@
       }
     },
     "node_modules/playwright-core": {
-      "version": "1.50.0",
-      "resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.50.0.tgz",
-      "integrity": "sha512-CXkSSlr4JaZs2tZHI40DsZUN/NIwgaUPsyLuOAaIZp2CyF2sN5MM5NJsyB188lFSSozFxQ5fPT4qM+f0tH/6wQ==",
+      "version": "1.50.1",
+      "resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.50.1.tgz",
+      "integrity": "sha512-ra9fsNWayuYumt+NiM069M6OkcRb1FZSK8bgi66AtpFoWkg2+y0bJSNmkFrWhMbEBbVKC/EruAHH3g0zmtwGmQ==",
       "dev": true,
       "license": "Apache-2.0",
       "bin": {
@@ -298,9 +298,9 @@
       }
     },
     "node_modules/undici-types": {
-      "version": "6.19.8",
-      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.19.8.tgz",
-      "integrity": "sha512-ve2KP6f/JnbPBFyobGHuerC9g1FYGn/F8n1LWTwNxCEzd6IfqTwUQcNXgEtmmQ6DlRrC1hrSrBnCZPokRrDHjw==",
+      "version": "6.21.0",
+      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.21.0.tgz",
+      "integrity": "sha512-iwDZqg0QAGrg9Rav5H4n0M64c3mkR59cJ6wQp+7C4nI0gsmExaedaYLNO44eT4AtBBwjbTiGPMlt2Md0T9H9JQ==",
       "dev": true,
       "license": "MIT"
     },
diff --git a/tests/Umbraco.Tests.AcceptanceTest/package.json b/tests/Umbraco.Tests.AcceptanceTest/package.json
index 6deebfb3fdcb..49cc458287de 100644
--- a/tests/Umbraco.Tests.AcceptanceTest/package.json
+++ b/tests/Umbraco.Tests.AcceptanceTest/package.json
@@ -14,7 +14,7 @@
     "releaseTest": "npx playwright test DefaultConfig --grep \"@release\""
   },
   "devDependencies": {
-    "@playwright/test": "^1.50",
+    "@playwright/test": "1.50",
     "@types/node": "^20.9.0",
     "prompt": "^1.2.0",
     "tslib": "^2.4.0",
@@ -22,7 +22,7 @@
   },
   "dependencies": {
     "@umbraco/json-models-builders": "^2.0.40",
-    "@umbraco/playwright-testhelpers": "^16.0.50",
+    "@umbraco/playwright-testhelpers": "^17.0.0-beta.1",
     "camelize": "^1.0.0",
     "dotenv": "^16.3.1",
     "node-fetch": "^2.6.7"
diff --git a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/ContentWithImageCropper.spec.ts b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/ContentWithImageCropper.spec.ts
index 717fc227c30f..a62f7b004e43 100644
--- a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/ContentWithImageCropper.spec.ts
+++ b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/ContentWithImageCropper.spec.ts
@@ -74,7 +74,8 @@ test('can publish content with the image cropper data type', {tag: '@smoke'}, as
   expect(contentData.values[0].value.focalPoint).toEqual(defaultFocalPoint);
 });
 
-test('can create content with the custom image cropper data type', {tag: '@smoke'}, async ({umbracoApi, umbracoUi}) => {
+// TODO: Fix flaky test
+test.fixme('can create content with the custom image cropper data type', {tag: '@smoke'}, async ({umbracoApi, umbracoUi}) => {
   // Arrange
   const customDataTypeName = 'CustomImageCropper';
   const cropAlias = 'TestCropLabel';
diff --git a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Settings/PartialView/PartialView.spec.ts b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Settings/PartialView/PartialView.spec.ts
index a4e933b59eaa..27eadd1b46bb 100644
--- a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Settings/PartialView/PartialView.spec.ts
+++ b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Settings/PartialView/PartialView.spec.ts
@@ -65,7 +65,8 @@ test('can create a partial view from snippet', async ({umbracoApi, umbracoUi}) =
   await umbracoUi.partialView.isPartialViewRootTreeItemVisible(partialViewFileName);
 });
 
-test('can rename a partial view', {tag: '@smoke'}, async ({umbracoApi, umbracoUi}) => {
+// TODO: Fix flaky test
+test.fixme('can rename a partial view', {tag: '@smoke'}, async ({umbracoApi, umbracoUi}) => {
   // Arrange
   const wrongPartialViewName = 'WrongName';
   const wrongPartialViewFileName = wrongPartialViewName + '.cshtml';

From 16132b0075391955f5e1c29d6b437c5e6fcef957 Mon Sep 17 00:00:00 2001
From: Andy Butland <abutland73@gmail.com>
Date: Thu, 9 Oct 2025 06:37:21 +0200
Subject: [PATCH 008/155] Update Umbraco version for LTS release in template

---
 templates/UmbracoProject/.template.config/template.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/UmbracoProject/.template.config/template.json b/templates/UmbracoProject/.template.config/template.json
index fe8b91ba18ea..37aa21d96685 100644
--- a/templates/UmbracoProject/.template.config/template.json
+++ b/templates/UmbracoProject/.template.config/template.json
@@ -98,7 +98,7 @@
           },
           {
             "condition": "(UmbracoRelease == 'LTS')",
-            "value": "13.10.1"
+            "value": "13.11.0"
           }
         ]
       }

From 64836e0b7af02a87e162946575807e0c4e921563 Mon Sep 17 00:00:00 2001
From: Andy Butland <abutland73@gmail.com>
Date: Thu, 9 Oct 2025 08:54:36 +0200
Subject: [PATCH 009/155] Update version from 17.0.0-rc to 17.1.0-rc

---
 version.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/version.json b/version.json
index be8cef3c1068..2ba7176858c0 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": "17.0.0-rc",
+  "version": "17.1.0-rc",
   "assemblyVersion": {
     "precision": "build"
   },

From 1fe7931d0766e032dfdefd3028c055b60cbd595d Mon Sep 17 00:00:00 2001
From: Laura Neto <12862535+lauraneto@users.noreply.github.com>
Date: Thu, 9 Oct 2025 09:41:41 +0200
Subject: [PATCH 010/155] Migrations: Adjust the `JsonBlockValueConverter` to
 handle conflicts with 'values' property (#20429)

* Adjust the `JsonBlockValueConverter` to handle conflicts with 'values' property (due to old data schema)

* Simplify code

* Add unit test to verify change.

---------

Co-authored-by: Andy Butland <abutland73@gmail.com>
---
 .../Serialization/JsonBlockValueConverter.cs  | 48 ++++++++++++++++++-
 .../JsonBlockValueConverterTests.cs           | 38 +++++++++++++++
 2 files changed, 84 insertions(+), 2 deletions(-)

diff --git a/src/Umbraco.Infrastructure/Serialization/JsonBlockValueConverter.cs b/src/Umbraco.Infrastructure/Serialization/JsonBlockValueConverter.cs
index 71624b6529b0..b29e829266fe 100644
--- a/src/Umbraco.Infrastructure/Serialization/JsonBlockValueConverter.cs
+++ b/src/Umbraco.Infrastructure/Serialization/JsonBlockValueConverter.cs
@@ -1,4 +1,5 @@
 using System.Text.Json;
+using System.Text.Json.Nodes;
 using System.Text.Json.Serialization;
 using Umbraco.Cms.Core.Models.Blocks;
 using Umbraco.Extensions;
@@ -121,7 +122,17 @@ private static Type GetLayoutItemType(Type blockValueType)
     }
 
     private List<BlockItemData> DeserializeBlockItemData(ref Utf8JsonReader reader, JsonSerializerOptions options, Type typeToConvert, string propertyName)
-        => DeserializeListOf<BlockItemData>(ref reader, options, typeToConvert, propertyName);
+    {
+        try
+        {
+            return DeserializeListOf<BlockItemData>(ref reader, options, typeToConvert, propertyName);
+        }
+        catch (JsonException ex) when (ex.Path?.EndsWith(".values") is true)
+        {
+            // If we hit a JsonException due to the "values" property conflict, attempt the fallback deserialization
+            return FallbackBlockItemDataDeserialization(ref reader, options);
+        }
+    }
 
     private List<BlockItemVariation> DeserializeBlockVariation(ref Utf8JsonReader reader, JsonSerializerOptions options, Type typeToConvert, string propertyName)
         => DeserializeListOf<BlockItemVariation>(ref reader, options, typeToConvert, propertyName);
@@ -224,5 +235,38 @@ private void DeserializeAndSetLayout(ref Utf8JsonReader reader, JsonSerializerOp
             }
         }
     }
-}
 
+    [Obsolete("Only needed to support the old data schema. Remove in V18.")]
+    private static List<BlockItemData> FallbackBlockItemDataDeserialization(ref Utf8JsonReader reader, JsonSerializerOptions options)
+    {
+        JsonArray? arrayElement = JsonSerializer.Deserialize<JsonArray>(ref reader, options);
+
+        return arrayElement?
+            .Select(itemElement => DeserializeBlockItemData(itemElement, options))
+            .OfType<BlockItemData>()
+            .ToList() ?? [];
+    }
+
+    [Obsolete("Only needed to support the old data schema. Remove in V18.")]
+    private static BlockItemData? DeserializeBlockItemData(JsonNode? jsonNode, JsonSerializerOptions options)
+    {
+        if (jsonNode is not JsonObject jsonObject || jsonObject.ContainsKey("values") is false)
+        {
+            // Nothing to be done, just deserialize as usual
+            return jsonNode.Deserialize<BlockItemData>(options);
+        }
+
+        // Handle the "values" property conflict by extracting the "values" property first and adding it to the
+        // RawPropertyValues dictionary after deserialization
+        JsonNode? values = jsonObject["values"];
+        jsonObject.Remove("values");
+
+        BlockItemData? blockItemData = jsonObject.Deserialize<BlockItemData>(options);
+        if (blockItemData is not null)
+        {
+            blockItemData.RawPropertyValues["values"] = values.Deserialize<object?>(options);
+        }
+
+        return blockItemData;
+    }
+}
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Serialization/JsonBlockValueConverterTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Serialization/JsonBlockValueConverterTests.cs
index f48c286a91e0..4d76b2ad8731 100644
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Serialization/JsonBlockValueConverterTests.cs
+++ b/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Serialization/JsonBlockValueConverterTests.cs
@@ -470,4 +470,42 @@ public void Try_Deserialize_Unknown_Block_Layout_With_Nested_Array()
         var serializer = new SystemTextJsonSerializer(new DefaultJsonSerializerEncoderFactory());
         Assert.DoesNotThrow(() => serializer.Deserialize<BlockListValue>(json));
     }
+
+    /// <summary>
+    /// Test case that verifies the fix for https://github.com/umbraco/Umbraco-CMS/issues/20409.
+    /// </summary>
+    [Test]
+    public void Can_Deserialize_BlockGrid_With_Blocks_Using_Values_As_Property_Alias()
+    {
+        // Create a serialized BlockGridValue in Umbraco 13 format that has a block with a property alias "values".
+        var serialized = @"{
+   ""layout"":{
+      ""Umbraco.BlockList"":[
+         {
+            ""contentUdi"":""umb://element/6ad18441631140d48515ea0fc5b00425""
+         }
+      ]
+   },
+   ""contentData"":[
+      {
+         ""contentTypeKey"":""a1d1123c-289b-4a05-b33f-9f06cb723da1"",
+         ""udi"":""umb://element/6ad18441631140d48515ea0fc5b00425"",
+         ""text"":""Text"",
+         ""values"":""Values""
+      }
+   ],
+   ""settingsData"":[
+   ]
+}";
+
+        var serializer = new SystemTextJsonSerializer(new DefaultJsonSerializerEncoderFactory());
+        var deserialized = serializer.Deserialize<BlockGridValue>(serialized);
+
+        Assert.IsNotNull(deserialized);
+
+        Assert.AreEqual(1, deserialized.ContentData.Count);
+        Assert.AreEqual(2, deserialized.ContentData[0].RawPropertyValues.Count);
+        Assert.AreEqual("Text", deserialized.ContentData[0].RawPropertyValues["text"]);
+        Assert.AreEqual("Values", deserialized.ContentData[0].RawPropertyValues["values"]);
+    }
 }

From 767894b72303c54084f7a21bbea077a3fad31738 Mon Sep 17 00:00:00 2001
From: Erik Leusink <49444441+Programeerik@users.noreply.github.com>
Date: Thu, 9 Oct 2025 11:50:11 +0200
Subject: [PATCH 011/155] Color Picker: Validate uniqueness of selected colors
 (#20431)

* Added unique color checker to color picker.

* Added Unittest for duplicates

* optimized for codescene

* removed the bump and simplified the function

* Fixed behaviour for duplicate checks so unit test passes.
A little refactoring.

* Adds continue so invalid colors aren't checked for duplicates.

---------

Co-authored-by: Andy Butland <abutland73@gmail.com>
---
 .../ColorPickerConfigurationEditor.cs         | 53 +++++++++++++++++--
 .../PropertyEditors/ColorListValidatorTest.cs | 20 +++++++
 2 files changed, 68 insertions(+), 5 deletions(-)

diff --git a/src/Umbraco.Infrastructure/PropertyEditors/ColorPickerConfigurationEditor.cs b/src/Umbraco.Infrastructure/PropertyEditors/ColorPickerConfigurationEditor.cs
index fe419a6566c2..f1da6618487f 100644
--- a/src/Umbraco.Infrastructure/PropertyEditors/ColorPickerConfigurationEditor.cs
+++ b/src/Umbraco.Infrastructure/PropertyEditors/ColorPickerConfigurationEditor.cs
@@ -10,8 +10,11 @@
 
 namespace Umbraco.Cms.Core.PropertyEditors;
 
-internal sealed class ColorPickerConfigurationEditor : ConfigurationEditor<ColorPickerConfiguration>
+internal sealed partial class ColorPickerConfigurationEditor : ConfigurationEditor<ColorPickerConfiguration>
 {
+    /// <summary>
+    /// Initializes a new instance of the <see cref="ColorPickerConfigurationEditor"/> class.
+    /// </summary>
     public ColorPickerConfigurationEditor(IIOHelper ioHelper, IConfigurationEditorJsonSerializer configurationEditorJsonSerializer)
         : base(ioHelper)
     {
@@ -19,13 +22,17 @@ public ColorPickerConfigurationEditor(IIOHelper ioHelper, IConfigurationEditorJs
         items.Validators.Add(new ColorListValidator(configurationEditorJsonSerializer));
     }
 
-    internal sealed class ColorListValidator : IValueValidator
+    internal sealed partial class ColorListValidator : IValueValidator
     {
         private readonly IConfigurationEditorJsonSerializer _configurationEditorJsonSerializer;
 
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ColorListValidator"/> class.
+        /// </summary>
         public ColorListValidator(IConfigurationEditorJsonSerializer configurationEditorJsonSerializer)
             => _configurationEditorJsonSerializer = configurationEditorJsonSerializer;
 
+        /// <inheritdoc/>
         public IEnumerable<ValidationResult> Validate(object? value, string? valueType, object? dataTypeConfiguration, PropertyValidationContext validationContext)
         {
             var stringValue = value?.ToString();
@@ -46,17 +53,53 @@ public IEnumerable<ValidationResult> Validate(object? value, string? valueType,
 
             if (items is null)
             {
-                yield return new ValidationResult($"The configuration value {stringValue} is not a valid color picker configuration", new[] { "items" });
+                yield return new ValidationResult($"The configuration value {stringValue} is not a valid color picker configuration", ["items"]);
                 yield break;
             }
 
+            var seen = new HashSet<string>(StringComparer.OrdinalIgnoreCase);
+            var duplicates = new List<string>();
             foreach (ColorPickerConfiguration.ColorPickerItem item in items)
             {
-                if (Regex.IsMatch(item.Value, "^([0-9a-f]{3}|[0-9a-f]{6})$", RegexOptions.IgnoreCase) == false)
+                if (ColorPattern().IsMatch(item.Value) == false)
                 {
-                    yield return new ValidationResult($"The value {item.Value} is not a valid hex color", new[] { "items" });
+                    yield return new ValidationResult($"The value {item.Value} is not a valid hex color", ["items"]);
+                    continue;
+                }
+
+                var normalized = Normalize(item.Value);
+                if (seen.Add(normalized) is false)
+                {
+                    duplicates.Add(normalized);
                 }
             }
+
+            if (duplicates.Count > 0)
+            {
+                yield return new ValidationResult(
+                    $"Duplicate color values are not allowed: {string.Join(", ", duplicates)}",
+                    ["items"]);
+            }
         }
+
+        private static string Normalize(string? value)
+        {
+            if (string.IsNullOrWhiteSpace(value))
+            {
+                return string.Empty;
+            }
+
+            var normalizedValue = value.Trim().ToLowerInvariant();
+
+            if (normalizedValue.Length == 3)
+            {
+                normalizedValue = $"{normalizedValue[0]}{normalizedValue[0]}{normalizedValue[1]}{normalizedValue[1]}{normalizedValue[2]}{normalizedValue[2]}";
+            }
+
+            return normalizedValue;
+        }
+
+        [GeneratedRegex("^([0-9a-f]{3}|[0-9a-f]{6})$", RegexOptions.IgnoreCase, "en-GB")]
+        private static partial Regex ColorPattern();
     }
 }
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/PropertyEditors/ColorListValidatorTest.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/PropertyEditors/ColorListValidatorTest.cs
index 72de48631f90..01b8a428c39b 100644
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/PropertyEditors/ColorListValidatorTest.cs
+++ b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/PropertyEditors/ColorListValidatorTest.cs
@@ -58,4 +58,24 @@ public void Validates_Color_Vals()
                 PropertyValidationContext.Empty());
         Assert.AreEqual(2, result.Count());
     }
+
+    [Test]
+    public void Validates_Color_Vals_Are_Unique()
+    {
+        var validator = new ColorPickerConfigurationEditor.ColorListValidator(ConfigurationEditorJsonSerializer());
+        var result =
+            validator.Validate(
+                new JsonArray(
+                    JsonNode.Parse("""{"value": "FFFFFF", "label": "One"}"""),
+                    JsonNode.Parse("""{"value": "000000", "label": "Two"}"""),
+                    JsonNode.Parse("""{"value": "FF00AA", "label": "Three"}"""),
+                    JsonNode.Parse("""{"value": "fff", "label": "Four"}"""),
+                    JsonNode.Parse("""{"value": "000000", "label": "Five"}"""),
+                    JsonNode.Parse("""{"value": "F0A", "label": "Six"}""")),
+                null,
+                null,
+                PropertyValidationContext.Empty());
+        Assert.AreEqual(1, result.Count());
+        Assert.IsTrue(result.First().ErrorMessage.Contains("ffffff, 000000, ff00aa"));
+    }
 }

From bcedc8de2a40ff6721061ff5d939bdee47ce0519 Mon Sep 17 00:00:00 2001
From: Rick Butterfield <rcb@umbraco.dk>
Date: Thu, 9 Oct 2025 13:27:53 +0100
Subject: [PATCH 012/155] Emails: Add `Expires` header  (#20285)

* Add `Expiry` header to emails, set default expiry to 30 days and allow user config via `appsettings`

* Remove `IsSmtpExpirationConfigured` as it will always have a value

* Check for `emailExpiration` value

* Removed `EmailExpiration` default value as it should be opt-in

* Simplify SMTP email expiration condition

* Fix APICompat issue

* Add implementation to `NotImplementedEmailSender`

* Rename `emailExpiration` to `expires` to match the SMTP header

* Obsolete interfaces without `expires` parameter, delegate to an existing method.

* Set expiry TimeSpan values from user configurable settings with defaults

* Fix formating

* Handle breaking changes, add obsoletion messages and simplify interfaces.

* Fix default of invite expires timespan (was being parsed as 72 days not 72 hours).

---------

Co-authored-by: Andy Butland <abutland73@gmail.com>
---
 .../Configuration/Models/GlobalSettings.cs    |  5 +++
 .../Configuration/Models/SecuritySettings.cs  | 15 ++++++++
 .../Configuration/Models/SmtpSettings.cs      |  5 +++
 .../EmailNotificationMethod.cs                |  2 +-
 src/Umbraco.Core/Mail/IEmailSender.cs         | 19 ++++++++++
 .../Mail/NotImplementedEmailSender.cs         |  4 +++
 .../Services/NotificationService.cs           |  6 ++--
 .../Mail/BasicSmtpEmailSenderClient.cs        | 26 +++++++++++---
 .../Mail/EmailSender.cs                       | 36 +++++++++++--------
 .../Mail/Interfaces/IEmailSenderClient.cs     | 18 +++++++---
 .../Security/EmailUserForgotPasswordSender.cs |  2 +-
 .../Security/EmailUserInviteSender.cs         | 22 ++++++++++--
 12 files changed, 130 insertions(+), 30 deletions(-)

diff --git a/src/Umbraco.Core/Configuration/Models/GlobalSettings.cs b/src/Umbraco.Core/Configuration/Models/GlobalSettings.cs
index d02555c850b5..8bd2e04dae79 100644
--- a/src/Umbraco.Core/Configuration/Models/GlobalSettings.cs
+++ b/src/Umbraco.Core/Configuration/Models/GlobalSettings.cs
@@ -181,6 +181,11 @@ internal const string
     /// </summary>
     public bool IsSmtpServerConfigured => !string.IsNullOrWhiteSpace(Smtp?.Host);
 
+    /// <summary>
+    ///     Gets a value indicating whether SMTP expiry is configured.
+    /// </summary>
+    public bool IsSmtpExpiryConfigured => Smtp?.EmailExpiration != null && Smtp?.EmailExpiration.HasValue == true;
+
     /// <summary>
     ///     Gets a value indicating whether there is a physical pickup directory configured.
     /// </summary>
diff --git a/src/Umbraco.Core/Configuration/Models/SecuritySettings.cs b/src/Umbraco.Core/Configuration/Models/SecuritySettings.cs
index bfff570c4f7c..0602ab6e8ea3 100644
--- a/src/Umbraco.Core/Configuration/Models/SecuritySettings.cs
+++ b/src/Umbraco.Core/Configuration/Models/SecuritySettings.cs
@@ -34,6 +34,9 @@ public class SecuritySettings
     internal const string StaticAuthorizeCallbackLogoutPathName = "/umbraco/logout";
     internal const string StaticAuthorizeCallbackErrorPathName = "/umbraco/error";
 
+    internal const string StaticPasswordResetEmailExpiry = "01:00:00";
+    internal const string StaticUserInviteEmailExpiry = "3.00:00:00";
+
     /// <summary>
     ///     Gets or sets a value indicating whether to keep the user logged in.
     /// </summary>
@@ -159,4 +162,16 @@ public class SecuritySettings
     /// </summary>
     [DefaultValue(StaticAuthorizeCallbackErrorPathName)]
     public string AuthorizeCallbackErrorPathName { get; set; } = StaticAuthorizeCallbackErrorPathName;
+
+    /// <summary>
+    ///     Gets or sets the expiry time for password reset emails.
+    /// </summary>
+    [DefaultValue(StaticPasswordResetEmailExpiry)]
+    public TimeSpan PasswordResetEmailExpiry { get; set; } = TimeSpan.Parse(StaticPasswordResetEmailExpiry);
+
+    /// <summary>
+    ///     Gets or sets the expiry time for user invite emails.
+    /// </summary>
+    [DefaultValue(StaticUserInviteEmailExpiry)]
+    public TimeSpan UserInviteEmailExpiry { get; set; } = TimeSpan.Parse(StaticUserInviteEmailExpiry);
 }
diff --git a/src/Umbraco.Core/Configuration/Models/SmtpSettings.cs b/src/Umbraco.Core/Configuration/Models/SmtpSettings.cs
index 92229b1b6d08..ea56445aa28e 100644
--- a/src/Umbraco.Core/Configuration/Models/SmtpSettings.cs
+++ b/src/Umbraco.Core/Configuration/Models/SmtpSettings.cs
@@ -96,4 +96,9 @@ public class SmtpSettings : ValidatableEntryBase
     ///     Gets or sets a value for the SMTP password.
     /// </summary>
     public string? Password { get; set; }
+
+    /// <summary>
+    ///     Gets or sets a value for the time until an email expires.
+    /// </summary>
+    public TimeSpan? EmailExpiration { get; set; }
 }
diff --git a/src/Umbraco.Core/HealthChecks/NotificationMethods/EmailNotificationMethod.cs b/src/Umbraco.Core/HealthChecks/NotificationMethods/EmailNotificationMethod.cs
index 022531c1eccf..6f373cb006c0 100644
--- a/src/Umbraco.Core/HealthChecks/NotificationMethods/EmailNotificationMethod.cs
+++ b/src/Umbraco.Core/HealthChecks/NotificationMethods/EmailNotificationMethod.cs
@@ -74,7 +74,7 @@ public override async Task SendAsync(HealthCheckResults results)
         var subject = _textService?.Localize("healthcheck", "scheduledHealthCheckEmailSubject", new[] { host });
 
         EmailMessage mailMessage = CreateMailMessage(subject, message);
-        Task? task = _emailSender?.SendAsync(mailMessage, Constants.Web.EmailTypes.HealthCheck);
+        Task? task = _emailSender?.SendAsync(mailMessage, Constants.Web.EmailTypes.HealthCheck, false, null);
         if (task is not null)
         {
             await task;
diff --git a/src/Umbraco.Core/Mail/IEmailSender.cs b/src/Umbraco.Core/Mail/IEmailSender.cs
index 2eb8cc826358..44cd9bd862b6 100644
--- a/src/Umbraco.Core/Mail/IEmailSender.cs
+++ b/src/Umbraco.Core/Mail/IEmailSender.cs
@@ -7,9 +7,28 @@ namespace Umbraco.Cms.Core.Mail;
 /// </summary>
 public interface IEmailSender
 {
+    /// <summary>
+    /// Sends a message asynchronously.
+    /// </summary>
+    [Obsolete("Please use the overload with expires parameter. Scheduled for removal in Umbraco 18.")]
     Task SendAsync(EmailMessage message, string emailType);
 
+    /// <summary>
+    /// Sends a message asynchronously.
+    /// </summary>
+    [Obsolete("Please use the overload with expires parameter. Scheduled for removal in Umbraco 18.")]
     Task SendAsync(EmailMessage message, string emailType, bool enableNotification);
 
+    /// <summary>
+    /// Sends a message asynchronously.
+    /// </summary>
+    Task SendAsync(EmailMessage message, string emailType, bool enableNotification = false, TimeSpan? expires = null)
+#pragma warning disable CS0618 // Type or member is obsolete
+        => SendAsync(message, emailType, enableNotification);
+#pragma warning restore CS0618 // Type or member is obsolete
+
+    /// <summary>
+    /// Verifies if the email sender is configured to send emails.
+    /// </summary>
     bool CanSendRequiredEmail();
 }
diff --git a/src/Umbraco.Core/Mail/NotImplementedEmailSender.cs b/src/Umbraco.Core/Mail/NotImplementedEmailSender.cs
index 7d0d2b486519..21d49db76bf9 100644
--- a/src/Umbraco.Core/Mail/NotImplementedEmailSender.cs
+++ b/src/Umbraco.Core/Mail/NotImplementedEmailSender.cs
@@ -12,6 +12,10 @@ public Task SendAsync(EmailMessage message, string emailType, bool enableNotific
         throw new NotImplementedException(
             "To send an Email ensure IEmailSender is implemented with a custom implementation");
 
+    public Task SendAsync(EmailMessage message, string emailType, bool enableNotification, TimeSpan? expires) =>
+        throw new NotImplementedException(
+            "To send an Email ensure IEmailSender is implemented with a custom implementation");
+
     public bool CanSendRequiredEmail()
         => throw new NotImplementedException(
             "To send an Email ensure IEmailSender is implemented with a custom implementation");
diff --git a/src/Umbraco.Core/Services/NotificationService.cs b/src/Umbraco.Core/Services/NotificationService.cs
index 3d5673fd7ad1..5a210777a044 100644
--- a/src/Umbraco.Core/Services/NotificationService.cs
+++ b/src/Umbraco.Core/Services/NotificationService.cs
@@ -557,7 +557,7 @@ private void Process(BlockingCollection<NotificationRequest> notificationRequest
         {
             ThreadPool.QueueUserWorkItem(state =>
             {
-                if (_logger.IsEnabled(Microsoft.Extensions.Logging.LogLevel.Debug))
+                if (_logger.IsEnabled(LogLevel.Debug))
                 {
                     _logger.LogDebug("Begin processing notifications.");
                 }
@@ -569,9 +569,9 @@ private void Process(BlockingCollection<NotificationRequest> notificationRequest
                     {
                         try
                         {
-                            _emailSender.SendAsync(request.Mail, Constants.Web.EmailTypes.Notification).GetAwaiter()
+                            _emailSender.SendAsync(request.Mail, Constants.Web.EmailTypes.Notification, false, null).GetAwaiter()
                                 .GetResult();
-                            if (_logger.IsEnabled(Microsoft.Extensions.Logging.LogLevel.Debug))
+                            if (_logger.IsEnabled(LogLevel.Debug))
                             {
                                 _logger.LogDebug("Notification '{Action}' sent to {Username} ({Email})", request.Action, request.UserName, request.Email);
                             }
diff --git a/src/Umbraco.Infrastructure/Mail/BasicSmtpEmailSenderClient.cs b/src/Umbraco.Infrastructure/Mail/BasicSmtpEmailSenderClient.cs
index 15ae1d0f4992..03687f6be832 100644
--- a/src/Umbraco.Infrastructure/Mail/BasicSmtpEmailSenderClient.cs
+++ b/src/Umbraco.Infrastructure/Mail/BasicSmtpEmailSenderClient.cs
@@ -15,28 +15,44 @@ namespace Umbraco.Cms.Infrastructure.Mail
     public class BasicSmtpEmailSenderClient : IEmailSenderClient
     {
         private readonly GlobalSettings _globalSettings;
+
+        /// <inheritdoc />
         public BasicSmtpEmailSenderClient(IOptionsMonitor<GlobalSettings> globalSettings)
-        {
-            _globalSettings = globalSettings.CurrentValue;
-        }
+            => _globalSettings = globalSettings.CurrentValue;
 
+        /// <inheritdoc />
         public async Task SendAsync(EmailMessage message)
+            => await SendAsync(message, null);
+
+        /// <inheritdoc />
+        public async Task SendAsync(EmailMessage message, TimeSpan? expires)
         {
             using var client = new SmtpClient();
 
             await client.ConnectAsync(
                 _globalSettings.Smtp!.Host,
-            _globalSettings.Smtp.Port,
+                _globalSettings.Smtp.Port,
                 (SecureSocketOptions)(int)_globalSettings.Smtp.SecureSocketOptions);
 
             if (!string.IsNullOrWhiteSpace(_globalSettings.Smtp.Username) &&
-            !string.IsNullOrWhiteSpace(_globalSettings.Smtp.Password))
+                !string.IsNullOrWhiteSpace(_globalSettings.Smtp.Password))
             {
                 await client.AuthenticateAsync(_globalSettings.Smtp.Username, _globalSettings.Smtp.Password);
             }
 
             var mimeMessage = message.ToMimeMessage(_globalSettings.Smtp!.From);
 
+            if (_globalSettings.IsSmtpExpiryConfigured)
+            {
+                expires ??= _globalSettings.Smtp.EmailExpiration;
+            }
+
+            if (expires.HasValue)
+            {
+                // `Expires` header needs to be in RFC 1123/2822 compatible format
+                mimeMessage.Headers.Add("Expires", DateTimeOffset.UtcNow.Add(expires.GetValueOrDefault()).ToString("R"));
+            }
+
             if (_globalSettings.Smtp.DeliveryMethod == SmtpDeliveryMethod.Network)
             {
                 await client.SendAsync(mimeMessage);
diff --git a/src/Umbraco.Infrastructure/Mail/EmailSender.cs b/src/Umbraco.Infrastructure/Mail/EmailSender.cs
index feb00735f223..fc9f71c95fab 100644
--- a/src/Umbraco.Infrastructure/Mail/EmailSender.cs
+++ b/src/Umbraco.Infrastructure/Mail/EmailSender.cs
@@ -30,6 +30,9 @@ public class EmailSender : IEmailSender
     private GlobalSettings _globalSettings;
     private readonly IEmailSenderClient _emailSenderClient;
 
+    /// <summary>
+    /// Initializes a new instance of the <see cref="EmailSender"/> class.
+    /// </summary>
     [Obsolete("Please use the non-obsolete constructor. Will be removed in V17.")]
     public EmailSender(
         ILogger<EmailSender> logger,
@@ -39,6 +42,9 @@ public EmailSender(
     {
     }
 
+    /// <summary>
+    /// Initializes a new instance of the <see cref="EmailSender"/> class.
+    /// </summary>
     [Obsolete("Please use the non-obsolete constructor. Will be removed in V17.")]
     public EmailSender(
         ILogger<EmailSender> logger,
@@ -55,6 +61,9 @@ public EmailSender(
         globalSettings.OnChange(x => _globalSettings = x);
     }
 
+    /// <summary>
+    /// Initializes a new instance of the <see cref="EmailSender"/> class.
+    /// </summary>
     [ActivatorUtilitiesConstructor]
     public EmailSender(
         ILogger<EmailSender> logger,
@@ -72,19 +81,19 @@ public EmailSender(
         globalSettings.OnChange(x => _globalSettings = x);
     }
 
-    /// <summary>
-    ///     Sends the message async
-    /// </summary>
-    /// <returns></returns>
+    /// <inheritdoc/>
     public async Task SendAsync(EmailMessage message, string emailType) =>
-        await SendAsyncInternal(message, emailType, false);
+        await SendAsyncInternal(message, emailType, false, null);
 
+    /// <inheritdoc/>
     public async Task SendAsync(EmailMessage message, string emailType, bool enableNotification) =>
-        await SendAsyncInternal(message, emailType, enableNotification);
+        await SendAsyncInternal(message, emailType, enableNotification, null);
 
-    /// <summary>
-    ///     Returns true if the application should be able to send a required application email
-    /// </summary>
+    /// <inheritdoc/>
+    public async Task SendAsync(EmailMessage message, string emailType, bool enableNotification = false, TimeSpan? expires = null) =>
+        await SendAsyncInternal(message, emailType, enableNotification, expires);
+
+    /// <inheritdoc/>
     /// <remarks>
     ///     We assume this is possible if either an event handler is registered or an smtp server is configured
     ///     or a pickup directory location is configured
@@ -93,7 +102,7 @@ public bool CanSendRequiredEmail() => _globalSettings.IsSmtpServerConfigured
                                           || _globalSettings.IsPickupDirectoryLocationConfigured
                                           || _notificationHandlerRegistered;
 
-    private async Task SendAsyncInternal(EmailMessage message, string emailType, bool enableNotification)
+    private async Task SendAsyncInternal(EmailMessage message, string emailType, bool enableNotification, TimeSpan? expires)
     {
         if (enableNotification)
         {
@@ -104,7 +113,7 @@ private async Task SendAsyncInternal(EmailMessage message, string emailType, boo
             // if a handler handled sending the email then don't continue.
             if (notification.IsHandled)
             {
-                if (_logger.IsEnabled(Microsoft.Extensions.Logging.LogLevel.Debug))
+                if (_logger.IsEnabled(LogLevel.Debug))
                 {
                     _logger.LogDebug(
                     "The email sending for {Subject} was handled by a notification handler",
@@ -116,7 +125,7 @@ private async Task SendAsyncInternal(EmailMessage message, string emailType, boo
 
         if (!_globalSettings.IsSmtpServerConfigured && !_globalSettings.IsPickupDirectoryLocationConfigured)
         {
-            if (_logger.IsEnabled(Microsoft.Extensions.Logging.LogLevel.Debug))
+            if (_logger.IsEnabled(LogLevel.Debug))
             {
                 _logger.LogDebug(
                 "Could not send email for {Subject}. It was not handled by a notification handler and there is no SMTP configured.",
@@ -173,7 +182,6 @@ private async Task SendAsyncInternal(EmailMessage message, string emailType, boo
             while (true);
         }
 
-        await _emailSenderClient.SendAsync(message);
+        await _emailSenderClient.SendAsync(message, expires);
     }
-
 }
diff --git a/src/Umbraco.Infrastructure/Mail/Interfaces/IEmailSenderClient.cs b/src/Umbraco.Infrastructure/Mail/Interfaces/IEmailSenderClient.cs
index 10dd5284c40f..3749d71bed3e 100644
--- a/src/Umbraco.Infrastructure/Mail/Interfaces/IEmailSenderClient.cs
+++ b/src/Umbraco.Infrastructure/Mail/Interfaces/IEmailSenderClient.cs
@@ -3,15 +3,25 @@
 namespace Umbraco.Cms.Infrastructure.Mail.Interfaces
 {
     /// <summary>
-    /// Client for sending an email from a MimeMessage
+    /// Client for sending an email from a MimeMessage.
     /// </summary>
     public interface IEmailSenderClient
     {
         /// <summary>
-        /// Sends the email message
+        /// Sends the email message.
         /// </summary>
-        /// <param name="message"></param>
-        /// <returns></returns>
+        /// <param name="message">The <see cref="EmailMessage"/> to send.</param>
+        [Obsolete("Please use the overload taking all parameters. Scheduled for removal in Umbraco 18.")]
         public Task SendAsync(EmailMessage message);
+
+        /// <summary>
+        /// Sends the email message with an expiration date.
+        /// </summary>
+        /// <param name="message">The <see cref="EmailMessage"/> to send.</param>
+        /// <param name="expires">An optional time for expiry.</param>
+        public Task SendAsync(EmailMessage message, TimeSpan? expires)
+#pragma warning disable CS0618 // Type or member is obsolete
+            => SendAsync(message);
+#pragma warning restore CS0618 // Type or member is obsolete
     }
 }
diff --git a/src/Umbraco.Infrastructure/Security/EmailUserForgotPasswordSender.cs b/src/Umbraco.Infrastructure/Security/EmailUserForgotPasswordSender.cs
index 6c276a21bb4d..784b14af7660 100644
--- a/src/Umbraco.Infrastructure/Security/EmailUserForgotPasswordSender.cs
+++ b/src/Umbraco.Infrastructure/Security/EmailUserForgotPasswordSender.cs
@@ -68,7 +68,7 @@ public async Task SendForgotPassword(UserForgotPasswordMessage messageModel)
 
         var message = new EmailMessage(senderEmail, address.ToString(), emailSubject, emailBody, true);
 
-        await _emailSender.SendAsync(message, Constants.Web.EmailTypes.PasswordReset, true);
+        await _emailSender.SendAsync(message, Constants.Web.EmailTypes.PasswordReset, true, _securitySettings.PasswordResetEmailExpiry);
     }
 
     public bool CanSend() => _securitySettings.AllowPasswordReset && _emailSender.CanSendRequiredEmail();
diff --git a/src/Umbraco.Infrastructure/Security/EmailUserInviteSender.cs b/src/Umbraco.Infrastructure/Security/EmailUserInviteSender.cs
index b6ef7a7447a8..6222e01ef243 100644
--- a/src/Umbraco.Infrastructure/Security/EmailUserInviteSender.cs
+++ b/src/Umbraco.Infrastructure/Security/EmailUserInviteSender.cs
@@ -1,9 +1,11 @@
-using System.Globalization;
+using System.Globalization;
 using System.Net;
+using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Options;
 using MimeKit;
 using Umbraco.Cms.Core;
 using Umbraco.Cms.Core.Configuration.Models;
+using Umbraco.Cms.Core.DependencyInjection;
 using Umbraco.Cms.Core.Mail;
 using Umbraco.Cms.Core.Models;
 using Umbraco.Cms.Core.Models.Email;
@@ -18,15 +20,31 @@ public class EmailUserInviteSender : IUserInviteSender
     private readonly IEmailSender _emailSender;
     private readonly ILocalizedTextService _localizedTextService;
     private readonly GlobalSettings _globalSettings;
+    private readonly SecuritySettings _securitySettings;
 
+    [Obsolete("Please use the constructor with all parameters. Scheduled for removal in Umbraco 18.")]
     public EmailUserInviteSender(
         IEmailSender emailSender,
         ILocalizedTextService localizedTextService,
         IOptions<GlobalSettings> globalSettings)
+        : this(
+              emailSender,
+              localizedTextService,
+              globalSettings,
+              StaticServiceProvider.Instance.GetRequiredService<IOptions<SecuritySettings>>())
+    {
+    }
+
+    public EmailUserInviteSender(
+        IEmailSender emailSender,
+        ILocalizedTextService localizedTextService,
+        IOptions<GlobalSettings> globalSettings,
+        IOptions<SecuritySettings> securitySettings)
     {
         _emailSender = emailSender;
         _localizedTextService = localizedTextService;
         _globalSettings = globalSettings.Value;
+        _securitySettings = securitySettings.Value;
     }
 
     public async Task InviteUser(UserInvitationMessage invite)
@@ -67,7 +85,7 @@ public async Task InviteUser(UserInvitationMessage invite)
 
         var message = new EmailMessage(senderEmail, address.ToString(), emailSubject, emailBody, true);
 
-        await _emailSender.SendAsync(message, Constants.Web.EmailTypes.UserInvite, true);
+        await _emailSender.SendAsync(message, Constants.Web.EmailTypes.UserInvite, true, _securitySettings.UserInviteEmailExpiry);
     }
 
     public bool CanSendInvites() => _emailSender.CanSendRequiredEmail();

From a4c373d3b5cea4c72f92d8976a39401d8ab8b03c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kr=C3=BCger?=
 <93977820+OskarKruger@users.noreply.github.com>
Date: Thu, 9 Oct 2025 15:56:30 +0200
Subject: [PATCH 013/155] Entity Actions: Create button discernible text (fixes
 #20205) (#20434)

* added hovering and focus border to RTE

* fix main to OG

* fix to main again

* I'm going to cry

* Missing localiztion feature, maybe UmbLitElement?

* added localization controller to fetch localized version

* localization successful for viewActionsFor and CreateFor

* clean up button text

* Changed label for content header to display proper name

* clean up code

* Included button labels for media section

* clean code

* Relocated localization keys,

as `actions_viewActionsFor` already existed.

Also made into a function, to support a fallback label.

* Simplified the "Create for" label/localization

Removed the need for a `getCreateAriaLabel()` method.

* Removed the double-localizations (of `actions_viewActionsFor`)

as the "umb-entity-actions-bundle" component handles this now.

* imports tidy-up

* Simplified localization key condition

---------

Co-authored-by: Oskar kruger <obk@umbraco.dk>
Co-authored-by: leekelleher <leekelleher@gmail.com>
---
 .../src/assets/lang/de.ts                     |  2 +
 .../src/assets/lang/en.ts                     |  1 +
 .../picker/clipboard-entry-picker.element.ts  |  2 +-
 .../entity-actions-bundle.element.ts          | 29 ++++++-------
 .../common/create/create.action.kind.ts       |  2 +-
 .../common/create/create.action.ts            | 10 ++---
 ...ntity-actions-table-column-view.element.ts |  2 +-
 .../menu-item-layout.element.ts               | 42 ++++++++++---------
 ...idebar-menu-with-entity-actions.element.ts |  5 ++-
 .../tree-item-base/tree-item-element-base.ts  | 11 ++---
 .../entity-actions/create/create.action.ts    |  4 +-
 .../entity-actions/create/manifests.ts        |  2 +-
 .../entity-actions/create/create.action.ts    |  5 +--
 .../media/entity-actions/create/manifests.ts  |  2 +-
 14 files changed, 62 insertions(+), 57 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/assets/lang/de.ts b/src/Umbraco.Web.UI.Client/src/assets/lang/de.ts
index c183998bfb20..071dae12ee0e 100644
--- a/src/Umbraco.Web.UI.Client/src/assets/lang/de.ts
+++ b/src/Umbraco.Web.UI.Client/src/assets/lang/de.ts
@@ -18,6 +18,7 @@ export default {
 		changeDataType: 'Datentyp ändern',
 		copy: 'Kopieren',
 		create: 'Neu',
+		createFor: (name: string) => (name ? `Neu erstellen für ${name}` : 'Neu'),
 		export: 'Exportieren',
 		createPackage: 'Neues Paket',
 		createGroup: 'Neue Gruppe',
@@ -63,6 +64,7 @@ export default {
 		unlock: 'Freigeben',
 		createblueprint: 'Inhaltsvorlage anlegen',
 		resendInvite: 'Einladung erneut versenden',
+		viewActionsFor: (name: string) => (name ? `Aktionen anzeigen für ${name}` : 'Aktionen anzeigen'),
 	},
 	actionCategories: {
 		content: 'Inhalt',
diff --git a/src/Umbraco.Web.UI.Client/src/assets/lang/en.ts b/src/Umbraco.Web.UI.Client/src/assets/lang/en.ts
index 5f5f6d57c058..f57a8dbea347 100644
--- a/src/Umbraco.Web.UI.Client/src/assets/lang/en.ts
+++ b/src/Umbraco.Web.UI.Client/src/assets/lang/en.ts
@@ -23,6 +23,7 @@ export default {
 		copy: 'Duplicate',
 		copyTo: 'Duplicate to',
 		create: 'Create',
+		createFor: (name: string) => (name ? `Create item for ${name}` : 'Create'),
 		createblueprint: 'Create Document Blueprint',
 		createGroup: 'Create group',
 		createPackage: 'Create Package',
diff --git a/src/Umbraco.Web.UI.Client/src/packages/clipboard/clipboard-entry/picker/clipboard-entry-picker.element.ts b/src/Umbraco.Web.UI.Client/src/packages/clipboard/clipboard-entry/picker/clipboard-entry-picker.element.ts
index 9f67b19f5cd6..244be5167905 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/clipboard/clipboard-entry/picker/clipboard-entry-picker.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/clipboard/clipboard-entry/picker/clipboard-entry-picker.element.ts
@@ -156,7 +156,7 @@ export class UmbClipboardEntryPickerElement extends UmbLitElement {
 				slot="actions"
 				.entityType=${item.entityType}
 				.unique=${item.unique}
-				.label=${this.localize.term('actions_viewActionsFor', [item.name])}>
+				.label=${this.localize.string(item.name)}>
 			</umb-entity-actions-bundle>
 		`;
 	}
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/components/entity-actions-bundle/entity-actions-bundle.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/components/entity-actions-bundle/entity-actions-bundle.element.ts
index 33904c550de8..b4d763e392f8 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/components/entity-actions-bundle/entity-actions-bundle.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/components/entity-actions-bundle/entity-actions-bundle.element.ts
@@ -1,10 +1,10 @@
 import { UmbEntityContext } from '../../entity/entity.context.js';
-import type { UmbEntityAction, ManifestEntityActionDefaultKind } from '@umbraco-cms/backoffice/entity-action';
-import type { PropertyValueMap } from '@umbraco-cms/backoffice/external/lit';
-import { html, nothing, customElement, property, state, ifDefined, css } from '@umbraco-cms/backoffice/external/lit';
-import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element';
+import { css, customElement, html, ifDefined, nothing, property, state } from '@umbraco-cms/backoffice/external/lit';
 import { umbExtensionsRegistry } from '@umbraco-cms/backoffice/extension-registry';
 import { UmbExtensionsManifestInitializer, createExtensionApi } from '@umbraco-cms/backoffice/extension-api';
+import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element';
+import type { PropertyValueMap } from '@umbraco-cms/backoffice/external/lit';
+import type { UmbEntityAction, ManifestEntityActionDefaultKind } from '@umbraco-cms/backoffice/entity-action';
 
 @customElement('umb-entity-actions-bundle')
 export class UmbEntityActionsBundleElement extends UmbLitElement {
@@ -114,14 +114,13 @@ export class UmbEntityActionsBundleElement extends UmbLitElement {
 
 	override render() {
 		if (this._numberOfActions === 0) return nothing;
-		return html`<uui-action-bar slot="actions">${this.#renderMore()} ${this.#renderFirstAction()} </uui-action-bar>`;
+		return html`<uui-action-bar slot="actions">${this.#renderMore()}${this.#renderFirstAction()}</uui-action-bar>`;
 	}
 
 	#renderMore() {
 		if (this._numberOfActions === 1) return nothing;
-
 		return html`
-			<umb-entity-actions-dropdown .label=${this.label} compact>
+			<umb-entity-actions-dropdown compact .label=${this.localize.term('actions_viewActionsFor', this.label)}>
 				<uui-symbol-more slot="label"></uui-symbol-more>
 			</umb-entity-actions-dropdown>
 		`;
@@ -129,13 +128,15 @@ export class UmbEntityActionsBundleElement extends UmbLitElement {
 
 	#renderFirstAction() {
 		if (!this._firstActionApi || !this._firstActionManifest) return nothing;
-		return html`<uui-button
-			label=${this.localize.string(this._firstActionManifest.meta.label)}
-			data-mark=${'entity-action:' + this._firstActionManifest.alias}
-			@click=${this.#onFirstActionClick}
-			href="${ifDefined(this._firstActionHref)}">
-			<uui-icon name=${ifDefined(this._firstActionManifest.meta.icon)}></uui-icon>
-		</uui-button>`;
+		return html`
+			<uui-button
+				label=${this.localize.string(this._firstActionManifest.meta.label, this.label)}
+				data-mark=${'entity-action:' + this._firstActionManifest.alias}
+				href=${ifDefined(this._firstActionHref)}
+				@click=${this.#onFirstActionClick}>
+				<umb-icon name=${ifDefined(this._firstActionManifest.meta.icon)}></umb-icon>
+			</uui-button>
+		`;
 	}
 
 	static override styles = [
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/entity-action/common/create/create.action.kind.ts b/src/Umbraco.Web.UI.Client/src/packages/core/entity-action/common/create/create.action.kind.ts
index a220d955aa3b..be22c22bec03 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/entity-action/common/create/create.action.kind.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/entity-action/common/create/create.action.kind.ts
@@ -15,7 +15,7 @@ export const manifest: UmbExtensionManifestKind = {
 		forEntityTypes: [],
 		meta: {
 			icon: 'icon-add',
-			label: '#actions_create',
+			label: '#actions_createFor',
 			additionalOptions: true,
 		},
 	},
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/entity-action/common/create/create.action.ts b/src/Umbraco.Web.UI.Client/src/packages/core/entity-action/common/create/create.action.ts
index 6b85c7ec3598..322a5ceef06b 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/entity-action/common/create/create.action.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/entity-action/common/create/create.action.ts
@@ -2,19 +2,15 @@ import { UmbEntityActionBase } from '../../entity-action-base.js';
 import type { UmbEntityActionArgs } from '../../types.js';
 import type { MetaEntityActionCreateKind } from './types.js';
 import { UMB_ENTITY_CREATE_OPTION_ACTION_LIST_MODAL } from './modal/constants.js';
+import { createExtensionApi, UmbExtensionsManifestInitializer } from '@umbraco-cms/backoffice/extension-api';
 import { umbOpenModal } from '@umbraco-cms/backoffice/modal';
-import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api';
 import { umbExtensionsRegistry } from '@umbraco-cms/backoffice/extension-registry';
-import {
-	type UmbExtensionManifestInitializer,
-	createExtensionApi,
-	UmbExtensionsManifestInitializer,
-	type PermittedControllerType,
-} from '@umbraco-cms/backoffice/extension-api';
 import type {
 	ManifestEntityCreateOptionAction,
 	UmbEntityCreateOptionAction,
 } from '@umbraco-cms/backoffice/entity-create-option-action';
+import type { PermittedControllerType, UmbExtensionManifestInitializer } from '@umbraco-cms/backoffice/extension-api';
+import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api';
 
 export class UmbCreateEntityAction extends UmbEntityActionBase<MetaEntityActionCreateKind> {
 	#hasSingleOption = true;
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/entity-action/global-components/entity-actions-table-column-view/entity-actions-table-column-view.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/entity-action/global-components/entity-actions-table-column-view/entity-actions-table-column-view.element.ts
index d2ca007786c1..925ccd4ca98d 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/entity-action/global-components/entity-actions-table-column-view/entity-actions-table-column-view.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/entity-action/global-components/entity-actions-table-column-view/entity-actions-table-column-view.element.ts
@@ -14,7 +14,7 @@ export class UmbEntityActionsTableColumnViewElement extends UmbLitElement {
 			<umb-entity-actions-bundle
 				.entityType=${this.value.entityType}
 				.unique=${this.value.unique}
-				.label=${this.localize.term('actions_viewActionsFor', [(this.value as any).name])}>
+				.label=${this.localize.string((this.value as any).name)}>
 			</umb-entity-actions-bundle>
 		`;
 	}
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/menu/components/menu-item-layout/menu-item-layout.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/menu/components/menu-item-layout/menu-item-layout.element.ts
index fdc2c07b7abf..b957066e6fde 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/menu/components/menu-item-layout/menu-item-layout.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/menu/components/menu-item-layout/menu-item-layout.element.ts
@@ -1,4 +1,4 @@
-import { html, customElement, property, ifDefined, state } from '@umbraco-cms/backoffice/external/lit';
+import { customElement, html, ifDefined, property, state, when } from '@umbraco-cms/backoffice/external/lit';
 import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element';
 import { ensureSlash } from '@umbraco-cms/backoffice/router';
 import { debounce } from '@umbraco-cms/backoffice/utils';
@@ -72,24 +72,28 @@ export class UmbMenuItemLayoutElement extends UmbLitElement {
 	}
 
 	override render() {
-		return html`<uui-menu-item
-			href="${ifDefined(this.href)}"
-			label=${this.label}
-			.caretLabel=${this.localize.term('visuallyHiddenTexts_expandChildItems') + ' ' + this.label}
-			?active=${this._isActive}
-			?has-children=${this.hasChildren}
-			target=${ifDefined(this.href && this.target ? this.target : undefined)}>
-			<umb-icon slot="icon" name=${this.iconName}></umb-icon>
-			${this.entityType
-				? html`<umb-entity-actions-bundle
-						slot="actions"
-						.entityType=${this.entityType}
-						.unique=${null}
-						.label=${this.localize.term('actions_viewActionsFor', [this.label])}>
-					</umb-entity-actions-bundle>`
-				: ''}
-			<slot></slot>
-		</uui-menu-item>`;
+		return html`
+			<uui-menu-item
+				label=${this.label}
+				href=${ifDefined(this.href)}
+				target=${ifDefined(this.href && this.target ? this.target : undefined)}
+				.caretLabel=${this.localize.term('visuallyHiddenTexts_expandChildItems') + ' ' + this.label}
+				?active=${this._isActive}
+				?has-children=${this.hasChildren}>
+				<umb-icon slot="icon" name=${this.iconName}></umb-icon>
+				${when(
+					this.entityType,
+					() => html`
+						<umb-entity-actions-bundle
+							slot="actions"
+							.entityType=${this.entityType}
+							.unique=${null}
+							.label=${this.label}></umb-entity-actions-bundle>
+					`,
+				)}
+				<slot></slot>
+			</uui-menu-item>
+		`;
 	}
 
 	override disconnectedCallback() {
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/menu/section-sidebar-menu-with-entity-actions/section-sidebar-menu-with-entity-actions.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/menu/section-sidebar-menu-with-entity-actions/section-sidebar-menu-with-entity-actions.element.ts
index f7c885fc10e1..4dbcb61fb151 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/menu/section-sidebar-menu-with-entity-actions/section-sidebar-menu-with-entity-actions.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/menu/section-sidebar-menu-with-entity-actions/section-sidebar-menu-with-entity-actions.element.ts
@@ -21,14 +21,15 @@ export class UmbSectionSidebarMenuWithEntityActionsElement extends UmbSectionSid
 	}
 
 	override renderHeader() {
+		const label = this.localize.string(this.manifest?.meta?.label ?? '');
 		return html`
 			<div id="header">
-				<h3>${this.localize.string(this.manifest?.meta?.label ?? '')}</h3>
+				<h3>${label}</h3>
 				<umb-entity-actions-bundle
 					slot="actions"
 					.unique=${this._unique}
 					.entityType=${this.manifest?.meta.entityType}
-					.label=${this.localize.term('actions_viewActionsFor', [this.manifest?.meta.label])}>
+					.label=${label}>
 				</umb-entity-actions-bundle>
 			</div>
 		`;
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/tree/tree-item/tree-item-base/tree-item-element-base.ts b/src/Umbraco.Web.UI.Client/src/packages/core/tree/tree-item/tree-item-base/tree-item-element-base.ts
index 0b0d1764a80d..2932c22a3c97 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/tree/tree-item/tree-item-base/tree-item-element-base.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/tree/tree-item/tree-item-base/tree-item-element-base.ts
@@ -138,6 +138,9 @@ export abstract class UmbTreeItemElementBase<
 	// Note: Currently we want to prevent opening when the item is in a selectable context, but this might change in the future.
 	// If we like to be able to open items in selectable context, then we might want to make it as a menu item action, so you have to click ... and chose an action called 'Edit'
 	override render() {
+		const caretLabelKey = this._isOpen
+			? 'visuallyHiddenTexts_collapseChildItems'
+			: 'visuallyHiddenTexts_expandChildItems';
 		return html`
 			<uui-menu-item
 				@show-children=${this._onShowChildren}
@@ -151,11 +154,9 @@ export abstract class UmbTreeItemElementBase<
 				.loading=${this._isLoading}
 				.hasChildren=${this._hasChildren}
 				.showChildren=${this._isOpen}
-				.caretLabel=${this._isOpen
-					? this.localize.term('visuallyHiddenTexts_collapseChildItems') + ' ' + this._label
-					: this.localize.term('visuallyHiddenTexts_expandChildItems') + ' ' + this._label}
+				.caretLabel=${this.localize.term(caretLabelKey) + ' ' + this._label}
 				label=${ifDefined(this._label)}
-				href="${ifDefined(this._isSelectableContext ? undefined : this._href)}">
+				href=${ifDefined(this._isSelectableContext ? undefined : this._href)}>
 				${this.renderIconContainer()} ${this.renderLabel()} ${this.#renderActions()} ${this.#renderChildItems()}
 				<slot></slot>
 				${this.#renderPaging()}
@@ -224,7 +225,7 @@ export abstract class UmbTreeItemElementBase<
 				slot="actions"
 				.entityType=${this.#api.entityType}
 				.unique=${this.#api.unique}
-				.label=${this.localize.term('actions_viewActionsFor', [this._label])}>
+				.label=${this._label}>
 			</umb-entity-actions-bundle>
 		`;
 	}
diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/create/create.action.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/create/create.action.ts
index 9383940f682b..9f6f4898cad8 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/create/create.action.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/create/create.action.ts
@@ -1,9 +1,9 @@
 import { UmbDocumentItemRepository } from '../../item/index.js';
 import { UMB_DOCUMENT_CREATE_OPTIONS_MODAL } from './document-create-options-modal.token.js';
-import type { UmbEntityActionArgs } from '@umbraco-cms/backoffice/entity-action';
+import { umbOpenModal } from '@umbraco-cms/backoffice/modal';
 import { UmbEntityActionBase } from '@umbraco-cms/backoffice/entity-action';
 import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api';
-import { umbOpenModal } from '@umbraco-cms/backoffice/modal';
+import type { UmbEntityActionArgs } from '@umbraco-cms/backoffice/entity-action';
 
 export class UmbCreateDocumentEntityAction extends UmbEntityActionBase<never> {
 	constructor(host: UmbControllerHost, args: UmbEntityActionArgs<never>) {
diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/create/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/create/manifests.ts
index 1cdd48b96d9b..361f62a30a43 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/create/manifests.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/create/manifests.ts
@@ -13,7 +13,7 @@ export const manifests: Array<UmbExtensionManifest> = [
 		forEntityTypes: [UMB_DOCUMENT_ROOT_ENTITY_TYPE, UMB_DOCUMENT_ENTITY_TYPE],
 		meta: {
 			icon: 'icon-add',
-			label: '#actions_create',
+			label: '#actions_createFor',
 			additionalOptions: true,
 		},
 		conditions: [
diff --git a/src/Umbraco.Web.UI.Client/src/packages/media/media/entity-actions/create/create.action.ts b/src/Umbraco.Web.UI.Client/src/packages/media/media/entity-actions/create/create.action.ts
index 3629d1424ba8..b8b65c17ff6a 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/media/media/entity-actions/create/create.action.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/media/media/entity-actions/create/create.action.ts
@@ -1,9 +1,9 @@
 import { UmbMediaItemRepository } from '../../repository/index.js';
 import { UMB_MEDIA_CREATE_OPTIONS_MODAL } from './media-create-options-modal.token.js';
-import type { UmbEntityActionArgs } from '@umbraco-cms/backoffice/entity-action';
+import { umbOpenModal } from '@umbraco-cms/backoffice/modal';
 import { UmbEntityActionBase } from '@umbraco-cms/backoffice/entity-action';
 import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api';
-import { umbOpenModal } from '@umbraco-cms/backoffice/modal';
+import type { UmbEntityActionArgs } from '@umbraco-cms/backoffice/entity-action';
 
 export class UmbCreateMediaEntityAction extends UmbEntityActionBase<never> {
 	constructor(host: UmbControllerHost, args: UmbEntityActionArgs<never>) {
@@ -30,5 +30,4 @@ export class UmbCreateMediaEntityAction extends UmbEntityActionBase<never> {
 		});
 	}
 }
-
 export { UmbCreateMediaEntityAction as api };
diff --git a/src/Umbraco.Web.UI.Client/src/packages/media/media/entity-actions/create/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/media/media/entity-actions/create/manifests.ts
index 7572bca3ebb6..a2261aeb9ac8 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/media/media/entity-actions/create/manifests.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/media/media/entity-actions/create/manifests.ts
@@ -12,7 +12,7 @@ export const manifests: Array<UmbExtensionManifest> = [
 		forEntityTypes: [UMB_MEDIA_ROOT_ENTITY_TYPE, UMB_MEDIA_ENTITY_TYPE],
 		meta: {
 			icon: 'icon-add',
-			label: '#actions_create',
+			label: '#actions_createFor',
 			additionalOptions: true,
 		},
 		conditions: [

From de449079ddfe90f54478bfae0ac23dd28d9ac752 Mon Sep 17 00:00:00 2001
From: leekelleher <leekelleher@gmail.com>
Date: Fri, 10 Oct 2025 08:43:32 +0100
Subject: [PATCH 014/155] Fixed build error

---
 .../clipboard-entry/picker/clipboard-entry-picker.element.ts    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Umbraco.Web.UI.Client/src/packages/clipboard/clipboard-entry/picker/clipboard-entry-picker.element.ts b/src/Umbraco.Web.UI.Client/src/packages/clipboard/clipboard-entry/picker/clipboard-entry-picker.element.ts
index 244be5167905..fda340058b6c 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/clipboard/clipboard-entry/picker/clipboard-entry-picker.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/clipboard/clipboard-entry/picker/clipboard-entry-picker.element.ts
@@ -156,7 +156,7 @@ export class UmbClipboardEntryPickerElement extends UmbLitElement {
 				slot="actions"
 				.entityType=${item.entityType}
 				.unique=${item.unique}
-				.label=${this.localize.string(item.name)}>
+				.label=${this.localize.string(item.name ?? '')}>
 			</umb-entity-actions-bundle>
 		`;
 	}

From 99c2aaf17abc3d1b13b3843503f449b7a1ae82a7 Mon Sep 17 00:00:00 2001
From: Andy Butland <abutland73@gmail.com>
Date: Fri, 10 Oct 2025 09:52:57 +0200
Subject: [PATCH 015/155] Members: Forward port of fix for member lockout issue
 #16988 from PR #17007 for 16 (#20441)

* Port PR #17007

* Update src/Umbraco.Infrastructure/Security/IdentityMapDefinition.cs

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

---------

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
---
 .../Security/IdentityMapDefinition.cs         | 42 ++++++++++++++++---
 1 file changed, 36 insertions(+), 6 deletions(-)

diff --git a/src/Umbraco.Infrastructure/Security/IdentityMapDefinition.cs b/src/Umbraco.Infrastructure/Security/IdentityMapDefinition.cs
index 5032a2a87182..c3046342908e 100644
--- a/src/Umbraco.Infrastructure/Security/IdentityMapDefinition.cs
+++ b/src/Umbraco.Infrastructure/Security/IdentityMapDefinition.cs
@@ -95,7 +95,7 @@ private void Map(IUser source, BackOfficeIdentityUser target)
         target.IsApproved = source.IsApproved;
         target.SecurityStamp = source.SecurityStamp;
         DateTime? lockedOutUntil = source.LastLockoutDate?.AddMinutes(_securitySettings.UserDefaultLockoutTimeInMinutes);
-        target.LockoutEnd = source.IsLockedOut ? (lockedOutUntil ?? DateTime.MaxValue).ToUniversalTime() : null;
+        target.LockoutEnd = source.IsLockedOut ? lockedOutUntil ?? DateTime.MaxValue : null;
         target.Kind = source.Kind;
     }
 
@@ -114,16 +114,46 @@ private void Map(IMember source, MemberIdentityUser target)
         target.IsApproved = source.IsApproved;
         target.SecurityStamp = source.SecurityStamp;
         DateTime? lockedOutUntil = source.LastLockoutDate?.AddMinutes(_securitySettings.MemberDefaultLockoutTimeInMinutes);
-        target.LockoutEnd = source.IsLockedOut ? (lockedOutUntil ?? DateTime.MaxValue).ToUniversalTime() : null;
+        target.LockoutEnd = GetLockoutEnd(source);
+        target.LastLockoutDateUtc = GetLastLockoutDateUtc(source);
+        target.CreatedDateUtc = EnsureUtcWithServerTime(source.CreateDate);
         target.Comments = source.Comments;
-        target.LastLockoutDateUtc = source.LastLockoutDate == DateTime.MinValue
-            ? null
-            : source.LastLockoutDate?.ToUniversalTime();
-        target.CreatedDateUtc = source.CreateDate.ToUniversalTime();
         target.Key = source.Key;
         target.MemberTypeAlias = source.ContentTypeAlias;
         target.TwoFactorEnabled = _twoFactorLoginService.IsTwoFactorEnabledAsync(source.Key).GetAwaiter().GetResult();
 
         // NB: same comments re AutoMapper as per BackOfficeUser
     }
+
+    private DateTimeOffset? GetLockoutEnd(IMember source)
+    {
+        if (source.IsLockedOut is false)
+        {
+            return null;
+        }
+
+        DateTime? lockedOutUntil = source.LastLockoutDate?.AddMinutes(_securitySettings.MemberDefaultLockoutTimeInMinutes);
+        if (lockedOutUntil.HasValue is false)
+        {
+            return DateTime.MaxValue;
+        }
+
+        return EnsureUtcWithServerTime(lockedOutUntil.Value);
+    }
+
+    private static DateTime? GetLastLockoutDateUtc(IMember source)
+    {
+        if (source.LastLockoutDate is null || source.LastLockoutDate == DateTime.MinValue)
+        {
+            return null;
+        }
+
+        return EnsureUtcWithServerTime(source.LastLockoutDate.Value);
+    }
+
+    private static DateTime EnsureUtcWithServerTime(DateTime date) =>
+
+        // We have a server time value here, but the Kind is UTC, so we can't use .ToUniversalTime() to convert to the UTC
+        // value that the LockoutEnd property expects. We need to create a DateTimeOffset with the correct offset.
+        DateTime.SpecifyKind(date, DateTimeKind.Local).ToUniversalTime();
 }

From fd34ce5bd7ec9af2fe10d05adb4a47747fb1aee9 Mon Sep 17 00:00:00 2001
From: Bjarne Fyrstenborg <bf@mcb.dk>
Date: Fri, 10 Oct 2025 10:32:19 +0200
Subject: [PATCH 016/155] Icon Picker: Fit icons scroll container to modal
 height (#20438)

* Fill height and align icons to top

* Auto scrollbar instead

* Auto height of grid rows

* Enforce scroll again
---
 .../icon-picker-modal/icon-picker-modal.element.ts             | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/icon-registry/icon-picker-modal/icon-picker-modal.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/icon-registry/icon-picker-modal/icon-picker-modal.element.ts
index e6aa5a8bfd9b..0311318845ae 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/icon-registry/icon-picker-modal/icon-picker-modal.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/icon-registry/icon-picker-modal/icon-picker-modal.element.ts
@@ -190,7 +190,10 @@ export class UmbIconPickerModalElement extends UmbModalBaseElement<UmbIconPicker
 				line-height: 0;
 				display: grid;
 				grid-template-columns: repeat(auto-fit, minmax(40px, calc((100% / 12) - 10px)));
+				grid-auto-rows: min-content;
 				gap: 10px;
+				height: 100%;
+				align-items: flex-start;
 				overflow-y: scroll;
 				max-height: 100%;
 				min-height: 0;

From 3df8b9e41a85355eff61f483cdddc7893f99ce54 Mon Sep 17 00:00:00 2001
From: Andy Butland <abutland73@gmail.com>
Date: Fri, 10 Oct 2025 15:00:47 +0200
Subject: [PATCH 017/155] Refactoring: Fixed spelling mistake in method name
 (#20460)

* Fixed spelling mistake in method name.

* Apply suggestion from @Copilot

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

---------

Co-authored-by: Kenn Jacobsen <kja@umbraco.dk>
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
---
 .../Controllers/RenderController.cs                   |  2 +-
 .../Controllers/UmbracoPageController.cs              | 11 +++++++++--
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/Umbraco.Web.Common/Controllers/RenderController.cs b/src/Umbraco.Web.Common/Controllers/RenderController.cs
index d1899b5db4d6..2d1d89f47f63 100644
--- a/src/Umbraco.Web.Common/Controllers/RenderController.cs
+++ b/src/Umbraco.Web.Common/Controllers/RenderController.cs
@@ -112,7 +112,7 @@ public override async Task OnActionExecutionAsync(ActionExecutingContext context
     /// </remarks>
     protected override IActionResult CurrentTemplate<T>(T model)
     {
-        if (EnsurePhsyicalViewExists(UmbracoRouteValues.TemplateName) == false)
+        if (EnsurePhysicalViewExists(UmbracoRouteValues.TemplateName) == false)
         {
             // no physical template file was found
             return new PublishedContentNotFoundResult(UmbracoContext);
diff --git a/src/Umbraco.Web.Common/Controllers/UmbracoPageController.cs b/src/Umbraco.Web.Common/Controllers/UmbracoPageController.cs
index 4634f4e48add..64cfe3c4ccfa 100644
--- a/src/Umbraco.Web.Common/Controllers/UmbracoPageController.cs
+++ b/src/Umbraco.Web.Common/Controllers/UmbracoPageController.cs
@@ -79,7 +79,7 @@ protected virtual IPublishedContent? CurrentPage
     /// </exception>
     protected virtual IActionResult CurrentTemplate<T>(T model)
     {
-        if (EnsurePhsyicalViewExists(UmbracoRouteValues.TemplateName) == false)
+        if (EnsurePhysicalViewExists(UmbracoRouteValues.TemplateName) == false)
         {
             throw new InvalidOperationException("No physical template file was found for template " +
                                                 UmbracoRouteValues.TemplateName);
@@ -92,7 +92,14 @@ protected virtual IActionResult CurrentTemplate<T>(T model)
     ///     Ensures that a physical view file exists on disk.
     /// </summary>
     /// <param name="template">The view name.</param>
-    protected bool EnsurePhsyicalViewExists(string? template)
+    [Obsolete("Please use the correctly spelt EnsurePhysicalViewExists method. Scheduled for removal in Umbraco 18.")]
+    protected bool EnsurePhsyicalViewExists(string? template) => EnsurePhysicalViewExists(template);
+
+    /// <summary>
+    ///     Ensures that a physical view file exists on disk.
+    /// </summary>
+    /// <param name="template">The view name.</param>
+    protected bool EnsurePhysicalViewExists(string? template)
     {
         if (string.IsNullOrWhiteSpace(template))
         {

From 7b4684cd70d03986754ef3c08cb33dc735b12042 Mon Sep 17 00:00:00 2001
From: Bjarne Fyrstenborg <bf@mcb.dk>
Date: Mon, 13 Oct 2025 06:34:02 +0200
Subject: [PATCH 018/155] UX: Center align log type in media history view
 (#20469)

Center align log type in media
---
 .../info-app/media-history-workspace-info-app.element.ts         | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/Umbraco.Web.UI.Client/src/packages/media/media/audit-log/info-app/media-history-workspace-info-app.element.ts b/src/Umbraco.Web.UI.Client/src/packages/media/media/audit-log/info-app/media-history-workspace-info-app.element.ts
index a728e44c10ff..80955b2f2bf4 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/media/media/audit-log/info-app/media-history-workspace-info-app.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/media/media/audit-log/info-app/media-history-workspace-info-app.element.ts
@@ -173,6 +173,7 @@ export class UmbMediaHistoryWorkspaceInfoAppElement extends UmbLitElement {
 			}
 
 			.log-type uui-tag {
+				justify-self: center;
 				height: fit-content;
 				margin-top: auto;
 				margin-bottom: auto;

From 0a027dd80d8e66d4ddfe3d176b86b3219fb57ed7 Mon Sep 17 00:00:00 2001
From: Laura Neto <12862535+lauraneto@users.noreply.github.com>
Date: Mon, 13 Oct 2025 13:12:45 +0200
Subject: [PATCH 019/155] Dependencies: Fixed dependency conflicts when
 installing Microsoft.EntityFrameworkCore.Design (closes #20421) (#20474)

* Add explicit references to Microsoft.CodeAnalysis.* packages to fix conflicts when installing Microsoft.EntityFrameworkCore.Design

This allows consumers to simply install Microsoft.EntityFrameworkCore.Design without having to manually install specific versions to deal with transitive dependency problems.

* Disable CPM for UI project to better reflect consumers

* Update src/Umbraco.Infrastructure/Umbraco.Infrastructure.csproj

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

---------

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
---
 Directory.Packages.props                          |  3 ---
 .../Umbraco.Infrastructure.csproj                 |  6 +++++-
 src/Umbraco.Web.UI/Umbraco.Web.UI.csproj          | 15 +++------------
 3 files changed, 8 insertions(+), 16 deletions(-)

diff --git a/Directory.Packages.props b/Directory.Packages.props
index 94a3dd9c676d..ca3619254235 100644
--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@@ -14,14 +14,11 @@
   <ItemGroup>
     <PackageVersion Include="Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation" Version="9.0.4" />
     <PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="4.13.0" />
-    <PackageVersion Include="Microsoft.CodeAnalysis.Common" Version="4.13.0" />
     <PackageVersion Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.13.0" />
-    <PackageVersion Include="Microsoft.CodeAnalysis.Workspaces.Common" Version="4.13.0" />
     <PackageVersion Include="Microsoft.CodeAnalysis.Workspaces.MSBuild" Version="4.13.0" />
     <PackageVersion Include="Microsoft.Data.Sqlite" Version="9.0.4" />
     <PackageVersion Include="Microsoft.EntityFrameworkCore.Sqlite" Version="9.0.4" />
     <PackageVersion Include="Microsoft.EntityFrameworkCore.SqlServer" Version="9.0.4" />
-    <PackageVersion Include="Microsoft.EntityFrameworkCore.Design" Version="9.0.4" />
     <PackageVersion Include="Microsoft.Extensions.Caching.Abstractions" Version="9.0.4" />
     <PackageVersion Include="Microsoft.Extensions.Caching.Memory" Version="9.0.4" />
     <PackageVersion Include="Microsoft.Extensions.Configuration.Abstractions" Version="9.0.4" />
diff --git a/src/Umbraco.Infrastructure/Umbraco.Infrastructure.csproj b/src/Umbraco.Infrastructure/Umbraco.Infrastructure.csproj
index 7df82c5cb032..1ae0863fe142 100644
--- a/src/Umbraco.Infrastructure/Umbraco.Infrastructure.csproj
+++ b/src/Umbraco.Infrastructure/Umbraco.Infrastructure.csproj
@@ -64,8 +64,12 @@
   </ItemGroup>
 
   <ItemGroup>
-    <!-- Take top-level depedendency on System.Text.RegularExpressions, because Dazinator.Extensions.FileProviders and MiniProfiler.AspNetCore.Mvc depends on a vulnerable version -->
+    <!-- Take top-level dependency on System.Text.RegularExpressions, because Dazinator.Extensions.FileProviders and MiniProfiler.AspNetCore.Mvc depends on a vulnerable version -->
     <PackageReference Include="System.Text.RegularExpressions" />
+
+    <!-- Take top-level dependency on these Microsoft.CodeAnalysis.* packages due to conflicts when installing Microsoft.EntityFrameworkCore.Design -->
+    <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" />
+    <PackageReference Include="Microsoft.CodeAnalysis.Workspaces.MSBuild" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
index d3a32481d540..a2fa5d39eaf7 100644
--- a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
+++ b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
@@ -5,6 +5,7 @@
     <EnablePackageValidation>false</EnablePackageValidation>
     <!-- Disable compression for static files, because MapStaticAssets() is not used anyway (yet) -->
     <CompressionEnabled>false</CompressionEnabled>
+    <ManagePackageVersionsCentrally>false</ManagePackageVersionsCentrally>
   </PropertyGroup>
 
   <PropertyGroup>
@@ -23,23 +24,13 @@
 
   <ItemGroup>
     <!-- Add design/build time support for EF Core migrations -->
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" PrivateAssets="all" />
-    <!-- Explicit transitive references to avoid warnings on build - see https://github.com/dotnet/efcore/issues/35143-->
-    <PackageReference Include="Microsoft.CodeAnalysis.Common" />
-    <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" />
-    <PackageReference Include="Microsoft.CodeAnalysis.Workspaces.Common" />
-    <PackageReference Include="Microsoft.CodeAnalysis.Workspaces.MSBuild" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <!-- Hide the content files that come from the Microsoft.CodeAnalysis.Workspaces.Common package. -->
-    <Content Update="$(NuGetPackageRoot)\microsoft.codeanalysis.workspaces.msbuild\**\**" Visible="false" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" PrivateAssets="all" Version="9.0.4" />
   </ItemGroup>
 
   <ItemGroup>
     <!-- Ensure the AppLocalIcu setting is the same as the referenced ICU package version and changes are also done to the template project! -->
     <!-- Opt-in to app-local ICU to ensure consistent globalization APIs across different platforms -->
-    <PackageReference Include="Microsoft.ICU.ICU4C.Runtime" VersionOverride="72.1.0.3" />
+    <PackageReference Include="Microsoft.ICU.ICU4C.Runtime" Version="72.1.0.3" />
     <RuntimeHostConfigurationOption Include="System.Globalization.AppLocalIcu" Value="72.1.0.3" Condition="$(RuntimeIdentifier.StartsWith('linux')) or $(RuntimeIdentifier.StartsWith('win')) or ('$(RuntimeIdentifier)' == '' and !$([MSBuild]::IsOSPlatform('osx')))" />
   </ItemGroup>
 

From 3ac37f3686f529edfe918a845f4b0c35b897c293 Mon Sep 17 00:00:00 2001
From: Lee Kelleher <leekelleher@users.noreply.github.com>
Date: Mon, 13 Oct 2025 16:32:48 +0100
Subject: [PATCH 020/155] Recycle Bin: Trigger cache invalidation for trashed
 document/media items (#20483)

* Configure document/media items to listen for `Trashed` server-events for cache invalidation

* Fire reload event on restore destination tree/menu

* Removed "trashed" part of the code comment
---
 .../restore-from-recycle-bin-modal.element.ts |  2 +-
 .../restore-from-recycle-bin.action.ts        | 19 ++++++++++++++-----
 ...-item.server.cache-invalidation.manager.ts |  3 ++-
 .../detail/cache-invalidation.manager.ts      |  5 ++++-
 .../item/cache-invalidation.manager.ts        |  5 ++++-
 ...-item.server.cache-invalidation.manager.ts |  3 ++-
 6 files changed, 27 insertions(+), 10 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/recycle-bin/entity-action/restore-from-recycle-bin/modal/restore-from-recycle-bin-modal.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/recycle-bin/entity-action/restore-from-recycle-bin/modal/restore-from-recycle-bin-modal.element.ts
index 8370cc78b0dd..77dfcdcd2ced 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/recycle-bin/entity-action/restore-from-recycle-bin/modal/restore-from-recycle-bin-modal.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/recycle-bin/entity-action/restore-from-recycle-bin/modal/restore-from-recycle-bin-modal.element.ts
@@ -53,7 +53,7 @@ export class UmbRestoreFromRecycleBinModalElement extends UmbModalBaseElement<
 
 			this.#setDestinationValue({
 				unique: null,
-				entityType: 'unknown',
+				entityType: this.data?.entityType ?? 'unknown',
 			});
 		}
 
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/recycle-bin/entity-action/restore-from-recycle-bin/restore-from-recycle-bin.action.ts b/src/Umbraco.Web.UI.Client/src/packages/core/recycle-bin/entity-action/restore-from-recycle-bin/restore-from-recycle-bin.action.ts
index cd8e4ac1b2fc..af7d3e410c5b 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/recycle-bin/entity-action/restore-from-recycle-bin/restore-from-recycle-bin.action.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/recycle-bin/entity-action/restore-from-recycle-bin/restore-from-recycle-bin.action.ts
@@ -1,7 +1,11 @@
 import { UMB_RESTORE_FROM_RECYCLE_BIN_MODAL } from './modal/restore-from-recycle-bin-modal.token.js';
 import type { MetaEntityActionRestoreFromRecycleBinKind } from './types.js';
 import { umbOpenModal } from '@umbraco-cms/backoffice/modal';
-import { UmbEntityActionBase, UmbRequestReloadStructureForEntityEvent } from '@umbraco-cms/backoffice/entity-action';
+import {
+	UmbEntityActionBase,
+	UmbRequestReloadChildrenOfEntityEvent,
+	UmbRequestReloadStructureForEntityEvent,
+} from '@umbraco-cms/backoffice/entity-action';
 import { UMB_ACTION_EVENT_CONTEXT } from '@umbraco-cms/backoffice/action';
 
 /**
@@ -33,15 +37,20 @@ export class UmbRestoreFromRecycleBinEntityAction extends UmbEntityActionBase<Me
 		if (!actionEventContext) {
 			throw new Error('Event context not found.');
 		}
-		const event = new UmbRequestReloadStructureForEntityEvent({
+
+		const sourceEvent = new UmbRequestReloadStructureForEntityEvent({
 			unique: this.args.unique,
 			entityType: this.args.entityType,
 		});
 
-		actionEventContext.dispatchEvent(event);
+		actionEventContext.dispatchEvent(sourceEvent);
+
+		const destinationEvent = new UmbRequestReloadChildrenOfEntityEvent({
+			unique: destination.unique,
+			entityType: destination.entityType,
+		});
 
-		// TODO: reload destination
-		console.log(destination.unique, destination.entityType);
+		actionEventContext.dispatchEvent(destinationEvent);
 	}
 }
 
diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/item/repository/document-item.server.cache-invalidation.manager.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/item/repository/document-item.server.cache-invalidation.manager.ts
index 7b4f06e0fc6b..a89aeb5f3738 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/item/repository/document-item.server.cache-invalidation.manager.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/item/repository/document-item.server.cache-invalidation.manager.ts
@@ -10,9 +10,10 @@ export class UmbManagementApiDocumentItemDataCacheInvalidationManager extends Um
 	constructor(host: UmbControllerHost) {
 		super(host, {
 			dataCache: documentItemCache,
-			/* The Document item model includes info about the Document Type. 
+			/* The Document item model includes info about the Document Type.
 			We need to invalidate the cache for both Document and DocumentType events. */
 			eventSources: ['Umbraco:CMS:Document', 'Umbraco:CMS:DocumentType'],
+			eventTypes: ['Updated', 'Deleted', 'Trashed'],
 		});
 	}
 
diff --git a/src/Umbraco.Web.UI.Client/src/packages/management-api/detail/cache-invalidation.manager.ts b/src/Umbraco.Web.UI.Client/src/packages/management-api/detail/cache-invalidation.manager.ts
index 3a5767b755d5..ab767589aa1a 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/management-api/detail/cache-invalidation.manager.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/management-api/detail/cache-invalidation.manager.ts
@@ -7,11 +7,13 @@ import { UmbControllerBase } from '@umbraco-cms/backoffice/class-api';
 export interface UmbManagementApiDetailDataInvalidationManagerArgs<DetailResponseModelType> {
 	dataCache: UmbManagementApiDetailDataCache<DetailResponseModelType>;
 	eventSources: Array<string>;
+	eventTypes?: Array<string>;
 }
 
 export class UmbManagementApiDetailDataCacheInvalidationManager<DetailResponseModelType> extends UmbControllerBase {
 	protected _dataCache: UmbManagementApiDetailDataCache<DetailResponseModelType>;
 	#eventSources: Array<string>;
+	#eventTypes: Array<string>;
 	#serverEventContext?: typeof UMB_MANAGEMENT_API_SERVER_EVENT_CONTEXT.TYPE;
 
 	constructor(
@@ -22,6 +24,7 @@ export class UmbManagementApiDetailDataCacheInvalidationManager<DetailResponseMo
 		{
 			this._dataCache = args.dataCache;
 			this.#eventSources = args.eventSources;
+			this.#eventTypes = args.eventTypes ?? ['Updated', 'Deleted'];
 
 			this.consumeContext(UMB_MANAGEMENT_API_SERVER_EVENT_CONTEXT, (context) => {
 				this.#serverEventContext = context;
@@ -42,7 +45,7 @@ export class UmbManagementApiDetailDataCacheInvalidationManager<DetailResponseMo
 
 	#observeServerEvents() {
 		this.observe(
-			this.#serverEventContext?.byEventSourcesAndEventTypes(this.#eventSources, ['Updated', 'Deleted']),
+			this.#serverEventContext?.byEventSourcesAndEventTypes(this.#eventSources, this.#eventTypes),
 			(event) => {
 				if (!event) return;
 				this._onServerEvent(event);
diff --git a/src/Umbraco.Web.UI.Client/src/packages/management-api/item/cache-invalidation.manager.ts b/src/Umbraco.Web.UI.Client/src/packages/management-api/item/cache-invalidation.manager.ts
index ee6a275f7887..8c8d397c7547 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/management-api/item/cache-invalidation.manager.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/management-api/item/cache-invalidation.manager.ts
@@ -7,11 +7,13 @@ import { UmbControllerBase } from '@umbraco-cms/backoffice/class-api';
 export interface UmbManagementApiItemDataInvalidationManagerArgs<ItemResponseModelType> {
 	dataCache: UmbManagementApiItemDataCache<ItemResponseModelType>;
 	eventSources: Array<string>;
+	eventTypes?: Array<string>;
 }
 
 export class UmbManagementApiItemDataCacheInvalidationManager<ItemResponseModelType> extends UmbControllerBase {
 	protected _dataCache: UmbManagementApiItemDataCache<ItemResponseModelType>;
 	#eventSources: Array<string>;
+	#eventTypes: Array<string>;
 	#serverEventContext?: typeof UMB_MANAGEMENT_API_SERVER_EVENT_CONTEXT.TYPE;
 
 	constructor(host: UmbControllerHost, args: UmbManagementApiItemDataInvalidationManagerArgs<ItemResponseModelType>) {
@@ -19,6 +21,7 @@ export class UmbManagementApiItemDataCacheInvalidationManager<ItemResponseModelT
 		{
 			this._dataCache = args.dataCache;
 			this.#eventSources = args.eventSources;
+			this.#eventTypes = args.eventTypes ?? ['Updated', 'Deleted'];
 
 			this.consumeContext(UMB_MANAGEMENT_API_SERVER_EVENT_CONTEXT, (context) => {
 				this.#serverEventContext = context;
@@ -40,7 +43,7 @@ export class UmbManagementApiItemDataCacheInvalidationManager<ItemResponseModelT
 	#observeServerEvents() {
 		// Invalidate cache entries when entities are updated or deleted
 		this.observe(
-			this.#serverEventContext?.byEventSourcesAndEventTypes(this.#eventSources, ['Updated', 'Deleted']),
+			this.#serverEventContext?.byEventSourcesAndEventTypes(this.#eventSources, this.#eventTypes),
 			(event) => {
 				if (!event) return;
 				this._onServerEvent(event);
diff --git a/src/Umbraco.Web.UI.Client/src/packages/media/media/repository/item/media-item.server.cache-invalidation.manager.ts b/src/Umbraco.Web.UI.Client/src/packages/media/media/repository/item/media-item.server.cache-invalidation.manager.ts
index fb6933c10a25..75a95ff9b2b2 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/media/media/repository/item/media-item.server.cache-invalidation.manager.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/media/media/repository/item/media-item.server.cache-invalidation.manager.ts
@@ -10,9 +10,10 @@ export class UmbManagementApiMediaItemDataCacheInvalidationManager extends UmbMa
 	constructor(host: UmbControllerHost) {
 		super(host, {
 			dataCache: mediaItemCache,
-			/* The Media item model includes info about the Media Type. 
+			/* The Media item model includes info about the Media Type.
 			We need to invalidate the cache for both Media and MediaType events. */
 			eventSources: ['Umbraco:CMS:Media', 'Umbraco:CMS:MediaType'],
+			eventTypes: ['Updated', 'Deleted', 'Trashed'],
 		});
 	}
 

From 28e4caaad37acab1df11c3180059bed7bfb191de Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= <niels.lyngso@gmail.com>
Date: Mon, 13 Oct 2025 18:42:06 +0200
Subject: [PATCH 021/155] fix merge gone wrong

---
 .../tree/tree-item/tree-item-base/tree-item-element-base.ts     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/tree/tree-item/tree-item-base/tree-item-element-base.ts b/src/Umbraco.Web.UI.Client/src/packages/core/tree/tree-item/tree-item-base/tree-item-element-base.ts
index edb8d18817be..296409029889 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/tree/tree-item/tree-item-base/tree-item-element-base.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/tree/tree-item/tree-item-base/tree-item-element-base.ts
@@ -213,7 +213,7 @@ export abstract class UmbTreeItemElementBase<
 				.showChildren=${this._isOpen}
 				.caretLabel=${this.localize.term(caretLabelKey) + ' ' + this._label}
 				label=${ifDefined(this._label)}
-				href=${ifDefined(this._isSelectableContext ? undefined : this._href)}>
+				href=${ifDefined(this._isSelectableContext ? undefined : this._href)}
 				.renderExpandSymbol=${this._renderExpandSymbol}>
 				${this.#renderLoadPrevButton()} ${this.renderIconContainer()} ${this.renderLabel()} ${this.#renderActions()}
 				${this.#renderChildItems()}

From 3393febdcac6a648dcfc8758d981c71fc157f031 Mon Sep 17 00:00:00 2001
From: Nicklas Kramer <kramernicklas@gmail.com>
Date: Mon, 13 Oct 2025 20:20:01 +0200
Subject: [PATCH 022/155] News dashboard: API and rendering of news stories on
 dashboard (#20416)

* Adding controller

* Lower case route to match other endpoints

* Adding service and typed output

* Renaming to NewsDashboard

* Moving more stuff to service

* Removing unused code

* Some refactoring in accordance with better architecture

* Created repository and mock data source for the news dashboard also display some data in the UI.

* Minor refactoring: naming, aligning with existing controller patterns.

* Update OpenApi.json.

* Update typed client sdk and types.

* Provide language to API endpoint, just in case we want to localize news in the future.

* Obsoleted configuration

* Moved mock data to mocks folder and updated repository to use the actual response model and service from the Api

* Prepared news repository with server data source.

* Rendered news items according to required group structure.
Added TODOs for remaining tasks.

* Fixed FE build issues.

* Update src/Umbraco.Core/Constants-Configuration.cs

* Fixed grid spacing, sanitize code and make the styles closer to the v13.

* Added container query and padding to the card body.

* Fix padding

* Fixed title according to priority.

* Relocated/renamed the news server data-source file

* Simplified the news repo/data-source classes

by extending `UmbControllerBase`, the host constructor is handled for us.

* Added `types.ts` export type files

* Refactored interface name + typing

* Added `uui-loader` component

* Tweaked styles, added box-shadow to cards

Added flexbox gap to the card body.

* Sorted import order

---------

Co-authored-by: Andy Butland <abutland73@gmail.com>
Co-authored-by: engjlr <enl@umbraco.dk>
Co-authored-by: leekelleher <leekelleher@gmail.com>
---
 .../NewsDashboard/NewsDashboardController.cs  |  22 +
 .../NewsDashboardControllerBase.cs            |  10 +
 .../DashboardBuilderExtensions.cs             |  15 +
 .../UmbracoBuilderExtensions.cs               |   3 +-
 src/Umbraco.Cms.Api.Management/OpenApi.json   | 589 +++++++++++++++++-
 .../NewsDashboard/INewsDashboardService.cs    |  18 +
 .../NewsDashboard/NewsDashboardService.cs     | 102 +++
 .../NewsDashboardItemResponseModel.cs         |  18 +
 .../NewsDashboardResponseModel.cs             |   6 +
 src/Umbraco.Core/Constants-Configuration.cs   |   1 +
 .../src/assets/lang/en.ts                     |   2 +-
 .../src/mocks/browser-handlers.ts             |   2 +
 .../src/mocks/data/umbraco-news.data.ts       | 115 ++++
 .../mocks/handlers/umbraco-news.handlers.ts   |  10 +
 .../src/packages/core/backend-api/sdk.gen.ts  |  77 ++-
 .../packages/core/backend-api/types.gen.ts    | 198 +++++-
 .../src/packages/umbraco-news/index.ts        |   3 +
 .../packages/umbraco-news/repository/index.ts |   2 +
 .../packages/umbraco-news/repository/types.ts |   1 +
 .../repository/umbraco-news.respository.ts    |  12 +
 .../umbraco-news.server.data-source.ts        |  25 +
 .../src/packages/umbraco-news/types.ts        |   1 +
 .../umbraco-news-dashboard.element.ts         | 308 +++++++--
 23 files changed, 1487 insertions(+), 53 deletions(-)
 create mode 100644 src/Umbraco.Cms.Api.Management/Controllers/NewsDashboard/NewsDashboardController.cs
 create mode 100644 src/Umbraco.Cms.Api.Management/Controllers/NewsDashboard/NewsDashboardControllerBase.cs
 create mode 100644 src/Umbraco.Cms.Api.Management/DependencyInjection/DashboardBuilderExtensions.cs
 create mode 100644 src/Umbraco.Cms.Api.Management/Services/NewsDashboard/INewsDashboardService.cs
 create mode 100644 src/Umbraco.Cms.Api.Management/Services/NewsDashboard/NewsDashboardService.cs
 create mode 100644 src/Umbraco.Cms.Api.Management/ViewModels/NewsDashboard/NewsDashboardItemResponseModel.cs
 create mode 100644 src/Umbraco.Cms.Api.Management/ViewModels/NewsDashboard/NewsDashboardResponseModel.cs
 create mode 100644 src/Umbraco.Web.UI.Client/src/mocks/data/umbraco-news.data.ts
 create mode 100644 src/Umbraco.Web.UI.Client/src/mocks/handlers/umbraco-news.handlers.ts
 create mode 100644 src/Umbraco.Web.UI.Client/src/packages/umbraco-news/index.ts
 create mode 100644 src/Umbraco.Web.UI.Client/src/packages/umbraco-news/repository/index.ts
 create mode 100644 src/Umbraco.Web.UI.Client/src/packages/umbraco-news/repository/types.ts
 create mode 100644 src/Umbraco.Web.UI.Client/src/packages/umbraco-news/repository/umbraco-news.respository.ts
 create mode 100644 src/Umbraco.Web.UI.Client/src/packages/umbraco-news/repository/umbraco-news.server.data-source.ts
 create mode 100644 src/Umbraco.Web.UI.Client/src/packages/umbraco-news/types.ts

diff --git a/src/Umbraco.Cms.Api.Management/Controllers/NewsDashboard/NewsDashboardController.cs b/src/Umbraco.Cms.Api.Management/Controllers/NewsDashboard/NewsDashboardController.cs
new file mode 100644
index 000000000000..583a8323b45d
--- /dev/null
+++ b/src/Umbraco.Cms.Api.Management/Controllers/NewsDashboard/NewsDashboardController.cs
@@ -0,0 +1,22 @@
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc;
+using Umbraco.Cms.Api.Management.Services.NewsDashboard;
+using Umbraco.Cms.Api.Management.ViewModels.NewsDashboard;
+
+namespace Umbraco.Cms.Api.Management.Controllers.NewsDashboard;
+
+public class NewsDashboardController : NewsDashboardControllerBase
+{
+    private readonly INewsDashboardService _newsDashboardService;
+
+    public NewsDashboardController(INewsDashboardService newsDashboardService) => _newsDashboardService = newsDashboardService;
+
+    [HttpGet]
+    [ProducesResponseType(typeof(NewsDashboardResponseModel), StatusCodes.Status200OK)]
+    public async Task<IActionResult> GetDashboard()
+    {
+        NewsDashboardResponseModel content = await _newsDashboardService.GetItemsAsync();
+
+        return Ok(content);
+    }
+}
diff --git a/src/Umbraco.Cms.Api.Management/Controllers/NewsDashboard/NewsDashboardControllerBase.cs b/src/Umbraco.Cms.Api.Management/Controllers/NewsDashboard/NewsDashboardControllerBase.cs
new file mode 100644
index 000000000000..a5d8eb8eb5fd
--- /dev/null
+++ b/src/Umbraco.Cms.Api.Management/Controllers/NewsDashboard/NewsDashboardControllerBase.cs
@@ -0,0 +1,10 @@
+using Microsoft.AspNetCore.Mvc;
+using Umbraco.Cms.Api.Management.Routing;
+
+namespace Umbraco.Cms.Api.Management.Controllers.NewsDashboard;
+
+[VersionedApiBackOfficeRoute("news-dashboard")]
+[ApiExplorerSettings(GroupName = "News Dashboard")]
+public abstract class NewsDashboardControllerBase : ManagementApiControllerBase
+{
+}
diff --git a/src/Umbraco.Cms.Api.Management/DependencyInjection/DashboardBuilderExtensions.cs b/src/Umbraco.Cms.Api.Management/DependencyInjection/DashboardBuilderExtensions.cs
new file mode 100644
index 000000000000..914546a6d0b3
--- /dev/null
+++ b/src/Umbraco.Cms.Api.Management/DependencyInjection/DashboardBuilderExtensions.cs
@@ -0,0 +1,15 @@
+using Microsoft.Extensions.DependencyInjection;
+using Umbraco.Cms.Api.Management.Services.NewsDashboard;
+using Umbraco.Cms.Core.DependencyInjection;
+
+namespace Umbraco.Cms.Api.Management.DependencyInjection;
+
+internal static class NewsDashboardBuilderExtensions
+{
+    internal static IUmbracoBuilder AddNewsDashboard(this IUmbracoBuilder builder)
+    {
+        builder.Services.AddSingleton<INewsDashboardService, NewsDashboardService>();
+
+        return builder;
+    }
+}
diff --git a/src/Umbraco.Cms.Api.Management/DependencyInjection/UmbracoBuilderExtensions.cs b/src/Umbraco.Cms.Api.Management/DependencyInjection/UmbracoBuilderExtensions.cs
index a788b1fad24d..a99e6de55303 100644
--- a/src/Umbraco.Cms.Api.Management/DependencyInjection/UmbracoBuilderExtensions.cs
+++ b/src/Umbraco.Cms.Api.Management/DependencyInjection/UmbracoBuilderExtensions.cs
@@ -71,7 +71,8 @@ public static IUmbracoBuilder AddUmbracoManagementApi(this IUmbracoBuilder build
                 .AddUserData()
                 .AddSegment()
                 .AddExport()
-                .AddImport();
+                .AddImport()
+                .AddNewsDashboard();
 
             services
                 .ConfigureOptions<ConfigureApiBehaviorOptions>()
diff --git a/src/Umbraco.Cms.Api.Management/OpenApi.json b/src/Umbraco.Cms.Api.Management/OpenApi.json
index 64674eb86f71..5f13509f568b 100644
--- a/src/Umbraco.Cms.Api.Management/OpenApi.json
+++ b/src/Umbraco.Cms.Api.Management/OpenApi.json
@@ -20321,6 +20321,461 @@
         ]
       }
     },
+    "/umbraco/management/api/v1/member-type/folder": {
+      "post": {
+        "tags": [
+          "Member Type"
+        ],
+        "operationId": "PostMemberTypeFolder",
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "oneOf": [
+                  {
+                    "$ref": "#/components/schemas/CreateFolderRequestModel"
+                  }
+                ]
+              }
+            },
+            "text/json": {
+              "schema": {
+                "oneOf": [
+                  {
+                    "$ref": "#/components/schemas/CreateFolderRequestModel"
+                  }
+                ]
+              }
+            },
+            "application/*+json": {
+              "schema": {
+                "oneOf": [
+                  {
+                    "$ref": "#/components/schemas/CreateFolderRequestModel"
+                  }
+                ]
+              }
+            }
+          }
+        },
+        "responses": {
+          "201": {
+            "description": "Created",
+            "headers": {
+              "Umb-Generated-Resource": {
+                "description": "Identifier of the newly created resource",
+                "schema": {
+                  "type": "string",
+                  "description": "Identifier of the newly created resource"
+                }
+              },
+              "Location": {
+                "description": "Location of the newly created resource",
+                "schema": {
+                  "type": "string",
+                  "description": "Location of the newly created resource",
+                  "format": "uri"
+                }
+              },
+              "Umb-Notifications": {
+                "description": "The list of notifications produced during the request.",
+                "schema": {
+                  "type": "array",
+                  "items": {
+                    "$ref": "#/components/schemas/NotificationHeaderModel"
+                  },
+                  "nullable": true
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "Bad Request",
+            "headers": {
+              "Umb-Notifications": {
+                "description": "The list of notifications produced during the request.",
+                "schema": {
+                  "type": "array",
+                  "items": {
+                    "$ref": "#/components/schemas/NotificationHeaderModel"
+                  },
+                  "nullable": true
+                }
+              }
+            },
+            "content": {
+              "application/json": {
+                "schema": {
+                  "oneOf": [
+                    {
+                      "$ref": "#/components/schemas/ProblemDetails"
+                    }
+                  ]
+                }
+              }
+            }
+          },
+          "404": {
+            "description": "Not Found",
+            "headers": {
+              "Umb-Notifications": {
+                "description": "The list of notifications produced during the request.",
+                "schema": {
+                  "type": "array",
+                  "items": {
+                    "$ref": "#/components/schemas/NotificationHeaderModel"
+                  },
+                  "nullable": true
+                }
+              }
+            },
+            "content": {
+              "application/json": {
+                "schema": {
+                  "oneOf": [
+                    {
+                      "$ref": "#/components/schemas/ProblemDetails"
+                    }
+                  ]
+                }
+              }
+            }
+          },
+          "401": {
+            "description": "The resource is protected and requires an authentication token"
+          },
+          "403": {
+            "description": "The authenticated user does not have access to this resource",
+            "headers": {
+              "Umb-Notifications": {
+                "description": "The list of notifications produced during the request.",
+                "schema": {
+                  "type": "array",
+                  "items": {
+                    "$ref": "#/components/schemas/NotificationHeaderModel"
+                  },
+                  "nullable": true
+                }
+              }
+            }
+          }
+        },
+        "security": [
+          {
+            "Backoffice-User": [ ]
+          }
+        ]
+      }
+    },
+    "/umbraco/management/api/v1/member-type/folder/{id}": {
+      "get": {
+        "tags": [
+          "Member Type"
+        ],
+        "operationId": "GetMemberTypeFolderById",
+        "parameters": [
+          {
+            "name": "id",
+            "in": "path",
+            "required": true,
+            "schema": {
+              "type": "string",
+              "format": "uuid"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "oneOf": [
+                    {
+                      "$ref": "#/components/schemas/FolderResponseModel"
+                    }
+                  ]
+                }
+              }
+            }
+          },
+          "404": {
+            "description": "Not Found",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "oneOf": [
+                    {
+                      "$ref": "#/components/schemas/ProblemDetails"
+                    }
+                  ]
+                }
+              }
+            }
+          },
+          "401": {
+            "description": "The resource is protected and requires an authentication token"
+          },
+          "403": {
+            "description": "The authenticated user does not have access to this resource"
+          }
+        },
+        "security": [
+          {
+            "Backoffice-User": [ ]
+          }
+        ]
+      },
+      "delete": {
+        "tags": [
+          "Member Type"
+        ],
+        "operationId": "DeleteMemberTypeFolderById",
+        "parameters": [
+          {
+            "name": "id",
+            "in": "path",
+            "required": true,
+            "schema": {
+              "type": "string",
+              "format": "uuid"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "headers": {
+              "Umb-Notifications": {
+                "description": "The list of notifications produced during the request.",
+                "schema": {
+                  "type": "array",
+                  "items": {
+                    "$ref": "#/components/schemas/NotificationHeaderModel"
+                  },
+                  "nullable": true
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "Bad Request",
+            "headers": {
+              "Umb-Notifications": {
+                "description": "The list of notifications produced during the request.",
+                "schema": {
+                  "type": "array",
+                  "items": {
+                    "$ref": "#/components/schemas/NotificationHeaderModel"
+                  },
+                  "nullable": true
+                }
+              }
+            },
+            "content": {
+              "application/json": {
+                "schema": {
+                  "oneOf": [
+                    {
+                      "$ref": "#/components/schemas/ProblemDetails"
+                    }
+                  ]
+                }
+              }
+            }
+          },
+          "404": {
+            "description": "Not Found",
+            "headers": {
+              "Umb-Notifications": {
+                "description": "The list of notifications produced during the request.",
+                "schema": {
+                  "type": "array",
+                  "items": {
+                    "$ref": "#/components/schemas/NotificationHeaderModel"
+                  },
+                  "nullable": true
+                }
+              }
+            },
+            "content": {
+              "application/json": {
+                "schema": {
+                  "oneOf": [
+                    {
+                      "$ref": "#/components/schemas/ProblemDetails"
+                    }
+                  ]
+                }
+              }
+            }
+          },
+          "401": {
+            "description": "The resource is protected and requires an authentication token"
+          },
+          "403": {
+            "description": "The authenticated user does not have access to this resource",
+            "headers": {
+              "Umb-Notifications": {
+                "description": "The list of notifications produced during the request.",
+                "schema": {
+                  "type": "array",
+                  "items": {
+                    "$ref": "#/components/schemas/NotificationHeaderModel"
+                  },
+                  "nullable": true
+                }
+              }
+            }
+          }
+        },
+        "security": [
+          {
+            "Backoffice-User": [ ]
+          }
+        ]
+      },
+      "put": {
+        "tags": [
+          "Member Type"
+        ],
+        "operationId": "PutMemberTypeFolderById",
+        "parameters": [
+          {
+            "name": "id",
+            "in": "path",
+            "required": true,
+            "schema": {
+              "type": "string",
+              "format": "uuid"
+            }
+          }
+        ],
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "oneOf": [
+                  {
+                    "$ref": "#/components/schemas/UpdateFolderResponseModel"
+                  }
+                ]
+              }
+            },
+            "text/json": {
+              "schema": {
+                "oneOf": [
+                  {
+                    "$ref": "#/components/schemas/UpdateFolderResponseModel"
+                  }
+                ]
+              }
+            },
+            "application/*+json": {
+              "schema": {
+                "oneOf": [
+                  {
+                    "$ref": "#/components/schemas/UpdateFolderResponseModel"
+                  }
+                ]
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "OK",
+            "headers": {
+              "Umb-Notifications": {
+                "description": "The list of notifications produced during the request.",
+                "schema": {
+                  "type": "array",
+                  "items": {
+                    "$ref": "#/components/schemas/NotificationHeaderModel"
+                  },
+                  "nullable": true
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "Bad Request",
+            "headers": {
+              "Umb-Notifications": {
+                "description": "The list of notifications produced during the request.",
+                "schema": {
+                  "type": "array",
+                  "items": {
+                    "$ref": "#/components/schemas/NotificationHeaderModel"
+                  },
+                  "nullable": true
+                }
+              }
+            },
+            "content": {
+              "application/json": {
+                "schema": {
+                  "oneOf": [
+                    {
+                      "$ref": "#/components/schemas/ProblemDetails"
+                    }
+                  ]
+                }
+              }
+            }
+          },
+          "404": {
+            "description": "Not Found",
+            "headers": {
+              "Umb-Notifications": {
+                "description": "The list of notifications produced during the request.",
+                "schema": {
+                  "type": "array",
+                  "items": {
+                    "$ref": "#/components/schemas/NotificationHeaderModel"
+                  },
+                  "nullable": true
+                }
+              }
+            },
+            "content": {
+              "application/json": {
+                "schema": {
+                  "oneOf": [
+                    {
+                      "$ref": "#/components/schemas/ProblemDetails"
+                    }
+                  ]
+                }
+              }
+            }
+          },
+          "401": {
+            "description": "The resource is protected and requires an authentication token"
+          },
+          "403": {
+            "description": "The authenticated user does not have access to this resource",
+            "headers": {
+              "Umb-Notifications": {
+                "description": "The list of notifications produced during the request.",
+                "schema": {
+                  "type": "array",
+                  "items": {
+                    "$ref": "#/components/schemas/NotificationHeaderModel"
+                  },
+                  "nullable": true
+                }
+              }
+            }
+          }
+        },
+        "security": [
+          {
+            "Backoffice-User": [ ]
+          }
+        ]
+      }
+    },
     "/umbraco/management/api/v1/tree/member-type/root": {
       "get": {
         "tags": [
@@ -21778,6 +22233,38 @@
         ]
       }
     },
+    "/umbraco/management/api/v1/news-dashboard": {
+      "get": {
+        "tags": [
+          "News Dashboard"
+        ],
+        "operationId": "GetNewsDashboard",
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "oneOf": [
+                    {
+                      "$ref": "#/components/schemas/NewsDashboardResponseModel"
+                    }
+                  ]
+                }
+              }
+            }
+          },
+          "401": {
+            "description": "The resource is protected and requires an authentication token"
+          }
+        },
+        "security": [
+          {
+            "Backoffice-User": [ ]
+          }
+        ]
+      }
+    },
     "/umbraco/management/api/v1/object-types": {
       "get": {
         "tags": [
@@ -37354,6 +37841,9 @@
                 {
                   "$ref": "#/components/schemas/DocumentPropertyValuePermissionPresentationModel"
                 },
+                {
+                  "$ref": "#/components/schemas/DocumentTypePermissionPresentationModel"
+                },
                 {
                   "$ref": "#/components/schemas/UnknownTypePermissionPresentationModel"
                 }
@@ -37640,6 +38130,9 @@
                 {
                   "$ref": "#/components/schemas/DocumentPropertyValuePermissionPresentationModel"
                 },
+                {
+                  "$ref": "#/components/schemas/DocumentTypePermissionPresentationModel"
+                },
                 {
                   "$ref": "#/components/schemas/UnknownTypePermissionPresentationModel"
                 }
@@ -38405,7 +38898,8 @@
             "type": "boolean"
           },
           "allowNonExistingSegmentsCreation": {
-            "type": "boolean"
+            "type": "boolean",
+            "deprecated": true
           }
         },
         "additionalProperties": false
@@ -39037,6 +39531,36 @@
         },
         "additionalProperties": false
       },
+      "DocumentTypePermissionPresentationModel": {
+        "required": [
+          "$type",
+          "documentTypeAlias",
+          "verbs"
+        ],
+        "type": "object",
+        "properties": {
+          "$type": {
+            "type": "string"
+          },
+          "verbs": {
+            "uniqueItems": true,
+            "type": "array",
+            "items": {
+              "type": "string"
+            }
+          },
+          "documentTypeAlias": {
+            "type": "string"
+          }
+        },
+        "additionalProperties": false,
+        "discriminator": {
+          "propertyName": "$type",
+          "mapping": {
+            "DocumentTypePermissionPresentationModel": "#/components/schemas/DocumentTypePermissionPresentationModel"
+          }
+        }
+      },
       "DocumentTypePropertyTypeContainerResponseModel": {
         "required": [
           "id",
@@ -42732,6 +43256,61 @@
         },
         "additionalProperties": false
       },
+      "NewsDashboardItemResponseModel": {
+        "required": [
+          "header",
+          "priority"
+        ],
+        "type": "object",
+        "properties": {
+          "priority": {
+            "type": "string"
+          },
+          "header": {
+            "type": "string"
+          },
+          "body": {
+            "type": "string",
+            "nullable": true
+          },
+          "buttonText": {
+            "type": "string",
+            "nullable": true
+          },
+          "imageUrl": {
+            "type": "string",
+            "nullable": true
+          },
+          "imageAltText": {
+            "type": "string",
+            "nullable": true
+          },
+          "url": {
+            "type": "string",
+            "nullable": true
+          }
+        },
+        "additionalProperties": false
+      },
+      "NewsDashboardResponseModel": {
+        "required": [
+          "items"
+        ],
+        "type": "object",
+        "properties": {
+          "items": {
+            "type": "array",
+            "items": {
+              "oneOf": [
+                {
+                  "$ref": "#/components/schemas/NewsDashboardItemResponseModel"
+                }
+              ]
+            }
+          }
+        },
+        "additionalProperties": false
+      },
       "NoopSetupTwoFactorModel": {
         "type": "object",
         "additionalProperties": false
@@ -47740,6 +48319,9 @@
                 {
                   "$ref": "#/components/schemas/DocumentPropertyValuePermissionPresentationModel"
                 },
+                {
+                  "$ref": "#/components/schemas/DocumentTypePermissionPresentationModel"
+                },
                 {
                   "$ref": "#/components/schemas/UnknownTypePermissionPresentationModel"
                 }
@@ -48177,6 +48759,9 @@
                 {
                   "$ref": "#/components/schemas/DocumentPropertyValuePermissionPresentationModel"
                 },
+                {
+                  "$ref": "#/components/schemas/DocumentTypePermissionPresentationModel"
+                },
                 {
                   "$ref": "#/components/schemas/UnknownTypePermissionPresentationModel"
                 }
@@ -48859,4 +49444,4 @@
       }
     }
   }
-}
\ No newline at end of file
+}
diff --git a/src/Umbraco.Cms.Api.Management/Services/NewsDashboard/INewsDashboardService.cs b/src/Umbraco.Cms.Api.Management/Services/NewsDashboard/INewsDashboardService.cs
new file mode 100644
index 000000000000..3f2b2c8b3f78
--- /dev/null
+++ b/src/Umbraco.Cms.Api.Management/Services/NewsDashboard/INewsDashboardService.cs
@@ -0,0 +1,18 @@
+using Umbraco.Cms.Api.Management.ViewModels.NewsDashboard;
+
+namespace Umbraco.Cms.Api.Management.Services.NewsDashboard;
+
+/// <summary>
+/// Defines a service for retrieving news dashboard items.
+/// </summary>
+public interface INewsDashboardService
+{
+    /// <summary>
+    /// Asynchronously retrieves the collection of news dashboard items.
+    /// </summary>
+    /// <returns>
+    /// A task that represents the asynchronous operation.
+    /// The task result contains a <see cref="NewsDashboardResponseModel"/> with the retrieved news dashboard items.
+    /// </returns>
+    Task<NewsDashboardResponseModel> GetItemsAsync();
+}
diff --git a/src/Umbraco.Cms.Api.Management/Services/NewsDashboard/NewsDashboardService.cs b/src/Umbraco.Cms.Api.Management/Services/NewsDashboard/NewsDashboardService.cs
new file mode 100644
index 000000000000..2d05e20df374
--- /dev/null
+++ b/src/Umbraco.Cms.Api.Management/Services/NewsDashboard/NewsDashboardService.cs
@@ -0,0 +1,102 @@
+using System.Diagnostics.CodeAnalysis;
+using System.Text.Json;
+using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Options;
+using Umbraco.Cms.Api.Management.ViewModels.NewsDashboard;
+using Umbraco.Cms.Core.Cache;
+using Umbraco.Cms.Core.Configuration;
+using Umbraco.Cms.Core.Configuration.Models;
+using Umbraco.Cms.Core.Security;
+using Umbraco.Cms.Core.Telemetry;
+using Umbraco.Extensions;
+
+namespace Umbraco.Cms.Api.Management.Services.NewsDashboard;
+
+/// <inheritdoc />
+public class NewsDashboardService : INewsDashboardService
+{
+    private readonly AppCaches _appCaches;
+    private readonly IUmbracoVersion _umbracoVersion;
+    private readonly ISiteIdentifierService _siteIdentifierService;
+    private readonly ILogger<NewsDashboardService> _logger;
+    private readonly IBackOfficeSecurityAccessor _backOfficeSecurityAccessor;
+    private readonly GlobalSettings _globalSettings;
+
+    private static readonly HttpClient _httpClient = new();
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="NewsDashboardService"/> class.
+    /// </summary>
+    public NewsDashboardService(
+        AppCaches appCaches,
+        IUmbracoVersion umbracoVersion,
+        ISiteIdentifierService siteIdentifierService,
+        ILogger<NewsDashboardService> logger,
+        IBackOfficeSecurityAccessor backOfficeSecurityAccessor,
+        IOptions<GlobalSettings> globalSettings)
+    {
+        _appCaches = appCaches;
+        _umbracoVersion = umbracoVersion;
+        _siteIdentifierService = siteIdentifierService;
+        _logger = logger;
+        _backOfficeSecurityAccessor = backOfficeSecurityAccessor;
+        _globalSettings = globalSettings.Value;
+    }
+
+    /// <inheritdoc />
+    public async Task<NewsDashboardResponseModel> GetItemsAsync()
+    {
+        const string BaseUrl = "https://umbraco-dashboard-news.euwest01.umbraco.io";
+        const string Path = "/api/News";
+
+        var version = _umbracoVersion.SemanticVersion.ToSemanticStringWithoutBuild();
+        _siteIdentifierService.TryGetOrCreateSiteIdentifier(out Guid siteIdentifier);
+
+        var language = _backOfficeSecurityAccessor.BackOfficeSecurity?.CurrentUser?.Language ?? _globalSettings.DefaultUILanguage;
+
+        var url = $"{BaseUrl}/{Path}?version={version}&siteId={siteIdentifier}&language={language}";
+
+        const string CacheKey = "umbraco-dashboard-news";
+        NewsDashboardResponseModel? content = _appCaches.RuntimeCache.GetCacheItem<NewsDashboardResponseModel>(CacheKey);
+        if (content is not null)
+        {
+            return content;
+        }
+
+        try
+        {
+            var json = await _httpClient.GetStringAsync(url);
+
+            if (TryMapModel(json, out NewsDashboardResponseModel? model))
+            {
+                _appCaches.RuntimeCache.InsertCacheItem(CacheKey, () => model, new TimeSpan(0, 30, 0));
+                content = model;
+            }
+        }
+        catch (Exception ex)
+        {
+            _logger.LogError(ex.InnerException ?? ex, "Error getting dashboard content from {Url}", url);
+        }
+
+        return content ?? new NewsDashboardResponseModel { Items = [] };
+    }
+
+    private bool TryMapModel(string json, [MaybeNullWhen(false)] out NewsDashboardResponseModel newsDashboardResponseModel)
+    {
+        try
+        {
+            var options = new JsonSerializerOptions { PropertyNameCaseInsensitive = true, };
+
+            List<NewsDashboardItemResponseModel>? items = JsonSerializer.Deserialize<List<NewsDashboardItemResponseModel>>(json, options);
+            newsDashboardResponseModel = new NewsDashboardResponseModel { Items = items ?? [] };
+
+            return true;
+        }
+        catch (JsonException ex)
+        {
+            _logger.LogError(ex.InnerException ?? ex, "Error deserializing dashboard news items");
+            newsDashboardResponseModel = null;
+            return false;
+        }
+    }
+}
diff --git a/src/Umbraco.Cms.Api.Management/ViewModels/NewsDashboard/NewsDashboardItemResponseModel.cs b/src/Umbraco.Cms.Api.Management/ViewModels/NewsDashboard/NewsDashboardItemResponseModel.cs
new file mode 100644
index 000000000000..ddad85617286
--- /dev/null
+++ b/src/Umbraco.Cms.Api.Management/ViewModels/NewsDashboard/NewsDashboardItemResponseModel.cs
@@ -0,0 +1,18 @@
+namespace Umbraco.Cms.Api.Management.ViewModels.NewsDashboard;
+
+public class NewsDashboardItemResponseModel
+{
+    public required string Priority { get; set; }
+
+    public required string Header { get; set; }
+
+    public string? Body { get; set; }
+
+    public string? ButtonText { get; set; }
+
+    public string? ImageUrl { get; set; }
+
+    public string? ImageAltText { get; set; }
+
+    public string? Url { get; set; }
+}
diff --git a/src/Umbraco.Cms.Api.Management/ViewModels/NewsDashboard/NewsDashboardResponseModel.cs b/src/Umbraco.Cms.Api.Management/ViewModels/NewsDashboard/NewsDashboardResponseModel.cs
new file mode 100644
index 000000000000..e9251f03ffa1
--- /dev/null
+++ b/src/Umbraco.Cms.Api.Management/ViewModels/NewsDashboard/NewsDashboardResponseModel.cs
@@ -0,0 +1,6 @@
+namespace Umbraco.Cms.Api.Management.ViewModels.NewsDashboard;
+
+public class NewsDashboardResponseModel
+{
+    public required IEnumerable<NewsDashboardItemResponseModel> Items { get; set; }
+}
diff --git a/src/Umbraco.Core/Constants-Configuration.cs b/src/Umbraco.Core/Constants-Configuration.cs
index 57b0d543a67a..8ac24c71f45d 100644
--- a/src/Umbraco.Core/Constants-Configuration.cs
+++ b/src/Umbraco.Core/Constants-Configuration.cs
@@ -57,6 +57,7 @@ public static class Configuration
         public const string ConfigUserPassword = ConfigPrefix + "Security:UserPassword";
         public const string ConfigRichTextEditor = ConfigPrefix + "RichTextEditor";
         public const string ConfigPackageMigration = ConfigPrefix + "PackageMigration";
+        [Obsolete("No longer used in Umbraco. Scheduled to be removed in Umbraco 19.")]
         public const string ConfigContentDashboard = ConfigPrefix + "ContentDashboard";
         public const string ConfigHelpPage = ConfigPrefix + "HelpPage";
         public const string ConfigInstallDefaultData = ConfigPrefix + "InstallDefaultData";
diff --git a/src/Umbraco.Web.UI.Client/src/assets/lang/en.ts b/src/Umbraco.Web.UI.Client/src/assets/lang/en.ts
index 364469d9f41f..70a0ad0020dd 100644
--- a/src/Umbraco.Web.UI.Client/src/assets/lang/en.ts
+++ b/src/Umbraco.Web.UI.Client/src/assets/lang/en.ts
@@ -2357,7 +2357,7 @@ export default {
 		noDependency: 'No',
 	},
 	dashboardTabs: {
-		contentIntro: 'Getting Started',
+		contentIntro: 'Welcome to Umbraco',
 		contentRedirectManager: 'Redirect URL Management',
 		mediaFolderBrowser: 'Content',
 		settingsWelcome: 'Welcome',
diff --git a/src/Umbraco.Web.UI.Client/src/mocks/browser-handlers.ts b/src/Umbraco.Web.UI.Client/src/mocks/browser-handlers.ts
index 6003f11ff521..495a91d0c212 100644
--- a/src/Umbraco.Web.UI.Client/src/mocks/browser-handlers.ts
+++ b/src/Umbraco.Web.UI.Client/src/mocks/browser-handlers.ts
@@ -32,6 +32,7 @@ import { handlers as stylesheetHandlers } from './handlers/stylesheet/index.js';
 import { handlers as tagHandlers } from './handlers/tag-handlers.js';
 import { handlers as telemetryHandlers } from './handlers/telemetry.handlers.js';
 import { handlers as templateHandlers } from './handlers/template/index.js';
+import { handlers as umbracoNewsHandlers } from './handlers/umbraco-news.handlers.js';
 import { handlers as upgradeHandlers } from './handlers/upgrade.handlers.js';
 import { handlers as userGroupsHandlers } from './handlers/user-group/index.js';
 import { handlers as userHandlers } from './handlers/user/index.js';
@@ -76,6 +77,7 @@ const handlers = [
 	...tagHandlers,
 	...telemetryHandlers,
 	...templateHandlers,
+	...umbracoNewsHandlers,
 	...upgradeHandlers,
 	...userGroupsHandlers,
 	...userHandlers,
diff --git a/src/Umbraco.Web.UI.Client/src/mocks/data/umbraco-news.data.ts b/src/Umbraco.Web.UI.Client/src/mocks/data/umbraco-news.data.ts
new file mode 100644
index 000000000000..366b0b883c71
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/mocks/data/umbraco-news.data.ts
@@ -0,0 +1,115 @@
+import type { NewsDashboardResponseModel } from '@umbraco-cms/backoffice/external/backend-api';
+
+export const umbNewsData: NewsDashboardResponseModel = {
+	items: [
+		{
+			priority: 'High',
+			header: 'News High 1',
+			body: '<p>Lorem ipsum <b>dolor sit amet</b>, consectetur adipiscing elit. Sed urna dui, convallis in porta sed, tempor non mauris. Aliquam placerat sed nulla a varius. Maecenas elementum tempus luctus. Nulla eu magna turpis. Nunc vel sodales urna. Donec ac ipsum sed ex egestas interdum. Aliquam pellentesque tellus id felis tempor gravida.</p>',
+			buttonText: 'Button text',
+			imageUrl: 'https://umbraco-dashboard-news.euwest01.umbraco.io/media/rxphk1dd/dashboard-11.jpg',
+			imageAltText: 'Test',
+			url: 'https://umbraco.com',
+		},
+		{
+			priority: 'High',
+			header: 'News high 2',
+			body: '<p>Lorem ipsum <b>dolor sit amet</b>, consectetur adipiscing elit. Sed urna dui, convallis in porta sed, tempor non mauris. Aliquam placerat sed nulla a varius. Maecenas elementum tempus luctus. Nulla eu magna turpis. Nunc vel sodales urna. Donec ac ipsum sed ex egestas interdum. Aliquam pellentesque tellus id felis tempor gravida.</p>',
+			buttonText: 'See more',
+			imageUrl: 'https://umbraco-dashboard-news.euwest01.umbraco.io/media/ezujjyhj/dashboard-12.jpg',
+			imageAltText: '',
+			url: 'https://umbraco.com',
+		},
+		{
+			priority: 'High',
+			header: 'News high 3',
+			body: '<p>Lorem ipsum <b>dolor sit amet</b>, consectetur adipiscing elit. Sed urna dui, convallis in porta sed, tempor non mauris. Aliquam placerat sed nulla a varius. Maecenas elementum tempus luctus. Nulla eu magna turpis. Nunc vel sodales urna. Donec ac ipsum sed ex egestas interdum. Aliquam pellentesque tellus id felis tempor gravida.</p>',
+			buttonText: 'See more',
+			imageUrl: 'https://umbraco-dashboard-news.euwest01.umbraco.io/media/ezujjyhj/dashboard-12.jpg',
+			imageAltText: '',
+			url: 'https://umbraco.com',
+		},
+		{
+			priority: 'High',
+			header: 'News high 4',
+			body: '<p>Lorem ipsum <b>dolor sit amet</b>, consectetur adipiscing elit. Sed urna dui, convallis in porta sed, tempor non mauris. Aliquam placerat sed nulla a varius. Maecenas elementum tempus luctus. Nulla eu magna turpis. Nunc vel sodales urna. Donec ac ipsum sed ex egestas interdum. Aliquam pellentesque tellus id felis tempor gravida.</p>',
+			buttonText: 'See more',
+			imageUrl: 'https://umbraco-dashboard-news.euwest01.umbraco.io/media/ezujjyhj/dashboard-12.jpg',
+			imageAltText: '',
+			url: 'https://umbraco.com',
+		},
+		{
+			priority: 'High',
+			header: 'News high 5',
+			body: '<p>Lorem ipsum <b>dolor sit amet</b>, consectetur adipiscing elit. Sed urna dui, convallis in porta sed, tempor non mauris. Aliquam placerat sed nulla a varius. Maecenas elementum tempus luctus. Nulla eu magna turpis. Nunc vel sodales urna. Donec ac ipsum sed ex egestas interdum. Aliquam pellentesque tellus id felis tempor gravida.</p>',
+			buttonText: 'See more',
+			imageUrl: 'https://umbraco-dashboard-news.euwest01.umbraco.io/media/ezujjyhj/dashboard-12.jpg',
+			imageAltText: '',
+			url: 'https://umbraco.com',
+		},
+		{
+			priority: 'Medium',
+			header: 'News medium 1',
+			body: '<p>Lorem ipsum <b>dolor sit amet</b>, consectetur adipiscing elit. Sed urna dui, convallis in porta sed, tempor non mauris. Aliquam placerat sed nulla a varius. Maecenas elementum tempus luctus. Nulla eu magna turpis. Nunc vel sodales urna. Donec ac ipsum sed ex egestas interdum. Aliquam pellentesque tellus id felis tempor gravida.</p>',
+			buttonText: 'See more',
+			imageUrl: '',
+			imageAltText: '',
+			url: 'https://umbraco.com',
+		},
+
+		{
+			priority: 'Normal',
+			header: 'Normal 1',
+			body: '<p>Lorem ipsum <b>dolor sit amet</b>, consectetur adipiscing elit. Sed urna dui, convallis in porta sed, tempor non mauris. Aliquam placerat sed nulla a varius. Maecenas elementum tempus luctus. Nulla eu magna turpis. Nunc vel sodales urna. Donec ac ipsum sed ex egestas interdum. Aliquam pellentesque tellus id felis tempor gravida.</p>',
+			buttonText: 'See more',
+			imageUrl: 'https://umbraco-dashboard-news.euwest01.umbraco.io/media/403pgsxa/stability-without-complexity.webp',
+			imageAltText: '',
+			url: 'https://umbraco.com',
+		},
+		{
+			priority: 'Normal',
+			header: 'Normal 2',
+			body: '<p>Lorem ipsum <b>dolor sit amet</b>, consectetur adipiscing elit. Sed urna dui, convallis in porta sed, tempor non mauris. Aliquam placerat sed nulla a varius. Maecenas elementum tempus luctus. Nulla eu magna turpis. Nunc vel sodales urna. Donec ac ipsum sed ex egestas interdum. Aliquam pellentesque tellus id felis tempor gravida.</p>',
+			buttonText: 'See more',
+			imageUrl: 'https://umbraco-dashboard-news.euwest01.umbraco.io/media/403pgsxa/stability-without-complexity.webp',
+			imageAltText: '',
+			url: 'https://umbraco.com',
+		},
+		{
+			priority: 'Normal',
+			header: 'Normal 3',
+			body: '<p>Lorem ipsum <b>dolor sit amet</b>, consectetur adipiscing elit. Sed urna dui, convallis in porta sed, tempor non mauris. Aliquam placerat sed nulla a varius. Maecenas elementum tempus luctus. Nulla eu magna turpis. Nunc vel sodales urna. Donec ac ipsum sed ex egestas interdum. Aliquam pellentesque tellus id felis tempor gravida.</p>',
+			buttonText: 'See more',
+			imageUrl: 'https://umbraco-dashboard-news.euwest01.umbraco.io/media/403pgsxa/stability-without-complexity.webp',
+			imageAltText: '',
+			url: 'https://umbraco.com',
+		},
+		{
+			priority: 'Normal',
+			header: 'Normal 4',
+			body: '<p>Lorem ipsum <b>dolor sit amet</b>, consectetur adipiscing elit. Sed urna dui, convallis in porta sed, tempor non mauris. Aliquam placerat sed nulla a varius. Maecenas elementum tempus luctus. Nulla eu magna turpis. Nunc vel sodales urna. Donec ac ipsum sed ex egestas interdum. Aliquam pellentesque tellus id felis tempor gravida.</p>',
+			buttonText: 'See more',
+			imageUrl: 'https://umbraco-dashboard-news.euwest01.umbraco.io/media/403pgsxa/stability-without-complexity.webp',
+			imageAltText: '',
+			url: 'https://umbraco.com',
+		},
+		{
+			priority: 'Normal',
+			header: 'Normal 5',
+			body: '<p>Lorem ipsum <b>dolor sit amet</b>, consectetur adipiscing elit. Sed urna dui, convallis in porta sed, tempor non mauris. Aliquam placerat sed nulla a varius. Maecenas elementum tempus luctus. Nulla eu magna turpis. Nunc vel sodales urna. Donec ac ipsum sed ex egestas interdum. Aliquam pellentesque tellus id felis tempor gravida.</p>',
+			buttonText: 'See more',
+			imageUrl: 'https://umbraco-dashboard-news.euwest01.umbraco.io/media/403pgsxa/stability-without-complexity.webp',
+			imageAltText: '',
+			url: 'https://umbraco.com',
+		},
+		{
+			priority: 'Normal',
+			header: 'Normal 6',
+			body: '<p>Lorem ipsum <b>dolor sit amet</b>, consectetur adipiscing elit. Sed urna dui, convallis in porta sed, tempor non mauris. Aliquam placerat sed nulla a varius. Maecenas elementum tempus luctus. Nulla eu magna turpis. Nunc vel sodales urna. Donec ac ipsum sed ex egestas interdum. Aliquam pellentesque tellus id felis tempor gravida.</p>',
+			buttonText: 'See more',
+			imageUrl: 'https://umbraco-dashboard-news.euwest01.umbraco.io/media/403pgsxa/stability-without-complexity.webp',
+			imageAltText: '',
+			url: 'https://umbraco.com',
+		},
+	],
+};
diff --git a/src/Umbraco.Web.UI.Client/src/mocks/handlers/umbraco-news.handlers.ts b/src/Umbraco.Web.UI.Client/src/mocks/handlers/umbraco-news.handlers.ts
new file mode 100644
index 000000000000..748bed633427
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/mocks/handlers/umbraco-news.handlers.ts
@@ -0,0 +1,10 @@
+const { rest } = window.MockServiceWorker;
+import { umbNewsData } from '../data/umbraco-news.data.js';
+import { umbracoPath } from '@umbraco-cms/backoffice/utils';
+
+export const handlers = [
+	rest.get(umbracoPath('/news-dashboard'), (req, res, ctx) => {
+		const response = umbNewsData;
+		return res(ctx.delay(), ctx.status(200), ctx.json(response));
+	}),
+];
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/backend-api/sdk.gen.ts b/src/Umbraco.Web.UI.Client/src/packages/core/backend-api/sdk.gen.ts
index 7a718c555cd6..65dfc31492b9 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/backend-api/sdk.gen.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/backend-api/sdk.gen.ts
@@ -2,7 +2,7 @@
 
 import { type Client, formDataBodySerializer, type Options as Options2, type TDataShape } from './client';
 import { client } from './client.gen';
-import type { DeleteDataTypeByIdData, DeleteDataTypeByIdErrors, DeleteDataTypeByIdResponses, DeleteDataTypeFolderByIdData, DeleteDataTypeFolderByIdErrors, DeleteDataTypeFolderByIdResponses, DeleteDictionaryByIdData, DeleteDictionaryByIdErrors, DeleteDictionaryByIdResponses, DeleteDocumentBlueprintByIdData, DeleteDocumentBlueprintByIdErrors, DeleteDocumentBlueprintByIdResponses, DeleteDocumentBlueprintFolderByIdData, DeleteDocumentBlueprintFolderByIdErrors, DeleteDocumentBlueprintFolderByIdResponses, DeleteDocumentByIdData, DeleteDocumentByIdErrors, DeleteDocumentByIdPublicAccessData, DeleteDocumentByIdPublicAccessErrors, DeleteDocumentByIdPublicAccessResponses, DeleteDocumentByIdResponses, DeleteDocumentTypeByIdData, DeleteDocumentTypeByIdErrors, DeleteDocumentTypeByIdResponses, DeleteDocumentTypeFolderByIdData, DeleteDocumentTypeFolderByIdErrors, DeleteDocumentTypeFolderByIdResponses, DeleteLanguageByIsoCodeData, DeleteLanguageByIsoCodeErrors, DeleteLanguageByIsoCodeResponses, DeleteLogViewerSavedSearchByNameData, DeleteLogViewerSavedSearchByNameErrors, DeleteLogViewerSavedSearchByNameResponses, DeleteMediaByIdData, DeleteMediaByIdErrors, DeleteMediaByIdResponses, DeleteMediaTypeByIdData, DeleteMediaTypeByIdErrors, DeleteMediaTypeByIdResponses, DeleteMediaTypeFolderByIdData, DeleteMediaTypeFolderByIdErrors, DeleteMediaTypeFolderByIdResponses, DeleteMemberByIdData, DeleteMemberByIdErrors, DeleteMemberByIdResponses, DeleteMemberGroupByIdData, DeleteMemberGroupByIdErrors, DeleteMemberGroupByIdResponses, DeleteMemberTypeByIdData, DeleteMemberTypeByIdErrors, DeleteMemberTypeByIdResponses, DeletePackageCreatedByIdData, DeletePackageCreatedByIdErrors, DeletePackageCreatedByIdResponses, DeletePartialViewByPathData, DeletePartialViewByPathErrors, DeletePartialViewByPathResponses, DeletePartialViewFolderByPathData, DeletePartialViewFolderByPathErrors, DeletePartialViewFolderByPathResponses, DeletePreviewData, DeletePreviewResponses, DeleteRecycleBinDocumentByIdData, DeleteRecycleBinDocumentByIdErrors, DeleteRecycleBinDocumentByIdResponses, DeleteRecycleBinDocumentData, DeleteRecycleBinDocumentErrors, DeleteRecycleBinDocumentResponses, DeleteRecycleBinMediaByIdData, DeleteRecycleBinMediaByIdErrors, DeleteRecycleBinMediaByIdResponses, DeleteRecycleBinMediaData, DeleteRecycleBinMediaErrors, DeleteRecycleBinMediaResponses, DeleteRedirectManagementByIdData, DeleteRedirectManagementByIdErrors, DeleteRedirectManagementByIdResponses, DeleteScriptByPathData, DeleteScriptByPathErrors, DeleteScriptByPathResponses, DeleteScriptFolderByPathData, DeleteScriptFolderByPathErrors, DeleteScriptFolderByPathResponses, DeleteStylesheetByPathData, DeleteStylesheetByPathErrors, DeleteStylesheetByPathResponses, DeleteStylesheetFolderByPathData, DeleteStylesheetFolderByPathErrors, DeleteStylesheetFolderByPathResponses, DeleteTemplateByIdData, DeleteTemplateByIdErrors, DeleteTemplateByIdResponses, DeleteTemporaryFileByIdData, DeleteTemporaryFileByIdErrors, DeleteTemporaryFileByIdResponses, DeleteUserAvatarByIdData, DeleteUserAvatarByIdErrors, DeleteUserAvatarByIdResponses, DeleteUserById2FaByProviderNameData, DeleteUserById2FaByProviderNameErrors, DeleteUserById2FaByProviderNameResponses, DeleteUserByIdClientCredentialsByClientIdData, DeleteUserByIdClientCredentialsByClientIdErrors, DeleteUserByIdClientCredentialsByClientIdResponses, DeleteUserByIdData, DeleteUserByIdErrors, DeleteUserByIdResponses, DeleteUserCurrent2FaByProviderNameData, DeleteUserCurrent2FaByProviderNameErrors, DeleteUserCurrent2FaByProviderNameResponses, DeleteUserData, DeleteUserDataByIdData, DeleteUserDataByIdErrors, DeleteUserDataByIdResponses, DeleteUserErrors, DeleteUserGroupByIdData, DeleteUserGroupByIdErrors, DeleteUserGroupByIdResponses, DeleteUserGroupByIdUsersData, DeleteUserGroupByIdUsersErrors, DeleteUserGroupByIdUsersResponses, DeleteUserGroupData, DeleteUserGroupErrors, DeleteUserGroupResponses, DeleteUserResponses, DeleteWebhookByIdData, DeleteWebhookByIdErrors, DeleteWebhookByIdResponses, GetCollectionDocumentByIdData, GetCollectionDocumentByIdErrors, GetCollectionDocumentByIdResponses, GetCollectionMediaData, GetCollectionMediaErrors, GetCollectionMediaResponses, GetCultureData, GetCultureErrors, GetCultureResponses, GetDataTypeByIdData, GetDataTypeByIdErrors, GetDataTypeByIdIsUsedData, GetDataTypeByIdIsUsedErrors, GetDataTypeByIdIsUsedResponses, GetDataTypeByIdReferencedByData, GetDataTypeByIdReferencedByErrors, GetDataTypeByIdReferencedByResponses, GetDataTypeByIdResponses, GetDataTypeConfigurationData, GetDataTypeConfigurationErrors, GetDataTypeConfigurationResponses, GetDataTypeFolderByIdData, GetDataTypeFolderByIdErrors, GetDataTypeFolderByIdResponses, GetDictionaryByIdData, GetDictionaryByIdErrors, GetDictionaryByIdExportData, GetDictionaryByIdExportErrors, GetDictionaryByIdExportResponses, GetDictionaryByIdResponses, GetDictionaryData, GetDictionaryErrors, GetDictionaryResponses, GetDocumentAreReferencedData, GetDocumentAreReferencedErrors, GetDocumentAreReferencedResponses, GetDocumentBlueprintByIdData, GetDocumentBlueprintByIdErrors, GetDocumentBlueprintByIdResponses, GetDocumentBlueprintByIdScaffoldData, GetDocumentBlueprintByIdScaffoldErrors, GetDocumentBlueprintByIdScaffoldResponses, GetDocumentBlueprintFolderByIdData, GetDocumentBlueprintFolderByIdErrors, GetDocumentBlueprintFolderByIdResponses, GetDocumentByIdAuditLogData, GetDocumentByIdAuditLogErrors, GetDocumentByIdAuditLogResponses, GetDocumentByIdAvailableSegmentOptionsData, GetDocumentByIdAvailableSegmentOptionsErrors, GetDocumentByIdAvailableSegmentOptionsResponses, GetDocumentByIdData, GetDocumentByIdDomainsData, GetDocumentByIdDomainsErrors, GetDocumentByIdDomainsResponses, GetDocumentByIdErrors, GetDocumentByIdNotificationsData, GetDocumentByIdNotificationsErrors, GetDocumentByIdNotificationsResponses, GetDocumentByIdPreviewUrlData, GetDocumentByIdPreviewUrlErrors, GetDocumentByIdPreviewUrlResponses, GetDocumentByIdPublicAccessData, GetDocumentByIdPublicAccessErrors, GetDocumentByIdPublicAccessResponses, GetDocumentByIdPublishedData, GetDocumentByIdPublishedErrors, GetDocumentByIdPublishedResponses, GetDocumentByIdPublishWithDescendantsResultByTaskIdData, GetDocumentByIdPublishWithDescendantsResultByTaskIdErrors, GetDocumentByIdPublishWithDescendantsResultByTaskIdResponses, GetDocumentByIdReferencedByData, GetDocumentByIdReferencedByErrors, GetDocumentByIdReferencedByResponses, GetDocumentByIdReferencedDescendantsData, GetDocumentByIdReferencedDescendantsErrors, GetDocumentByIdReferencedDescendantsResponses, GetDocumentByIdResponses, GetDocumentConfigurationData, GetDocumentConfigurationErrors, GetDocumentConfigurationResponses, GetDocumentTypeAllowedAtRootData, GetDocumentTypeAllowedAtRootErrors, GetDocumentTypeAllowedAtRootResponses, GetDocumentTypeByIdAllowedChildrenData, GetDocumentTypeByIdAllowedChildrenErrors, GetDocumentTypeByIdAllowedChildrenResponses, GetDocumentTypeByIdBlueprintData, GetDocumentTypeByIdBlueprintErrors, GetDocumentTypeByIdBlueprintResponses, GetDocumentTypeByIdCompositionReferencesData, GetDocumentTypeByIdCompositionReferencesErrors, GetDocumentTypeByIdCompositionReferencesResponses, GetDocumentTypeByIdData, GetDocumentTypeByIdErrors, GetDocumentTypeByIdExportData, GetDocumentTypeByIdExportErrors, GetDocumentTypeByIdExportResponses, GetDocumentTypeByIdResponses, GetDocumentTypeConfigurationData, GetDocumentTypeConfigurationErrors, GetDocumentTypeConfigurationResponses, GetDocumentTypeFolderByIdData, GetDocumentTypeFolderByIdErrors, GetDocumentTypeFolderByIdResponses, GetDocumentUrlsData, GetDocumentUrlsErrors, GetDocumentUrlsResponses, GetDocumentVersionByIdData, GetDocumentVersionByIdErrors, GetDocumentVersionByIdResponses, GetDocumentVersionData, GetDocumentVersionErrors, GetDocumentVersionResponses, GetDynamicRootStepsData, GetDynamicRootStepsErrors, GetDynamicRootStepsResponses, GetFilterDataTypeData, GetFilterDataTypeErrors, GetFilterDataTypeResponses, GetFilterMemberData, GetFilterMemberErrors, GetFilterMemberResponses, GetFilterUserData, GetFilterUserErrors, GetFilterUserGroupData, GetFilterUserGroupErrors, GetFilterUserGroupResponses, GetFilterUserResponses, GetHealthCheckGroupByNameData, GetHealthCheckGroupByNameErrors, GetHealthCheckGroupByNameResponses, GetHealthCheckGroupData, GetHealthCheckGroupErrors, GetHealthCheckGroupResponses, GetHelpData, GetHelpErrors, GetHelpResponses, GetImagingResizeUrlsData, GetImagingResizeUrlsErrors, GetImagingResizeUrlsResponses, GetImportAnalyzeData, GetImportAnalyzeErrors, GetImportAnalyzeResponses, GetIndexerByIndexNameData, GetIndexerByIndexNameErrors, GetIndexerByIndexNameResponses, GetIndexerData, GetIndexerErrors, GetIndexerResponses, GetInstallSettingsData, GetInstallSettingsErrors, GetInstallSettingsResponses, GetItemDataTypeData, GetItemDataTypeErrors, GetItemDataTypeResponses, GetItemDataTypeSearchData, GetItemDataTypeSearchErrors, GetItemDataTypeSearchResponses, GetItemDictionaryData, GetItemDictionaryErrors, GetItemDictionaryResponses, GetItemDocumentBlueprintData, GetItemDocumentBlueprintErrors, GetItemDocumentBlueprintResponses, GetItemDocumentData, GetItemDocumentErrors, GetItemDocumentResponses, GetItemDocumentSearchData, GetItemDocumentSearchErrors, GetItemDocumentSearchResponses, GetItemDocumentTypeData, GetItemDocumentTypeErrors, GetItemDocumentTypeResponses, GetItemDocumentTypeSearchData, GetItemDocumentTypeSearchErrors, GetItemDocumentTypeSearchResponses, GetItemLanguageData, GetItemLanguageDefaultData, GetItemLanguageDefaultErrors, GetItemLanguageDefaultResponses, GetItemLanguageErrors, GetItemLanguageResponses, GetItemMediaData, GetItemMediaErrors, GetItemMediaResponses, GetItemMediaSearchData, GetItemMediaSearchErrors, GetItemMediaSearchResponses, GetItemMediaTypeAllowedData, GetItemMediaTypeAllowedErrors, GetItemMediaTypeAllowedResponses, GetItemMediaTypeData, GetItemMediaTypeErrors, GetItemMediaTypeFoldersData, GetItemMediaTypeFoldersErrors, GetItemMediaTypeFoldersResponses, GetItemMediaTypeResponses, GetItemMediaTypeSearchData, GetItemMediaTypeSearchErrors, GetItemMediaTypeSearchResponses, GetItemMemberData, GetItemMemberErrors, GetItemMemberGroupData, GetItemMemberGroupErrors, GetItemMemberGroupResponses, GetItemMemberResponses, GetItemMemberSearchData, GetItemMemberSearchErrors, GetItemMemberSearchResponses, GetItemMemberTypeData, GetItemMemberTypeErrors, GetItemMemberTypeResponses, GetItemMemberTypeSearchData, GetItemMemberTypeSearchErrors, GetItemMemberTypeSearchResponses, GetItemPartialViewData, GetItemPartialViewErrors, GetItemPartialViewResponses, GetItemRelationTypeData, GetItemRelationTypeErrors, GetItemRelationTypeResponses, GetItemScriptData, GetItemScriptErrors, GetItemScriptResponses, GetItemStaticFileData, GetItemStaticFileErrors, GetItemStaticFileResponses, GetItemStylesheetData, GetItemStylesheetErrors, GetItemStylesheetResponses, GetItemTemplateData, GetItemTemplateErrors, GetItemTemplateResponses, GetItemTemplateSearchData, GetItemTemplateSearchErrors, GetItemTemplateSearchResponses, GetItemUserData, GetItemUserErrors, GetItemUserGroupData, GetItemUserGroupErrors, GetItemUserGroupResponses, GetItemUserResponses, GetItemWebhookData, GetItemWebhookErrors, GetItemWebhookResponses, GetLanguageByIsoCodeData, GetLanguageByIsoCodeErrors, GetLanguageByIsoCodeResponses, GetLanguageData, GetLanguageErrors, GetLanguageResponses, GetLogViewerLevelCountData, GetLogViewerLevelCountErrors, GetLogViewerLevelCountResponses, GetLogViewerLevelData, GetLogViewerLevelErrors, GetLogViewerLevelResponses, GetLogViewerLogData, GetLogViewerLogErrors, GetLogViewerLogResponses, GetLogViewerMessageTemplateData, GetLogViewerMessageTemplateErrors, GetLogViewerMessageTemplateResponses, GetLogViewerSavedSearchByNameData, GetLogViewerSavedSearchByNameErrors, GetLogViewerSavedSearchByNameResponses, GetLogViewerSavedSearchData, GetLogViewerSavedSearchErrors, GetLogViewerSavedSearchResponses, GetLogViewerValidateLogsSizeData, GetLogViewerValidateLogsSizeErrors, GetLogViewerValidateLogsSizeResponses, GetManifestManifestData, GetManifestManifestErrors, GetManifestManifestPrivateData, GetManifestManifestPrivateErrors, GetManifestManifestPrivateResponses, GetManifestManifestPublicData, GetManifestManifestPublicResponses, GetManifestManifestResponses, GetMediaAreReferencedData, GetMediaAreReferencedErrors, GetMediaAreReferencedResponses, GetMediaByIdAuditLogData, GetMediaByIdAuditLogErrors, GetMediaByIdAuditLogResponses, GetMediaByIdData, GetMediaByIdErrors, GetMediaByIdReferencedByData, GetMediaByIdReferencedByErrors, GetMediaByIdReferencedByResponses, GetMediaByIdReferencedDescendantsData, GetMediaByIdReferencedDescendantsErrors, GetMediaByIdReferencedDescendantsResponses, GetMediaByIdResponses, GetMediaConfigurationData, GetMediaConfigurationErrors, GetMediaConfigurationResponses, GetMediaTypeAllowedAtRootData, GetMediaTypeAllowedAtRootErrors, GetMediaTypeAllowedAtRootResponses, GetMediaTypeByIdAllowedChildrenData, GetMediaTypeByIdAllowedChildrenErrors, GetMediaTypeByIdAllowedChildrenResponses, GetMediaTypeByIdCompositionReferencesData, GetMediaTypeByIdCompositionReferencesErrors, GetMediaTypeByIdCompositionReferencesResponses, GetMediaTypeByIdData, GetMediaTypeByIdErrors, GetMediaTypeByIdExportData, GetMediaTypeByIdExportErrors, GetMediaTypeByIdExportResponses, GetMediaTypeByIdResponses, GetMediaTypeConfigurationData, GetMediaTypeConfigurationErrors, GetMediaTypeConfigurationResponses, GetMediaTypeFolderByIdData, GetMediaTypeFolderByIdErrors, GetMediaTypeFolderByIdResponses, GetMediaUrlsData, GetMediaUrlsErrors, GetMediaUrlsResponses, GetMemberAreReferencedData, GetMemberAreReferencedErrors, GetMemberAreReferencedResponses, GetMemberByIdData, GetMemberByIdErrors, GetMemberByIdReferencedByData, GetMemberByIdReferencedByErrors, GetMemberByIdReferencedByResponses, GetMemberByIdReferencedDescendantsData, GetMemberByIdReferencedDescendantsErrors, GetMemberByIdReferencedDescendantsResponses, GetMemberByIdResponses, GetMemberConfigurationData, GetMemberConfigurationErrors, GetMemberConfigurationResponses, GetMemberGroupByIdData, GetMemberGroupByIdErrors, GetMemberGroupByIdResponses, GetMemberGroupData, GetMemberGroupErrors, GetMemberGroupResponses, GetMemberTypeByIdCompositionReferencesData, GetMemberTypeByIdCompositionReferencesErrors, GetMemberTypeByIdCompositionReferencesResponses, GetMemberTypeByIdData, GetMemberTypeByIdErrors, GetMemberTypeByIdResponses, GetMemberTypeConfigurationData, GetMemberTypeConfigurationErrors, GetMemberTypeConfigurationResponses, GetModelsBuilderDashboardData, GetModelsBuilderDashboardErrors, GetModelsBuilderDashboardResponses, GetModelsBuilderStatusData, GetModelsBuilderStatusErrors, GetModelsBuilderStatusResponses, GetObjectTypesData, GetObjectTypesErrors, GetObjectTypesResponses, GetOembedQueryData, GetOembedQueryErrors, GetOembedQueryResponses, GetPackageConfigurationData, GetPackageConfigurationErrors, GetPackageConfigurationResponses, GetPackageCreatedByIdData, GetPackageCreatedByIdDownloadData, GetPackageCreatedByIdDownloadErrors, GetPackageCreatedByIdDownloadResponses, GetPackageCreatedByIdErrors, GetPackageCreatedByIdResponses, GetPackageCreatedData, GetPackageCreatedErrors, GetPackageCreatedResponses, GetPackageMigrationStatusData, GetPackageMigrationStatusErrors, GetPackageMigrationStatusResponses, GetPartialViewByPathData, GetPartialViewByPathErrors, GetPartialViewByPathResponses, GetPartialViewFolderByPathData, GetPartialViewFolderByPathErrors, GetPartialViewFolderByPathResponses, GetPartialViewSnippetByIdData, GetPartialViewSnippetByIdErrors, GetPartialViewSnippetByIdResponses, GetPartialViewSnippetData, GetPartialViewSnippetErrors, GetPartialViewSnippetResponses, GetProfilingStatusData, GetProfilingStatusErrors, GetProfilingStatusResponses, GetPropertyTypeIsUsedData, GetPropertyTypeIsUsedErrors, GetPropertyTypeIsUsedResponses, GetPublishedCacheRebuildStatusData, GetPublishedCacheRebuildStatusErrors, GetPublishedCacheRebuildStatusResponses, GetRecycleBinDocumentByIdOriginalParentData, GetRecycleBinDocumentByIdOriginalParentErrors, GetRecycleBinDocumentByIdOriginalParentResponses, GetRecycleBinDocumentChildrenData, GetRecycleBinDocumentChildrenErrors, GetRecycleBinDocumentChildrenResponses, GetRecycleBinDocumentReferencedByData, GetRecycleBinDocumentReferencedByErrors, GetRecycleBinDocumentReferencedByResponses, GetRecycleBinDocumentRootData, GetRecycleBinDocumentRootErrors, GetRecycleBinDocumentRootResponses, GetRecycleBinDocumentSiblingsData, GetRecycleBinDocumentSiblingsErrors, GetRecycleBinDocumentSiblingsResponses, GetRecycleBinMediaByIdOriginalParentData, GetRecycleBinMediaByIdOriginalParentErrors, GetRecycleBinMediaByIdOriginalParentResponses, GetRecycleBinMediaChildrenData, GetRecycleBinMediaChildrenErrors, GetRecycleBinMediaChildrenResponses, GetRecycleBinMediaReferencedByData, GetRecycleBinMediaReferencedByErrors, GetRecycleBinMediaReferencedByResponses, GetRecycleBinMediaRootData, GetRecycleBinMediaRootErrors, GetRecycleBinMediaRootResponses, GetRecycleBinMediaSiblingsData, GetRecycleBinMediaSiblingsErrors, GetRecycleBinMediaSiblingsResponses, GetRedirectManagementByIdData, GetRedirectManagementByIdErrors, GetRedirectManagementByIdResponses, GetRedirectManagementData, GetRedirectManagementErrors, GetRedirectManagementResponses, GetRedirectManagementStatusData, GetRedirectManagementStatusErrors, GetRedirectManagementStatusResponses, GetRelationByRelationTypeIdData, GetRelationByRelationTypeIdErrors, GetRelationByRelationTypeIdResponses, GetRelationTypeByIdData, GetRelationTypeByIdErrors, GetRelationTypeByIdResponses, GetRelationTypeData, GetRelationTypeErrors, GetRelationTypeResponses, GetScriptByPathData, GetScriptByPathErrors, GetScriptByPathResponses, GetScriptFolderByPathData, GetScriptFolderByPathErrors, GetScriptFolderByPathResponses, GetSearcherBySearcherNameQueryData, GetSearcherBySearcherNameQueryErrors, GetSearcherBySearcherNameQueryResponses, GetSearcherData, GetSearcherErrors, GetSearcherResponses, GetSecurityConfigurationData, GetSecurityConfigurationErrors, GetSecurityConfigurationResponses, GetSegmentData, GetSegmentErrors, GetSegmentResponses, GetServerConfigurationData, GetServerConfigurationResponses, GetServerInformationData, GetServerInformationErrors, GetServerInformationResponses, GetServerStatusData, GetServerStatusErrors, GetServerStatusResponses, GetServerTroubleshootingData, GetServerTroubleshootingErrors, GetServerTroubleshootingResponses, GetServerUpgradeCheckData, GetServerUpgradeCheckErrors, GetServerUpgradeCheckResponses, GetStylesheetByPathData, GetStylesheetByPathErrors, GetStylesheetByPathResponses, GetStylesheetFolderByPathData, GetStylesheetFolderByPathErrors, GetStylesheetFolderByPathResponses, GetTagData, GetTagErrors, GetTagResponses, GetTelemetryData, GetTelemetryErrors, GetTelemetryLevelData, GetTelemetryLevelErrors, GetTelemetryLevelResponses, GetTelemetryResponses, GetTemplateByIdData, GetTemplateByIdErrors, GetTemplateByIdResponses, GetTemplateConfigurationData, GetTemplateConfigurationErrors, GetTemplateConfigurationResponses, GetTemplateQuerySettingsData, GetTemplateQuerySettingsErrors, GetTemplateQuerySettingsResponses, GetTemporaryFileByIdData, GetTemporaryFileByIdErrors, GetTemporaryFileByIdResponses, GetTemporaryFileConfigurationData, GetTemporaryFileConfigurationErrors, GetTemporaryFileConfigurationResponses, GetTreeDataTypeAncestorsData, GetTreeDataTypeAncestorsErrors, GetTreeDataTypeAncestorsResponses, GetTreeDataTypeChildrenData, GetTreeDataTypeChildrenErrors, GetTreeDataTypeChildrenResponses, GetTreeDataTypeRootData, GetTreeDataTypeRootErrors, GetTreeDataTypeRootResponses, GetTreeDataTypeSiblingsData, GetTreeDataTypeSiblingsErrors, GetTreeDataTypeSiblingsResponses, GetTreeDictionaryAncestorsData, GetTreeDictionaryAncestorsErrors, GetTreeDictionaryAncestorsResponses, GetTreeDictionaryChildrenData, GetTreeDictionaryChildrenErrors, GetTreeDictionaryChildrenResponses, GetTreeDictionaryRootData, GetTreeDictionaryRootErrors, GetTreeDictionaryRootResponses, GetTreeDocumentAncestorsData, GetTreeDocumentAncestorsErrors, GetTreeDocumentAncestorsResponses, GetTreeDocumentBlueprintAncestorsData, GetTreeDocumentBlueprintAncestorsErrors, GetTreeDocumentBlueprintAncestorsResponses, GetTreeDocumentBlueprintChildrenData, GetTreeDocumentBlueprintChildrenErrors, GetTreeDocumentBlueprintChildrenResponses, GetTreeDocumentBlueprintRootData, GetTreeDocumentBlueprintRootErrors, GetTreeDocumentBlueprintRootResponses, GetTreeDocumentBlueprintSiblingsData, GetTreeDocumentBlueprintSiblingsErrors, GetTreeDocumentBlueprintSiblingsResponses, GetTreeDocumentChildrenData, GetTreeDocumentChildrenErrors, GetTreeDocumentChildrenResponses, GetTreeDocumentRootData, GetTreeDocumentRootErrors, GetTreeDocumentRootResponses, GetTreeDocumentSiblingsData, GetTreeDocumentSiblingsErrors, GetTreeDocumentSiblingsResponses, GetTreeDocumentTypeAncestorsData, GetTreeDocumentTypeAncestorsErrors, GetTreeDocumentTypeAncestorsResponses, GetTreeDocumentTypeChildrenData, GetTreeDocumentTypeChildrenErrors, GetTreeDocumentTypeChildrenResponses, GetTreeDocumentTypeRootData, GetTreeDocumentTypeRootErrors, GetTreeDocumentTypeRootResponses, GetTreeDocumentTypeSiblingsData, GetTreeDocumentTypeSiblingsErrors, GetTreeDocumentTypeSiblingsResponses, GetTreeMediaAncestorsData, GetTreeMediaAncestorsErrors, GetTreeMediaAncestorsResponses, GetTreeMediaChildrenData, GetTreeMediaChildrenErrors, GetTreeMediaChildrenResponses, GetTreeMediaRootData, GetTreeMediaRootErrors, GetTreeMediaRootResponses, GetTreeMediaSiblingsData, GetTreeMediaSiblingsErrors, GetTreeMediaSiblingsResponses, GetTreeMediaTypeAncestorsData, GetTreeMediaTypeAncestorsErrors, GetTreeMediaTypeAncestorsResponses, GetTreeMediaTypeChildrenData, GetTreeMediaTypeChildrenErrors, GetTreeMediaTypeChildrenResponses, GetTreeMediaTypeRootData, GetTreeMediaTypeRootErrors, GetTreeMediaTypeRootResponses, GetTreeMediaTypeSiblingsData, GetTreeMediaTypeSiblingsErrors, GetTreeMediaTypeSiblingsResponses, GetTreeMemberGroupRootData, GetTreeMemberGroupRootErrors, GetTreeMemberGroupRootResponses, GetTreeMemberTypeRootData, GetTreeMemberTypeRootErrors, GetTreeMemberTypeRootResponses, GetTreeMemberTypeSiblingsData, GetTreeMemberTypeSiblingsErrors, GetTreeMemberTypeSiblingsResponses, GetTreePartialViewAncestorsData, GetTreePartialViewAncestorsErrors, GetTreePartialViewAncestorsResponses, GetTreePartialViewChildrenData, GetTreePartialViewChildrenErrors, GetTreePartialViewChildrenResponses, GetTreePartialViewRootData, GetTreePartialViewRootErrors, GetTreePartialViewRootResponses, GetTreePartialViewSiblingsData, GetTreePartialViewSiblingsErrors, GetTreePartialViewSiblingsResponses, GetTreeScriptAncestorsData, GetTreeScriptAncestorsErrors, GetTreeScriptAncestorsResponses, GetTreeScriptChildrenData, GetTreeScriptChildrenErrors, GetTreeScriptChildrenResponses, GetTreeScriptRootData, GetTreeScriptRootErrors, GetTreeScriptRootResponses, GetTreeScriptSiblingsData, GetTreeScriptSiblingsErrors, GetTreeScriptSiblingsResponses, GetTreeStaticFileAncestorsData, GetTreeStaticFileAncestorsErrors, GetTreeStaticFileAncestorsResponses, GetTreeStaticFileChildrenData, GetTreeStaticFileChildrenErrors, GetTreeStaticFileChildrenResponses, GetTreeStaticFileRootData, GetTreeStaticFileRootErrors, GetTreeStaticFileRootResponses, GetTreeStylesheetAncestorsData, GetTreeStylesheetAncestorsErrors, GetTreeStylesheetAncestorsResponses, GetTreeStylesheetChildrenData, GetTreeStylesheetChildrenErrors, GetTreeStylesheetChildrenResponses, GetTreeStylesheetRootData, GetTreeStylesheetRootErrors, GetTreeStylesheetRootResponses, GetTreeStylesheetSiblingsData, GetTreeStylesheetSiblingsErrors, GetTreeStylesheetSiblingsResponses, GetTreeTemplateAncestorsData, GetTreeTemplateAncestorsErrors, GetTreeTemplateAncestorsResponses, GetTreeTemplateChildrenData, GetTreeTemplateChildrenErrors, GetTreeTemplateChildrenResponses, GetTreeTemplateRootData, GetTreeTemplateRootErrors, GetTreeTemplateRootResponses, GetTreeTemplateSiblingsData, GetTreeTemplateSiblingsErrors, GetTreeTemplateSiblingsResponses, GetUpgradeSettingsData, GetUpgradeSettingsErrors, GetUpgradeSettingsResponses, GetUserById2FaData, GetUserById2FaErrors, GetUserById2FaResponses, GetUserByIdCalculateStartNodesData, GetUserByIdCalculateStartNodesErrors, GetUserByIdCalculateStartNodesResponses, GetUserByIdClientCredentialsData, GetUserByIdClientCredentialsErrors, GetUserByIdClientCredentialsResponses, GetUserByIdData, GetUserByIdErrors, GetUserByIdResponses, GetUserConfigurationData, GetUserConfigurationErrors, GetUserConfigurationResponses, GetUserCurrent2FaByProviderNameData, GetUserCurrent2FaByProviderNameErrors, GetUserCurrent2FaByProviderNameResponses, GetUserCurrent2FaData, GetUserCurrent2FaErrors, GetUserCurrent2FaResponses, GetUserCurrentConfigurationData, GetUserCurrentConfigurationErrors, GetUserCurrentConfigurationResponses, GetUserCurrentData, GetUserCurrentErrors, GetUserCurrentLoginProvidersData, GetUserCurrentLoginProvidersErrors, GetUserCurrentLoginProvidersResponses, GetUserCurrentPermissionsData, GetUserCurrentPermissionsDocumentData, GetUserCurrentPermissionsDocumentErrors, GetUserCurrentPermissionsDocumentResponses, GetUserCurrentPermissionsErrors, GetUserCurrentPermissionsMediaData, GetUserCurrentPermissionsMediaErrors, GetUserCurrentPermissionsMediaResponses, GetUserCurrentPermissionsResponses, GetUserCurrentResponses, GetUserData, GetUserDataByIdData, GetUserDataByIdErrors, GetUserDataByIdResponses, GetUserDataData, GetUserDataErrors, GetUserDataResponses, GetUserErrors, GetUserGroupByIdData, GetUserGroupByIdErrors, GetUserGroupByIdResponses, GetUserGroupData, GetUserGroupErrors, GetUserGroupResponses, GetUserResponses, GetWebhookByIdData, GetWebhookByIdErrors, GetWebhookByIdLogsData, GetWebhookByIdLogsErrors, GetWebhookByIdLogsResponses, GetWebhookByIdResponses, GetWebhookData, GetWebhookErrors, GetWebhookEventsData, GetWebhookEventsErrors, GetWebhookEventsResponses, GetWebhookLogsData, GetWebhookLogsErrors, GetWebhookLogsResponses, GetWebhookResponses, PostDataTypeByIdCopyData, PostDataTypeByIdCopyErrors, PostDataTypeByIdCopyResponses, PostDataTypeData, PostDataTypeErrors, PostDataTypeFolderData, PostDataTypeFolderErrors, PostDataTypeFolderResponses, PostDataTypeResponses, PostDictionaryData, PostDictionaryErrors, PostDictionaryImportData, PostDictionaryImportErrors, PostDictionaryImportResponses, PostDictionaryResponses, PostDocumentBlueprintData, PostDocumentBlueprintErrors, PostDocumentBlueprintFolderData, PostDocumentBlueprintFolderErrors, PostDocumentBlueprintFolderResponses, PostDocumentBlueprintFromDocumentData, PostDocumentBlueprintFromDocumentErrors, PostDocumentBlueprintFromDocumentResponses, PostDocumentBlueprintResponses, PostDocumentByIdCopyData, PostDocumentByIdCopyErrors, PostDocumentByIdCopyResponses, PostDocumentByIdPublicAccessData, PostDocumentByIdPublicAccessErrors, PostDocumentByIdPublicAccessResponses, PostDocumentData, PostDocumentErrors, PostDocumentResponses, PostDocumentTypeAvailableCompositionsData, PostDocumentTypeAvailableCompositionsErrors, PostDocumentTypeAvailableCompositionsResponses, PostDocumentTypeByIdCopyData, PostDocumentTypeByIdCopyErrors, PostDocumentTypeByIdCopyResponses, PostDocumentTypeData, PostDocumentTypeErrors, PostDocumentTypeFolderData, PostDocumentTypeFolderErrors, PostDocumentTypeFolderResponses, PostDocumentTypeImportData, PostDocumentTypeImportErrors, PostDocumentTypeImportResponses, PostDocumentTypeResponses, PostDocumentValidateData, PostDocumentValidateErrors, PostDocumentValidateResponses, PostDocumentVersionByIdRollbackData, PostDocumentVersionByIdRollbackErrors, PostDocumentVersionByIdRollbackResponses, PostDynamicRootQueryData, PostDynamicRootQueryErrors, PostDynamicRootQueryResponses, PostHealthCheckExecuteActionData, PostHealthCheckExecuteActionErrors, PostHealthCheckExecuteActionResponses, PostHealthCheckGroupByNameCheckData, PostHealthCheckGroupByNameCheckErrors, PostHealthCheckGroupByNameCheckResponses, PostIndexerByIndexNameRebuildData, PostIndexerByIndexNameRebuildErrors, PostIndexerByIndexNameRebuildResponses, PostInstallSetupData, PostInstallSetupErrors, PostInstallSetupResponses, PostInstallValidateDatabaseData, PostInstallValidateDatabaseErrors, PostInstallValidateDatabaseResponses, PostLanguageData, PostLanguageErrors, PostLanguageResponses, PostLogViewerSavedSearchData, PostLogViewerSavedSearchErrors, PostLogViewerSavedSearchResponses, PostMediaData, PostMediaErrors, PostMediaResponses, PostMediaTypeAvailableCompositionsData, PostMediaTypeAvailableCompositionsErrors, PostMediaTypeAvailableCompositionsResponses, PostMediaTypeByIdCopyData, PostMediaTypeByIdCopyErrors, PostMediaTypeByIdCopyResponses, PostMediaTypeData, PostMediaTypeErrors, PostMediaTypeFolderData, PostMediaTypeFolderErrors, PostMediaTypeFolderResponses, PostMediaTypeImportData, PostMediaTypeImportErrors, PostMediaTypeImportResponses, PostMediaTypeResponses, PostMediaValidateData, PostMediaValidateErrors, PostMediaValidateResponses, PostMemberData, PostMemberErrors, PostMemberGroupData, PostMemberGroupErrors, PostMemberGroupResponses, PostMemberResponses, PostMemberTypeAvailableCompositionsData, PostMemberTypeAvailableCompositionsErrors, PostMemberTypeAvailableCompositionsResponses, PostMemberTypeByIdCopyData, PostMemberTypeByIdCopyErrors, PostMemberTypeByIdCopyResponses, PostMemberTypeData, PostMemberTypeErrors, PostMemberTypeResponses, PostMemberValidateData, PostMemberValidateErrors, PostMemberValidateResponses, PostModelsBuilderBuildData, PostModelsBuilderBuildErrors, PostModelsBuilderBuildResponses, PostPackageByNameRunMigrationData, PostPackageByNameRunMigrationErrors, PostPackageByNameRunMigrationResponses, PostPackageCreatedData, PostPackageCreatedErrors, PostPackageCreatedResponses, PostPartialViewData, PostPartialViewErrors, PostPartialViewFolderData, PostPartialViewFolderErrors, PostPartialViewFolderResponses, PostPartialViewResponses, PostPreviewData, PostPreviewErrors, PostPreviewResponses, PostPublishedCacheRebuildData, PostPublishedCacheRebuildErrors, PostPublishedCacheRebuildResponses, PostPublishedCacheReloadData, PostPublishedCacheReloadErrors, PostPublishedCacheReloadResponses, PostRedirectManagementStatusData, PostRedirectManagementStatusErrors, PostRedirectManagementStatusResponses, PostScriptData, PostScriptErrors, PostScriptFolderData, PostScriptFolderErrors, PostScriptFolderResponses, PostScriptResponses, PostSecurityForgotPasswordData, PostSecurityForgotPasswordErrors, PostSecurityForgotPasswordResetData, PostSecurityForgotPasswordResetErrors, PostSecurityForgotPasswordResetResponses, PostSecurityForgotPasswordResponses, PostSecurityForgotPasswordVerifyData, PostSecurityForgotPasswordVerifyErrors, PostSecurityForgotPasswordVerifyResponses, PostStylesheetData, PostStylesheetErrors, PostStylesheetFolderData, PostStylesheetFolderErrors, PostStylesheetFolderResponses, PostStylesheetResponses, PostTelemetryLevelData, PostTelemetryLevelErrors, PostTelemetryLevelResponses, PostTemplateData, PostTemplateErrors, PostTemplateQueryExecuteData, PostTemplateQueryExecuteErrors, PostTemplateQueryExecuteResponses, PostTemplateResponses, PostTemporaryFileData, PostTemporaryFileErrors, PostTemporaryFileResponses, PostUpgradeAuthorizeData, PostUpgradeAuthorizeErrors, PostUpgradeAuthorizeResponses, PostUserAvatarByIdData, PostUserAvatarByIdErrors, PostUserAvatarByIdResponses, PostUserByIdChangePasswordData, PostUserByIdChangePasswordErrors, PostUserByIdChangePasswordResponses, PostUserByIdClientCredentialsData, PostUserByIdClientCredentialsErrors, PostUserByIdClientCredentialsResponses, PostUserByIdResetPasswordData, PostUserByIdResetPasswordErrors, PostUserByIdResetPasswordResponses, PostUserCurrent2FaByProviderNameData, PostUserCurrent2FaByProviderNameErrors, PostUserCurrent2FaByProviderNameResponses, PostUserCurrentAvatarData, PostUserCurrentAvatarErrors, PostUserCurrentAvatarResponses, PostUserCurrentChangePasswordData, PostUserCurrentChangePasswordErrors, PostUserCurrentChangePasswordResponses, PostUserData, PostUserDataData, PostUserDataErrors, PostUserDataResponses, PostUserDisableData, PostUserDisableErrors, PostUserDisableResponses, PostUserEnableData, PostUserEnableErrors, PostUserEnableResponses, PostUserErrors, PostUserGroupByIdUsersData, PostUserGroupByIdUsersErrors, PostUserGroupByIdUsersResponses, PostUserGroupData, PostUserGroupErrors, PostUserGroupResponses, PostUserInviteCreatePasswordData, PostUserInviteCreatePasswordErrors, PostUserInviteCreatePasswordResponses, PostUserInviteData, PostUserInviteErrors, PostUserInviteResendData, PostUserInviteResendErrors, PostUserInviteResendResponses, PostUserInviteResponses, PostUserInviteVerifyData, PostUserInviteVerifyErrors, PostUserInviteVerifyResponses, PostUserResponses, PostUserSetUserGroupsData, PostUserSetUserGroupsErrors, PostUserSetUserGroupsResponses, PostUserUnlockData, PostUserUnlockErrors, PostUserUnlockResponses, PostWebhookData, PostWebhookErrors, PostWebhookResponses, PutDataTypeByIdData, PutDataTypeByIdErrors, PutDataTypeByIdMoveData, PutDataTypeByIdMoveErrors, PutDataTypeByIdMoveResponses, PutDataTypeByIdResponses, PutDataTypeFolderByIdData, PutDataTypeFolderByIdErrors, PutDataTypeFolderByIdResponses, PutDictionaryByIdData, PutDictionaryByIdErrors, PutDictionaryByIdMoveData, PutDictionaryByIdMoveErrors, PutDictionaryByIdMoveResponses, PutDictionaryByIdResponses, PutDocumentBlueprintByIdData, PutDocumentBlueprintByIdErrors, PutDocumentBlueprintByIdMoveData, PutDocumentBlueprintByIdMoveErrors, PutDocumentBlueprintByIdMoveResponses, PutDocumentBlueprintByIdResponses, PutDocumentBlueprintFolderByIdData, PutDocumentBlueprintFolderByIdErrors, PutDocumentBlueprintFolderByIdResponses, PutDocumentByIdData, PutDocumentByIdDomainsData, PutDocumentByIdDomainsErrors, PutDocumentByIdDomainsResponses, PutDocumentByIdErrors, PutDocumentByIdMoveData, PutDocumentByIdMoveErrors, PutDocumentByIdMoveResponses, PutDocumentByIdMoveToRecycleBinData, PutDocumentByIdMoveToRecycleBinErrors, PutDocumentByIdMoveToRecycleBinResponses, PutDocumentByIdNotificationsData, PutDocumentByIdNotificationsErrors, PutDocumentByIdNotificationsResponses, PutDocumentByIdPublicAccessData, PutDocumentByIdPublicAccessErrors, PutDocumentByIdPublicAccessResponses, PutDocumentByIdPublishData, PutDocumentByIdPublishErrors, PutDocumentByIdPublishResponses, PutDocumentByIdPublishWithDescendantsData, PutDocumentByIdPublishWithDescendantsErrors, PutDocumentByIdPublishWithDescendantsResponses, PutDocumentByIdResponses, PutDocumentByIdUnpublishData, PutDocumentByIdUnpublishErrors, PutDocumentByIdUnpublishResponses, PutDocumentSortData, PutDocumentSortErrors, PutDocumentSortResponses, PutDocumentTypeByIdData, PutDocumentTypeByIdErrors, PutDocumentTypeByIdImportData, PutDocumentTypeByIdImportErrors, PutDocumentTypeByIdImportResponses, PutDocumentTypeByIdMoveData, PutDocumentTypeByIdMoveErrors, PutDocumentTypeByIdMoveResponses, PutDocumentTypeByIdResponses, PutDocumentTypeFolderByIdData, PutDocumentTypeFolderByIdErrors, PutDocumentTypeFolderByIdResponses, PutDocumentVersionByIdPreventCleanupData, PutDocumentVersionByIdPreventCleanupErrors, PutDocumentVersionByIdPreventCleanupResponses, PutLanguageByIsoCodeData, PutLanguageByIsoCodeErrors, PutLanguageByIsoCodeResponses, PutMediaByIdData, PutMediaByIdErrors, PutMediaByIdMoveData, PutMediaByIdMoveErrors, PutMediaByIdMoveResponses, PutMediaByIdMoveToRecycleBinData, PutMediaByIdMoveToRecycleBinErrors, PutMediaByIdMoveToRecycleBinResponses, PutMediaByIdResponses, PutMediaByIdValidateData, PutMediaByIdValidateErrors, PutMediaByIdValidateResponses, PutMediaSortData, PutMediaSortErrors, PutMediaSortResponses, PutMediaTypeByIdData, PutMediaTypeByIdErrors, PutMediaTypeByIdImportData, PutMediaTypeByIdImportErrors, PutMediaTypeByIdImportResponses, PutMediaTypeByIdMoveData, PutMediaTypeByIdMoveErrors, PutMediaTypeByIdMoveResponses, PutMediaTypeByIdResponses, PutMediaTypeFolderByIdData, PutMediaTypeFolderByIdErrors, PutMediaTypeFolderByIdResponses, PutMemberByIdData, PutMemberByIdErrors, PutMemberByIdResponses, PutMemberByIdValidateData, PutMemberByIdValidateErrors, PutMemberByIdValidateResponses, PutMemberGroupByIdData, PutMemberGroupByIdErrors, PutMemberGroupByIdResponses, PutMemberTypeByIdData, PutMemberTypeByIdErrors, PutMemberTypeByIdResponses, PutPackageCreatedByIdData, PutPackageCreatedByIdErrors, PutPackageCreatedByIdResponses, PutPartialViewByPathData, PutPartialViewByPathErrors, PutPartialViewByPathRenameData, PutPartialViewByPathRenameErrors, PutPartialViewByPathRenameResponses, PutPartialViewByPathResponses, PutProfilingStatusData, PutProfilingStatusErrors, PutProfilingStatusResponses, PutRecycleBinDocumentByIdRestoreData, PutRecycleBinDocumentByIdRestoreErrors, PutRecycleBinDocumentByIdRestoreResponses, PutRecycleBinMediaByIdRestoreData, PutRecycleBinMediaByIdRestoreErrors, PutRecycleBinMediaByIdRestoreResponses, PutScriptByPathData, PutScriptByPathErrors, PutScriptByPathRenameData, PutScriptByPathRenameErrors, PutScriptByPathRenameResponses, PutScriptByPathResponses, PutStylesheetByPathData, PutStylesheetByPathErrors, PutStylesheetByPathRenameData, PutStylesheetByPathRenameErrors, PutStylesheetByPathRenameResponses, PutStylesheetByPathResponses, PutTemplateByIdData, PutTemplateByIdErrors, PutTemplateByIdResponses, PutUmbracoManagementApiV11DocumentByIdValidate11Data, PutUmbracoManagementApiV11DocumentByIdValidate11Errors, PutUmbracoManagementApiV11DocumentByIdValidate11Responses, PutUserByIdData, PutUserByIdErrors, PutUserByIdResponses, PutUserDataData, PutUserDataErrors, PutUserDataResponses, PutUserGroupByIdData, PutUserGroupByIdErrors, PutUserGroupByIdResponses, PutWebhookByIdData, PutWebhookByIdErrors, PutWebhookByIdResponses } from './types.gen';
+import type { DeleteDataTypeByIdData, DeleteDataTypeByIdErrors, DeleteDataTypeByIdResponses, DeleteDataTypeFolderByIdData, DeleteDataTypeFolderByIdErrors, DeleteDataTypeFolderByIdResponses, DeleteDictionaryByIdData, DeleteDictionaryByIdErrors, DeleteDictionaryByIdResponses, DeleteDocumentBlueprintByIdData, DeleteDocumentBlueprintByIdErrors, DeleteDocumentBlueprintByIdResponses, DeleteDocumentBlueprintFolderByIdData, DeleteDocumentBlueprintFolderByIdErrors, DeleteDocumentBlueprintFolderByIdResponses, DeleteDocumentByIdData, DeleteDocumentByIdErrors, DeleteDocumentByIdPublicAccessData, DeleteDocumentByIdPublicAccessErrors, DeleteDocumentByIdPublicAccessResponses, DeleteDocumentByIdResponses, DeleteDocumentTypeByIdData, DeleteDocumentTypeByIdErrors, DeleteDocumentTypeByIdResponses, DeleteDocumentTypeFolderByIdData, DeleteDocumentTypeFolderByIdErrors, DeleteDocumentTypeFolderByIdResponses, DeleteLanguageByIsoCodeData, DeleteLanguageByIsoCodeErrors, DeleteLanguageByIsoCodeResponses, DeleteLogViewerSavedSearchByNameData, DeleteLogViewerSavedSearchByNameErrors, DeleteLogViewerSavedSearchByNameResponses, DeleteMediaByIdData, DeleteMediaByIdErrors, DeleteMediaByIdResponses, DeleteMediaTypeByIdData, DeleteMediaTypeByIdErrors, DeleteMediaTypeByIdResponses, DeleteMediaTypeFolderByIdData, DeleteMediaTypeFolderByIdErrors, DeleteMediaTypeFolderByIdResponses, DeleteMemberByIdData, DeleteMemberByIdErrors, DeleteMemberByIdResponses, DeleteMemberGroupByIdData, DeleteMemberGroupByIdErrors, DeleteMemberGroupByIdResponses, DeleteMemberTypeByIdData, DeleteMemberTypeByIdErrors, DeleteMemberTypeByIdResponses, DeleteMemberTypeFolderByIdData, DeleteMemberTypeFolderByIdErrors, DeleteMemberTypeFolderByIdResponses, DeletePackageCreatedByIdData, DeletePackageCreatedByIdErrors, DeletePackageCreatedByIdResponses, DeletePartialViewByPathData, DeletePartialViewByPathErrors, DeletePartialViewByPathResponses, DeletePartialViewFolderByPathData, DeletePartialViewFolderByPathErrors, DeletePartialViewFolderByPathResponses, DeletePreviewData, DeletePreviewResponses, DeleteRecycleBinDocumentByIdData, DeleteRecycleBinDocumentByIdErrors, DeleteRecycleBinDocumentByIdResponses, DeleteRecycleBinDocumentData, DeleteRecycleBinDocumentErrors, DeleteRecycleBinDocumentResponses, DeleteRecycleBinMediaByIdData, DeleteRecycleBinMediaByIdErrors, DeleteRecycleBinMediaByIdResponses, DeleteRecycleBinMediaData, DeleteRecycleBinMediaErrors, DeleteRecycleBinMediaResponses, DeleteRedirectManagementByIdData, DeleteRedirectManagementByIdErrors, DeleteRedirectManagementByIdResponses, DeleteScriptByPathData, DeleteScriptByPathErrors, DeleteScriptByPathResponses, DeleteScriptFolderByPathData, DeleteScriptFolderByPathErrors, DeleteScriptFolderByPathResponses, DeleteStylesheetByPathData, DeleteStylesheetByPathErrors, DeleteStylesheetByPathResponses, DeleteStylesheetFolderByPathData, DeleteStylesheetFolderByPathErrors, DeleteStylesheetFolderByPathResponses, DeleteTemplateByIdData, DeleteTemplateByIdErrors, DeleteTemplateByIdResponses, DeleteTemporaryFileByIdData, DeleteTemporaryFileByIdErrors, DeleteTemporaryFileByIdResponses, DeleteUserAvatarByIdData, DeleteUserAvatarByIdErrors, DeleteUserAvatarByIdResponses, DeleteUserById2FaByProviderNameData, DeleteUserById2FaByProviderNameErrors, DeleteUserById2FaByProviderNameResponses, DeleteUserByIdClientCredentialsByClientIdData, DeleteUserByIdClientCredentialsByClientIdErrors, DeleteUserByIdClientCredentialsByClientIdResponses, DeleteUserByIdData, DeleteUserByIdErrors, DeleteUserByIdResponses, DeleteUserCurrent2FaByProviderNameData, DeleteUserCurrent2FaByProviderNameErrors, DeleteUserCurrent2FaByProviderNameResponses, DeleteUserData, DeleteUserDataByIdData, DeleteUserDataByIdErrors, DeleteUserDataByIdResponses, DeleteUserErrors, DeleteUserGroupByIdData, DeleteUserGroupByIdErrors, DeleteUserGroupByIdResponses, DeleteUserGroupByIdUsersData, DeleteUserGroupByIdUsersErrors, DeleteUserGroupByIdUsersResponses, DeleteUserGroupData, DeleteUserGroupErrors, DeleteUserGroupResponses, DeleteUserResponses, DeleteWebhookByIdData, DeleteWebhookByIdErrors, DeleteWebhookByIdResponses, GetCollectionDocumentByIdData, GetCollectionDocumentByIdErrors, GetCollectionDocumentByIdResponses, GetCollectionMediaData, GetCollectionMediaErrors, GetCollectionMediaResponses, GetCultureData, GetCultureErrors, GetCultureResponses, GetDataTypeByIdData, GetDataTypeByIdErrors, GetDataTypeByIdIsUsedData, GetDataTypeByIdIsUsedErrors, GetDataTypeByIdIsUsedResponses, GetDataTypeByIdReferencedByData, GetDataTypeByIdReferencedByErrors, GetDataTypeByIdReferencedByResponses, GetDataTypeByIdResponses, GetDataTypeConfigurationData, GetDataTypeConfigurationErrors, GetDataTypeConfigurationResponses, GetDataTypeFolderByIdData, GetDataTypeFolderByIdErrors, GetDataTypeFolderByIdResponses, GetDictionaryByIdData, GetDictionaryByIdErrors, GetDictionaryByIdExportData, GetDictionaryByIdExportErrors, GetDictionaryByIdExportResponses, GetDictionaryByIdResponses, GetDictionaryData, GetDictionaryErrors, GetDictionaryResponses, GetDocumentAreReferencedData, GetDocumentAreReferencedErrors, GetDocumentAreReferencedResponses, GetDocumentBlueprintByIdData, GetDocumentBlueprintByIdErrors, GetDocumentBlueprintByIdResponses, GetDocumentBlueprintByIdScaffoldData, GetDocumentBlueprintByIdScaffoldErrors, GetDocumentBlueprintByIdScaffoldResponses, GetDocumentBlueprintFolderByIdData, GetDocumentBlueprintFolderByIdErrors, GetDocumentBlueprintFolderByIdResponses, GetDocumentByIdAuditLogData, GetDocumentByIdAuditLogErrors, GetDocumentByIdAuditLogResponses, GetDocumentByIdAvailableSegmentOptionsData, GetDocumentByIdAvailableSegmentOptionsErrors, GetDocumentByIdAvailableSegmentOptionsResponses, GetDocumentByIdData, GetDocumentByIdDomainsData, GetDocumentByIdDomainsErrors, GetDocumentByIdDomainsResponses, GetDocumentByIdErrors, GetDocumentByIdNotificationsData, GetDocumentByIdNotificationsErrors, GetDocumentByIdNotificationsResponses, GetDocumentByIdPreviewUrlData, GetDocumentByIdPreviewUrlErrors, GetDocumentByIdPreviewUrlResponses, GetDocumentByIdPublicAccessData, GetDocumentByIdPublicAccessErrors, GetDocumentByIdPublicAccessResponses, GetDocumentByIdPublishedData, GetDocumentByIdPublishedErrors, GetDocumentByIdPublishedResponses, GetDocumentByIdPublishWithDescendantsResultByTaskIdData, GetDocumentByIdPublishWithDescendantsResultByTaskIdErrors, GetDocumentByIdPublishWithDescendantsResultByTaskIdResponses, GetDocumentByIdReferencedByData, GetDocumentByIdReferencedByErrors, GetDocumentByIdReferencedByResponses, GetDocumentByIdReferencedDescendantsData, GetDocumentByIdReferencedDescendantsErrors, GetDocumentByIdReferencedDescendantsResponses, GetDocumentByIdResponses, GetDocumentConfigurationData, GetDocumentConfigurationErrors, GetDocumentConfigurationResponses, GetDocumentTypeAllowedAtRootData, GetDocumentTypeAllowedAtRootErrors, GetDocumentTypeAllowedAtRootResponses, GetDocumentTypeByIdAllowedChildrenData, GetDocumentTypeByIdAllowedChildrenErrors, GetDocumentTypeByIdAllowedChildrenResponses, GetDocumentTypeByIdBlueprintData, GetDocumentTypeByIdBlueprintErrors, GetDocumentTypeByIdBlueprintResponses, GetDocumentTypeByIdCompositionReferencesData, GetDocumentTypeByIdCompositionReferencesErrors, GetDocumentTypeByIdCompositionReferencesResponses, GetDocumentTypeByIdData, GetDocumentTypeByIdErrors, GetDocumentTypeByIdExportData, GetDocumentTypeByIdExportErrors, GetDocumentTypeByIdExportResponses, GetDocumentTypeByIdResponses, GetDocumentTypeConfigurationData, GetDocumentTypeConfigurationErrors, GetDocumentTypeConfigurationResponses, GetDocumentTypeFolderByIdData, GetDocumentTypeFolderByIdErrors, GetDocumentTypeFolderByIdResponses, GetDocumentUrlsData, GetDocumentUrlsErrors, GetDocumentUrlsResponses, GetDocumentVersionByIdData, GetDocumentVersionByIdErrors, GetDocumentVersionByIdResponses, GetDocumentVersionData, GetDocumentVersionErrors, GetDocumentVersionResponses, GetDynamicRootStepsData, GetDynamicRootStepsErrors, GetDynamicRootStepsResponses, GetFilterDataTypeData, GetFilterDataTypeErrors, GetFilterDataTypeResponses, GetFilterMemberData, GetFilterMemberErrors, GetFilterMemberResponses, GetFilterUserData, GetFilterUserErrors, GetFilterUserGroupData, GetFilterUserGroupErrors, GetFilterUserGroupResponses, GetFilterUserResponses, GetHealthCheckGroupByNameData, GetHealthCheckGroupByNameErrors, GetHealthCheckGroupByNameResponses, GetHealthCheckGroupData, GetHealthCheckGroupErrors, GetHealthCheckGroupResponses, GetHelpData, GetHelpErrors, GetHelpResponses, GetImagingResizeUrlsData, GetImagingResizeUrlsErrors, GetImagingResizeUrlsResponses, GetImportAnalyzeData, GetImportAnalyzeErrors, GetImportAnalyzeResponses, GetIndexerByIndexNameData, GetIndexerByIndexNameErrors, GetIndexerByIndexNameResponses, GetIndexerData, GetIndexerErrors, GetIndexerResponses, GetInstallSettingsData, GetInstallSettingsErrors, GetInstallSettingsResponses, GetItemDataTypeData, GetItemDataTypeErrors, GetItemDataTypeResponses, GetItemDataTypeSearchData, GetItemDataTypeSearchErrors, GetItemDataTypeSearchResponses, GetItemDictionaryData, GetItemDictionaryErrors, GetItemDictionaryResponses, GetItemDocumentBlueprintData, GetItemDocumentBlueprintErrors, GetItemDocumentBlueprintResponses, GetItemDocumentData, GetItemDocumentErrors, GetItemDocumentResponses, GetItemDocumentSearchData, GetItemDocumentSearchErrors, GetItemDocumentSearchResponses, GetItemDocumentTypeData, GetItemDocumentTypeErrors, GetItemDocumentTypeResponses, GetItemDocumentTypeSearchData, GetItemDocumentTypeSearchErrors, GetItemDocumentTypeSearchResponses, GetItemLanguageData, GetItemLanguageDefaultData, GetItemLanguageDefaultErrors, GetItemLanguageDefaultResponses, GetItemLanguageErrors, GetItemLanguageResponses, GetItemMediaData, GetItemMediaErrors, GetItemMediaResponses, GetItemMediaSearchData, GetItemMediaSearchErrors, GetItemMediaSearchResponses, GetItemMediaTypeAllowedData, GetItemMediaTypeAllowedErrors, GetItemMediaTypeAllowedResponses, GetItemMediaTypeData, GetItemMediaTypeErrors, GetItemMediaTypeFoldersData, GetItemMediaTypeFoldersErrors, GetItemMediaTypeFoldersResponses, GetItemMediaTypeResponses, GetItemMediaTypeSearchData, GetItemMediaTypeSearchErrors, GetItemMediaTypeSearchResponses, GetItemMemberData, GetItemMemberErrors, GetItemMemberGroupData, GetItemMemberGroupErrors, GetItemMemberGroupResponses, GetItemMemberResponses, GetItemMemberSearchData, GetItemMemberSearchErrors, GetItemMemberSearchResponses, GetItemMemberTypeData, GetItemMemberTypeErrors, GetItemMemberTypeResponses, GetItemMemberTypeSearchData, GetItemMemberTypeSearchErrors, GetItemMemberTypeSearchResponses, GetItemPartialViewData, GetItemPartialViewErrors, GetItemPartialViewResponses, GetItemRelationTypeData, GetItemRelationTypeErrors, GetItemRelationTypeResponses, GetItemScriptData, GetItemScriptErrors, GetItemScriptResponses, GetItemStaticFileData, GetItemStaticFileErrors, GetItemStaticFileResponses, GetItemStylesheetData, GetItemStylesheetErrors, GetItemStylesheetResponses, GetItemTemplateData, GetItemTemplateErrors, GetItemTemplateResponses, GetItemTemplateSearchData, GetItemTemplateSearchErrors, GetItemTemplateSearchResponses, GetItemUserData, GetItemUserErrors, GetItemUserGroupData, GetItemUserGroupErrors, GetItemUserGroupResponses, GetItemUserResponses, GetItemWebhookData, GetItemWebhookErrors, GetItemWebhookResponses, GetLanguageByIsoCodeData, GetLanguageByIsoCodeErrors, GetLanguageByIsoCodeResponses, GetLanguageData, GetLanguageErrors, GetLanguageResponses, GetLogViewerLevelCountData, GetLogViewerLevelCountErrors, GetLogViewerLevelCountResponses, GetLogViewerLevelData, GetLogViewerLevelErrors, GetLogViewerLevelResponses, GetLogViewerLogData, GetLogViewerLogErrors, GetLogViewerLogResponses, GetLogViewerMessageTemplateData, GetLogViewerMessageTemplateErrors, GetLogViewerMessageTemplateResponses, GetLogViewerSavedSearchByNameData, GetLogViewerSavedSearchByNameErrors, GetLogViewerSavedSearchByNameResponses, GetLogViewerSavedSearchData, GetLogViewerSavedSearchErrors, GetLogViewerSavedSearchResponses, GetLogViewerValidateLogsSizeData, GetLogViewerValidateLogsSizeErrors, GetLogViewerValidateLogsSizeResponses, GetManifestManifestData, GetManifestManifestErrors, GetManifestManifestPrivateData, GetManifestManifestPrivateErrors, GetManifestManifestPrivateResponses, GetManifestManifestPublicData, GetManifestManifestPublicResponses, GetManifestManifestResponses, GetMediaAreReferencedData, GetMediaAreReferencedErrors, GetMediaAreReferencedResponses, GetMediaByIdAuditLogData, GetMediaByIdAuditLogErrors, GetMediaByIdAuditLogResponses, GetMediaByIdData, GetMediaByIdErrors, GetMediaByIdReferencedByData, GetMediaByIdReferencedByErrors, GetMediaByIdReferencedByResponses, GetMediaByIdReferencedDescendantsData, GetMediaByIdReferencedDescendantsErrors, GetMediaByIdReferencedDescendantsResponses, GetMediaByIdResponses, GetMediaConfigurationData, GetMediaConfigurationErrors, GetMediaConfigurationResponses, GetMediaTypeAllowedAtRootData, GetMediaTypeAllowedAtRootErrors, GetMediaTypeAllowedAtRootResponses, GetMediaTypeByIdAllowedChildrenData, GetMediaTypeByIdAllowedChildrenErrors, GetMediaTypeByIdAllowedChildrenResponses, GetMediaTypeByIdCompositionReferencesData, GetMediaTypeByIdCompositionReferencesErrors, GetMediaTypeByIdCompositionReferencesResponses, GetMediaTypeByIdData, GetMediaTypeByIdErrors, GetMediaTypeByIdExportData, GetMediaTypeByIdExportErrors, GetMediaTypeByIdExportResponses, GetMediaTypeByIdResponses, GetMediaTypeConfigurationData, GetMediaTypeConfigurationErrors, GetMediaTypeConfigurationResponses, GetMediaTypeFolderByIdData, GetMediaTypeFolderByIdErrors, GetMediaTypeFolderByIdResponses, GetMediaUrlsData, GetMediaUrlsErrors, GetMediaUrlsResponses, GetMemberAreReferencedData, GetMemberAreReferencedErrors, GetMemberAreReferencedResponses, GetMemberByIdData, GetMemberByIdErrors, GetMemberByIdReferencedByData, GetMemberByIdReferencedByErrors, GetMemberByIdReferencedByResponses, GetMemberByIdReferencedDescendantsData, GetMemberByIdReferencedDescendantsErrors, GetMemberByIdReferencedDescendantsResponses, GetMemberByIdResponses, GetMemberConfigurationData, GetMemberConfigurationErrors, GetMemberConfigurationResponses, GetMemberGroupByIdData, GetMemberGroupByIdErrors, GetMemberGroupByIdResponses, GetMemberGroupData, GetMemberGroupErrors, GetMemberGroupResponses, GetMemberTypeByIdCompositionReferencesData, GetMemberTypeByIdCompositionReferencesErrors, GetMemberTypeByIdCompositionReferencesResponses, GetMemberTypeByIdData, GetMemberTypeByIdErrors, GetMemberTypeByIdResponses, GetMemberTypeConfigurationData, GetMemberTypeConfigurationErrors, GetMemberTypeConfigurationResponses, GetMemberTypeFolderByIdData, GetMemberTypeFolderByIdErrors, GetMemberTypeFolderByIdResponses, GetModelsBuilderDashboardData, GetModelsBuilderDashboardErrors, GetModelsBuilderDashboardResponses, GetModelsBuilderStatusData, GetModelsBuilderStatusErrors, GetModelsBuilderStatusResponses, GetNewsDashboardData, GetNewsDashboardErrors, GetNewsDashboardResponses, GetObjectTypesData, GetObjectTypesErrors, GetObjectTypesResponses, GetOembedQueryData, GetOembedQueryErrors, GetOembedQueryResponses, GetPackageConfigurationData, GetPackageConfigurationErrors, GetPackageConfigurationResponses, GetPackageCreatedByIdData, GetPackageCreatedByIdDownloadData, GetPackageCreatedByIdDownloadErrors, GetPackageCreatedByIdDownloadResponses, GetPackageCreatedByIdErrors, GetPackageCreatedByIdResponses, GetPackageCreatedData, GetPackageCreatedErrors, GetPackageCreatedResponses, GetPackageMigrationStatusData, GetPackageMigrationStatusErrors, GetPackageMigrationStatusResponses, GetPartialViewByPathData, GetPartialViewByPathErrors, GetPartialViewByPathResponses, GetPartialViewFolderByPathData, GetPartialViewFolderByPathErrors, GetPartialViewFolderByPathResponses, GetPartialViewSnippetByIdData, GetPartialViewSnippetByIdErrors, GetPartialViewSnippetByIdResponses, GetPartialViewSnippetData, GetPartialViewSnippetErrors, GetPartialViewSnippetResponses, GetProfilingStatusData, GetProfilingStatusErrors, GetProfilingStatusResponses, GetPropertyTypeIsUsedData, GetPropertyTypeIsUsedErrors, GetPropertyTypeIsUsedResponses, GetPublishedCacheRebuildStatusData, GetPublishedCacheRebuildStatusErrors, GetPublishedCacheRebuildStatusResponses, GetRecycleBinDocumentByIdOriginalParentData, GetRecycleBinDocumentByIdOriginalParentErrors, GetRecycleBinDocumentByIdOriginalParentResponses, GetRecycleBinDocumentChildrenData, GetRecycleBinDocumentChildrenErrors, GetRecycleBinDocumentChildrenResponses, GetRecycleBinDocumentReferencedByData, GetRecycleBinDocumentReferencedByErrors, GetRecycleBinDocumentReferencedByResponses, GetRecycleBinDocumentRootData, GetRecycleBinDocumentRootErrors, GetRecycleBinDocumentRootResponses, GetRecycleBinDocumentSiblingsData, GetRecycleBinDocumentSiblingsErrors, GetRecycleBinDocumentSiblingsResponses, GetRecycleBinMediaByIdOriginalParentData, GetRecycleBinMediaByIdOriginalParentErrors, GetRecycleBinMediaByIdOriginalParentResponses, GetRecycleBinMediaChildrenData, GetRecycleBinMediaChildrenErrors, GetRecycleBinMediaChildrenResponses, GetRecycleBinMediaReferencedByData, GetRecycleBinMediaReferencedByErrors, GetRecycleBinMediaReferencedByResponses, GetRecycleBinMediaRootData, GetRecycleBinMediaRootErrors, GetRecycleBinMediaRootResponses, GetRecycleBinMediaSiblingsData, GetRecycleBinMediaSiblingsErrors, GetRecycleBinMediaSiblingsResponses, GetRedirectManagementByIdData, GetRedirectManagementByIdErrors, GetRedirectManagementByIdResponses, GetRedirectManagementData, GetRedirectManagementErrors, GetRedirectManagementResponses, GetRedirectManagementStatusData, GetRedirectManagementStatusErrors, GetRedirectManagementStatusResponses, GetRelationByRelationTypeIdData, GetRelationByRelationTypeIdErrors, GetRelationByRelationTypeIdResponses, GetRelationTypeByIdData, GetRelationTypeByIdErrors, GetRelationTypeByIdResponses, GetRelationTypeData, GetRelationTypeErrors, GetRelationTypeResponses, GetScriptByPathData, GetScriptByPathErrors, GetScriptByPathResponses, GetScriptFolderByPathData, GetScriptFolderByPathErrors, GetScriptFolderByPathResponses, GetSearcherBySearcherNameQueryData, GetSearcherBySearcherNameQueryErrors, GetSearcherBySearcherNameQueryResponses, GetSearcherData, GetSearcherErrors, GetSearcherResponses, GetSecurityConfigurationData, GetSecurityConfigurationErrors, GetSecurityConfigurationResponses, GetSegmentData, GetSegmentErrors, GetSegmentResponses, GetServerConfigurationData, GetServerConfigurationResponses, GetServerInformationData, GetServerInformationErrors, GetServerInformationResponses, GetServerStatusData, GetServerStatusErrors, GetServerStatusResponses, GetServerTroubleshootingData, GetServerTroubleshootingErrors, GetServerTroubleshootingResponses, GetServerUpgradeCheckData, GetServerUpgradeCheckErrors, GetServerUpgradeCheckResponses, GetStylesheetByPathData, GetStylesheetByPathErrors, GetStylesheetByPathResponses, GetStylesheetFolderByPathData, GetStylesheetFolderByPathErrors, GetStylesheetFolderByPathResponses, GetTagData, GetTagErrors, GetTagResponses, GetTelemetryData, GetTelemetryErrors, GetTelemetryLevelData, GetTelemetryLevelErrors, GetTelemetryLevelResponses, GetTelemetryResponses, GetTemplateByIdData, GetTemplateByIdErrors, GetTemplateByIdResponses, GetTemplateConfigurationData, GetTemplateConfigurationErrors, GetTemplateConfigurationResponses, GetTemplateQuerySettingsData, GetTemplateQuerySettingsErrors, GetTemplateQuerySettingsResponses, GetTemporaryFileByIdData, GetTemporaryFileByIdErrors, GetTemporaryFileByIdResponses, GetTemporaryFileConfigurationData, GetTemporaryFileConfigurationErrors, GetTemporaryFileConfigurationResponses, GetTreeDataTypeAncestorsData, GetTreeDataTypeAncestorsErrors, GetTreeDataTypeAncestorsResponses, GetTreeDataTypeChildrenData, GetTreeDataTypeChildrenErrors, GetTreeDataTypeChildrenResponses, GetTreeDataTypeRootData, GetTreeDataTypeRootErrors, GetTreeDataTypeRootResponses, GetTreeDataTypeSiblingsData, GetTreeDataTypeSiblingsErrors, GetTreeDataTypeSiblingsResponses, GetTreeDictionaryAncestorsData, GetTreeDictionaryAncestorsErrors, GetTreeDictionaryAncestorsResponses, GetTreeDictionaryChildrenData, GetTreeDictionaryChildrenErrors, GetTreeDictionaryChildrenResponses, GetTreeDictionaryRootData, GetTreeDictionaryRootErrors, GetTreeDictionaryRootResponses, GetTreeDocumentAncestorsData, GetTreeDocumentAncestorsErrors, GetTreeDocumentAncestorsResponses, GetTreeDocumentBlueprintAncestorsData, GetTreeDocumentBlueprintAncestorsErrors, GetTreeDocumentBlueprintAncestorsResponses, GetTreeDocumentBlueprintChildrenData, GetTreeDocumentBlueprintChildrenErrors, GetTreeDocumentBlueprintChildrenResponses, GetTreeDocumentBlueprintRootData, GetTreeDocumentBlueprintRootErrors, GetTreeDocumentBlueprintRootResponses, GetTreeDocumentBlueprintSiblingsData, GetTreeDocumentBlueprintSiblingsErrors, GetTreeDocumentBlueprintSiblingsResponses, GetTreeDocumentChildrenData, GetTreeDocumentChildrenErrors, GetTreeDocumentChildrenResponses, GetTreeDocumentRootData, GetTreeDocumentRootErrors, GetTreeDocumentRootResponses, GetTreeDocumentSiblingsData, GetTreeDocumentSiblingsErrors, GetTreeDocumentSiblingsResponses, GetTreeDocumentTypeAncestorsData, GetTreeDocumentTypeAncestorsErrors, GetTreeDocumentTypeAncestorsResponses, GetTreeDocumentTypeChildrenData, GetTreeDocumentTypeChildrenErrors, GetTreeDocumentTypeChildrenResponses, GetTreeDocumentTypeRootData, GetTreeDocumentTypeRootErrors, GetTreeDocumentTypeRootResponses, GetTreeDocumentTypeSiblingsData, GetTreeDocumentTypeSiblingsErrors, GetTreeDocumentTypeSiblingsResponses, GetTreeMediaAncestorsData, GetTreeMediaAncestorsErrors, GetTreeMediaAncestorsResponses, GetTreeMediaChildrenData, GetTreeMediaChildrenErrors, GetTreeMediaChildrenResponses, GetTreeMediaRootData, GetTreeMediaRootErrors, GetTreeMediaRootResponses, GetTreeMediaSiblingsData, GetTreeMediaSiblingsErrors, GetTreeMediaSiblingsResponses, GetTreeMediaTypeAncestorsData, GetTreeMediaTypeAncestorsErrors, GetTreeMediaTypeAncestorsResponses, GetTreeMediaTypeChildrenData, GetTreeMediaTypeChildrenErrors, GetTreeMediaTypeChildrenResponses, GetTreeMediaTypeRootData, GetTreeMediaTypeRootErrors, GetTreeMediaTypeRootResponses, GetTreeMediaTypeSiblingsData, GetTreeMediaTypeSiblingsErrors, GetTreeMediaTypeSiblingsResponses, GetTreeMemberGroupRootData, GetTreeMemberGroupRootErrors, GetTreeMemberGroupRootResponses, GetTreeMemberTypeRootData, GetTreeMemberTypeRootErrors, GetTreeMemberTypeRootResponses, GetTreeMemberTypeSiblingsData, GetTreeMemberTypeSiblingsErrors, GetTreeMemberTypeSiblingsResponses, GetTreePartialViewAncestorsData, GetTreePartialViewAncestorsErrors, GetTreePartialViewAncestorsResponses, GetTreePartialViewChildrenData, GetTreePartialViewChildrenErrors, GetTreePartialViewChildrenResponses, GetTreePartialViewRootData, GetTreePartialViewRootErrors, GetTreePartialViewRootResponses, GetTreePartialViewSiblingsData, GetTreePartialViewSiblingsErrors, GetTreePartialViewSiblingsResponses, GetTreeScriptAncestorsData, GetTreeScriptAncestorsErrors, GetTreeScriptAncestorsResponses, GetTreeScriptChildrenData, GetTreeScriptChildrenErrors, GetTreeScriptChildrenResponses, GetTreeScriptRootData, GetTreeScriptRootErrors, GetTreeScriptRootResponses, GetTreeScriptSiblingsData, GetTreeScriptSiblingsErrors, GetTreeScriptSiblingsResponses, GetTreeStaticFileAncestorsData, GetTreeStaticFileAncestorsErrors, GetTreeStaticFileAncestorsResponses, GetTreeStaticFileChildrenData, GetTreeStaticFileChildrenErrors, GetTreeStaticFileChildrenResponses, GetTreeStaticFileRootData, GetTreeStaticFileRootErrors, GetTreeStaticFileRootResponses, GetTreeStylesheetAncestorsData, GetTreeStylesheetAncestorsErrors, GetTreeStylesheetAncestorsResponses, GetTreeStylesheetChildrenData, GetTreeStylesheetChildrenErrors, GetTreeStylesheetChildrenResponses, GetTreeStylesheetRootData, GetTreeStylesheetRootErrors, GetTreeStylesheetRootResponses, GetTreeStylesheetSiblingsData, GetTreeStylesheetSiblingsErrors, GetTreeStylesheetSiblingsResponses, GetTreeTemplateAncestorsData, GetTreeTemplateAncestorsErrors, GetTreeTemplateAncestorsResponses, GetTreeTemplateChildrenData, GetTreeTemplateChildrenErrors, GetTreeTemplateChildrenResponses, GetTreeTemplateRootData, GetTreeTemplateRootErrors, GetTreeTemplateRootResponses, GetTreeTemplateSiblingsData, GetTreeTemplateSiblingsErrors, GetTreeTemplateSiblingsResponses, GetUpgradeSettingsData, GetUpgradeSettingsErrors, GetUpgradeSettingsResponses, GetUserById2FaData, GetUserById2FaErrors, GetUserById2FaResponses, GetUserByIdCalculateStartNodesData, GetUserByIdCalculateStartNodesErrors, GetUserByIdCalculateStartNodesResponses, GetUserByIdClientCredentialsData, GetUserByIdClientCredentialsErrors, GetUserByIdClientCredentialsResponses, GetUserByIdData, GetUserByIdErrors, GetUserByIdResponses, GetUserConfigurationData, GetUserConfigurationErrors, GetUserConfigurationResponses, GetUserCurrent2FaByProviderNameData, GetUserCurrent2FaByProviderNameErrors, GetUserCurrent2FaByProviderNameResponses, GetUserCurrent2FaData, GetUserCurrent2FaErrors, GetUserCurrent2FaResponses, GetUserCurrentConfigurationData, GetUserCurrentConfigurationErrors, GetUserCurrentConfigurationResponses, GetUserCurrentData, GetUserCurrentErrors, GetUserCurrentLoginProvidersData, GetUserCurrentLoginProvidersErrors, GetUserCurrentLoginProvidersResponses, GetUserCurrentPermissionsData, GetUserCurrentPermissionsDocumentData, GetUserCurrentPermissionsDocumentErrors, GetUserCurrentPermissionsDocumentResponses, GetUserCurrentPermissionsErrors, GetUserCurrentPermissionsMediaData, GetUserCurrentPermissionsMediaErrors, GetUserCurrentPermissionsMediaResponses, GetUserCurrentPermissionsResponses, GetUserCurrentResponses, GetUserData, GetUserDataByIdData, GetUserDataByIdErrors, GetUserDataByIdResponses, GetUserDataData, GetUserDataErrors, GetUserDataResponses, GetUserErrors, GetUserGroupByIdData, GetUserGroupByIdErrors, GetUserGroupByIdResponses, GetUserGroupData, GetUserGroupErrors, GetUserGroupResponses, GetUserResponses, GetWebhookByIdData, GetWebhookByIdErrors, GetWebhookByIdLogsData, GetWebhookByIdLogsErrors, GetWebhookByIdLogsResponses, GetWebhookByIdResponses, GetWebhookData, GetWebhookErrors, GetWebhookEventsData, GetWebhookEventsErrors, GetWebhookEventsResponses, GetWebhookLogsData, GetWebhookLogsErrors, GetWebhookLogsResponses, GetWebhookResponses, PostDataTypeByIdCopyData, PostDataTypeByIdCopyErrors, PostDataTypeByIdCopyResponses, PostDataTypeData, PostDataTypeErrors, PostDataTypeFolderData, PostDataTypeFolderErrors, PostDataTypeFolderResponses, PostDataTypeResponses, PostDictionaryData, PostDictionaryErrors, PostDictionaryImportData, PostDictionaryImportErrors, PostDictionaryImportResponses, PostDictionaryResponses, PostDocumentBlueprintData, PostDocumentBlueprintErrors, PostDocumentBlueprintFolderData, PostDocumentBlueprintFolderErrors, PostDocumentBlueprintFolderResponses, PostDocumentBlueprintFromDocumentData, PostDocumentBlueprintFromDocumentErrors, PostDocumentBlueprintFromDocumentResponses, PostDocumentBlueprintResponses, PostDocumentByIdCopyData, PostDocumentByIdCopyErrors, PostDocumentByIdCopyResponses, PostDocumentByIdPublicAccessData, PostDocumentByIdPublicAccessErrors, PostDocumentByIdPublicAccessResponses, PostDocumentData, PostDocumentErrors, PostDocumentResponses, PostDocumentTypeAvailableCompositionsData, PostDocumentTypeAvailableCompositionsErrors, PostDocumentTypeAvailableCompositionsResponses, PostDocumentTypeByIdCopyData, PostDocumentTypeByIdCopyErrors, PostDocumentTypeByIdCopyResponses, PostDocumentTypeData, PostDocumentTypeErrors, PostDocumentTypeFolderData, PostDocumentTypeFolderErrors, PostDocumentTypeFolderResponses, PostDocumentTypeImportData, PostDocumentTypeImportErrors, PostDocumentTypeImportResponses, PostDocumentTypeResponses, PostDocumentValidateData, PostDocumentValidateErrors, PostDocumentValidateResponses, PostDocumentVersionByIdRollbackData, PostDocumentVersionByIdRollbackErrors, PostDocumentVersionByIdRollbackResponses, PostDynamicRootQueryData, PostDynamicRootQueryErrors, PostDynamicRootQueryResponses, PostHealthCheckExecuteActionData, PostHealthCheckExecuteActionErrors, PostHealthCheckExecuteActionResponses, PostHealthCheckGroupByNameCheckData, PostHealthCheckGroupByNameCheckErrors, PostHealthCheckGroupByNameCheckResponses, PostIndexerByIndexNameRebuildData, PostIndexerByIndexNameRebuildErrors, PostIndexerByIndexNameRebuildResponses, PostInstallSetupData, PostInstallSetupErrors, PostInstallSetupResponses, PostInstallValidateDatabaseData, PostInstallValidateDatabaseErrors, PostInstallValidateDatabaseResponses, PostLanguageData, PostLanguageErrors, PostLanguageResponses, PostLogViewerSavedSearchData, PostLogViewerSavedSearchErrors, PostLogViewerSavedSearchResponses, PostMediaData, PostMediaErrors, PostMediaResponses, PostMediaTypeAvailableCompositionsData, PostMediaTypeAvailableCompositionsErrors, PostMediaTypeAvailableCompositionsResponses, PostMediaTypeByIdCopyData, PostMediaTypeByIdCopyErrors, PostMediaTypeByIdCopyResponses, PostMediaTypeData, PostMediaTypeErrors, PostMediaTypeFolderData, PostMediaTypeFolderErrors, PostMediaTypeFolderResponses, PostMediaTypeImportData, PostMediaTypeImportErrors, PostMediaTypeImportResponses, PostMediaTypeResponses, PostMediaValidateData, PostMediaValidateErrors, PostMediaValidateResponses, PostMemberData, PostMemberErrors, PostMemberGroupData, PostMemberGroupErrors, PostMemberGroupResponses, PostMemberResponses, PostMemberTypeAvailableCompositionsData, PostMemberTypeAvailableCompositionsErrors, PostMemberTypeAvailableCompositionsResponses, PostMemberTypeByIdCopyData, PostMemberTypeByIdCopyErrors, PostMemberTypeByIdCopyResponses, PostMemberTypeData, PostMemberTypeErrors, PostMemberTypeFolderData, PostMemberTypeFolderErrors, PostMemberTypeFolderResponses, PostMemberTypeResponses, PostMemberValidateData, PostMemberValidateErrors, PostMemberValidateResponses, PostModelsBuilderBuildData, PostModelsBuilderBuildErrors, PostModelsBuilderBuildResponses, PostPackageByNameRunMigrationData, PostPackageByNameRunMigrationErrors, PostPackageByNameRunMigrationResponses, PostPackageCreatedData, PostPackageCreatedErrors, PostPackageCreatedResponses, PostPartialViewData, PostPartialViewErrors, PostPartialViewFolderData, PostPartialViewFolderErrors, PostPartialViewFolderResponses, PostPartialViewResponses, PostPreviewData, PostPreviewErrors, PostPreviewResponses, PostPublishedCacheRebuildData, PostPublishedCacheRebuildErrors, PostPublishedCacheRebuildResponses, PostPublishedCacheReloadData, PostPublishedCacheReloadErrors, PostPublishedCacheReloadResponses, PostRedirectManagementStatusData, PostRedirectManagementStatusErrors, PostRedirectManagementStatusResponses, PostScriptData, PostScriptErrors, PostScriptFolderData, PostScriptFolderErrors, PostScriptFolderResponses, PostScriptResponses, PostSecurityForgotPasswordData, PostSecurityForgotPasswordErrors, PostSecurityForgotPasswordResetData, PostSecurityForgotPasswordResetErrors, PostSecurityForgotPasswordResetResponses, PostSecurityForgotPasswordResponses, PostSecurityForgotPasswordVerifyData, PostSecurityForgotPasswordVerifyErrors, PostSecurityForgotPasswordVerifyResponses, PostStylesheetData, PostStylesheetErrors, PostStylesheetFolderData, PostStylesheetFolderErrors, PostStylesheetFolderResponses, PostStylesheetResponses, PostTelemetryLevelData, PostTelemetryLevelErrors, PostTelemetryLevelResponses, PostTemplateData, PostTemplateErrors, PostTemplateQueryExecuteData, PostTemplateQueryExecuteErrors, PostTemplateQueryExecuteResponses, PostTemplateResponses, PostTemporaryFileData, PostTemporaryFileErrors, PostTemporaryFileResponses, PostUpgradeAuthorizeData, PostUpgradeAuthorizeErrors, PostUpgradeAuthorizeResponses, PostUserAvatarByIdData, PostUserAvatarByIdErrors, PostUserAvatarByIdResponses, PostUserByIdChangePasswordData, PostUserByIdChangePasswordErrors, PostUserByIdChangePasswordResponses, PostUserByIdClientCredentialsData, PostUserByIdClientCredentialsErrors, PostUserByIdClientCredentialsResponses, PostUserByIdResetPasswordData, PostUserByIdResetPasswordErrors, PostUserByIdResetPasswordResponses, PostUserCurrent2FaByProviderNameData, PostUserCurrent2FaByProviderNameErrors, PostUserCurrent2FaByProviderNameResponses, PostUserCurrentAvatarData, PostUserCurrentAvatarErrors, PostUserCurrentAvatarResponses, PostUserCurrentChangePasswordData, PostUserCurrentChangePasswordErrors, PostUserCurrentChangePasswordResponses, PostUserData, PostUserDataData, PostUserDataErrors, PostUserDataResponses, PostUserDisableData, PostUserDisableErrors, PostUserDisableResponses, PostUserEnableData, PostUserEnableErrors, PostUserEnableResponses, PostUserErrors, PostUserGroupByIdUsersData, PostUserGroupByIdUsersErrors, PostUserGroupByIdUsersResponses, PostUserGroupData, PostUserGroupErrors, PostUserGroupResponses, PostUserInviteCreatePasswordData, PostUserInviteCreatePasswordErrors, PostUserInviteCreatePasswordResponses, PostUserInviteData, PostUserInviteErrors, PostUserInviteResendData, PostUserInviteResendErrors, PostUserInviteResendResponses, PostUserInviteResponses, PostUserInviteVerifyData, PostUserInviteVerifyErrors, PostUserInviteVerifyResponses, PostUserResponses, PostUserSetUserGroupsData, PostUserSetUserGroupsErrors, PostUserSetUserGroupsResponses, PostUserUnlockData, PostUserUnlockErrors, PostUserUnlockResponses, PostWebhookData, PostWebhookErrors, PostWebhookResponses, PutDataTypeByIdData, PutDataTypeByIdErrors, PutDataTypeByIdMoveData, PutDataTypeByIdMoveErrors, PutDataTypeByIdMoveResponses, PutDataTypeByIdResponses, PutDataTypeFolderByIdData, PutDataTypeFolderByIdErrors, PutDataTypeFolderByIdResponses, PutDictionaryByIdData, PutDictionaryByIdErrors, PutDictionaryByIdMoveData, PutDictionaryByIdMoveErrors, PutDictionaryByIdMoveResponses, PutDictionaryByIdResponses, PutDocumentBlueprintByIdData, PutDocumentBlueprintByIdErrors, PutDocumentBlueprintByIdMoveData, PutDocumentBlueprintByIdMoveErrors, PutDocumentBlueprintByIdMoveResponses, PutDocumentBlueprintByIdResponses, PutDocumentBlueprintFolderByIdData, PutDocumentBlueprintFolderByIdErrors, PutDocumentBlueprintFolderByIdResponses, PutDocumentByIdData, PutDocumentByIdDomainsData, PutDocumentByIdDomainsErrors, PutDocumentByIdDomainsResponses, PutDocumentByIdErrors, PutDocumentByIdMoveData, PutDocumentByIdMoveErrors, PutDocumentByIdMoveResponses, PutDocumentByIdMoveToRecycleBinData, PutDocumentByIdMoveToRecycleBinErrors, PutDocumentByIdMoveToRecycleBinResponses, PutDocumentByIdNotificationsData, PutDocumentByIdNotificationsErrors, PutDocumentByIdNotificationsResponses, PutDocumentByIdPublicAccessData, PutDocumentByIdPublicAccessErrors, PutDocumentByIdPublicAccessResponses, PutDocumentByIdPublishData, PutDocumentByIdPublishErrors, PutDocumentByIdPublishResponses, PutDocumentByIdPublishWithDescendantsData, PutDocumentByIdPublishWithDescendantsErrors, PutDocumentByIdPublishWithDescendantsResponses, PutDocumentByIdResponses, PutDocumentByIdUnpublishData, PutDocumentByIdUnpublishErrors, PutDocumentByIdUnpublishResponses, PutDocumentSortData, PutDocumentSortErrors, PutDocumentSortResponses, PutDocumentTypeByIdData, PutDocumentTypeByIdErrors, PutDocumentTypeByIdImportData, PutDocumentTypeByIdImportErrors, PutDocumentTypeByIdImportResponses, PutDocumentTypeByIdMoveData, PutDocumentTypeByIdMoveErrors, PutDocumentTypeByIdMoveResponses, PutDocumentTypeByIdResponses, PutDocumentTypeFolderByIdData, PutDocumentTypeFolderByIdErrors, PutDocumentTypeFolderByIdResponses, PutDocumentVersionByIdPreventCleanupData, PutDocumentVersionByIdPreventCleanupErrors, PutDocumentVersionByIdPreventCleanupResponses, PutLanguageByIsoCodeData, PutLanguageByIsoCodeErrors, PutLanguageByIsoCodeResponses, PutMediaByIdData, PutMediaByIdErrors, PutMediaByIdMoveData, PutMediaByIdMoveErrors, PutMediaByIdMoveResponses, PutMediaByIdMoveToRecycleBinData, PutMediaByIdMoveToRecycleBinErrors, PutMediaByIdMoveToRecycleBinResponses, PutMediaByIdResponses, PutMediaByIdValidateData, PutMediaByIdValidateErrors, PutMediaByIdValidateResponses, PutMediaSortData, PutMediaSortErrors, PutMediaSortResponses, PutMediaTypeByIdData, PutMediaTypeByIdErrors, PutMediaTypeByIdImportData, PutMediaTypeByIdImportErrors, PutMediaTypeByIdImportResponses, PutMediaTypeByIdMoveData, PutMediaTypeByIdMoveErrors, PutMediaTypeByIdMoveResponses, PutMediaTypeByIdResponses, PutMediaTypeFolderByIdData, PutMediaTypeFolderByIdErrors, PutMediaTypeFolderByIdResponses, PutMemberByIdData, PutMemberByIdErrors, PutMemberByIdResponses, PutMemberByIdValidateData, PutMemberByIdValidateErrors, PutMemberByIdValidateResponses, PutMemberGroupByIdData, PutMemberGroupByIdErrors, PutMemberGroupByIdResponses, PutMemberTypeByIdData, PutMemberTypeByIdErrors, PutMemberTypeByIdResponses, PutMemberTypeFolderByIdData, PutMemberTypeFolderByIdErrors, PutMemberTypeFolderByIdResponses, PutPackageCreatedByIdData, PutPackageCreatedByIdErrors, PutPackageCreatedByIdResponses, PutPartialViewByPathData, PutPartialViewByPathErrors, PutPartialViewByPathRenameData, PutPartialViewByPathRenameErrors, PutPartialViewByPathRenameResponses, PutPartialViewByPathResponses, PutProfilingStatusData, PutProfilingStatusErrors, PutProfilingStatusResponses, PutRecycleBinDocumentByIdRestoreData, PutRecycleBinDocumentByIdRestoreErrors, PutRecycleBinDocumentByIdRestoreResponses, PutRecycleBinMediaByIdRestoreData, PutRecycleBinMediaByIdRestoreErrors, PutRecycleBinMediaByIdRestoreResponses, PutScriptByPathData, PutScriptByPathErrors, PutScriptByPathRenameData, PutScriptByPathRenameErrors, PutScriptByPathRenameResponses, PutScriptByPathResponses, PutStylesheetByPathData, PutStylesheetByPathErrors, PutStylesheetByPathRenameData, PutStylesheetByPathRenameErrors, PutStylesheetByPathRenameResponses, PutStylesheetByPathResponses, PutTemplateByIdData, PutTemplateByIdErrors, PutTemplateByIdResponses, PutUmbracoManagementApiV11DocumentByIdValidate11Data, PutUmbracoManagementApiV11DocumentByIdValidate11Errors, PutUmbracoManagementApiV11DocumentByIdValidate11Responses, PutUserByIdData, PutUserByIdErrors, PutUserByIdResponses, PutUserDataData, PutUserDataErrors, PutUserDataResponses, PutUserGroupByIdData, PutUserGroupByIdErrors, PutUserGroupByIdResponses, PutWebhookByIdData, PutWebhookByIdErrors, PutWebhookByIdResponses } from './types.gen';
 
 export type Options<TData extends TDataShape = TDataShape, ThrowOnError extends boolean = boolean> = Options2<TData, ThrowOnError> & {
     /**
@@ -3323,6 +3323,66 @@ export class MemberTypeService {
         });
     }
     
+    public static postMemberTypeFolder<ThrowOnError extends boolean = true>(options?: Options<PostMemberTypeFolderData, ThrowOnError>) {
+        return (options?.client ?? client).post<PostMemberTypeFolderResponses, PostMemberTypeFolderErrors, ThrowOnError>({
+            security: [
+                {
+                    scheme: 'bearer',
+                    type: 'http'
+                }
+            ],
+            url: '/umbraco/management/api/v1/member-type/folder',
+            ...options,
+            headers: {
+                'Content-Type': 'application/json',
+                ...options?.headers
+            }
+        });
+    }
+    
+    public static deleteMemberTypeFolderById<ThrowOnError extends boolean = true>(options: Options<DeleteMemberTypeFolderByIdData, ThrowOnError>) {
+        return (options.client ?? client).delete<DeleteMemberTypeFolderByIdResponses, DeleteMemberTypeFolderByIdErrors, ThrowOnError>({
+            security: [
+                {
+                    scheme: 'bearer',
+                    type: 'http'
+                }
+            ],
+            url: '/umbraco/management/api/v1/member-type/folder/{id}',
+            ...options
+        });
+    }
+    
+    public static getMemberTypeFolderById<ThrowOnError extends boolean = true>(options: Options<GetMemberTypeFolderByIdData, ThrowOnError>) {
+        return (options.client ?? client).get<GetMemberTypeFolderByIdResponses, GetMemberTypeFolderByIdErrors, ThrowOnError>({
+            security: [
+                {
+                    scheme: 'bearer',
+                    type: 'http'
+                }
+            ],
+            url: '/umbraco/management/api/v1/member-type/folder/{id}',
+            ...options
+        });
+    }
+    
+    public static putMemberTypeFolderById<ThrowOnError extends boolean = true>(options: Options<PutMemberTypeFolderByIdData, ThrowOnError>) {
+        return (options.client ?? client).put<PutMemberTypeFolderByIdResponses, PutMemberTypeFolderByIdErrors, ThrowOnError>({
+            security: [
+                {
+                    scheme: 'bearer',
+                    type: 'http'
+                }
+            ],
+            url: '/umbraco/management/api/v1/member-type/folder/{id}',
+            ...options,
+            headers: {
+                'Content-Type': 'application/json',
+                ...options.headers
+            }
+        });
+    }
+    
     public static getTreeMemberTypeRoot<ThrowOnError extends boolean = true>(options?: Options<GetTreeMemberTypeRootData, ThrowOnError>) {
         return (options?.client ?? client).get<GetTreeMemberTypeRootResponses, GetTreeMemberTypeRootErrors, ThrowOnError>({
             security: [
@@ -3578,6 +3638,21 @@ export class ModelsBuilderService {
     }
 }
 
+export class NewsDashboardService {
+    public static getNewsDashboard<ThrowOnError extends boolean = true>(options?: Options<GetNewsDashboardData, ThrowOnError>) {
+        return (options?.client ?? client).get<GetNewsDashboardResponses, GetNewsDashboardErrors, ThrowOnError>({
+            security: [
+                {
+                    scheme: 'bearer',
+                    type: 'http'
+                }
+            ],
+            url: '/umbraco/management/api/v1/news-dashboard',
+            ...options
+        });
+    }
+}
+
 export class ObjectTypesService {
     public static getObjectTypes<ThrowOnError extends boolean = true>(options?: Options<GetObjectTypesData, ThrowOnError>) {
         return (options?.client ?? client).get<GetObjectTypesResponses, GetObjectTypesErrors, ThrowOnError>({
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/backend-api/types.gen.ts b/src/Umbraco.Web.UI.Client/src/packages/core/backend-api/types.gen.ts
index 97294e9a0bee..0bd3f90ea53e 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/backend-api/types.gen.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/backend-api/types.gen.ts
@@ -412,7 +412,7 @@ export type CreateUserGroupRequestModel = {
     mediaStartNode?: ReferenceByIdModel | null;
     mediaRootAccess: boolean;
     fallbackPermissions: Array<string>;
-    permissions: Array<DocumentPermissionPresentationModel | DocumentPropertyValuePermissionPresentationModel | UnknownTypePermissionPresentationModel>;
+    permissions: Array<DocumentPermissionPresentationModel | DocumentPropertyValuePermissionPresentationModel | DocumentTypePermissionPresentationModel | UnknownTypePermissionPresentationModel>;
     id?: string | null;
 };
 
@@ -471,7 +471,7 @@ export type CurrentUserResponseModel = {
     hasAccessToAllLanguages: boolean;
     hasAccessToSensitiveData: boolean;
     fallbackPermissions: Array<string>;
-    permissions: Array<DocumentPermissionPresentationModel | DocumentPropertyValuePermissionPresentationModel | UnknownTypePermissionPresentationModel>;
+    permissions: Array<DocumentPermissionPresentationModel | DocumentPropertyValuePermissionPresentationModel | DocumentTypePermissionPresentationModel | UnknownTypePermissionPresentationModel>;
     allowedSections: Array<string>;
     isAdmin: boolean;
 };
@@ -642,6 +642,9 @@ export type DocumentConfigurationResponseModel = {
     disableDeleteWhenReferenced: boolean;
     disableUnpublishWhenReferenced: boolean;
     allowEditInvariantFromNonDefault: boolean;
+    /**
+     * @deprecated
+     */
     allowNonExistingSegmentsCreation: boolean;
 };
 
@@ -770,6 +773,12 @@ export type DocumentTypeItemResponseModel = {
     description?: string | null;
 };
 
+export type DocumentTypePermissionPresentationModel = {
+    $type: string;
+    verbs: Array<string>;
+    documentTypeAlias: string;
+};
+
 export type DocumentTypePropertyTypeContainerResponseModel = {
     id: string;
     parent?: ReferenceByIdModel | null;
@@ -1634,6 +1643,20 @@ export type NamedEntityTreeItemResponseModel = {
     name: string;
 };
 
+export type NewsDashboardItemResponseModel = {
+    priority: string;
+    header: string;
+    body?: string | null;
+    buttonText?: string | null;
+    imageUrl?: string | null;
+    imageAltText?: string | null;
+    url?: string | null;
+};
+
+export type NewsDashboardResponseModel = {
+    items: Array<NewsDashboardItemResponseModel>;
+};
+
 export type NoopSetupTwoFactorModel = {
     [key: string]: never;
 };
@@ -2788,7 +2811,7 @@ export type UpdateUserGroupRequestModel = {
     mediaStartNode?: ReferenceByIdModel | null;
     mediaRootAccess: boolean;
     fallbackPermissions: Array<string>;
-    permissions: Array<DocumentPermissionPresentationModel | DocumentPropertyValuePermissionPresentationModel | UnknownTypePermissionPresentationModel>;
+    permissions: Array<DocumentPermissionPresentationModel | DocumentPropertyValuePermissionPresentationModel | DocumentTypePermissionPresentationModel | UnknownTypePermissionPresentationModel>;
 };
 
 export type UpdateUserGroupsOnUserRequestModel = {
@@ -2889,7 +2912,7 @@ export type UserGroupResponseModel = {
     mediaStartNode?: ReferenceByIdModel | null;
     mediaRootAccess: boolean;
     fallbackPermissions: Array<string>;
-    permissions: Array<DocumentPermissionPresentationModel | DocumentPropertyValuePermissionPresentationModel | UnknownTypePermissionPresentationModel>;
+    permissions: Array<DocumentPermissionPresentationModel | DocumentPropertyValuePermissionPresentationModel | DocumentTypePermissionPresentationModel | UnknownTypePermissionPresentationModel>;
     id: string;
     isDeletable: boolean;
     aliasCanBeChanged: boolean;
@@ -10784,6 +10807,150 @@ export type GetMemberTypeConfigurationResponses = {
 
 export type GetMemberTypeConfigurationResponse = GetMemberTypeConfigurationResponses[keyof GetMemberTypeConfigurationResponses];
 
+export type PostMemberTypeFolderData = {
+    body?: CreateFolderRequestModel;
+    path?: never;
+    query?: never;
+    url: '/umbraco/management/api/v1/member-type/folder';
+};
+
+export type PostMemberTypeFolderErrors = {
+    /**
+     * Bad Request
+     */
+    400: ProblemDetails;
+    /**
+     * The resource is protected and requires an authentication token
+     */
+    401: unknown;
+    /**
+     * The authenticated user does not have access to this resource
+     */
+    403: unknown;
+    /**
+     * Not Found
+     */
+    404: ProblemDetails;
+};
+
+export type PostMemberTypeFolderError = PostMemberTypeFolderErrors[keyof PostMemberTypeFolderErrors];
+
+export type PostMemberTypeFolderResponses = {
+    /**
+     * Created
+     */
+    201: unknown;
+};
+
+export type DeleteMemberTypeFolderByIdData = {
+    body?: never;
+    path: {
+        id: string;
+    };
+    query?: never;
+    url: '/umbraco/management/api/v1/member-type/folder/{id}';
+};
+
+export type DeleteMemberTypeFolderByIdErrors = {
+    /**
+     * Bad Request
+     */
+    400: ProblemDetails;
+    /**
+     * The resource is protected and requires an authentication token
+     */
+    401: unknown;
+    /**
+     * The authenticated user does not have access to this resource
+     */
+    403: unknown;
+    /**
+     * Not Found
+     */
+    404: ProblemDetails;
+};
+
+export type DeleteMemberTypeFolderByIdError = DeleteMemberTypeFolderByIdErrors[keyof DeleteMemberTypeFolderByIdErrors];
+
+export type DeleteMemberTypeFolderByIdResponses = {
+    /**
+     * OK
+     */
+    200: unknown;
+};
+
+export type GetMemberTypeFolderByIdData = {
+    body?: never;
+    path: {
+        id: string;
+    };
+    query?: never;
+    url: '/umbraco/management/api/v1/member-type/folder/{id}';
+};
+
+export type GetMemberTypeFolderByIdErrors = {
+    /**
+     * The resource is protected and requires an authentication token
+     */
+    401: unknown;
+    /**
+     * The authenticated user does not have access to this resource
+     */
+    403: unknown;
+    /**
+     * Not Found
+     */
+    404: ProblemDetails;
+};
+
+export type GetMemberTypeFolderByIdError = GetMemberTypeFolderByIdErrors[keyof GetMemberTypeFolderByIdErrors];
+
+export type GetMemberTypeFolderByIdResponses = {
+    /**
+     * OK
+     */
+    200: FolderResponseModel;
+};
+
+export type GetMemberTypeFolderByIdResponse = GetMemberTypeFolderByIdResponses[keyof GetMemberTypeFolderByIdResponses];
+
+export type PutMemberTypeFolderByIdData = {
+    body?: UpdateFolderResponseModel;
+    path: {
+        id: string;
+    };
+    query?: never;
+    url: '/umbraco/management/api/v1/member-type/folder/{id}';
+};
+
+export type PutMemberTypeFolderByIdErrors = {
+    /**
+     * Bad Request
+     */
+    400: ProblemDetails;
+    /**
+     * The resource is protected and requires an authentication token
+     */
+    401: unknown;
+    /**
+     * The authenticated user does not have access to this resource
+     */
+    403: unknown;
+    /**
+     * Not Found
+     */
+    404: ProblemDetails;
+};
+
+export type PutMemberTypeFolderByIdError = PutMemberTypeFolderByIdErrors[keyof PutMemberTypeFolderByIdErrors];
+
+export type PutMemberTypeFolderByIdResponses = {
+    /**
+     * OK
+     */
+    200: unknown;
+};
+
 export type GetTreeMemberTypeRootData = {
     body?: never;
     path?: never;
@@ -11364,6 +11531,29 @@ export type GetModelsBuilderStatusResponses = {
 
 export type GetModelsBuilderStatusResponse = GetModelsBuilderStatusResponses[keyof GetModelsBuilderStatusResponses];
 
+export type GetNewsDashboardData = {
+    body?: never;
+    path?: never;
+    query?: never;
+    url: '/umbraco/management/api/v1/news-dashboard';
+};
+
+export type GetNewsDashboardErrors = {
+    /**
+     * The resource is protected and requires an authentication token
+     */
+    401: unknown;
+};
+
+export type GetNewsDashboardResponses = {
+    /**
+     * OK
+     */
+    200: NewsDashboardResponseModel;
+};
+
+export type GetNewsDashboardResponse = GetNewsDashboardResponses[keyof GetNewsDashboardResponses];
+
 export type GetObjectTypesData = {
     body?: never;
     path?: never;
diff --git a/src/Umbraco.Web.UI.Client/src/packages/umbraco-news/index.ts b/src/Umbraco.Web.UI.Client/src/packages/umbraco-news/index.ts
new file mode 100644
index 000000000000..23a384a46005
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/packages/umbraco-news/index.ts
@@ -0,0 +1,3 @@
+export * from './repository/index.js';
+
+export type * from './types.js';
diff --git a/src/Umbraco.Web.UI.Client/src/packages/umbraco-news/repository/index.ts b/src/Umbraco.Web.UI.Client/src/packages/umbraco-news/repository/index.ts
new file mode 100644
index 000000000000..525b08e59cdf
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/packages/umbraco-news/repository/index.ts
@@ -0,0 +1,2 @@
+export * from './umbraco-news.respository.js';
+export * from './umbraco-news.server.data-source.js';
diff --git a/src/Umbraco.Web.UI.Client/src/packages/umbraco-news/repository/types.ts b/src/Umbraco.Web.UI.Client/src/packages/umbraco-news/repository/types.ts
new file mode 100644
index 000000000000..fededb277fe4
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/packages/umbraco-news/repository/types.ts
@@ -0,0 +1 @@
+export type * from './umbraco-news.server.data-source.js';
diff --git a/src/Umbraco.Web.UI.Client/src/packages/umbraco-news/repository/umbraco-news.respository.ts b/src/Umbraco.Web.UI.Client/src/packages/umbraco-news/repository/umbraco-news.respository.ts
new file mode 100644
index 000000000000..62c7ff9f4a06
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/packages/umbraco-news/repository/umbraco-news.respository.ts
@@ -0,0 +1,12 @@
+import { UmbNewsServerDataSource } from './umbraco-news.server.data-source.js';
+import { UmbRepositoryBase } from '@umbraco-cms/backoffice/repository';
+import type { NewsDashboardResponseModel } from '@umbraco-cms/backoffice/external/backend-api';
+import type { UmbDataSourceResponse } from '@umbraco-cms/backoffice/repository';
+
+export class UmbNewsDashboardRepository extends UmbRepositoryBase {
+	#dataSource = new UmbNewsServerDataSource(this);
+
+	async getNewsDashboard(): Promise<UmbDataSourceResponse<NewsDashboardResponseModel>> {
+		return this.#dataSource.getNewsItems();
+	}
+}
diff --git a/src/Umbraco.Web.UI.Client/src/packages/umbraco-news/repository/umbraco-news.server.data-source.ts b/src/Umbraco.Web.UI.Client/src/packages/umbraco-news/repository/umbraco-news.server.data-source.ts
new file mode 100644
index 000000000000..277447daa5e5
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/packages/umbraco-news/repository/umbraco-news.server.data-source.ts
@@ -0,0 +1,25 @@
+import { tryExecute } from '@umbraco-cms/backoffice/resources';
+import { NewsDashboardService } from '@umbraco-cms/backoffice/external/backend-api';
+import { UmbControllerBase } from '@umbraco-cms/backoffice/class-api';
+import type { NewsDashboardResponseModel } from '@umbraco-cms/backoffice/external/backend-api';
+import type { UmbDataSourceResponse } from '@umbraco-cms/backoffice/repository';
+
+export interface UmbNewsDataSource {
+	getNewsItems(): Promise<UmbDataSourceResponse<NewsDashboardResponseModel>>;
+}
+
+/**
+ * A data source for the news items
+ * @class UmbNewsServerDataSource
+ * @implements {UmbNewsDataSource}
+ */
+export class UmbNewsServerDataSource extends UmbControllerBase implements UmbNewsDataSource {
+	/**
+	 * Get all news items from the server
+	 * @returns {*}
+	 * @memberof UmbNewsServerDataSource
+	 */
+	async getNewsItems() {
+		return await tryExecute(this._host, NewsDashboardService.getNewsDashboard());
+	}
+}
diff --git a/src/Umbraco.Web.UI.Client/src/packages/umbraco-news/types.ts b/src/Umbraco.Web.UI.Client/src/packages/umbraco-news/types.ts
new file mode 100644
index 000000000000..e32ac4b889fe
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/packages/umbraco-news/types.ts
@@ -0,0 +1 @@
+export type * from './repository/types.js';
diff --git a/src/Umbraco.Web.UI.Client/src/packages/umbraco-news/umbraco-news-dashboard.element.ts b/src/Umbraco.Web.UI.Client/src/packages/umbraco-news/umbraco-news-dashboard.element.ts
index 7a1c506bb10b..ba1ef0e957a7 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/umbraco-news/umbraco-news-dashboard.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/umbraco-news/umbraco-news-dashboard.element.ts
@@ -1,64 +1,198 @@
-import { UmbTextStyles } from '@umbraco-cms/backoffice/style';
-import { css, customElement, html } from '@umbraco-cms/backoffice/external/lit';
+import { UmbNewsDashboardRepository } from './repository/index.js';
+import {
+	css,
+	customElement,
+	html,
+	nothing,
+	repeat,
+	state,
+	unsafeHTML,
+	when,
+} from '@umbraco-cms/backoffice/external/lit';
+import { sanitizeHTML } from '@umbraco-cms/backoffice/utils';
 import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element';
+import { UmbTextStyles } from '@umbraco-cms/backoffice/style';
+import type { NewsDashboardItemResponseModel } from '@umbraco-cms/backoffice/external/backend-api';
+
+interface UmbNewsDashboardGroupedItems {
+	priority: number;
+	items: Array<NewsDashboardItemResponseModel>;
+}
 
 @customElement('umb-umbraco-news-dashboard')
 export class UmbUmbracoNewsDashboardElement extends UmbLitElement {
-	#infoLinks = [
-		{
-			name: this.localize.term('welcomeDashboard_documentationHeadline'),
-			description: this.localize.term('welcomeDashboard_documentationDescription'),
-			href: 'https://docs.umbraco.com/?utm_source=core&utm_medium=dashboard&utm_campaign=docs',
-		},
-		{
-			name: this.localize.term('welcomeDashboard_communityHeadline'),
-			description: this.localize.term('welcomeDashboard_communityDescription'),
-			href: 'https://our.umbraco.com/?utm_source=core&utm_medium=dashboard&utm_content=text&utm_campaign=our_forum',
-		},
-		{
-			name: this.localize.term('welcomeDashboard_resourcesHeadline'),
-			description: this.localize.term('welcomeDashboard_resourcesDescription'),
-			href: 'https://umbraco.com/resources/?utm_source=core&utm_medium=dashboard&utm_content=text&utm_campaign=resources',
-		},
-		{
-			name: this.localize.term('welcomeDashboard_trainingHeadline'),
-			description: this.localize.term('welcomeDashboard_trainingDescription'),
-			href: 'https://umbraco.com/training/?utm_source=core&utm_medium=dashboard&utm_content=text&utm_campaign=training',
-		},
-	];
+	@state()
+	private _items: Array<NewsDashboardItemResponseModel> = [];
+
+	@state()
+	private _groupedItems: Array<UmbNewsDashboardGroupedItems> = [];
+
+	@state()
+	private _loaded: boolean = false;
+
+	#repo = new UmbNewsDashboardRepository(this);
+
+	override async firstUpdated() {
+		const res = await this.#repo.getNewsDashboard();
+		this._items = res.data?.items ?? [];
+		this._groupedItems = this.#groupItemsByPriority();
+		this._loaded = true;
+	}
+
+	#groupItemsByPriority(): Array<UmbNewsDashboardGroupedItems> {
+		const sanitizedItems = this._items.map((i) => ({
+			...i,
+			body: i.body ? sanitizeHTML(i.body) : '',
+		}));
+
+		// Separate items by priority.
+		const priority1 = sanitizedItems.filter((item) => item.priority === 'High');
+		const priority2 = sanitizedItems.filter((item) => item.priority === 'Medium');
+		const priority3 = sanitizedItems.filter((item) => item.priority === 'Normal');
+
+		// Group 1: First 4 items from priority 1.
+		const group1Items = priority1.slice(0, 4);
+		const overflow1 = priority1.slice(4);
+
+		// Group 2: Overflow from priority 1 + priority 2 items (max 4 total).
+		const group2Items = [...overflow1, ...priority2].slice(0, 4);
+		const overflow2Count = overflow1.length + priority2.length - 4;
+		const overflow2 = overflow2Count > 0 ? [...overflow1, ...priority2].slice(4) : [];
+
+		// Group 3: Overflow from groups 1 & 2 + priority 3 items.
+		const group3Items = [...overflow2, ...priority3];
+
+		return [
+			{ priority: 1, items: group1Items },
+			{ priority: 2, items: group2Items },
+			{ priority: 3, items: group3Items },
+		];
+	}
 
 	override render() {
+		if (!this._loaded) {
+			return html`<div class="loader"><uui-loader></uui-loader></div>`;
+		}
+
+		if (this._items.length === 0) {
+			return this.#renderDefaultContent();
+		}
+
 		return html`
-			<div id="info-links" class="uui-text">
-				<uui-box id="our-umbraco">
-					<div>
-						<h2 class="uui-h3">${this.localize.term('welcomeDashboard_ourUmbracoHeadline')}</h2>
-						<p>${this.localize.term('welcomeDashboard_ourUmbracoDescription')}</p>
-						<uui-button
-							look="outline"
-							target="_blank"
-							href="https://our.umbraco.com/?utm_source=core&amp;utm_medium=dashboard&amp;utm_content=image&amp;utm_campaign=our"
-							label=${this.localize.term('welcomeDashboard_ourUmbracoButton')}></uui-button>
+			${repeat(
+				this._groupedItems,
+				(g) => g.priority,
+				(g) => html`
+					<div class="cards">
+						${repeat(
+							g.items,
+							(i, idx) => i.url || i.header || idx,
+							(i) => {
+								const isLastRow = g.priority === 3;
+
+								const content = html`
+									${when(
+										g.priority <= 2,
+										() =>
+											html`${i.imageUrl
+												? html`<img class="card-img" src=${i.imageUrl} alt=${i.imageAltText ?? ''} />`
+												: html`<div class="card-img placeholder" aria-hidden="true"></div>`}`,
+										() => nothing,
+									)}
+									<div class="card-body">
+										${g.priority <= 2
+											? html`<h2 class="card-title">${i.header}</h2>`
+											: html`<h3 class="card-title">${i.header}</h3>`}
+										${i.body ? html`<div class="card-text">${unsafeHTML(i.body)}</div>` : null}
+										${!isLastRow && i.url
+											? html`<div class="card-actions">
+													<uui-button look="outline" href=${i.url} target="_blank">
+														${i.buttonText || 'Open'}
+													</uui-button>
+												</div>`
+											: nothing}
+									</div>
+								`;
+
+								// LAST ROW: whole card is a link
+								return isLastRow
+									? i.url
+										? html`
+												<a class="card normal-priority" role="listitem" href=${i.url} target="_blank" rel="noopener">
+													${content}
+												</a>
+											`
+										: html` <article class="card normal-priority" role="listitem">${content}</article> `
+									: html` <article class="card" role="listitem">${content}</article> `;
+							},
+						)}
 					</div>
-				</uui-box>
-				${this.#infoLinks.map(
-					(link) => html`
-						<a class="info-link" target="_blank" href=${link.href}>
-							<h3 class="uui-h5">${link.name}</h3>
-							<p>${link.description}</p>
-						</a>
-					`,
-				)}
-			</div>
+				`,
+			)}
 		`;
 	}
 
+	#renderDefaultContent() {
+		const infoLinks = [
+			{
+				name: this.localize.term('welcomeDashboard_documentationHeadline'),
+				description: this.localize.term('welcomeDashboard_documentationDescription'),
+				href: 'https://docs.umbraco.com/?utm_source=core&utm_medium=dashboard&utm_campaign=docs',
+			},
+			{
+				name: this.localize.term('welcomeDashboard_communityHeadline'),
+				description: this.localize.term('welcomeDashboard_communityDescription'),
+				href: 'https://our.umbraco.com/?utm_source=core&utm_medium=dashboard&utm_content=text&utm_campaign=our_forum',
+			},
+			{
+				name: this.localize.term('welcomeDashboard_resourcesHeadline'),
+				description: this.localize.term('welcomeDashboard_resourcesDescription'),
+				href: 'https://umbraco.com/resources/?utm_source=core&utm_medium=dashboard&utm_content=text&utm_campaign=resources',
+			},
+			{
+				name: this.localize.term('welcomeDashboard_trainingHeadline'),
+				description: this.localize.term('welcomeDashboard_trainingDescription'),
+				href: 'https://umbraco.com/training/?utm_source=core&utm_medium=dashboard&utm_content=text&utm_campaign=training',
+			},
+		];
+		return html`<div id="info-links" class="uui-text">
+			<uui-box id="our-umbraco">
+				<div>
+					<h2 class="uui-h3">${this.localize.term('welcomeDashboard_ourUmbracoHeadline')}</h2>
+					<p>${this.localize.term('welcomeDashboard_ourUmbracoDescription')}</p>
+					<uui-button
+						look="outline"
+						target="_blank"
+						href="https://our.umbraco.com/?utm_source=core&amp;utm_medium=dashboard&amp;utm_content=image&amp;utm_campaign=our"
+						label=${this.localize.term('welcomeDashboard_ourUmbracoButton')}></uui-button>
+				</div>
+			</uui-box>
+			${infoLinks.map(
+				(link) => html`
+					<a class="info-link" target="_blank" href=${link.href}>
+						<h3 class="uui-h5">${link.name}</h3>
+						<p>${link.description}</p>
+					</a>
+				`,
+			)}
+		</div>`;
+	}
+
 	static override styles = [
 		UmbTextStyles,
 		css`
 			:host {
 				display: block;
 				padding: var(--uui-size-layout-1);
+				max-width: 1500px;
+				container-type: inline-size;
+				container-name: dashboard;
+			}
+
+			.loader {
+				display: flex;
+				justify-content: center;
+				align-items: center;
 			}
 
 			p {
@@ -100,6 +234,92 @@ export class UmbUmbracoNewsDashboardElement extends UmbLitElement {
 				margin-top: 0;
 				margin-bottom: 0;
 			}
+
+			/* Grid */
+			.cards {
+				--cols: 4;
+				--gap: var(--uui-size-space-4);
+				width: 100%;
+				display: grid;
+				grid-template-columns: repeat(
+					auto-fit,
+					minmax(calc((100% - (var(--cols) - 1) * var(--gap)) / var(--cols)), 1fr)
+				);
+				gap: var(--gap);
+			}
+
+			.cards + .cards {
+				margin-top: var(--uui-size-space-5);
+			}
+
+			@container (max-width: 1200px) {
+				.cards {
+					grid-template-columns: repeat(auto-fit, minmax(2, 1fr));
+				}
+			}
+			@container (max-width: 700px) {
+				.cards {
+					grid-template-columns: 1fr;
+				}
+			}
+
+			/* Card */
+			.card {
+				background: var(--uui-color-surface);
+				border-radius: var(--uui-border-radius, 8px);
+				box-shadow: var(
+					--uui-box-box-shadow,
+					var(--uui-shadow-depth-1, 0 1px 3px rgba(0, 0, 0, 0.12), 0 1px 2px rgba(0, 0, 0, 0.24))
+				);
+				overflow: hidden;
+				display: flex;
+				flex-direction: column;
+				height: 100%;
+			}
+
+			.card-img {
+				width: 100%;
+				object-fit: cover;
+				display: block;
+			}
+
+			.card-img.placeholder {
+				height: 8px;
+			}
+
+			.card-body {
+				display: flex;
+				flex-direction: column;
+				padding: var(--uui-size-space-5);
+				flex: 1 1 auto;
+				justify-content: space-between;
+				gap: var(--uui-size-space-3, 9px);
+			}
+
+			.card-title {
+				margin: 0;
+			}
+
+			.card-text > p {
+				margin: 0;
+			}
+
+			.normal-priority {
+				display: block;
+				border: 1px solid var(--uui-color-divider);
+				border-radius: var(--uui-border-radius, 8px);
+				text-decoration: none;
+				color: inherit;
+				overflow: hidden;
+
+				.card-body {
+					gap: 0;
+				}
+			}
+
+			.card-actions {
+				align-self: end;
+			}
 		`,
 	];
 }

From 4ba186633c4c8b8cae47bc7849008866fa057385 Mon Sep 17 00:00:00 2001
From: Lee Kelleher <leekelleher@users.noreply.github.com>
Date: Tue, 14 Oct 2025 07:46:48 +0100
Subject: [PATCH 023/155] UFM: Adds `$index` support to Block editors (fixes
 #20470) (#20488)

* Block List: adds `$index` support for UFM labels

* Block Grid: adds `$index` support for UFM labels

* Block RTE: adds `$index` support for UFM labels

Which is always zero `0`.
But has been wired up if we do implement the index order in future.
---
 .../block-grid-block-inline.element.ts          |  5 ++++-
 .../block-grid-block.element.ts                 |  5 ++++-
 .../block-grid-entries.element.ts               |  8 ++++----
 .../block-grid-entry.element.ts                 |  4 +++-
 .../block-list-entry.element.ts                 | 17 +++++++++--------
 .../inline-list-block.element.ts                |  5 ++++-
 .../ref-list-block/ref-list-block.element.ts    |  5 ++++-
 .../property-editor-ui-block-list.element.ts    | 11 ++++++-----
 .../block-rte-entry/block-rte-entry.element.ts  | 11 ++++++-----
 .../ref-rte-block/ref-rte-block.element.ts      |  5 ++++-
 10 files changed, 48 insertions(+), 28 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/packages/block/block-grid/components/block-grid-block-inline/block-grid-block-inline.element.ts b/src/Umbraco.Web.UI.Client/src/packages/block/block-grid/components/block-grid-block-inline/block-grid-block-inline.element.ts
index f1dc58534248..6a515902f167 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/block/block-grid/components/block-grid-block-inline/block-grid-block-inline.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/block/block-grid/components/block-grid-block-inline/block-grid-block-inline.element.ts
@@ -38,6 +38,9 @@ export class UmbBlockGridBlockInlineElement extends UmbLitElement {
 	@property({ type: String, reflect: false })
 	icon?: string;
 
+	@property({ type: Number, attribute: false })
+	index?: number;
+
 	@property({ type: Boolean, reflect: true })
 	unpublished?: boolean;
 
@@ -173,7 +176,7 @@ export class UmbBlockGridBlockInlineElement extends UmbLitElement {
 	}
 
 	#renderBlockInfo() {
-		const blockValue = { ...this.content, $settings: this.settings };
+		const blockValue = { ...this.content, $settings: this.settings, $index: this.index };
 		return html`
 			<span id="content">
 				<span id="icon">
diff --git a/src/Umbraco.Web.UI.Client/src/packages/block/block-grid/components/block-grid-block/block-grid-block.element.ts b/src/Umbraco.Web.UI.Client/src/packages/block/block-grid/components/block-grid-block/block-grid-block.element.ts
index c6406db6bf4d..92e27823e769 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/block/block-grid/components/block-grid-block/block-grid-block.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/block/block-grid/components/block-grid-block/block-grid-block.element.ts
@@ -14,6 +14,9 @@ export class UmbBlockGridBlockElement extends UmbLitElement {
 	@property({ type: String, reflect: false })
 	icon?: string;
 
+	@property({ type: Number, attribute: false })
+	index?: number;
+
 	@property({ attribute: false })
 	config?: UmbBlockEditorCustomViewConfiguration;
 
@@ -27,7 +30,7 @@ export class UmbBlockGridBlockElement extends UmbLitElement {
 	settings?: UmbBlockDataType;
 
 	override render() {
-		const blockValue = { ...this.content, $settings: this.settings };
+		const blockValue = { ...this.content, $settings: this.settings, $index: this.index };
 		return html`
 			<umb-ref-grid-block
 				standalone
diff --git a/src/Umbraco.Web.UI.Client/src/packages/block/block-grid/components/block-grid-entries/block-grid-entries.element.ts b/src/Umbraco.Web.UI.Client/src/packages/block/block-grid/components/block-grid-entries/block-grid-entries.element.ts
index 3c0df0f3ae0c..5392d3e63f3d 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/block/block-grid/components/block-grid-entries/block-grid-entries.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/block/block-grid/components/block-grid-entries/block-grid-entries.element.ts
@@ -392,13 +392,13 @@ export class UmbBlockGridEntriesElement extends UmbFormControlMixin(UmbLitElemen
 			<div class="umb-block-grid__layout-container" data-area-length=${this._layoutEntries.length}>
 				${repeat(
 					this._layoutEntries,
-					(x) => x.contentKey,
-					(layoutEntry, index) =>
+					(layout, index) => `${index}_${layout.contentKey}`,
+					(layout, index) =>
 						html`<umb-block-grid-entry
 							class="umb-block-grid__layout-item"
 							index=${index}
-							.contentKey=${layoutEntry.contentKey}
-							.layout=${layoutEntry}>
+							.contentKey=${layout.contentKey}
+							.layout=${layout}>
 						</umb-block-grid-entry>`,
 				)}
 			</div>
diff --git a/src/Umbraco.Web.UI.Client/src/packages/block/block-grid/components/block-grid-entry/block-grid-entry.element.ts b/src/Umbraco.Web.UI.Client/src/packages/block/block-grid/components/block-grid-entry/block-grid-entry.element.ts
index 5fb10c3349a9..ac93c62bff2c 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/block/block-grid/components/block-grid-entry/block-grid-entry.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/block/block-grid/components/block-grid-entry/block-grid-entry.element.ts
@@ -190,7 +190,7 @@ export class UmbBlockGridEntryElement extends UmbLitElement implements UmbProper
 			},
 			null,
 		);
-		// TODO: Implement index.
+		this.observe(this.#context.index, (index) => this.#updateBlockViewProps({ index }), null);
 		this.observe(
 			this.#context.label,
 			(label) => {
@@ -517,6 +517,7 @@ export class UmbBlockGridEntryElement extends UmbLitElement implements UmbProper
 			class="umb-block-grid__block--view"
 			.label=${this._label}
 			.icon=${this._icon}
+			.index=${this._blockViewProps.index}
 			.unpublished=${!this._exposed}
 			.config=${this._blockViewProps.config}
 			.content=${this._blockViewProps.content}
@@ -529,6 +530,7 @@ export class UmbBlockGridEntryElement extends UmbLitElement implements UmbProper
 			class="umb-block-grid__block--view"
 			.label=${this._label}
 			.icon=${this._icon}
+			.index=${this._blockViewProps.index}
 			.unpublished=${!this._exposed}
 			.config=${this._blockViewProps.config}
 			.content=${this._blockViewProps.content}
diff --git a/src/Umbraco.Web.UI.Client/src/packages/block/block-list/components/block-list-entry/block-list-entry.element.ts b/src/Umbraco.Web.UI.Client/src/packages/block/block-list/components/block-list-entry/block-list-entry.element.ts
index 5e3a68e444a7..554dfd36b546 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/block/block-list/components/block-list-entry/block-list-entry.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/block/block-list/components/block-list-entry/block-list-entry.element.ts
@@ -29,19 +29,15 @@ import '../unsupported-list-block/index.js';
  */
 @customElement('umb-block-list-entry')
 export class UmbBlockListEntryElement extends UmbLitElement implements UmbPropertyEditorUiElement {
-	//
 	@property({ type: Number })
-	public get index(): number | undefined {
-		return this.#context.getIndex();
-	}
 	public set index(value: number | undefined) {
 		this.#context.setIndex(value);
 	}
+	public get index(): number | undefined {
+		return this.#context.getIndex();
+	}
 
 	@property({ attribute: false })
-	public get contentKey(): string | undefined {
-		return this._contentKey;
-	}
 	public set contentKey(value: string | undefined) {
 		if (!value) return;
 		this._contentKey = value;
@@ -57,6 +53,9 @@ export class UmbBlockListEntryElement extends UmbLitElement implements UmbProper
 			'observeMessagesForContent',
 		);
 	}
+	public get contentKey(): string | undefined {
+		return this._contentKey;
+	}
 	private _contentKey?: string | undefined;
 
 	#context = new UmbBlockListEntryContext(this);
@@ -147,7 +146,7 @@ export class UmbBlockListEntryElement extends UmbLitElement implements UmbProper
 			},
 			null,
 		);
-		// TODO: Implement index.
+		this.observe(this.#context.index, (index) => this.#updateBlockViewProps({ index }), null);
 		this.observe(
 			this.#context.label,
 			(label) => {
@@ -374,6 +373,7 @@ export class UmbBlockListEntryElement extends UmbLitElement implements UmbProper
 		return html`<umb-ref-list-block
 			.label=${this._label}
 			.icon=${this._icon}
+			.index=${this._blockViewProps.index}
 			.unpublished=${!this._exposed}
 			.config=${this._blockViewProps.config}
 			.content=${this._blockViewProps.content}
@@ -385,6 +385,7 @@ export class UmbBlockListEntryElement extends UmbLitElement implements UmbProper
 		return html`<umb-inline-list-block
 			.label=${this._label}
 			.icon=${this._icon}
+			.index=${this._blockViewProps.index}
 			.unpublished=${!this._exposed}
 			.config=${this._blockViewProps.config}
 			.content=${this._blockViewProps.content}
diff --git a/src/Umbraco.Web.UI.Client/src/packages/block/block-list/components/inline-list-block/inline-list-block.element.ts b/src/Umbraco.Web.UI.Client/src/packages/block/block-list/components/inline-list-block/inline-list-block.element.ts
index ab211a2433b9..fd379b6f28ba 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/block/block-list/components/inline-list-block/inline-list-block.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/block/block-list/components/inline-list-block/inline-list-block.element.ts
@@ -30,6 +30,9 @@ export class UmbInlineListBlockElement extends UmbLitElement {
 	@property({ type: String, reflect: false })
 	icon?: string;
 
+	@property({ type: Number, attribute: false })
+	index?: number;
+
 	@property({ type: Boolean, reflect: true })
 	unpublished?: boolean;
 
@@ -153,7 +156,7 @@ export class UmbInlineListBlockElement extends UmbLitElement {
 	}
 
 	#renderBlockInfo() {
-		const blockValue = { ...this.content, $settings: this.settings };
+		const blockValue = { ...this.content, $settings: this.settings, $index: this.index };
 		return html`
 			<span id="content">
 				<span id="icon">
diff --git a/src/Umbraco.Web.UI.Client/src/packages/block/block-list/components/ref-list-block/ref-list-block.element.ts b/src/Umbraco.Web.UI.Client/src/packages/block/block-list/components/ref-list-block/ref-list-block.element.ts
index 1be1ace010b8..574f72143c69 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/block/block-list/components/ref-list-block/ref-list-block.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/block/block-list/components/ref-list-block/ref-list-block.element.ts
@@ -14,6 +14,9 @@ export class UmbRefListBlockElement extends UmbLitElement {
 	@property({ type: String, reflect: false })
 	icon?: string;
 
+	@property({ type: Number, attribute: false })
+	index?: number;
+
 	@property({ type: Boolean, reflect: true })
 	unpublished?: boolean;
 
@@ -27,7 +30,7 @@ export class UmbRefListBlockElement extends UmbLitElement {
 	config?: UmbBlockEditorCustomViewConfiguration;
 
 	override render() {
-		const blockValue = { ...this.content, $settings: this.settings };
+		const blockValue = { ...this.content, $settings: this.settings, $index: this.index };
 		return html`
 			<uui-ref-node standalone href=${(this.config?.showContentEdit ? this.config?.editContentPath : undefined) ?? ''}>
 				<umb-icon slot="icon" .name=${this.icon}></umb-icon>
diff --git a/src/Umbraco.Web.UI.Client/src/packages/block/block-list/property-editors/block-list-editor/property-editor-ui-block-list.element.ts b/src/Umbraco.Web.UI.Client/src/packages/block/block-list/property-editors/block-list-editor/property-editor-ui-block-list.element.ts
index 943d79c51dd6..ddc7fe59671c 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/block/block-list/property-editors/block-list-editor/property-editor-ui-block-list.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/block/block-list/property-editors/block-list-editor/property-editor-ui-block-list.element.ts
@@ -373,12 +373,13 @@ export class UmbPropertyEditorUIBlockListElement
 		return html`
 			${repeat(
 				this._layouts,
-				(x) => x.contentKey,
-				(layoutEntry, index) => html`
+				(layout, index) => `${index}_${layout.contentKey}`,
+				(layout, index) => html`
 					${this.#renderInlineCreateButton(index)}
 					<umb-block-list-entry
-						.contentKey=${layoutEntry.contentKey}
-						.layout=${layoutEntry}
+						index=${index}
+						.contentKey=${layout.contentKey}
+						.layout=${layout}
 						${umbDestroyOnDisconnect()}>
 					</umb-block-list-entry>
 				`,
@@ -391,7 +392,7 @@ export class UmbPropertyEditorUIBlockListElement
 		if (this.readonly && this._layouts.length > 0) {
 			return nothing;
 		} else {
-			return html` <uui-button-group> ${this.#renderCreateButton()} ${this.#renderPasteButton()} </uui-button-group> `;
+			return html`<uui-button-group>${this.#renderCreateButton()}${this.#renderPasteButton()}</uui-button-group>`;
 		}
 	}
 
diff --git a/src/Umbraco.Web.UI.Client/src/packages/block/block-rte/components/block-rte-entry/block-rte-entry.element.ts b/src/Umbraco.Web.UI.Client/src/packages/block/block-rte/components/block-rte-entry/block-rte-entry.element.ts
index 63d79ac8f888..e9624ed2ebfd 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/block/block-rte/components/block-rte-entry/block-rte-entry.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/block/block-rte/components/block-rte-entry/block-rte-entry.element.ts
@@ -22,9 +22,6 @@ import type { UmbExtensionElementInitializer } from '@umbraco-cms/backoffice/ext
 @customElement('umb-rte-block')
 export class UmbBlockRteEntryElement extends UmbLitElement implements UmbPropertyEditorUiElement {
 	@property({ type: String, attribute: 'data-content-key', reflect: true })
-	public get contentKey(): string | undefined {
-		return this._contentKey;
-	}
 	public set contentKey(value: string | undefined) {
 		if (!value) return;
 		this._contentKey = value;
@@ -40,6 +37,9 @@ export class UmbBlockRteEntryElement extends UmbLitElement implements UmbPropert
 			'observeMessagesForContent',
 		);
 	}
+	public get contentKey(): string | undefined {
+		return this._contentKey;
+	}
 	private _contentKey?: string | undefined;
 
 	#context = new UmbBlockRteEntryContext(this);
@@ -138,7 +138,7 @@ export class UmbBlockRteEntryElement extends UmbLitElement implements UmbPropert
 			},
 			null,
 		);
-		// TODO: Implement index.
+		this.observe(this.#context.index, (index) => this.#updateBlockViewProps({ index }), null);
 		this.observe(
 			this.#context.label,
 			(label) => {
@@ -292,7 +292,7 @@ export class UmbBlockRteEntryElement extends UmbLitElement implements UmbPropert
 
 	#renderActionBar() {
 		return this._showActions
-			? html` <uui-action-bar> ${this.#renderEditAction()} ${this.#renderEditSettingsAction()}</uui-action-bar> `
+			? html`<uui-action-bar>${this.#renderEditAction()}${this.#renderEditSettingsAction()}</uui-action-bar>`
 			: nothing;
 	}
 
@@ -308,6 +308,7 @@ export class UmbBlockRteEntryElement extends UmbLitElement implements UmbPropert
 		return html`<umb-ref-rte-block
 			.label=${this._label}
 			.icon=${this._icon}
+			.index=${this._blockViewProps.index}
 			.unpublished=${!this._exposed}
 			.content=${this._blockViewProps.content}
 			.settings=${this._blockViewProps.settings}
diff --git a/src/Umbraco.Web.UI.Client/src/packages/block/block-rte/components/ref-rte-block/ref-rte-block.element.ts b/src/Umbraco.Web.UI.Client/src/packages/block/block-rte/components/ref-rte-block/ref-rte-block.element.ts
index 20adfe8be50c..27fa020e4ad9 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/block/block-rte/components/ref-rte-block/ref-rte-block.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/block/block-rte/components/ref-rte-block/ref-rte-block.element.ts
@@ -16,6 +16,9 @@ export class UmbRefRteBlockElement extends UmbLitElement {
 	@property({ type: String })
 	icon?: string;
 
+	@property({ type: Number, attribute: false })
+	index?: number;
+
 	@property({ type: Boolean, reflect: true })
 	unpublished?: boolean;
 
@@ -46,7 +49,7 @@ export class UmbRefRteBlockElement extends UmbLitElement {
 	}
 
 	override render() {
-		const blockValue = { ...this.content, $settings: this.settings };
+		const blockValue = { ...this.content, $settings: this.settings, $index: this.index };
 		return html`
 			<uui-ref-node standalone href=${(this.config?.showContentEdit ? this._workspaceEditPath : undefined) ?? ''}>
 				<div class="selection-background" aria-hidden="true">&emsp;</div>

From 494674d35422f96099ad6b30b14f5e0a9f3222f5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kr=C3=BCger?=
 <93977820+OskarKruger@users.noreply.github.com>
Date: Tue, 14 Oct 2025 09:20:01 +0200
Subject: [PATCH 024/155] Entity Actions: More create button discernible text,
 extension of #20434 (#20458)

* added hovering and focus border to RTE

* fix main to OG

* fix to main again

* I'm going to cry

* Missing localiztion feature, maybe UmbLitElement?

* added localization controller to fetch localized version

* localization successful for viewActionsFor and CreateFor

* clean up button text

* Changed label for content header to display proper name

* clean up code

* Included button labels for media section

* clean code

* Relocated localization keys,

as `actions_viewActionsFor` already existed.

Also made into a function, to support a fallback label.

* Simplified the "Create for" label/localization

Removed the need for a `getCreateAriaLabel()` method.

* Removed the double-localizations (of `actions_viewActionsFor`)

as the "umb-entity-actions-bundle" component handles this now.

* imports tidy-up

* Simplified localization key condition

* switched to new localization key for other sections for new labeling

* Bumped `@umbraco/playwright-testhelpers` 16.0.55

https://github.com/umbraco/Umbraco.Playwright.Testhelpers/releases/tag/release%2F16.0.55

---------

Co-authored-by: Oskar kruger <obk@umbraco.dk>
Co-authored-by: leekelleher <leekelleher@gmail.com>
---
 .../packages/core/collection/action/create/manifests.ts   | 2 +-
 .../src/packages/dictionary/entity-action/manifests.ts    | 2 +-
 .../entity-actions/create/manifests.ts                    | 2 +-
 .../document-types/entity-actions/create/manifests.ts     | 2 +-
 .../documents/user-permissions/document/manifests.ts      | 2 +-
 .../src/packages/language/entity-actions/manifests.ts     | 2 +-
 .../members/member-group/entity-actions/manifests.ts      | 2 +-
 .../members/member/entity-actions/create/manifests.ts     | 2 +-
 .../partial-views/entity-actions/create/manifests.ts      | 2 +-
 .../templating/scripts/entity-actions/create/manifests.ts | 2 +-
 .../templating/templates/entity-actions/manifests.ts      | 2 +-
 tests/Umbraco.Tests.AcceptanceTest/package-lock.json      | 8 ++++----
 tests/Umbraco.Tests.AcceptanceTest/package.json           | 2 +-
 13 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/collection/action/create/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/core/collection/action/create/manifests.ts
index 429fb41b26b9..c12d8a346313 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/collection/action/create/manifests.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/collection/action/create/manifests.ts
@@ -12,7 +12,7 @@ export const manifests: Array<UmbExtensionManifest | UmbExtensionManifestKind> =
 			element: () => import('./collection-create-action.element.js'),
 			weight: 1200,
 			meta: {
-				label: '#actions_create',
+				label: '#actions_createFor',
 			},
 		},
 	},
diff --git a/src/Umbraco.Web.UI.Client/src/packages/dictionary/entity-action/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/dictionary/entity-action/manifests.ts
index 66c2670c34f8..b267083ba959 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/dictionary/entity-action/manifests.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/dictionary/entity-action/manifests.ts
@@ -13,7 +13,7 @@ export const manifests: Array<UmbExtensionManifest> = [
 		forEntityTypes: [UMB_DICTIONARY_ENTITY_TYPE, UMB_DICTIONARY_ROOT_ENTITY_TYPE],
 		meta: {
 			icon: 'icon-add',
-			label: '#general_create',
+			label: '#actions_createFor',
 			additionalOptions: true,
 		},
 	},
diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/document-blueprints/entity-actions/create/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/document-blueprints/entity-actions/create/manifests.ts
index b945f804e0ab..03f28adc56b3 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/documents/document-blueprints/entity-actions/create/manifests.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/documents/document-blueprints/entity-actions/create/manifests.ts
@@ -11,7 +11,7 @@ export const manifests: Array<UmbExtensionManifest> = [
 		forEntityTypes: [UMB_DOCUMENT_BLUEPRINT_ROOT_ENTITY_TYPE, UMB_DOCUMENT_BLUEPRINT_FOLDER_ENTITY_TYPE],
 		meta: {
 			icon: 'icon-add',
-			label: '#actions_create',
+			label: '#actions_createFor',
 			additionalOptions: true,
 		},
 	},
diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/entity-actions/create/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/entity-actions/create/manifests.ts
index f0a18c7cb745..d80976449b20 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/entity-actions/create/manifests.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/entity-actions/create/manifests.ts
@@ -17,7 +17,7 @@ export const manifests: Array<UmbExtensionManifest | UmbExtensionManifestKind> =
 		],
 		meta: {
 			icon: 'icon-add',
-			label: '#actions_create',
+			label: '#actions_createFor',
 			additionalOptions: true,
 			headline: '#create_createUnder #treeHeaders_documentTypes',
 		},
diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/user-permissions/document/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/user-permissions/document/manifests.ts
index 03bebae42416..f8aec35d4bfd 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/user-permissions/document/manifests.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/user-permissions/document/manifests.ts
@@ -65,7 +65,7 @@ const permissions: Array<ManifestEntityUserPermission> = [
 		forEntityTypes: [UMB_DOCUMENT_ENTITY_TYPE],
 		meta: {
 			verbs: ['Umb.Document.Create'],
-			label: '#actions_create',
+			label: '#actions_createFor',
 			description: '#actionDescriptions_create',
 		},
 	},
diff --git a/src/Umbraco.Web.UI.Client/src/packages/language/entity-actions/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/language/entity-actions/manifests.ts
index f917dc1d27f2..0e7d7d346627 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/language/entity-actions/manifests.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/language/entity-actions/manifests.ts
@@ -23,7 +23,7 @@ export const manifests: Array<UmbExtensionManifest> = [
 		forEntityTypes: [UMB_LANGUAGE_ROOT_ENTITY_TYPE],
 		meta: {
 			icon: 'icon-add',
-			label: '#actions_create',
+			label: '#actions_createFor',
 			additionalOptions: true,
 		},
 	},
diff --git a/src/Umbraco.Web.UI.Client/src/packages/members/member-group/entity-actions/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/members/member-group/entity-actions/manifests.ts
index e450465c720a..e00131cd07df 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/members/member-group/entity-actions/manifests.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/members/member-group/entity-actions/manifests.ts
@@ -12,7 +12,7 @@ export const manifests: Array<UmbExtensionManifest> = [
 		forEntityTypes: [UMB_MEMBER_GROUP_ROOT_ENTITY_TYPE],
 		meta: {
 			icon: 'icon-add',
-			label: '#actions_create',
+			label: '#actions_createFor',
 			additionalOptions: true,
 		},
 	},
diff --git a/src/Umbraco.Web.UI.Client/src/packages/members/member/entity-actions/create/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/members/member/entity-actions/create/manifests.ts
index 9216d08ffc3a..a382103aa3da 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/members/member/entity-actions/create/manifests.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/members/member/entity-actions/create/manifests.ts
@@ -11,7 +11,7 @@ export const manifests: Array<UmbExtensionManifest> = [
 		forEntityTypes: [UMB_MEMBER_ROOT_ENTITY_TYPE],
 		meta: {
 			icon: 'icon-add',
-			label: '#actions_create',
+			label: '#actions_createFor',
 			additionalOptions: true,
 		},
 	},
diff --git a/src/Umbraco.Web.UI.Client/src/packages/templating/partial-views/entity-actions/create/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/templating/partial-views/entity-actions/create/manifests.ts
index 6ba2c40dc8c8..242d9100a719 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/templating/partial-views/entity-actions/create/manifests.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/templating/partial-views/entity-actions/create/manifests.ts
@@ -11,7 +11,7 @@ export const manifests: Array<UmbExtensionManifest> = [
 		forEntityTypes: [UMB_PARTIAL_VIEW_ROOT_ENTITY_TYPE, UMB_PARTIAL_VIEW_FOLDER_ENTITY_TYPE],
 		meta: {
 			icon: 'icon-add',
-			label: '#actions_create',
+			label: '#actions_createFor',
 			additionalOptions: true,
 		},
 	},
diff --git a/src/Umbraco.Web.UI.Client/src/packages/templating/scripts/entity-actions/create/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/templating/scripts/entity-actions/create/manifests.ts
index 68cb772ad2b0..3c94201b59ed 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/templating/scripts/entity-actions/create/manifests.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/templating/scripts/entity-actions/create/manifests.ts
@@ -11,7 +11,7 @@ export const manifests: Array<UmbExtensionManifest> = [
 		forEntityTypes: [UMB_SCRIPT_ROOT_ENTITY_TYPE, UMB_SCRIPT_FOLDER_ENTITY_TYPE],
 		meta: {
 			icon: 'icon-add',
-			label: '#actions_create',
+			label: '#actions_createFor',
 			additionalOptions: true,
 		},
 	},
diff --git a/src/Umbraco.Web.UI.Client/src/packages/templating/templates/entity-actions/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/templating/templates/entity-actions/manifests.ts
index 1ee92fff8159..4485d593ffeb 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/templating/templates/entity-actions/manifests.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/templating/templates/entity-actions/manifests.ts
@@ -13,7 +13,7 @@ export const manifests: Array<UmbExtensionManifest> = [
 		forEntityTypes: [UMB_TEMPLATE_ENTITY_TYPE, UMB_TEMPLATE_ROOT_ENTITY_TYPE],
 		meta: {
 			icon: 'icon-add',
-			label: '#actions_create',
+			label: '#actions_createFor',
 			additionalOptions: true,
 		},
 	},
diff --git a/tests/Umbraco.Tests.AcceptanceTest/package-lock.json b/tests/Umbraco.Tests.AcceptanceTest/package-lock.json
index b1e7b97b7a08..6a65872266d9 100644
--- a/tests/Umbraco.Tests.AcceptanceTest/package-lock.json
+++ b/tests/Umbraco.Tests.AcceptanceTest/package-lock.json
@@ -8,7 +8,7 @@
       "hasInstallScript": true,
       "dependencies": {
         "@umbraco/json-models-builders": "^2.0.40",
-        "@umbraco/playwright-testhelpers": "^16.0.50",
+        "@umbraco/playwright-testhelpers": "^16.0.55",
         "camelize": "^1.0.0",
         "dotenv": "^16.3.1",
         "node-fetch": "^2.6.7"
@@ -67,9 +67,9 @@
       }
     },
     "node_modules/@umbraco/playwright-testhelpers": {
-      "version": "16.0.50",
-      "resolved": "https://registry.npmjs.org/@umbraco/playwright-testhelpers/-/playwright-testhelpers-16.0.50.tgz",
-      "integrity": "sha512-2tHQUdv8lCV4O47hGMvyC+JJfG4//fSSE/gUOVfFNDEHzhU5mSZ8f9oGKob8XOv2RB7ynZFYtIIxEMZIWrGFDA==",
+      "version": "16.0.55",
+      "resolved": "https://registry.npmjs.org/@umbraco/playwright-testhelpers/-/playwright-testhelpers-16.0.55.tgz",
+      "integrity": "sha512-715l112FHB7snWq0sY7e0fUD2ppWSSysBKHFhcQkGGw+3Gbo68Z6iXfeAketzKohWji19un4KC3mvZU0IICr9g==",
       "license": "MIT",
       "dependencies": {
         "@umbraco/json-models-builders": "2.0.40",
diff --git a/tests/Umbraco.Tests.AcceptanceTest/package.json b/tests/Umbraco.Tests.AcceptanceTest/package.json
index 6deebfb3fdcb..adf43dd3260b 100644
--- a/tests/Umbraco.Tests.AcceptanceTest/package.json
+++ b/tests/Umbraco.Tests.AcceptanceTest/package.json
@@ -22,7 +22,7 @@
   },
   "dependencies": {
     "@umbraco/json-models-builders": "^2.0.40",
-    "@umbraco/playwright-testhelpers": "^16.0.50",
+    "@umbraco/playwright-testhelpers": "^16.0.55",
     "camelize": "^1.0.0",
     "dotenv": "^16.3.1",
     "node-fetch": "^2.6.7"

From b5662d9c8901e621bc95cdd169b2ee2801958797 Mon Sep 17 00:00:00 2001
From: Laura Neto <12862535+lauraneto@users.noreply.github.com>
Date: Tue, 14 Oct 2025 09:39:53 +0200
Subject: [PATCH 025/155] Dependencies: Remove `Microsoft.CodeAnalysis.CSharp`
 dependency from Umbraco.Infrastructure (#20481)

* Remove Microsoft.CodeAnalysis.CSharp from Infrastructure project

This was only needed for runtime compilation and thus is no longer needed in Infrastructure.
It also caused dependency problems with EF Core Design in previous versions.

* Disable CPM for UI project to better reflect consumers

This will ensure that we face any potential dependency issues consumers are also likely to run into.

* Add `Microsoft.CodeAnalysis.CSharp` reference to `Umbraco.Cms.DevelopmentMode.Backoffice`
---
 Directory.Packages.props                          |  5 -----
 .../Umbraco.Cms.DevelopmentMode.Backoffice.csproj |  3 ++-
 .../Umbraco.Infrastructure.csproj                 |  1 -
 src/Umbraco.Web.UI/Umbraco.Web.UI.csproj          | 15 +++------------
 4 files changed, 5 insertions(+), 19 deletions(-)

diff --git a/Directory.Packages.props b/Directory.Packages.props
index e2aa9d1c3fbe..60d2e5d102d4 100644
--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@@ -14,14 +14,9 @@
   <ItemGroup>
     <PackageVersion Include="Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation" Version="10.0.0-rc.1.25451.107" />
     <PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="4.14.0" />
-    <PackageVersion Include="Microsoft.CodeAnalysis.Common" Version="4.14.0" />
-    <PackageVersion Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.14.0" />
-    <PackageVersion Include="Microsoft.CodeAnalysis.Workspaces.Common" Version="4.14.0" />
-    <PackageVersion Include="Microsoft.CodeAnalysis.Workspaces.MSBuild" Version="4.14.0" />
     <PackageVersion Include="Microsoft.Data.Sqlite" Version="10.0.0-rc.1.25451.107" />
     <PackageVersion Include="Microsoft.EntityFrameworkCore.Sqlite" Version="10.0.0-rc.1.25451.107" />
     <PackageVersion Include="Microsoft.EntityFrameworkCore.SqlServer" Version="10.0.0-rc.1.25451.107" />
-    <PackageVersion Include="Microsoft.EntityFrameworkCore.Design" Version="10.0.0-rc.1.25451.107" />
     <PackageVersion Include="Microsoft.Extensions.Caching.Abstractions" Version="10.0.0-rc.1.25451.107" />
     <PackageVersion Include="Microsoft.Extensions.Caching.Memory" Version="10.0.0-rc.1.25451.107" />
     <PackageVersion Include="Microsoft.Extensions.Configuration.Abstractions" Version="10.0.0-rc.1.25451.107" />
diff --git a/src/Umbraco.Cms.DevelopmentMode.Backoffice/Umbraco.Cms.DevelopmentMode.Backoffice.csproj b/src/Umbraco.Cms.DevelopmentMode.Backoffice/Umbraco.Cms.DevelopmentMode.Backoffice.csproj
index 635bbeed4cb9..bacbbd7cbf9a 100644
--- a/src/Umbraco.Cms.DevelopmentMode.Backoffice/Umbraco.Cms.DevelopmentMode.Backoffice.csproj
+++ b/src/Umbraco.Cms.DevelopmentMode.Backoffice/Umbraco.Cms.DevelopmentMode.Backoffice.csproj
@@ -8,10 +8,11 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation" />
+    <PackageReference Include="Microsoft.CodeAnalysis.CSharp" />
   </ItemGroup>
 
   <ItemGroup>
     <ProjectReference Include="..\Umbraco.Web.Common\Umbraco.Web.Common.csproj" />
   </ItemGroup>
-  
+
 </Project>
diff --git a/src/Umbraco.Infrastructure/Umbraco.Infrastructure.csproj b/src/Umbraco.Infrastructure/Umbraco.Infrastructure.csproj
index 1004517b4400..06e73265fcaa 100644
--- a/src/Umbraco.Infrastructure/Umbraco.Infrastructure.csproj
+++ b/src/Umbraco.Infrastructure/Umbraco.Infrastructure.csproj
@@ -40,7 +40,6 @@
     <PackageReference Include="HtmlAgilityPack" />
     <PackageReference Include="MailKit" />
     <PackageReference Include="Markdown" />
-    <PackageReference Include="Microsoft.CodeAnalysis.CSharp" />
     <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" />
     <PackageReference Include="Microsoft.Extensions.Configuration.Json" />
     <PackageReference Include="Microsoft.Extensions.DependencyInjection" />
diff --git a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
index 37fd91a3e544..21bff12dca08 100644
--- a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
+++ b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
@@ -5,6 +5,7 @@
     <EnablePackageValidation>false</EnablePackageValidation>
     <!-- Disable compression for static files, because MapStaticAssets() is not used anyway (yet) -->
     <CompressionEnabled>false</CompressionEnabled>
+    <ManagePackageVersionsCentrally>false</ManagePackageVersionsCentrally>
   </PropertyGroup>
 
   <PropertyGroup>
@@ -24,23 +25,13 @@
 
   <ItemGroup>
     <!-- Add design/build time support for EF Core migrations -->
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" PrivateAssets="all" />
-    <!-- Explicit transitive references to avoid warnings on build - see https://github.com/dotnet/efcore/issues/35143-->
-    <PackageReference Include="Microsoft.CodeAnalysis.Common" />
-    <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" />
-    <PackageReference Include="Microsoft.CodeAnalysis.Workspaces.Common" />
-    <PackageReference Include="Microsoft.CodeAnalysis.Workspaces.MSBuild" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <!-- Hide the content files that come from the Microsoft.CodeAnalysis.Workspaces.Common package. -->
-    <Content Update="$(NuGetPackageRoot)\microsoft.codeanalysis.workspaces.msbuild\**\**" Visible="false" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" PrivateAssets="all" Version="10.0.0-rc.1.25451.107" />
   </ItemGroup>
 
   <ItemGroup>
     <!-- Ensure the AppLocalIcu setting is the same as the referenced ICU package version and changes are also done to the template project! -->
     <!-- Opt-in to app-local ICU to ensure consistent globalization APIs across different platforms -->
-    <PackageReference Include="Microsoft.ICU.ICU4C.Runtime" VersionOverride="72.1.0.3" />
+    <PackageReference Include="Microsoft.ICU.ICU4C.Runtime" Version="72.1.0.3" />
     <RuntimeHostConfigurationOption Include="System.Globalization.AppLocalIcu" Value="72.1.0.3" Condition="$(RuntimeIdentifier.StartsWith('linux')) or $(RuntimeIdentifier.StartsWith('win')) or ('$(RuntimeIdentifier)' == '' and !$([MSBuild]::IsOSPlatform('osx')))" />
   </ItemGroup>
 

From 12adfd52bdb9374bb139670518bb83f9bd5ca791 Mon Sep 17 00:00:00 2001
From: Andy Butland <abutland73@gmail.com>
Date: Tue, 14 Oct 2025 11:22:21 +0200
Subject: [PATCH 026/155] Performance: Reduce number of database calls in save
 and publish operations (#20485)

* Added request caching to media picker media retrieval, to improve performance in save operations.

* WIP: Update or insert in bulk when updating property data.

* Add tests verifying UpdateBatch.

* Fixed issue with UpdateBatch and SQL Server.

* Removed stopwatch.

* Fix test on SQLite (failing on SQLServer).

* Added temporary test for direct call to NPoco UpdateBatch.

* Fixed test on SQLServer.

* Add integration test verifying the same property data is persisted as before the performance refactor.

* Log expected warning in DocumentUrlService as debug.
---
 .../Services/DocumentUrlService.cs            |  3 +-
 .../Implement/ContentRepositoryBase.cs        | 21 ++++--
 .../MediaPicker3PropertyEditor.cs             | 27 ++++++-
 .../ContentPublishingServiceTests.Publish.cs  | 28 ++++++++
 .../Persistence/NPocoTests/NPocoFetchTests.cs |  3 -
 .../NPocoTests/NPocoUpdateBatchTests.cs       | 70 +++++++++++++++++++
 6 files changed, 142 insertions(+), 10 deletions(-)
 create mode 100644 tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/NPocoTests/NPocoUpdateBatchTests.cs

diff --git a/src/Umbraco.Core/Services/DocumentUrlService.cs b/src/Umbraco.Core/Services/DocumentUrlService.cs
index 5d27f6d634bb..12f882365202 100644
--- a/src/Umbraco.Core/Services/DocumentUrlService.cs
+++ b/src/Umbraco.Core/Services/DocumentUrlService.cs
@@ -432,7 +432,8 @@ private void HandleCaching(IScopeContext scopeContext, IContent document, string
 
         if (draftUrlSegments.Any() is false)
         {
-            _logger.LogWarning("No draft URL segments found for document {DocumentKey} in culture {Culture}", document.Key, culture ?? "{null}");
+            // Log at debug level because this is expected when a document is not published in a given language.
+            _logger.LogDebug("No draft URL segments found for document {DocumentKey} in culture {Culture}", document.Key, culture ?? "{null}");
         }
         else
         {
diff --git a/src/Umbraco.Infrastructure/Persistence/Repositories/Implement/ContentRepositoryBase.cs b/src/Umbraco.Infrastructure/Persistence/Repositories/Implement/ContentRepositoryBase.cs
index 82fc8f911993..4426374af246 100644
--- a/src/Umbraco.Infrastructure/Persistence/Repositories/Implement/ContentRepositoryBase.cs
+++ b/src/Umbraco.Infrastructure/Persistence/Repositories/Implement/ContentRepositoryBase.cs
@@ -1132,25 +1132,38 @@ protected void ReplacePropertyValues(TEntity entity, int versionId, int publishe
 
             IEnumerable<PropertyDataDto> propertyDataDtos = PropertyFactory.BuildDtos(entity.ContentType.Variations, entity.VersionId, publishedVersionId, entity.Properties, LanguageRepository, out edited, out editedCultures);
 
+            var toUpdate = new List<PropertyDataDto>();
+            var toInsert = new List<PropertyDataDto>();
             foreach (PropertyDataDto propertyDataDto in propertyDataDtos)
             {
                 // Check if this already exists and update, else insert a new one
                 if (propertyTypeToPropertyData.TryGetValue((propertyDataDto.PropertyTypeId, propertyDataDto.VersionId, propertyDataDto.LanguageId, propertyDataDto.Segment), out PropertyDataDto? propData))
                 {
                     propertyDataDto.Id = propData.Id;
-                    Database.Update(propertyDataDto);
+                    toUpdate.Add(propertyDataDto);
                 }
                 else
                 {
-                    // TODO: we can speed this up: Use BulkInsert and then do one SELECT to re-retrieve the property data inserted with assigned IDs.
-                    // This is a perfect thing to benchmark with Benchmark.NET to compare perf between Nuget releases.
-                    Database.Insert(propertyDataDto);
+                    toInsert.Add(propertyDataDto);
                 }
 
                 // track which ones have been processed
                 existingPropDataIds.Remove(propertyDataDto.Id);
             }
 
+            if (toUpdate.Count > 0)
+            {
+                var updateBatch = toUpdate
+                    .Select(x => UpdateBatch.For(x))
+                    .ToList();
+                Database.UpdateBatch(updateBatch, new BatchOptions { BatchSize = 100 });
+            }
+
+            if (toInsert.Count > 0)
+            {
+                Database.InsertBulk(toInsert);
+            }
+
             // For any remaining that haven't been processed they need to be deleted
             if (existingPropDataIds.Count > 0)
             {
diff --git a/src/Umbraco.Infrastructure/PropertyEditors/MediaPicker3PropertyEditor.cs b/src/Umbraco.Infrastructure/PropertyEditors/MediaPicker3PropertyEditor.cs
index 26efa02f1029..d4a9e492bd17 100644
--- a/src/Umbraco.Infrastructure/PropertyEditors/MediaPicker3PropertyEditor.cs
+++ b/src/Umbraco.Infrastructure/PropertyEditors/MediaPicker3PropertyEditor.cs
@@ -54,6 +54,8 @@ protected override IDataValueEditor CreateValueEditor() =>
     /// </summary>
     internal sealed class MediaPicker3PropertyValueEditor : DataValueEditor, IDataValueReference
     {
+        private const string MediaCacheKeyFormat = nameof(MediaPicker3PropertyValueEditor) + "_Media_{0}";
+
         private readonly IDataTypeConfigurationCache _dataTypeReadCache;
         private readonly IJsonSerializer _jsonSerializer;
         private readonly IMediaImportService _mediaImportService;
@@ -61,6 +63,7 @@ internal sealed class MediaPicker3PropertyValueEditor : DataValueEditor, IDataVa
         private readonly ITemporaryFileService _temporaryFileService;
         private readonly IScopeProvider _scopeProvider;
         private readonly IBackOfficeSecurityAccessor _backOfficeSecurityAccessor;
+        private readonly AppCaches _appCaches;
 
         /// <summary>
         /// Initializes a new instance of the <see cref="MediaPicker3PropertyValueEditor"/> class.
@@ -93,6 +96,8 @@ public MediaPicker3PropertyValueEditor(
             _scopeProvider = scopeProvider;
             _backOfficeSecurityAccessor = backOfficeSecurityAccessor;
             _dataTypeReadCache = dataTypeReadCache;
+            _appCaches = appCaches;
+
             var validators = new TypedJsonValidatorRunner<List<MediaWithCropsDto>, MediaPicker3Configuration>(
                 jsonSerializer,
                 new MinMaxValidator(localizedTextService),
@@ -203,13 +208,31 @@ private List<MediaWithCropsDto> UpdateMediaTypeAliases(List<MediaWithCropsDto> m
 
             foreach (MediaWithCropsDto mediaWithCropsDto in mediaWithCropsDtos)
             {
-                IMedia? media = _mediaService.GetById(mediaWithCropsDto.MediaKey);
+                IMedia? media = GetMediaById(mediaWithCropsDto.MediaKey);
                 mediaWithCropsDto.MediaTypeAlias = media?.ContentType.Alias ?? unknownMediaType;
             }
 
             return mediaWithCropsDtos.Where(m => m.MediaTypeAlias != unknownMediaType).ToList();
         }
 
+        private IMedia? GetMediaById(Guid key)
+        {
+            // Cache media lookups in case the same media is handled multiple times across a save operation,
+            // which is possible, particularly if we have multiple languages and blocks.
+            var cacheKey = string.Format(MediaCacheKeyFormat, key);
+            IMedia? media = _appCaches.RequestCache.GetCacheItem<IMedia?>(cacheKey);
+            if (media is null)
+            {
+                media = _mediaService.GetById(key);
+                if (media is not null)
+                {
+                    _appCaches.RequestCache.Set(cacheKey, media);
+                }
+            }
+
+            return media;
+        }
+
         private List<MediaWithCropsDto> HandleTemporaryMediaUploads(List<MediaWithCropsDto> mediaWithCropsDtos, MediaPicker3Configuration configuration)
         {
             var invalidDtos = new List<MediaWithCropsDto>();
@@ -217,7 +240,7 @@ private List<MediaWithCropsDto> HandleTemporaryMediaUploads(List<MediaWithCropsD
             foreach (MediaWithCropsDto mediaWithCropsDto in mediaWithCropsDtos)
             {
                 // if the media already exist, don't bother with it
-                if (_mediaService.GetById(mediaWithCropsDto.MediaKey) != null)
+                if (GetMediaById(mediaWithCropsDto.MediaKey) != null)
                 {
                     continue;
                 }
diff --git a/tests/Umbraco.Tests.Integration/Umbraco.Core/Services/ContentPublishingServiceTests.Publish.cs b/tests/Umbraco.Tests.Integration/Umbraco.Core/Services/ContentPublishingServiceTests.Publish.cs
index d843f3755876..d58fcb2157f9 100644
--- a/tests/Umbraco.Tests.Integration/Umbraco.Core/Services/ContentPublishingServiceTests.Publish.cs
+++ b/tests/Umbraco.Tests.Integration/Umbraco.Core/Services/ContentPublishingServiceTests.Publish.cs
@@ -3,6 +3,7 @@
 using Umbraco.Cms.Core.Models.ContentPublishing;
 using Umbraco.Cms.Core.Services;
 using Umbraco.Cms.Core.Services.OperationStatus;
+using Umbraco.Cms.Infrastructure.Persistence.Dtos;
 using Umbraco.Cms.Tests.Integration.Testing;
 
 namespace Umbraco.Cms.Tests.Integration.Umbraco.Core.Services;
@@ -388,4 +389,31 @@ public async Task Republishing_Single_Culture_Does_Not_Change_Publish_Or_Update_
                                 ?? throw new InvalidOperationException("Expected a publish date for EN");
         Assert.Greater(lastPublishDateEn, firstPublishDateEn);
     }
+
+    [Test]
+    public async Task Publishing_Single_Culture_Persists_Expected_Property_Data()
+    {
+        var (langEn, langDa, langBe, contentType) = await SetupVariantDoctypeAsync();
+        var content = await CreateVariantContentAsync(langEn, langDa, langBe, contentType);
+
+        using (var scope = ScopeProvider.CreateScope())
+        {
+            var dtos = scope.Database.Fetch<PropertyDataDto>();
+            Assert.AreEqual(18, dtos.Count);  // 3 properties * 3 cultures * 2 (published + edited).
+            scope.Complete();
+        }
+
+        var publishAttempt = await ContentPublishingService.PublishAsync(
+            content.Key,
+            [new() { Culture = langEn.IsoCode }],
+            Constants.Security.SuperUserKey);
+        Assert.IsTrue(publishAttempt.Success);
+
+        using (var scope = ScopeProvider.CreateScope())
+        {
+            var dtos = scope.Database.Fetch<PropertyDataDto>();
+            Assert.AreEqual(19, dtos.Count); // + 3 for published populated title property, - 2 for existing published properties of other cultures.
+            scope.Complete();
+        }
+    }
 }
diff --git a/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/NPocoTests/NPocoFetchTests.cs b/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/NPocoTests/NPocoFetchTests.cs
index b7996b779f7c..d7885bd27f61 100644
--- a/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/NPocoTests/NPocoFetchTests.cs
+++ b/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/NPocoTests/NPocoFetchTests.cs
@@ -1,13 +1,10 @@
 // Copyright (c) Umbraco.
 // See LICENSE for more details.
 
-using System.Collections.Generic;
-using System.Linq;
 using NPoco;
 using NUnit.Framework;
 using Umbraco.Cms.Tests.Common.Testing;
 using Umbraco.Cms.Tests.Integration.Testing;
-using Umbraco.Extensions;
 
 namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Persistence.NPocoTests;
 
diff --git a/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/NPocoTests/NPocoUpdateBatchTests.cs b/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/NPocoTests/NPocoUpdateBatchTests.cs
new file mode 100644
index 000000000000..ff35ea259c90
--- /dev/null
+++ b/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/NPocoTests/NPocoUpdateBatchTests.cs
@@ -0,0 +1,70 @@
+// Copyright (c) Umbraco.
+// See LICENSE for more details.
+
+using NPoco;
+using NUnit.Framework;
+using Umbraco.Cms.Infrastructure.Persistence.Dtos;
+using Umbraco.Cms.Tests.Common.Testing;
+using Umbraco.Cms.Tests.Integration.Testing;
+
+namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Persistence.NPocoTests;
+
+[TestFixture]
+[UmbracoTest(Database = UmbracoTestOptions.Database.NewSchemaPerTest)]
+internal sealed class NPocoUpdateBatchTests : UmbracoIntegrationTest
+{
+    [Test]
+    public void Can_Update_Batch()
+    {
+        // Arrange
+        var servers = new List<ServerRegistrationDto>();
+        for (var i = 0; i < 3; i++)
+        {
+            servers.Add(new ServerRegistrationDto
+            {
+                Id = i + 1,
+                ServerAddress = "address" + i,
+                ServerIdentity = "computer" + i,
+                DateRegistered = DateTime.Now,
+                IsActive = false,
+                DateAccessed = DateTime.Now,
+            });
+        }
+
+        using (var scope = ScopeProvider.CreateScope())
+        {
+            scope.Database.BulkInsertRecords(servers);
+            scope.Complete();
+        }
+
+        // Act
+        for (var i = 0; i < 3; i++)
+        {
+            servers[i].ServerAddress = "newaddress" + i;
+            servers[i].IsActive = true;
+        }
+
+        using (var scope = ScopeProvider.CreateScope())
+        {
+            var updateBatch = servers
+                .Select(x => UpdateBatch.For(x))
+                .ToList();
+            var updated = scope.Database.UpdateBatch(updateBatch, new BatchOptions { BatchSize = 100 });
+            Assert.AreEqual(3, updated);
+            scope.Complete();
+        }
+
+        // Assert
+        using (var scope = ScopeProvider.CreateScope())
+        {
+            var dtos = scope.Database.Fetch<ServerRegistrationDto>();
+            Assert.AreEqual(3, dtos.Count);
+            for (var i = 0; i < 3; i++)
+            {
+                Assert.AreEqual(servers[i].ServerAddress, dtos[i].ServerAddress);
+                Assert.AreEqual(servers[i].ServerIdentity, dtos[i].ServerIdentity);
+                Assert.AreEqual(servers[i].IsActive, dtos[i].IsActive);
+            }
+        }
+    }
+}

From e53220c8f5a9a8c28bd433b974a3cd6cadc584a3 Mon Sep 17 00:00:00 2001
From: Sven Geusens <sge@umbraco.dk>
Date: Tue, 14 Oct 2025 01:15:01 -0900
Subject: [PATCH 027/155] Delivery API: Fix not reindexing branch descendants
 when branch root already published but unchanged (closes #20370) (#20462)

* Fix deliveryApi not reindexing branch descendants when branch root already published and unchanged

* Commit update and name improvement
---
 ...veryApiContentIndexHandleContentChanges.cs | 30 ++++++++++++++++---
 1 file changed, 26 insertions(+), 4 deletions(-)

diff --git a/src/Umbraco.Infrastructure/Examine/Deferred/DeliveryApiContentIndexHandleContentChanges.cs b/src/Umbraco.Infrastructure/Examine/Deferred/DeliveryApiContentIndexHandleContentChanges.cs
index fb0d2c92193f..73078b58686a 100644
--- a/src/Umbraco.Infrastructure/Examine/Deferred/DeliveryApiContentIndexHandleContentChanges.cs
+++ b/src/Umbraco.Infrastructure/Examine/Deferred/DeliveryApiContentIndexHandleContentChanges.cs
@@ -59,7 +59,19 @@ public void Execute() => _backgroundTaskQueue.QueueBackgroundWorkItem(_ =>
                 RemoveFromIndex(pendingRemovals, index);
                 pendingRemovals.Clear();
 
-                Reindex(content, index);
+                ReIndexResult reIndexResult = Reindex(content, index);
+
+
+                // When we get to this point, we are dealing with either
+                // a refresh node or a refresh branch (see reindex =...).
+                // A refresh branch can be many things, the Reindex function takes care of most scenarios.
+                // But it only reindexes descendants if the base node has any changed cultures (see comments in that function)
+                // So by checking what kind of operation it did when the initial indexrequest is for a refresh branch,
+                // we can support reindexing a branch while the base node was unchanged.
+                if (reIndexResult == ReIndexResult.Updated && changeTypes.HasType(TreeChangeTypes.RefreshBranch))
+                {
+                    ReindexDescendants(content, index);
+                }
             }
         }
 
@@ -68,7 +80,7 @@ public void Execute() => _backgroundTaskQueue.QueueBackgroundWorkItem(_ =>
         return Task.CompletedTask;
     });
 
-    private void Reindex(IContent content, IIndex index)
+    private ReIndexResult Reindex(IContent content, IIndex index)
     {
         // get the currently indexed cultures for the content
         CulturePublishStatus[] existingCultures = index
@@ -95,16 +107,19 @@ private void Reindex(IContent content, IIndex index)
             // we likely got here because a removal triggered a "refresh branch" notification, now we
             // need to delete every last culture of this content and all descendants
             RemoveFromIndex(content.Id, index);
-            return;
+            return ReIndexResult.Removed;
         }
 
-        // if the published state changed of any culture, chances are there are similar changes ot the content descendants
+        // if the published state changed of any culture, chances are there are similar changes at the content descendants
         // that need to be reflected in the index, so we'll reindex all descendants
         var changedCulturePublishStatus = indexedCultures.Intersect(existingCultures).Count() != existingCultures.Length;
         if (changedCulturePublishStatus)
         {
             ReindexDescendants(content, index);
+            return ReIndexResult.UpdatedWithDescendants;
         }
+
+        return ReIndexResult.Updated;
     }
 
     private CulturePublishStatus[] UpdateIndex(IContent content, IIndex index)
@@ -179,4 +194,11 @@ public override bool Equals(object? obj)
 
         public override int GetHashCode() => HashCode.Combine(Culture, Published);
     }
+
+    private enum ReIndexResult
+    {
+        Updated,
+        UpdatedWithDescendants,
+        Removed,
+    }
 }

From ac56bffef2bb7c42f4acc8e96288c88a879309d9 Mon Sep 17 00:00:00 2001
From: Mads Rasmussen <madsr@hey.com>
Date: Tue, 14 Oct 2025 12:26:25 +0200
Subject: [PATCH 028/155] fix import in storybook of moved file

---
 src/Umbraco.Web.UI.Client/.storybook/preview.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Umbraco.Web.UI.Client/.storybook/preview.js b/src/Umbraco.Web.UI.Client/.storybook/preview.js
index 98c8ab65b5e8..1ea461cf076e 100644
--- a/src/Umbraco.Web.UI.Client/.storybook/preview.js
+++ b/src/Umbraco.Web.UI.Client/.storybook/preview.js
@@ -47,7 +47,7 @@ import { manifests as propertyEditorManifests } from '../src/packages/property-e
 import { manifests as publishCacheManifests } from '../src/packages/publish-cache/manifests';
 import { manifests as relationsManifests } from '../src/packages/relations/manifests';
 import { manifests as rteManifests } from '../src/packages/rte/manifests';
-import { manifests as searchManifests } from '../src/packages/search/manifests';
+import { manifests as searchManifests } from '../src/packages/core/search/manifests';
 import { manifests as segmentManifests } from '../src/packages/segment/manifests';
 import { manifests as settingsManifests } from '../src/packages/settings/manifests';
 import { manifests as staticFileManifests } from '../src/packages/static-file/manifests';

From cdf9ee4566aea65dba1d7544137e0b3364958ae6 Mon Sep 17 00:00:00 2001
From: Anders Reus <88318565+andersreus@users.noreply.github.com>
Date: Tue, 14 Oct 2025 16:06:48 +0200
Subject: [PATCH 029/155] Added culture to the ApiContentRouteBuilder to
 include variant languages. (#20366) (#20499)

Added culture to the ApiContentRouteBuilder to include variant languages.
---
 src/Umbraco.Core/DeliveryApi/ApiContentBuilderBase.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Umbraco.Core/DeliveryApi/ApiContentBuilderBase.cs b/src/Umbraco.Core/DeliveryApi/ApiContentBuilderBase.cs
index 209ce4e33e2e..2ae47082108c 100644
--- a/src/Umbraco.Core/DeliveryApi/ApiContentBuilderBase.cs
+++ b/src/Umbraco.Core/DeliveryApi/ApiContentBuilderBase.cs
@@ -45,7 +45,7 @@ protected ApiContentBuilderBase(
 
     public virtual T? Build(IPublishedContent content)
     {
-        IApiContentRoute? route = ApiContentRouteBuilder.Build(content);
+        IApiContentRoute? route = ApiContentRouteBuilder.Build(content, VariationContextAccessor.VariationContext?.Culture);
         if (route is null)
         {
             return default;

From a19b9fb5fe162d21776cdfd269cbed8e41cc1a25 Mon Sep 17 00:00:00 2001
From: Copilot <198982749+Copilot@users.noreply.github.com>
Date: Tue, 14 Oct 2025 16:35:42 +0000
Subject: [PATCH 030/155] UFM: Add camelCase aliases for UFM filters to support
 UFMJS expressions (closes #20500) (#20501)

* Initial plan

* Add camelCase aliases for UFM filters with hyphens (stripHtml, titleCase, wordLimit)

Co-authored-by: iOvergaard <752371+iOvergaard@users.noreply.github.com>

* Add manifest tests for camelCase filter aliases

Co-authored-by: iOvergaard <752371+iOvergaard@users.noreply.github.com>

* discards tests that are not useful

* test: updates imports for stripHtml api

* Exports `UmbUfmStripHtmlFilterApi` class

---------

Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>
Co-authored-by: iOvergaard <752371+iOvergaard@users.noreply.github.com>
Co-authored-by: leekelleher <leekelleher@gmail.com>
---
 .../src/packages/ufm/filters/manifests.ts     | 24 ++++++++++
 .../ufm/filters/strip-html.filter.test.ts     | 47 +++++++++++++++++++
 .../packages/ufm/filters/strip-html.filter.ts |  1 +
 3 files changed, 72 insertions(+)
 create mode 100644 src/Umbraco.Web.UI.Client/src/packages/ufm/filters/strip-html.filter.test.ts

diff --git a/src/Umbraco.Web.UI.Client/src/packages/ufm/filters/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/ufm/filters/manifests.ts
index 265b99358ced..8efad58bd0c7 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/ufm/filters/manifests.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/ufm/filters/manifests.ts
@@ -29,6 +29,14 @@ export const manifests: Array<ManifestUfmFilter> = [
 		api: () => import('./strip-html.filter.js'),
 		meta: { alias: 'strip-html' },
 	},
+	// TODO: Remove in V18 - replaced by camelCase alias below for UFMJS compatibility
+	{
+		type: 'ufmFilter',
+		alias: 'Umb.Filter.StripHtmlCamelCase',
+		name: 'Strip HTML UFM Filter (camelCase)',
+		api: () => import('./strip-html.filter.js'),
+		meta: { alias: 'stripHtml' },
+	},
 	{
 		type: 'ufmFilter',
 		alias: 'Umb.Filter.TitleCase',
@@ -36,6 +44,14 @@ export const manifests: Array<ManifestUfmFilter> = [
 		api: () => import('./title-case.filter.js'),
 		meta: { alias: 'title-case' },
 	},
+	// TODO: Remove in V18 - replaced by camelCase alias below for UFMJS compatibility
+	{
+		type: 'ufmFilter',
+		alias: 'Umb.Filter.TitleCaseCamelCase',
+		name: 'Title Case UFM Filter (camelCase)',
+		api: () => import('./title-case.filter.js'),
+		meta: { alias: 'titleCase' },
+	},
 	{
 		type: 'ufmFilter',
 		alias: 'Umb.Filter.Truncate',
@@ -57,4 +73,12 @@ export const manifests: Array<ManifestUfmFilter> = [
 		api: () => import('./word-limit.filter.js'),
 		meta: { alias: 'word-limit' },
 	},
+	// TODO: Remove in V18 - replaced by camelCase alias below for UFMJS compatibility
+	{
+		type: 'ufmFilter',
+		alias: 'Umb.Filter.WordLimitCamelCase',
+		name: 'Word Limit UFM Filter (camelCase)',
+		api: () => import('./word-limit.filter.js'),
+		meta: { alias: 'wordLimit' },
+	},
 ];
diff --git a/src/Umbraco.Web.UI.Client/src/packages/ufm/filters/strip-html.filter.test.ts b/src/Umbraco.Web.UI.Client/src/packages/ufm/filters/strip-html.filter.test.ts
new file mode 100644
index 000000000000..45c39844b6f4
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/packages/ufm/filters/strip-html.filter.test.ts
@@ -0,0 +1,47 @@
+import { expect } from '@open-wc/testing';
+import { UmbUfmStripHtmlFilterApi } from './strip-html.filter.js';
+
+describe('UmbUfmStripHtmlFilter', () => {
+	let filter: UmbUfmStripHtmlFilterApi;
+
+	beforeEach(() => {
+		filter = new UmbUfmStripHtmlFilterApi();
+	});
+
+	describe('filter', () => {
+		it('should strip HTML tags from string', () => {
+			const result = filter.filter('<p>Hello <strong>World</strong></p>');
+			expect(result).to.equal('Hello World');
+		});
+
+		it('should handle empty string', () => {
+			const result = filter.filter('');
+			expect(result).to.equal('');
+		});
+
+		it('should handle null input', () => {
+			const result = filter.filter(null);
+			expect(result).to.equal('');
+		});
+
+		it('should handle undefined input', () => {
+			const result = filter.filter(undefined);
+			expect(result).to.equal('');
+		});
+
+		it('should handle markup object', () => {
+			const result = filter.filter({ markup: '<p>Test</p>' });
+			expect(result).to.equal('Test');
+		});
+
+		it('should strip complex HTML', () => {
+			const result = filter.filter('<div><h1>Title</h1><p>Paragraph with <a href="#">link</a></p></div>');
+			expect(result).to.equal('TitleParagraph with link');
+		});
+
+		it('should handle plain text without HTML', () => {
+			const result = filter.filter('Plain text');
+			expect(result).to.equal('Plain text');
+		});
+	});
+});
diff --git a/src/Umbraco.Web.UI.Client/src/packages/ufm/filters/strip-html.filter.ts b/src/Umbraco.Web.UI.Client/src/packages/ufm/filters/strip-html.filter.ts
index 98b7e394d836..a65969e52243 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/ufm/filters/strip-html.filter.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/ufm/filters/strip-html.filter.ts
@@ -13,3 +13,4 @@ class UmbUfmStripHtmlFilterApi extends UmbUfmFilterBase {
 }
 
 export { UmbUfmStripHtmlFilterApi as api };
+export { UmbUfmStripHtmlFilterApi };

From e22b459d9c72ac7f738fb7ea163713cee86aa07d Mon Sep 17 00:00:00 2001
From: NguyenThuyLan <116753400+NguyenThuyLan@users.noreply.github.com>
Date: Wed, 15 Oct 2025 13:33:24 +0700
Subject: [PATCH 031/155] WorkspaceView: Add tests for create and using custom
 workspace view (#20408)

* WorkspaceView: Add tests for create and using custom workspace view

* update helper version

* Update tests/Umbraco.Tests.AcceptanceTest/tests/ExtensionRegistry/WorkspaceView.spec.ts

Co-authored-by: Nhu Dinh <150406148+nhudinh0309@users.noreply.github.com>

* Update tests/Umbraco.Tests.AcceptanceTest/tests/ExtensionRegistry/WorkspaceView.spec.ts

Co-authored-by: Nhu Dinh <150406148+nhudinh0309@users.noreply.github.com>

* update format code

* Update tests/Umbraco.Tests.AcceptanceTest/tests/ExtensionRegistry/WorkspaceView.spec.ts

Co-authored-by: Nhu Dinh <150406148+nhudinh0309@users.noreply.github.com>

* Update tests/Umbraco.Tests.AcceptanceTest/tests/ExtensionRegistry/WorkspaceView.spec.ts

Co-authored-by: Nhu Dinh <150406148+nhudinh0309@users.noreply.github.com>

* Update tests/Umbraco.Tests.AcceptanceTest/tests/ExtensionRegistry/WorkspaceView.spec.ts

Co-authored-by: Nhu Dinh <150406148+nhudinh0309@users.noreply.github.com>

---------

Co-authored-by: Lan Nguyen Thuy <lnt@umbraco.dk>
Co-authored-by: Nhu Dinh <150406148+nhudinh0309@users.noreply.github.com>
---
 .../workspace-view/umbraco-package.json       | 24 ++++++++++
 .../workspace-view/workspace-view.js          | 28 ++++++++++++
 .../workspace-view/workspace-view.js.map      |  1 +
 .../ExtensionRegistry/WorkspaceView.spec.ts   | 44 +++++++++++++++++++
 4 files changed, 97 insertions(+)
 create mode 100644 tests/Umbraco.Tests.AcceptanceTest/tests/ExtensionRegistry/AdditionalSetup/App_Plugins/workspace-view/umbraco-package.json
 create mode 100644 tests/Umbraco.Tests.AcceptanceTest/tests/ExtensionRegistry/AdditionalSetup/App_Plugins/workspace-view/workspace-view.js
 create mode 100644 tests/Umbraco.Tests.AcceptanceTest/tests/ExtensionRegistry/AdditionalSetup/App_Plugins/workspace-view/workspace-view.js.map
 create mode 100644 tests/Umbraco.Tests.AcceptanceTest/tests/ExtensionRegistry/WorkspaceView.spec.ts

diff --git a/tests/Umbraco.Tests.AcceptanceTest/tests/ExtensionRegistry/AdditionalSetup/App_Plugins/workspace-view/umbraco-package.json b/tests/Umbraco.Tests.AcceptanceTest/tests/ExtensionRegistry/AdditionalSetup/App_Plugins/workspace-view/umbraco-package.json
new file mode 100644
index 000000000000..42d4c1957f7a
--- /dev/null
+++ b/tests/Umbraco.Tests.AcceptanceTest/tests/ExtensionRegistry/AdditionalSetup/App_Plugins/workspace-view/umbraco-package.json
@@ -0,0 +1,24 @@
+{
+  "$schema": "../../umbraco-package-schema.json",
+  "name": "My workspace",
+  "version": "0.1.0",
+  "extensions": [
+    {
+      "type": "workspaceView",
+      "alias": "My.WorkspaceView",
+      "name": "My Workspace View",
+      "element": "/App_Plugins/workspace-view/workspace-view.js",
+      "meta": {
+        "label": "My Workspace View",
+        "pathname": "/my-workspace-view",
+        "icon": "icon-add"
+      },
+      "conditions": [
+        {
+          "alias": "Umb.Condition.WorkspaceAlias",
+          "match": "Umb.Workspace.Document"
+        }
+      ]
+    }
+  ]
+}
diff --git a/tests/Umbraco.Tests.AcceptanceTest/tests/ExtensionRegistry/AdditionalSetup/App_Plugins/workspace-view/workspace-view.js b/tests/Umbraco.Tests.AcceptanceTest/tests/ExtensionRegistry/AdditionalSetup/App_Plugins/workspace-view/workspace-view.js
new file mode 100644
index 000000000000..b471d1e7cf1a
--- /dev/null
+++ b/tests/Umbraco.Tests.AcceptanceTest/tests/ExtensionRegistry/AdditionalSetup/App_Plugins/workspace-view/workspace-view.js
@@ -0,0 +1,28 @@
+import { LitElement as n, html as a, css as c, customElement as p } from "@umbraco-cms/backoffice/external/lit";
+import { UmbElementMixin as u } from "@umbraco-cms/backoffice/element-api";
+var w = Object.getOwnPropertyDescriptor, v = (o, s, i, l) => {
+  for (var e = l > 1 ? void 0 : l ? w(s, i) : s, r = o.length - 1, m; r >= 0; r--)
+    (m = o[r]) && (e = m(e) || e);
+  return e;
+};
+let t = class extends u(n) {
+  render() {
+    return a`     
+     <uui-box headline="Workspace View">
+        Welcome to my newly created workspace view.
+      </uui-box>            
+    `;
+  }
+};
+t.styles = c`
+    uui-box {
+      margin: 20px;
+    }
+  `;
+t = v([
+  p("my-workspaceview")
+], t);
+export {
+  t as default
+};
+//# sourceMappingURL=workspace-view.js.map
diff --git a/tests/Umbraco.Tests.AcceptanceTest/tests/ExtensionRegistry/AdditionalSetup/App_Plugins/workspace-view/workspace-view.js.map b/tests/Umbraco.Tests.AcceptanceTest/tests/ExtensionRegistry/AdditionalSetup/App_Plugins/workspace-view/workspace-view.js.map
new file mode 100644
index 000000000000..42be166b3e3f
--- /dev/null
+++ b/tests/Umbraco.Tests.AcceptanceTest/tests/ExtensionRegistry/AdditionalSetup/App_Plugins/workspace-view/workspace-view.js.map
@@ -0,0 +1 @@
+{"version":3,"file":"workspace-view.js","sources":["../../workspace-view/src/my-element.ts"],"sourcesContent":["import { LitElement, html, customElement, css } from \"@umbraco-cms/backoffice/external/lit\";\nimport { UmbElementMixin } from \"@umbraco-cms/backoffice/element-api\";\n\n@customElement('my-workspaceview')\nexport default class MyWorkspaceViewElement extends UmbElementMixin(LitElement) {\n\n    render() {\n        return html`     \n     <uui-box headline=\"Workspace View\">\n        Welcome to my newly created workspace view.\n      </uui-box>            \n    `\n    }\n\n    static styles = css`\n    uui-box {\n      margin: 20px;\n    }\n  `\n}\n\ndeclare global {\n    interface HTMLElementTagNameMap {\n        'my-workspaceview': MyWorkspaceViewElement\n    }\n}\n"],"names":["MyWorkspaceViewElement","UmbElementMixin","LitElement","html","css","__decorateClass","customElement"],"mappings":";;;;;;;AAIA,IAAqBA,IAArB,cAAoDC,EAAgBC,CAAU,EAAE;AAAA,EAE5E,SAAS;AACL,WAAOC;AAAA;AAAA;AAAA;AAAA;AAAA,EAKX;AAOJ;AAfqBH,EAUV,SAASI;AAAA;AAAA;AAAA;AAAA;AAVCJ,IAArBK,EAAA;AAAA,EADCC,EAAc,kBAAkB;AAAA,GACZN,CAAA;"}
\ No newline at end of file
diff --git a/tests/Umbraco.Tests.AcceptanceTest/tests/ExtensionRegistry/WorkspaceView.spec.ts b/tests/Umbraco.Tests.AcceptanceTest/tests/ExtensionRegistry/WorkspaceView.spec.ts
new file mode 100644
index 000000000000..b5d166fe86a6
--- /dev/null
+++ b/tests/Umbraco.Tests.AcceptanceTest/tests/ExtensionRegistry/WorkspaceView.spec.ts
@@ -0,0 +1,44 @@
+import {ConstantHelper, test} from '@umbraco/playwright-testhelpers';
+
+// Content
+const contentName = 'TestContent';
+// DocumentType
+const documentTypeName = 'TestDocumentTypeForContent';
+// DataType
+const dataTypeName = 'Textstring';
+// Media
+const mediaName = 'TestMedia';
+
+test.afterEach(async ({umbracoApi}) => {
+  await umbracoApi.document.ensureNameNotExists(contentName);
+  await umbracoApi.documentType.ensureNameNotExists(documentTypeName);
+  await umbracoApi.media.ensureNameNotExists(mediaName);
+});
+
+test('can see the custom workspace view in the content section', async ({umbracoApi, umbracoUi}) => {
+  // Arrange
+  const dataTypeData = await umbracoApi.dataType.getByName(dataTypeName);
+  const documentTypeId = await umbracoApi.documentType.createDocumentTypeWithPropertyEditor(documentTypeName, dataTypeName, dataTypeData.id);
+  await umbracoApi.document.createDocumentWithTextContent(contentName, documentTypeId, 'Test content', dataTypeName);
+
+  // Act
+  await umbracoUi.goToBackOffice();
+  await umbracoUi.content.goToSection(ConstantHelper.sections.content);
+  await umbracoUi.content.goToContentWithName(contentName);
+
+  // Assert
+  await umbracoUi.content.isWorkspaceViewTabWithAliasVisible('My.WorkspaceView', true);
+});
+
+test('cannot see the custom workspace view in the media section', async ({umbracoApi, umbracoUi}) => {
+  // Arrange
+  await umbracoApi.media.createDefaultMediaWithImage(mediaName);
+
+  // Act
+  await umbracoUi.goToBackOffice();
+  await umbracoUi.content.goToSection(ConstantHelper.sections.media);
+  await umbracoUi.media.goToMediaWithName(mediaName);
+
+  // Assert
+  await umbracoUi.media.isWorkspaceViewTabWithAliasVisible('My.WorkspaceView', false);
+});
\ No newline at end of file

From 1ab13a970b9d7a8d648c786858c5692e96690178 Mon Sep 17 00:00:00 2001
From: NguyenThuyLan <116753400+NguyenThuyLan@users.noreply.github.com>
Date: Wed, 15 Oct 2025 13:33:41 +0700
Subject: [PATCH 032/155] Dashboard: Add tests for create and using custom
 dashboard (#20253)

* add tests for custom dashboard

* update test dashboard using helper

* remove extensionRegistry for playwright config

* update helper version for dashboard

* Update tests/Umbraco.Tests.AcceptanceTest/tests/ExtensionRegistry/CustomDashboard.spec.ts

Co-authored-by: Nhu Dinh <150406148+nhudinh0309@users.noreply.github.com>

* fix format code

---------

Co-authored-by: Lan Nguyen Thuy <lnt@umbraco.dk>
Co-authored-by: Nhu Dinh <150406148+nhudinh0309@users.noreply.github.com>
---
 .../welcome-dashboard/umbraco-package.json    | 25 ++++++++++++
 .../welcome-dashboard/welcome-dashboard.js    | 38 +++++++++++++++++++
 .../welcome-dashboard.js.map                  |  1 +
 .../ExtensionRegistry/CustomDashboard.spec.ts | 22 +++++++++++
 4 files changed, 86 insertions(+)
 create mode 100644 tests/Umbraco.Tests.AcceptanceTest/tests/ExtensionRegistry/AdditionalSetup/App_Plugins/welcome-dashboard/umbraco-package.json
 create mode 100644 tests/Umbraco.Tests.AcceptanceTest/tests/ExtensionRegistry/AdditionalSetup/App_Plugins/welcome-dashboard/welcome-dashboard.js
 create mode 100644 tests/Umbraco.Tests.AcceptanceTest/tests/ExtensionRegistry/AdditionalSetup/App_Plugins/welcome-dashboard/welcome-dashboard.js.map
 create mode 100644 tests/Umbraco.Tests.AcceptanceTest/tests/ExtensionRegistry/CustomDashboard.spec.ts

diff --git a/tests/Umbraco.Tests.AcceptanceTest/tests/ExtensionRegistry/AdditionalSetup/App_Plugins/welcome-dashboard/umbraco-package.json b/tests/Umbraco.Tests.AcceptanceTest/tests/ExtensionRegistry/AdditionalSetup/App_Plugins/welcome-dashboard/umbraco-package.json
new file mode 100644
index 000000000000..d8e628762cd2
--- /dev/null
+++ b/tests/Umbraco.Tests.AcceptanceTest/tests/ExtensionRegistry/AdditionalSetup/App_Plugins/welcome-dashboard/umbraco-package.json
@@ -0,0 +1,25 @@
+{
+  "$schema": "../../umbraco-package-schema.json",
+  "name": "My.WelcomePackage",
+  "version": "0.1.0",
+  "extensions": [
+    {
+      "type": "dashboard",
+      "alias": "my.welcome.dashboard",
+      "name": "My Welcome Dashboard",
+      "element": "/App_Plugins/welcome-dashboard/welcome-dashboard.js",
+      "elementName": "my-welcome-dashboard",
+      "weight": 30,
+      "meta": {
+        "label": "Welcome Dashboard",
+        "pathname": "welcome-dashboard"
+      },
+      "conditions": [
+        {
+          "alias": "Umb.Condition.SectionAlias",
+          "match": "Umb.Section.Content"
+        }
+      ]
+    }
+  ]
+}
\ No newline at end of file
diff --git a/tests/Umbraco.Tests.AcceptanceTest/tests/ExtensionRegistry/AdditionalSetup/App_Plugins/welcome-dashboard/welcome-dashboard.js b/tests/Umbraco.Tests.AcceptanceTest/tests/ExtensionRegistry/AdditionalSetup/App_Plugins/welcome-dashboard/welcome-dashboard.js
new file mode 100644
index 000000000000..8ddf0fbaa3a0
--- /dev/null
+++ b/tests/Umbraco.Tests.AcceptanceTest/tests/ExtensionRegistry/AdditionalSetup/App_Plugins/welcome-dashboard/welcome-dashboard.js
@@ -0,0 +1,38 @@
+import { css as n, customElement as c, html as d } from "@umbraco-cms/backoffice/external/lit";
+import { UmbLitElement as p } from "@umbraco-cms/backoffice/lit-element";
+var i = Object.getOwnPropertyDescriptor, h = (r, s, l, a) => {
+  for (var e = a > 1 ? void 0 : a ? i(s, l) : s, o = r.length - 1, m; o >= 0; o--)
+    (m = r[o]) && (e = m(e) || e);
+  return e;
+};
+let t = class extends p {
+  render() {
+    return d`
+      <h1>Welcome Dashboard</h1>
+      <div>
+        <p>
+          This is the Backoffice. From here, you can modify the content,
+          media, and settings of your website.
+        </p>
+        <p>© Sample Company 20XX</p>
+      </div>
+    `;
+  }
+};
+t.styles = [
+  n`
+      :host {
+        display: block;
+        padding: 24px;
+      }
+    `
+];
+t = h([
+  c("my-welcome-dashboard")
+], t);
+const b = t;
+export {
+  t as MyWelcomeDashboardElement,
+  b as default
+};
+//# sourceMappingURL=welcome-dashboard.js.map
diff --git a/tests/Umbraco.Tests.AcceptanceTest/tests/ExtensionRegistry/AdditionalSetup/App_Plugins/welcome-dashboard/welcome-dashboard.js.map b/tests/Umbraco.Tests.AcceptanceTest/tests/ExtensionRegistry/AdditionalSetup/App_Plugins/welcome-dashboard/welcome-dashboard.js.map
new file mode 100644
index 000000000000..65539b9a6582
--- /dev/null
+++ b/tests/Umbraco.Tests.AcceptanceTest/tests/ExtensionRegistry/AdditionalSetup/App_Plugins/welcome-dashboard/welcome-dashboard.js.map
@@ -0,0 +1 @@
+{"version":3,"file":"welcome-dashboard.js","sources":["../../welcome-dashboard/src/welcome-dashboard.element.ts"],"sourcesContent":["import { css, html, customElement } from '@umbraco-cms/backoffice/external/lit';\r\nimport { UmbLitElement } from '@umbraco-cms/backoffice/lit-element';\r\n\r\n@customElement('my-welcome-dashboard')\r\nexport class MyWelcomeDashboardElement extends UmbLitElement {\r\n\r\n    override render() {\r\n        return html`\r\n      <h1>Welcome Dashboard</h1>\r\n      <div>\r\n        <p>\r\n          This is the Backoffice. From here, you can modify the content,\r\n          media, and settings of your website.\r\n        </p>\r\n        <p>© Sample Company 20XX</p>\r\n      </div>\r\n    `;\r\n    }\r\n\r\n    static override readonly styles = [\r\n        css`\r\n      :host {\r\n        display: block;\r\n        padding: 24px;\r\n      }\r\n    `,\r\n    ];\r\n}\r\n\r\nexport default MyWelcomeDashboardElement;\r\n\r\ndeclare global {\r\n    interface HTMLElementTagNameMap {\r\n        'my-welcome-dashboard': MyWelcomeDashboardElement;\r\n    }\r\n}"],"names":["MyWelcomeDashboardElement","UmbLitElement","html","css","__decorateClass","customElement","MyWelcomeDashboardElement$1"],"mappings":";;;;;;;AAIO,IAAMA,IAAN,cAAwCC,EAAc;AAAA,EAEhD,SAAS;AACd,WAAOC;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,EAUX;AAUJ;AAvBaF,EAegB,SAAS;AAAA,EAC9BG;AAAA;AAAA;AAAA;AAAA;AAAA;AAMJ;AAtBSH,IAANI,EAAA;AAAA,EADNC,EAAc,sBAAsB;AAAA,GACxBL,CAAA;AAyBb,MAAAM,IAAeN;"}
\ No newline at end of file
diff --git a/tests/Umbraco.Tests.AcceptanceTest/tests/ExtensionRegistry/CustomDashboard.spec.ts b/tests/Umbraco.Tests.AcceptanceTest/tests/ExtensionRegistry/CustomDashboard.spec.ts
new file mode 100644
index 000000000000..0303f6b9af38
--- /dev/null
+++ b/tests/Umbraco.Tests.AcceptanceTest/tests/ExtensionRegistry/CustomDashboard.spec.ts
@@ -0,0 +1,22 @@
+import {ConstantHelper, test} from '@umbraco/playwright-testhelpers';
+
+// Dashboard
+const dashboardName = 'Welcome Dashboard';
+
+test('can see the custom dashboard in content section', async ({umbracoUi}) => {
+  // Act
+  await umbracoUi.goToBackOffice();
+  await umbracoUi.content.goToSection(ConstantHelper.sections.content);
+
+  // Assert
+  await umbracoUi.content.isDashboardTabWithNameVisible(dashboardName, true);
+});
+
+test('can not see the custom dashboard in media section', async ({umbracoUi}) => {
+  // Act
+  await umbracoUi.goToBackOffice();
+  await umbracoUi.content.goToSection(ConstantHelper.sections.media);
+
+  // Assert
+  await umbracoUi.content.isDashboardTabWithNameVisible(dashboardName, false);
+});
\ No newline at end of file

From fdf759d08debcbf4d86fed2d6d2c6aaed16ef03e Mon Sep 17 00:00:00 2001
From: Andy Butland <abutland73@gmail.com>
Date: Wed, 15 Oct 2025 09:41:41 +0200
Subject: [PATCH 033/155] Content Types: Prevent creation of document type with
 an alias that case insensitively matches an existing alias (closes #20467)
 (#20471)

Prevent creation of document type with an alias that case insensitively matches an existing alias.
---
 .../ContentTypeEditing/ContentTypeEditingServiceBase.cs    | 4 ++--
 .../Services/ContentTypeEditingServiceTests.Create.cs      | 7 ++++---
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/Umbraco.Core/Services/ContentTypeEditing/ContentTypeEditingServiceBase.cs b/src/Umbraco.Core/Services/ContentTypeEditing/ContentTypeEditingServiceBase.cs
index 00708fb43912..b1847c80da0f 100644
--- a/src/Umbraco.Core/Services/ContentTypeEditing/ContentTypeEditingServiceBase.cs
+++ b/src/Umbraco.Core/Services/ContentTypeEditing/ContentTypeEditingServiceBase.cs
@@ -1,4 +1,4 @@
-using Umbraco.Cms.Core.Models;
+using Umbraco.Cms.Core.Models;
 using Umbraco.Cms.Core.Models.ContentTypeEditing;
 using Umbraco.Cms.Core.Services.OperationStatus;
 using Umbraco.Cms.Core.Strings;
@@ -407,7 +407,7 @@ private static ContentTypeOperationStatus ValidateContainers(ContentTypeEditingM
     }
 
     // This this method gets aliases across documents, members, and media, so it covers it all
-    private bool ContentTypeAliasIsInUse(string alias) => _contentTypeService.GetAllContentTypeAliases().Contains(alias);
+    private bool ContentTypeAliasIsInUse(string alias) => _contentTypeService.GetAllContentTypeAliases().InvariantContains(alias);
 
     private bool ContentTypeAliasCanBeUsedFor(string alias, Guid key)
     {
diff --git a/tests/Umbraco.Tests.Integration/Umbraco.Core/Services/ContentTypeEditingServiceTests.Create.cs b/tests/Umbraco.Tests.Integration/Umbraco.Core/Services/ContentTypeEditingServiceTests.Create.cs
index 814d1b5be79c..a987e9a4f78d 100644
--- a/tests/Umbraco.Tests.Integration/Umbraco.Core/Services/ContentTypeEditingServiceTests.Create.cs
+++ b/tests/Umbraco.Tests.Integration/Umbraco.Core/Services/ContentTypeEditingServiceTests.Create.cs
@@ -861,14 +861,15 @@ public async Task Cannot_Use_Invalid_Alias(string contentTypeAlias)
         Assert.AreEqual(ContentTypeOperationStatus.InvalidAlias, result.Status);
     }
 
-    [Test]
-    public async Task Cannot_Use_Existing_Alias()
+    [TestCase("test")] // Matches alias case sensitively.
+    [TestCase("Test")] // Matches alias case insensitively.
+    public async Task Cannot_Use_Existing_Alias(string newAlias)
     {
         var createModel = ContentTypeCreateModel("Test", "test");
         var result = await ContentTypeEditingService.CreateAsync(createModel, Constants.Security.SuperUserKey);
         Assert.IsTrue(result.Success);
 
-        createModel = ContentTypeCreateModel("Test 2", "test");
+        createModel = ContentTypeCreateModel("Test 2", newAlias);
         result = await ContentTypeEditingService.CreateAsync(createModel, Constants.Security.SuperUserKey);
         Assert.IsFalse(result.Success);
         Assert.AreEqual(ContentTypeOperationStatus.DuplicateAlias, result.Status);

From e71f36d816fd515109afcad935fada0a26f406b3 Mon Sep 17 00:00:00 2001
From: Andy Butland <abutland73@gmail.com>
Date: Wed, 15 Oct 2025 10:06:00 +0200
Subject: [PATCH 034/155] Back Office: Fixes link to workspace root from
 breadcrumb trail (closes: #20455) (#20459)

Fixes link to workspace root from breadcrumb trail.
---
 .../workspace-menu-breadcrumb.element.ts                 | 8 +++++++-
 .../workspace-variant-menu-breadcrumb.element.ts         | 9 +++++++--
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/workspace/components/workspace-breadcrumb/workspace-menu-breadcrumb/workspace-menu-breadcrumb.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/workspace/components/workspace-breadcrumb/workspace-menu-breadcrumb/workspace-menu-breadcrumb.element.ts
index 0fcb8deab4fe..b1cd9d327123 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/workspace/components/workspace-breadcrumb/workspace-menu-breadcrumb/workspace-menu-breadcrumb.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/workspace/components/workspace-breadcrumb/workspace-menu-breadcrumb/workspace-menu-breadcrumb.element.ts
@@ -78,7 +78,13 @@ export class UmbWorkspaceBreadcrumbElement extends UmbLitElement {
 
 	#getHref(structureItem: UmbStructureItemModel) {
 		if (structureItem.isFolder) return undefined;
-		return `section/${this.#sectionContext?.getPathname()}/workspace/${structureItem.entityType}/edit/${structureItem.unique}`;
+
+		let href = `section/${this.#sectionContext?.getPathname()}`;
+		if (structureItem.unique) {
+			href += `/workspace/${structureItem.entityType}/edit/${structureItem.unique}`;
+		}
+
+		return href;
 	}
 
 	override render() {
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/workspace/components/workspace-breadcrumb/workspace-variant-menu-breadcrumb/workspace-variant-menu-breadcrumb.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/workspace/components/workspace-breadcrumb/workspace-variant-menu-breadcrumb/workspace-variant-menu-breadcrumb.element.ts
index 7b267e6da820..04fe73d6a8af 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/workspace/components/workspace-breadcrumb/workspace-variant-menu-breadcrumb/workspace-variant-menu-breadcrumb.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/workspace/components/workspace-breadcrumb/workspace-variant-menu-breadcrumb/workspace-variant-menu-breadcrumb.element.ts
@@ -115,8 +115,13 @@ export class UmbWorkspaceVariantMenuBreadcrumbElement extends UmbLitElement {
 
 	#getHref(structureItem: any) {
 		if (structureItem.isFolder) return undefined;
-		const workspaceBasePath = `section/${this.#sectionContext?.getPathname()}/workspace/${structureItem.entityType}/edit`;
-		return `${workspaceBasePath}/${structureItem.unique}/${this._workspaceActiveVariantId?.toCultureString()}`;
+
+		let href = `section/${this.#sectionContext?.getPathname()}`;
+		if (structureItem.unique) {
+			href += `/workspace/${structureItem.entityType}/edit/${structureItem.unique}/${this._workspaceActiveVariantId?.toCultureString()}`;
+		}
+
+		return href;
 	}
 
 	override render() {

From 4c05a114c5b582eef5ebb36e1e38312214b910b3 Mon Sep 17 00:00:00 2001
From: Warren Buckley <warren@hackmakedo.com>
Date: Wed, 15 Oct 2025 13:10:39 +0100
Subject: [PATCH 035/155] Fixes 20476 - Changes icon to be no entry sign
 (#20496)

---
 .../documents/documents/entity-sign/is-protected/manifest.ts    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-sign/is-protected/manifest.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-sign/is-protected/manifest.ts
index a9ef60b1490d..a87addb16a0a 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-sign/is-protected/manifest.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-sign/is-protected/manifest.ts
@@ -9,7 +9,7 @@ export const manifests: UmbExtensionManifest = {
 	forEntityFlags: ['Umb.IsProtected'],
 	weight: 1000,
 	meta: {
-		iconName: 'icon-lock',
+		iconName: 'icon-block',
 		label: 'Protected',
 		iconColorAlias: 'red',
 	},

From a504fd1ef88d0ce926e865a317af91ec6dd247ce Mon Sep 17 00:00:00 2001
From: Laura Neto <12862535+lauraneto@users.noreply.github.com>
Date: Thu, 16 Oct 2025 08:22:11 +0200
Subject: [PATCH 036/155] Bump version to 16.3.0

---
 src/Umbraco.Web.UI.Client/package-lock.json | 4 ++--
 src/Umbraco.Web.UI.Client/package.json      | 2 +-
 version.json                                | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/package-lock.json b/src/Umbraco.Web.UI.Client/package-lock.json
index 33947947a951..71e0a69db2a6 100644
--- a/src/Umbraco.Web.UI.Client/package-lock.json
+++ b/src/Umbraco.Web.UI.Client/package-lock.json
@@ -1,12 +1,12 @@
 {
 	"name": "@umbraco-cms/backoffice",
-	"version": "16.3.0-rc",
+	"version": "16.3.0",
 	"lockfileVersion": 3,
 	"requires": true,
 	"packages": {
 		"": {
 			"name": "@umbraco-cms/backoffice",
-			"version": "16.3.0-rc",
+			"version": "16.3.0",
 			"license": "MIT",
 			"workspaces": [
 				"./src/packages/*",
diff --git a/src/Umbraco.Web.UI.Client/package.json b/src/Umbraco.Web.UI.Client/package.json
index 3c831031ace3..de785cc2058b 100644
--- a/src/Umbraco.Web.UI.Client/package.json
+++ b/src/Umbraco.Web.UI.Client/package.json
@@ -1,7 +1,7 @@
 {
 	"name": "@umbraco-cms/backoffice",
 	"license": "MIT",
-	"version": "16.3.0-rc",
+	"version": "16.3.0",
 	"type": "module",
 	"exports": {
 		".": null,
diff --git a/version.json b/version.json
index cd1e47b49d76..e71c12fcd95b 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": "16.3.0-rc4",
+  "version": "16.3.0",
   "assemblyVersion": {
     "precision": "build"
   },

From ae73fb343175e7aa23e8c2551d477dacac347037 Mon Sep 17 00:00:00 2001
From: Andreas Zerbst <73799582+andr317c@users.noreply.github.com>
Date: Thu, 16 Oct 2025 11:24:56 +0200
Subject: [PATCH 037/155] E2E: Updated acceptance tests to match changes
 (#20493)

* Updated tests to match changes

* More updates

* Bumped version

* Reverted change
---
 tests/Umbraco.Tests.AcceptanceTest/package-lock.json      | 8 ++++----
 tests/Umbraco.Tests.AcceptanceTest/package.json           | 2 +-
 .../tests/DefaultConfig/Content/Content.spec.ts           | 4 ++--
 .../tests/DefaultConfig/Content/ContentInfoTab.spec.ts    | 2 +-
 .../DefaultConfig/Content/ContentWithTrueFalse.spec.ts    | 2 +-
 .../DataType/BlockGrid/BlockGridEditor.spec.ts            | 2 +-
 .../DataType/BlockListEditor/BlockListEditor.spec.ts      | 2 +-
 .../tests/DefaultConfig/Media/Media.spec.ts               | 1 +
 8 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/tests/Umbraco.Tests.AcceptanceTest/package-lock.json b/tests/Umbraco.Tests.AcceptanceTest/package-lock.json
index d6c157d75fd8..87ed32ef3ab9 100644
--- a/tests/Umbraco.Tests.AcceptanceTest/package-lock.json
+++ b/tests/Umbraco.Tests.AcceptanceTest/package-lock.json
@@ -8,7 +8,7 @@
       "hasInstallScript": true,
       "dependencies": {
         "@umbraco/json-models-builders": "^2.0.40",
-        "@umbraco/playwright-testhelpers": "^17.0.0-beta.1",
+        "@umbraco/playwright-testhelpers": "^17.0.0-beta.4",
         "camelize": "^1.0.0",
         "dotenv": "^16.3.1",
         "node-fetch": "^2.6.7"
@@ -67,9 +67,9 @@
       }
     },
     "node_modules/@umbraco/playwright-testhelpers": {
-      "version": "17.0.0-beta.1",
-      "resolved": "https://registry.npmjs.org/@umbraco/playwright-testhelpers/-/playwright-testhelpers-17.0.0-beta.1.tgz",
-      "integrity": "sha512-EhS4j5ARDcR3tI7ArTmLuBHW+e49qyWq3Ts8ckCXvFjkPgR3u/Z5JPOIFWUZ+rTahNZi3axs3i+dVcWWA4Fyjw==",
+      "version": "17.0.0-beta.4",
+      "resolved": "https://registry.npmjs.org/@umbraco/playwright-testhelpers/-/playwright-testhelpers-17.0.0-beta.4.tgz",
+      "integrity": "sha512-+OE1A2oAdFel4myf5T/jJLuw0aLvSOUBplkUfsYFj2ACeLygfAp/MM7q2RQ+YlCym/wdF+jAqJM3g+zsKEDjaQ==",
       "license": "MIT",
       "dependencies": {
         "@umbraco/json-models-builders": "2.0.40",
diff --git a/tests/Umbraco.Tests.AcceptanceTest/package.json b/tests/Umbraco.Tests.AcceptanceTest/package.json
index 49cc458287de..f1a7b85fa49e 100644
--- a/tests/Umbraco.Tests.AcceptanceTest/package.json
+++ b/tests/Umbraco.Tests.AcceptanceTest/package.json
@@ -22,7 +22,7 @@
   },
   "dependencies": {
     "@umbraco/json-models-builders": "^2.0.40",
-    "@umbraco/playwright-testhelpers": "^17.0.0-beta.1",
+    "@umbraco/playwright-testhelpers": "^17.0.0-beta.4",
     "camelize": "^1.0.0",
     "dotenv": "^16.3.1",
     "node-fetch": "^2.6.7"
diff --git a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/Content.spec.ts b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/Content.spec.ts
index f4b69a1231be..edea7a59e422 100644
--- a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/Content.spec.ts
+++ b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/Content.spec.ts
@@ -234,8 +234,8 @@ test('can duplicate a content node to other parent', async ({umbracoApi, umbraco
   await umbracoUi.content.doesSuccessNotificationHaveText(NotificationConstantHelper.success.duplicated);
   await umbracoUi.content.isContentInTreeVisible(contentName);
   await umbracoUi.content.isContentInTreeVisible(parentContentName);
-  await umbracoUi.content.openContentCaretButtonForName(parentContentName);
-  await umbracoUi.content.isChildContentInTreeVisible(parentContentName, contentName);
+  await umbracoUi.content.goToContentWithName(parentContentName);
+  await umbracoUi.content.isContentWithNameVisibleInList(contentName);
 
   // Clean
   await umbracoApi.document.ensureNameNotExists(parentContentName);
diff --git a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/ContentInfoTab.spec.ts b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/ContentInfoTab.spec.ts
index 54c07aa39fcd..a27953764450 100644
--- a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/ContentInfoTab.spec.ts
+++ b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/ContentInfoTab.spec.ts
@@ -17,7 +17,7 @@ test.afterEach(async ({umbracoApi}) => {
 
 test('can see correct information when published', async ({umbracoApi, umbracoUi}) => {
   // Arrange
-  const notPublishContentLink = 'This item is not published';
+  const notPublishContentLink = 'Not created';
   const dataTypeName = 'Textstring';
   const contentText = 'This is test content text';
   const dataTypeData = await umbracoApi.dataType.getByName(dataTypeName);
diff --git a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/ContentWithTrueFalse.spec.ts b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/ContentWithTrueFalse.spec.ts
index 75e252c28cf5..f58f224b6cb4 100644
--- a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/ContentWithTrueFalse.spec.ts
+++ b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/ContentWithTrueFalse.spec.ts
@@ -58,7 +58,7 @@ test('can publish content with the true/false data type', async ({umbracoApi, um
   expect(await umbracoApi.document.doesNameExist(contentName)).toBeTruthy();
   const contentData = await umbracoApi.document.getByName(contentName);
   expect(contentData.variants[0].state).toBe(expectedState);
-  expect(contentData.values).toEqual([]);
+  expect(contentData.values[0].value).toEqual(false);
 });
 
 test('can toggle the true/false value in the content', {tag: '@release'}, async ({umbracoApi, umbracoUi}) => {
diff --git a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/DataType/BlockGrid/BlockGridEditor.spec.ts b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/DataType/BlockGrid/BlockGridEditor.spec.ts
index 54eed6a46446..e2b5d799eca5 100644
--- a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/DataType/BlockGrid/BlockGridEditor.spec.ts
+++ b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/DataType/BlockGrid/BlockGridEditor.spec.ts
@@ -275,7 +275,7 @@ test('max can not be less than min in a block grid editor', async ({umbracoApi,
 
   // Assert
   await umbracoUi.dataType.isFailedStateButtonVisible();
-  await umbracoUi.dataType.doesAmountContainErrorMessageWithText('The low value must not be exceed the high value');
+  await umbracoUi.dataType.doesAmountContainErrorMessageWithText('The low value must not exceed the high value.');
   const dataTypeData = await umbracoApi.dataType.getByName(blockGridEditorName);
   expect(dataTypeData.values[0].value.min).toBe(minAmount);
   // The max value should not be updated
diff --git a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/DataType/BlockListEditor/BlockListEditor.spec.ts b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/DataType/BlockListEditor/BlockListEditor.spec.ts
index 1239425d2001..5db02e7d48d0 100644
--- a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/DataType/BlockListEditor/BlockListEditor.spec.ts
+++ b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/DataType/BlockListEditor/BlockListEditor.spec.ts
@@ -173,7 +173,7 @@ test('max can not be less than min', async ({umbracoApi, umbracoUi}) => {
   // Assert
   await umbracoUi.dataType.isFailedStateButtonVisible();
   const dataTypeData = await umbracoApi.dataType.getByName(blockListEditorName);
-  await umbracoUi.dataType.doesAmountContainErrorMessageWithText('The low value must not be exceed the high value');
+  await umbracoUi.dataType.doesAmountContainErrorMessageWithText('The low value must not exceed the high value.');
   expect(dataTypeData.values[0].value.min).toBe(minAmount);
   // The max value should not be updated
   expect(dataTypeData.values[0].value.max).toBe(oldMaxAmount);
diff --git a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Media/Media.spec.ts b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Media/Media.spec.ts
index ab749dc20a88..e70132f3c5ea 100644
--- a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Media/Media.spec.ts
+++ b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Media/Media.spec.ts
@@ -73,6 +73,7 @@ for (const mediaFileType of mediaFileTypes) {
 
     // Assert
     await umbracoUi.media.waitForMediaItemToBeCreated();
+    await umbracoUi.media.goToSection(ConstantHelper.sections.media);
     const mediaData = await umbracoApi.media.getByName(mediaFileType.fileName);
     const mediaUrl = await umbracoApi.media.getFullMediaUrl(mediaData.id);
     await umbracoUi.media.doesMediaHaveThumbnail(mediaData.id, mediaFileType.thumbnail, mediaUrl);

From 369b020d9db0315ce88c6e2835509639267c3444 Mon Sep 17 00:00:00 2001
From: Kenn Jacobsen <kja@umbraco.dk>
Date: Thu, 16 Oct 2025 12:56:32 +0200
Subject: [PATCH 038/155] Explicitly flush isolated caches by key for content
 updates (#20519)

* Explicitly flush isolated caches by key for content updates

* Apply suggestions from code review

---------

Co-authored-by: Andy Butland <abutland73@gmail.com>
---
 .../Implement/DocumentRepository.cs           |   5 +
 .../Repositories/Implement/MediaRepository.cs |   5 +
 ...ontentServiceNotificationWithCacheTests.cs | 148 ++++++++++++++++++
 .../MediaServiceNotificationWithCacheTests.cs | 146 +++++++++++++++++
 4 files changed, 304 insertions(+)
 create mode 100644 tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/ContentServiceNotificationWithCacheTests.cs
 create mode 100644 tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/MediaServiceNotificationWithCacheTests.cs

diff --git a/src/Umbraco.Infrastructure/Persistence/Repositories/Implement/DocumentRepository.cs b/src/Umbraco.Infrastructure/Persistence/Repositories/Implement/DocumentRepository.cs
index 80b07966357f..8cccdd924751 100644
--- a/src/Umbraco.Infrastructure/Persistence/Repositories/Implement/DocumentRepository.cs
+++ b/src/Umbraco.Infrastructure/Persistence/Repositories/Implement/DocumentRepository.cs
@@ -1328,6 +1328,11 @@ protected override void PersistUpdatedItem(IContent entity)
 
         entity.ResetDirtyProperties();
 
+        // We need to flush the isolated cache by key explicitly here.
+        // The ContentCacheRefresher does the same thing, but by the time it's invoked, custom notification handlers
+        // might have already consumed the cached version (which at this point is the previous version).
+        IsolatedCache.ClearByKey(RepositoryCacheKeys.GetKey<IContent, Guid>(entity.Key));
+
         // troubleshooting
         //if (Database.ExecuteScalar<int>($"SELECT COUNT(*) FROM {Constants.DatabaseSchema.Tables.DocumentVersion} JOIN {Constants.DatabaseSchema.Tables.ContentVersion} ON {Constants.DatabaseSchema.Tables.DocumentVersion}.id={Constants.DatabaseSchema.Tables.ContentVersion}.id WHERE published=1 AND nodeId=" + content.Id) > 1)
         //{
diff --git a/src/Umbraco.Infrastructure/Persistence/Repositories/Implement/MediaRepository.cs b/src/Umbraco.Infrastructure/Persistence/Repositories/Implement/MediaRepository.cs
index d08607ec092d..75dc8a3eb786 100644
--- a/src/Umbraco.Infrastructure/Persistence/Repositories/Implement/MediaRepository.cs
+++ b/src/Umbraco.Infrastructure/Persistence/Repositories/Implement/MediaRepository.cs
@@ -480,6 +480,11 @@ protected override void PersistUpdatedItem(IMedia entity)
         OnUowRefreshedEntity(new MediaRefreshNotification(entity, new EventMessages()));
 
         entity.ResetDirtyProperties();
+
+        // We need to flush the isolated cache by key explicitly here.
+        // The MediaCacheRefresher does the same thing, but by the time it's invoked, custom notification handlers
+        // might have already consumed the cached version (which at this point is the previous version).
+        IsolatedCache.ClearByKey(RepositoryCacheKeys.GetKey<IMedia, Guid>(entity.Key));
     }
 
     protected override void PersistDeletedItem(IMedia entity)
diff --git a/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/ContentServiceNotificationWithCacheTests.cs b/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/ContentServiceNotificationWithCacheTests.cs
new file mode 100644
index 000000000000..8bfe6859e799
--- /dev/null
+++ b/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/ContentServiceNotificationWithCacheTests.cs
@@ -0,0 +1,148 @@
+using Microsoft.Extensions.DependencyInjection;
+using Moq;
+using NUnit.Framework;
+using Umbraco.Cms.Core;
+using Umbraco.Cms.Core.Cache;
+using Umbraco.Cms.Core.Events;
+using Umbraco.Cms.Core.Models;
+using Umbraco.Cms.Core.Models.ContentEditing;
+using Umbraco.Cms.Core.Notifications;
+using Umbraco.Cms.Core.Services;
+using Umbraco.Cms.Infrastructure.Persistence.Repositories.Implement;
+using Umbraco.Cms.Tests.Common.Builders;
+using Umbraco.Cms.Tests.Common.Testing;
+using Umbraco.Cms.Tests.Integration.Testing;
+
+namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Services;
+
+[TestFixture]
+[UmbracoTest(
+    Database = UmbracoTestOptions.Database.NewSchemaPerTest,
+    PublishedRepositoryEvents = true,
+    WithApplication = true,
+    Logger = UmbracoTestOptions.Logger.Console)]
+internal sealed class ContentServiceNotificationWithCacheTests : UmbracoIntegrationTest
+{
+    private IContentType _contentType;
+
+    private IContentTypeService ContentTypeService => GetRequiredService<IContentTypeService>();
+
+    private IContentService ContentService => GetRequiredService<IContentService>();
+
+    private IContentEditingService ContentEditingService => GetRequiredService<IContentEditingService>();
+
+    protected override void ConfigureTestServices(IServiceCollection services)
+        => services.AddSingleton(AppCaches.Create(Mock.Of<IRequestCache>()));
+
+    [SetUp]
+    public async Task SetupTest()
+    {
+        ContentRepositoryBase.ThrowOnWarning = true;
+
+        _contentType = ContentTypeBuilder.CreateBasicContentType();
+        _contentType.AllowedAsRoot = true;
+        await ContentTypeService.CreateAsync(_contentType, Constants.Security.SuperUserKey);
+    }
+
+    [TearDown]
+    public void Teardown() => ContentRepositoryBase.ThrowOnWarning = false;
+
+    protected override void CustomTestSetup(IUmbracoBuilder builder) => builder
+        .AddNotificationHandler<ContentSavingNotification, ContentNotificationHandler>()
+        .AddNotificationHandler<ContentSavedNotification, ContentNotificationHandler>();
+
+    [Test]
+    public async Task Saving_Saved_Get_Value()
+    {
+        var createAttempt = await ContentEditingService.CreateAsync(
+            new ContentCreateModel
+            {
+                ContentTypeKey = _contentType.Key,
+                Variants = [
+                    new() { Name = "Initial name" }
+                ],
+            },
+            Constants.Security.SuperUserKey);
+
+        Assert.Multiple(() =>
+        {
+            Assert.IsTrue(createAttempt.Success);
+            Assert.IsNotNull(createAttempt.Result.Content);
+        });
+
+        var savingWasCalled = false;
+        var savedWasCalled = false;
+
+        ContentNotificationHandler.SavingContent = notification =>
+        {
+            savingWasCalled = true;
+
+            var saved = notification.SavedEntities.First();
+            var documentById = ContentService.GetById(saved.Id)!;
+            var documentByKey = ContentService.GetById(saved.Key)!;
+
+            Assert.Multiple(() =>
+            {
+                Assert.AreEqual("Updated name", saved.Name);
+                Assert.AreEqual("Initial name", documentById.Name);
+                Assert.AreEqual("Initial name", documentByKey.Name);
+            });
+        };
+
+        ContentNotificationHandler.SavedContent = notification =>
+        {
+            savedWasCalled = true;
+
+            var saved = notification.SavedEntities.First();
+            var documentById = ContentService.GetById(saved.Id)!;
+            var documentByKey = ContentService.GetById(saved.Key)!;
+
+            Assert.Multiple(() =>
+            {
+                Assert.AreEqual("Updated name", saved.Name);
+                Assert.AreEqual("Updated name", documentById.Name);
+                Assert.AreEqual("Updated name", documentByKey.Name);
+            });
+        };
+
+        try
+        {
+            var updateAttempt = await ContentEditingService.UpdateAsync(
+                createAttempt.Result.Content!.Key,
+                new ContentUpdateModel
+                {
+                    Variants = [
+                        new() { Name = "Updated name" }
+                    ],
+                },
+                Constants.Security.SuperUserKey);
+
+            Assert.Multiple(() =>
+            {
+                Assert.IsTrue(updateAttempt.Success);
+                Assert.IsNotNull(updateAttempt.Result.Content);
+            });
+
+            Assert.IsTrue(savingWasCalled);
+            Assert.IsTrue(savedWasCalled);
+        }
+        finally
+        {
+            ContentNotificationHandler.SavingContent = null;
+            ContentNotificationHandler.SavedContent = null;
+        }
+    }
+
+    internal sealed class ContentNotificationHandler :
+        INotificationHandler<ContentSavingNotification>,
+        INotificationHandler<ContentSavedNotification>
+    {
+        public static Action<ContentSavingNotification>? SavingContent { get; set; }
+
+        public static Action<ContentSavedNotification>? SavedContent { get; set; }
+
+        public void Handle(ContentSavedNotification notification) => SavedContent?.Invoke(notification);
+
+        public void Handle(ContentSavingNotification notification) => SavingContent?.Invoke(notification);
+    }
+}
diff --git a/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/MediaServiceNotificationWithCacheTests.cs b/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/MediaServiceNotificationWithCacheTests.cs
new file mode 100644
index 000000000000..d4de99dabab6
--- /dev/null
+++ b/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/MediaServiceNotificationWithCacheTests.cs
@@ -0,0 +1,146 @@
+using Microsoft.Extensions.DependencyInjection;
+using Moq;
+using NUnit.Framework;
+using Umbraco.Cms.Core;
+using Umbraco.Cms.Core.Cache;
+using Umbraco.Cms.Core.Events;
+using Umbraco.Cms.Core.Models;
+using Umbraco.Cms.Core.Models.ContentEditing;
+using Umbraco.Cms.Core.Notifications;
+using Umbraco.Cms.Core.Services;
+using Umbraco.Cms.Infrastructure.Persistence.Repositories.Implement;
+using Umbraco.Cms.Tests.Common.Testing;
+using Umbraco.Cms.Tests.Integration.Testing;
+
+namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Services;
+
+[TestFixture]
+[UmbracoTest(
+    Database = UmbracoTestOptions.Database.NewSchemaPerTest,
+    PublishedRepositoryEvents = true,
+    WithApplication = true,
+    Logger = UmbracoTestOptions.Logger.Console)]
+internal sealed class MediaServiceNotificationWithCacheTests : UmbracoIntegrationTest
+{
+    private IMediaType _mediaType;
+
+    private IMediaTypeService MediaTypeService => GetRequiredService<IMediaTypeService>();
+
+    private IMediaService MediaService => GetRequiredService<IMediaService>();
+
+    private IMediaEditingService MediaEditingService => GetRequiredService<IMediaEditingService>();
+
+    protected override void ConfigureTestServices(IServiceCollection services)
+        => services.AddSingleton(AppCaches.Create(Mock.Of<IRequestCache>()));
+
+    [SetUp]
+    public void SetupTest()
+    {
+        ContentRepositoryBase.ThrowOnWarning = true;
+
+        _mediaType = MediaTypeService.Get("folder")
+                     ?? throw new ApplicationException("Could not find the \"folder\" media type");
+    }
+
+    [TearDown]
+    public void Teardown() => ContentRepositoryBase.ThrowOnWarning = false;
+
+    protected override void CustomTestSetup(IUmbracoBuilder builder) => builder
+        .AddNotificationHandler<MediaSavingNotification, MediaNotificationHandler>()
+        .AddNotificationHandler<MediaSavedNotification, MediaNotificationHandler>();
+
+    [Test]
+    public async Task Saving_Saved_Get_Value()
+    {
+        var createAttempt = await MediaEditingService.CreateAsync(
+            new MediaCreateModel
+            {
+                ContentTypeKey = _mediaType.Key,
+                Variants = [
+                    new() { Name = "Initial name" }
+                ],
+            },
+            Constants.Security.SuperUserKey);
+
+        Assert.Multiple(() =>
+        {
+            Assert.IsTrue(createAttempt.Success);
+            Assert.IsNotNull(createAttempt.Result.Content);
+        });
+
+        var savingWasCalled = false;
+        var savedWasCalled = false;
+
+        MediaNotificationHandler.SavingMedia = notification =>
+        {
+            savingWasCalled = true;
+
+            var saved = notification.SavedEntities.First();
+            var documentById = MediaService.GetById(saved.Id)!;
+            var documentByKey = MediaService.GetById(saved.Key)!;
+
+            Assert.Multiple(() =>
+            {
+                Assert.AreEqual("Updated name", saved.Name);
+                Assert.AreEqual("Initial name", documentById.Name);
+                Assert.AreEqual("Initial name", documentByKey.Name);
+            });
+        };
+
+        MediaNotificationHandler.SavedMedia = notification =>
+        {
+            savedWasCalled = true;
+
+            var saved = notification.SavedEntities.First();
+            var documentById = MediaService.GetById(saved.Id)!;
+            var documentByKey = MediaService.GetById(saved.Key)!;
+
+            Assert.Multiple(() =>
+            {
+                Assert.AreEqual("Updated name", saved.Name);
+                Assert.AreEqual("Updated name", documentById.Name);
+                Assert.AreEqual("Updated name", documentByKey.Name);
+            });
+        };
+
+        try
+        {
+            var updateAttempt = await MediaEditingService.UpdateAsync(
+                createAttempt.Result.Content!.Key,
+                new MediaUpdateModel
+                {
+                    Variants = [
+                        new() { Name = "Updated name" }
+                    ],
+                },
+                Constants.Security.SuperUserKey);
+
+            Assert.Multiple(() =>
+            {
+                Assert.IsTrue(updateAttempt.Success);
+                Assert.IsNotNull(updateAttempt.Result.Content);
+            });
+
+            Assert.IsTrue(savingWasCalled);
+            Assert.IsTrue(savedWasCalled);
+        }
+        finally
+        {
+            MediaNotificationHandler.SavingMedia = null;
+            MediaNotificationHandler.SavedMedia = null;
+        }
+    }
+
+    internal sealed class MediaNotificationHandler :
+        INotificationHandler<MediaSavingNotification>,
+        INotificationHandler<MediaSavedNotification>
+    {
+        public static Action<MediaSavingNotification>? SavingMedia { get; set; }
+
+        public static Action<MediaSavedNotification>? SavedMedia { get; set; }
+
+        public void Handle(MediaSavedNotification notification) => SavedMedia?.Invoke(notification);
+
+        public void Handle(MediaSavingNotification notification) => SavingMedia?.Invoke(notification);
+    }
+}

From 271edb521432e0ddb7d34400845c820ad271f781 Mon Sep 17 00:00:00 2001
From: Engiber Lozada <89547469+engijlr@users.noreply.github.com>
Date: Thu, 16 Oct 2025 14:55:43 +0200
Subject: [PATCH 039/155] News Dashboard: split into card + container, parent
 handles the data from the repo (#20503)

* Made card element it is own reusable component and passing the data as property.

* Created the umb-news-container element to handle all the priority grouping.

* Added hover styles to normal-priority cards.

* Removed unused variable.
---
 .../components/umb-news-card.element.ts       | 132 ++++++++++++
 .../components/umb-news-container.element.ts  | 110 ++++++++++
 .../umbraco-news-dashboard.element.ts         | 190 +-----------------
 3 files changed, 245 insertions(+), 187 deletions(-)
 create mode 100644 src/Umbraco.Web.UI.Client/src/packages/umbraco-news/components/umb-news-card.element.ts
 create mode 100644 src/Umbraco.Web.UI.Client/src/packages/umbraco-news/components/umb-news-container.element.ts

diff --git a/src/Umbraco.Web.UI.Client/src/packages/umbraco-news/components/umb-news-card.element.ts b/src/Umbraco.Web.UI.Client/src/packages/umbraco-news/components/umb-news-card.element.ts
new file mode 100644
index 000000000000..133f5e53c546
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/packages/umbraco-news/components/umb-news-card.element.ts
@@ -0,0 +1,132 @@
+import { css, customElement, html, nothing, property, unsafeHTML, when } from '@umbraco-cms/backoffice/external/lit';
+import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element';
+import type { NewsDashboardItemResponseModel } from '@umbraco-cms/backoffice/external/backend-api';
+
+@customElement('umb-news-card')
+export class UmbNewsCardElement extends UmbLitElement {
+	@property({ type: Object })
+	item!: NewsDashboardItemResponseModel;
+
+	@property({ type: Number })
+	priority: number = 3;
+
+	#renderHeading(priority: number, text: string) {
+		if (priority <= 2) return html`<h2 class="card-title">${text}</h2>`;
+		return html`<h3 class="card-title">${text}</h3>`;
+	}
+
+	override render() {
+		if (!this.item) return nothing;
+
+		const isLastRow = this.priority === 3;
+
+		const showImage = this.priority <= 2 && !!this.item.imageUrl;
+
+		const content = html`
+			${when(
+				showImage,
+				() =>
+					this.item.imageUrl
+						? html`<img class="card-img" src=${this.item.imageUrl} alt=${this.item.imageAltText ?? ''} />`
+						: html`<div class="card-img placeholder" aria-hidden="true"></div>`,
+				() => nothing,
+			)}
+			<div class="card-body">
+				${this.#renderHeading(this.priority, this.item.header)}
+				${this.item.body ? html`<div class="card-text">${unsafeHTML(this.item.body)}</div>` : nothing}
+				${!isLastRow && this.item.url
+					? html`<div class="card-actions">
+							<uui-button look="outline" href=${this.item.url} target="_blank" rel="noopener">
+								${this.item.buttonText || 'Open'}
+							</uui-button>
+						</div>`
+					: nothing}
+			</div>
+		`;
+
+		// Last row: whole card is a link
+		return isLastRow
+			? this.item.url
+				? html`
+						<a class="card normal-priority" role="listitem" href=${this.item.url} target="_blank" rel="noopener">
+							${content}
+						</a>
+					`
+				: html` <article class="card normal-priority" role="listitem">${content}</article> `
+			: html` <article class="card" role="listitem">${content}</article> `;
+	}
+
+	static override styles = css`
+		:host {
+			display: block;
+			height: 100%;
+		}
+
+		.card {
+			background: var(--uui-color-surface);
+			border-radius: var(--uui-border-radius, 8px);
+			box-shadow: var(
+				--uui-box-box-shadow,
+				var(--uui-shadow-depth-1, 0 1px 3px rgba(0, 0, 0, 0.12), 0 1px 2px rgba(0, 0, 0, 0.24))
+			);
+			overflow: hidden;
+			display: flex;
+			flex-direction: column;
+			height: 100%;
+		}
+
+		.card-img {
+			width: 100%;
+			object-fit: cover;
+			display: block;
+		}
+
+		.card-img.placeholder {
+			height: 8px;
+		}
+
+		.card-body {
+			display: flex;
+			flex-direction: column;
+			padding: var(--uui-size-space-5);
+			flex: 1 1 auto;
+			justify-content: space-between;
+			gap: var(--uui-size-space-3, 9px);
+		}
+
+		.card-title {
+			margin: 0;
+		}
+
+		.card-text > p {
+			margin: 0;
+		}
+
+		.normal-priority {
+			display: block;
+			border: 1px solid var(--uui-color-divider);
+			border-radius: var(--uui-border-radius, 8px);
+			text-decoration: none;
+			color: inherit;
+			overflow: hidden;
+
+			.card-body {
+				gap: 0;
+			}
+		}
+		.normal-priority:hover {
+			color: var(--uui-color-interactive-emphasis);
+		}
+		.card-actions {
+			align-self: end;
+		}
+	`;
+}
+
+export default UmbNewsCardElement;
+
+declare global {
+	interface HTMLElementTagNameMap {
+		'umb-news-card': UmbNewsCardElement;
+	}
+}
diff --git a/src/Umbraco.Web.UI.Client/src/packages/umbraco-news/components/umb-news-container.element.ts b/src/Umbraco.Web.UI.Client/src/packages/umbraco-news/components/umb-news-container.element.ts
new file mode 100644
index 000000000000..1ca905f829dc
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/packages/umbraco-news/components/umb-news-container.element.ts
@@ -0,0 +1,110 @@
+import { css, customElement, html, nothing, property, repeat } from '@umbraco-cms/backoffice/external/lit';
+import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element';
+import type { NewsDashboardItemResponseModel } from '@umbraco-cms/backoffice/external/backend-api';
+
+import './umb-news-card.element.js';
+import { sanitizeHTML } from '@umbraco-cms/backoffice/utils';
+
+@customElement('umb-news-container')
+export class UmbNewsContainerElement extends UmbLitElement {
+	@property({ type: Array })
+	items: Array<NewsDashboardItemResponseModel> = [];
+
+	#groupItemsByPriority(items: NewsDashboardItemResponseModel[]) {
+		const sanitizedItems = items.map((i) => ({
+			...i,
+			body: i.body ? sanitizeHTML(i.body) : '',
+		}));
+
+		// Separate items by priority.
+		const priority1 = sanitizedItems.filter((item) => item.priority === 'High');
+		const priority2 = sanitizedItems.filter((item) => item.priority === 'Medium');
+		const priority3 = sanitizedItems.filter((item) => item.priority === 'Normal');
+
+		// Group 1: First 4 items from priority 1.
+		const group1Items = priority1.slice(0, 4);
+		const overflow1 = priority1.slice(4);
+
+		// Group 2: Overflow from priority 1 + priority 2 items (max 4 total).
+		const group2Items = [...overflow1, ...priority2].slice(0, 4);
+		const overflow2Count = overflow1.length + priority2.length - 4;
+		const overflow2 = overflow2Count > 0 ? [...overflow1, ...priority2].slice(4) : [];
+
+		// Group 3: Overflow from groups 1 & 2 + priority 3 items.
+		const group3Items = [...overflow2, ...priority3];
+
+		return [
+			{ priority: 1, items: group1Items },
+			{ priority: 2, items: group2Items },
+			{ priority: 3, items: group3Items },
+		];
+	}
+
+	override render() {
+		if (!this.items?.length) return nothing;
+
+		const groups = this.#groupItemsByPriority(this.items);
+
+		return html`
+			${repeat(
+				groups,
+				(g) => g.priority,
+				(g) => html`
+					<div class="cards" role="list" aria-label=${`Priority ${g.priority}`}>
+						${repeat(
+							g.items,
+							(i, idx) => i.url || i.header || idx,
+							(i) => html`<umb-news-card .item=${i} .priority=${g.priority}></umb-news-card>`,
+						)}
+					</div>
+				`,
+			)}
+		`;
+	}
+
+	static override styles = css`
+		.cards {
+			--cols: 4;
+			--gap: var(--uui-size-space-4);
+			width: 100%;
+			display: grid;
+			grid-template-columns: repeat(auto-fit, minmax(calc((100% - (var(--cols) - 1) * var(--gap)) / var(--cols)), 1fr));
+			gap: var(--gap);
+		}
+
+		.cards + .cards {
+			margin-top: var(--uui-size-space-5);
+		}
+
+		/* For when container-type is not been assigned, not so sure about it???*/
+		@media (max-width: 1200px) {
+			.cards {
+				grid-template-columns: repeat(auto-fit, minmax(2, 1fr));
+			}
+		}
+		@media (max-width: 700px) {
+			.cards {
+				grid-template-columns: 1fr;
+			}
+		}
+
+		@container dashboard (max-width: 1200px) {
+			.cards {
+				grid-template-columns: repeat(auto-fit, minmax(2, 1fr));
+			}
+		}
+		@container dashboard (max-width: 700px) {
+			.cards {
+				grid-template-columns: 1fr;
+			}
+		}
+	`;
+}
+
+export default UmbNewsContainerElement;
+
+declare global {
+	interface HTMLElementTagNameMap {
+		'umb-news-container': UmbNewsContainerElement;
+	}
+}
diff --git a/src/Umbraco.Web.UI.Client/src/packages/umbraco-news/umbraco-news-dashboard.element.ts b/src/Umbraco.Web.UI.Client/src/packages/umbraco-news/umbraco-news-dashboard.element.ts
index ba1ef0e957a7..bad9fc44977a 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/umbraco-news/umbraco-news-dashboard.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/umbraco-news/umbraco-news-dashboard.element.ts
@@ -1,32 +1,16 @@
 import { UmbNewsDashboardRepository } from './repository/index.js';
-import {
-	css,
-	customElement,
-	html,
-	nothing,
-	repeat,
-	state,
-	unsafeHTML,
-	when,
-} from '@umbraco-cms/backoffice/external/lit';
-import { sanitizeHTML } from '@umbraco-cms/backoffice/utils';
+import { css, customElement, html, state } from '@umbraco-cms/backoffice/external/lit';
 import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element';
 import { UmbTextStyles } from '@umbraco-cms/backoffice/style';
 import type { NewsDashboardItemResponseModel } from '@umbraco-cms/backoffice/external/backend-api';
 
-interface UmbNewsDashboardGroupedItems {
-	priority: number;
-	items: Array<NewsDashboardItemResponseModel>;
-}
+import './components/umb-news-container.element.js';
 
 @customElement('umb-umbraco-news-dashboard')
 export class UmbUmbracoNewsDashboardElement extends UmbLitElement {
 	@state()
 	private _items: Array<NewsDashboardItemResponseModel> = [];
 
-	@state()
-	private _groupedItems: Array<UmbNewsDashboardGroupedItems> = [];
-
 	@state()
 	private _loaded: boolean = false;
 
@@ -35,40 +19,9 @@ export class UmbUmbracoNewsDashboardElement extends UmbLitElement {
 	override async firstUpdated() {
 		const res = await this.#repo.getNewsDashboard();
 		this._items = res.data?.items ?? [];
-		this._groupedItems = this.#groupItemsByPriority();
 		this._loaded = true;
 	}
 
-	#groupItemsByPriority(): Array<UmbNewsDashboardGroupedItems> {
-		const sanitizedItems = this._items.map((i) => ({
-			...i,
-			body: i.body ? sanitizeHTML(i.body) : '',
-		}));
-
-		// Separate items by priority.
-		const priority1 = sanitizedItems.filter((item) => item.priority === 'High');
-		const priority2 = sanitizedItems.filter((item) => item.priority === 'Medium');
-		const priority3 = sanitizedItems.filter((item) => item.priority === 'Normal');
-
-		// Group 1: First 4 items from priority 1.
-		const group1Items = priority1.slice(0, 4);
-		const overflow1 = priority1.slice(4);
-
-		// Group 2: Overflow from priority 1 + priority 2 items (max 4 total).
-		const group2Items = [...overflow1, ...priority2].slice(0, 4);
-		const overflow2Count = overflow1.length + priority2.length - 4;
-		const overflow2 = overflow2Count > 0 ? [...overflow1, ...priority2].slice(4) : [];
-
-		// Group 3: Overflow from groups 1 & 2 + priority 3 items.
-		const group3Items = [...overflow2, ...priority3];
-
-		return [
-			{ priority: 1, items: group1Items },
-			{ priority: 2, items: group2Items },
-			{ priority: 3, items: group3Items },
-		];
-	}
-
 	override render() {
 		if (!this._loaded) {
 			return html`<div class="loader"><uui-loader></uui-loader></div>`;
@@ -78,58 +31,7 @@ export class UmbUmbracoNewsDashboardElement extends UmbLitElement {
 			return this.#renderDefaultContent();
 		}
 
-		return html`
-			${repeat(
-				this._groupedItems,
-				(g) => g.priority,
-				(g) => html`
-					<div class="cards">
-						${repeat(
-							g.items,
-							(i, idx) => i.url || i.header || idx,
-							(i) => {
-								const isLastRow = g.priority === 3;
-
-								const content = html`
-									${when(
-										g.priority <= 2,
-										() =>
-											html`${i.imageUrl
-												? html`<img class="card-img" src=${i.imageUrl} alt=${i.imageAltText ?? ''} />`
-												: html`<div class="card-img placeholder" aria-hidden="true"></div>`}`,
-										() => nothing,
-									)}
-									<div class="card-body">
-										${g.priority <= 2
-											? html`<h2 class="card-title">${i.header}</h2>`
-											: html`<h3 class="card-title">${i.header}</h3>`}
-										${i.body ? html`<div class="card-text">${unsafeHTML(i.body)}</div>` : null}
-										${!isLastRow && i.url
-											? html`<div class="card-actions">
-													<uui-button look="outline" href=${i.url} target="_blank">
-														${i.buttonText || 'Open'}
-													</uui-button>
-												</div>`
-											: nothing}
-									</div>
-								`;
-
-								// LAST ROW: whole card is a link
-								return isLastRow
-									? i.url
-										? html`
-												<a class="card normal-priority" role="listitem" href=${i.url} target="_blank" rel="noopener">
-													${content}
-												</a>
-											`
-										: html` <article class="card normal-priority" role="listitem">${content}</article> `
-									: html` <article class="card" role="listitem">${content}</article> `;
-							},
-						)}
-					</div>
-				`,
-			)}
-		`;
+		return html` <umb-news-container .items=${this._items}></umb-news-container> `;
 	}
 
 	#renderDefaultContent() {
@@ -234,92 +136,6 @@ export class UmbUmbracoNewsDashboardElement extends UmbLitElement {
 				margin-top: 0;
 				margin-bottom: 0;
 			}
-
-			/* Grid */
-			.cards {
-				--cols: 4;
-				--gap: var(--uui-size-space-4);
-				width: 100%;
-				display: grid;
-				grid-template-columns: repeat(
-					auto-fit,
-					minmax(calc((100% - (var(--cols) - 1) * var(--gap)) / var(--cols)), 1fr)
-				);
-				gap: var(--gap);
-			}
-
-			.cards + .cards {
-				margin-top: var(--uui-size-space-5);
-			}
-
-			@container (max-width: 1200px) {
-				.cards {
-					grid-template-columns: repeat(auto-fit, minmax(2, 1fr));
-				}
-			}
-			@container (max-width: 700px) {
-				.cards {
-					grid-template-columns: 1fr;
-				}
-			}
-
-			/* Card */
-			.card {
-				background: var(--uui-color-surface);
-				border-radius: var(--uui-border-radius, 8px);
-				box-shadow: var(
-					--uui-box-box-shadow,
-					var(--uui-shadow-depth-1, 0 1px 3px rgba(0, 0, 0, 0.12), 0 1px 2px rgba(0, 0, 0, 0.24))
-				);
-				overflow: hidden;
-				display: flex;
-				flex-direction: column;
-				height: 100%;
-			}
-
-			.card-img {
-				width: 100%;
-				object-fit: cover;
-				display: block;
-			}
-
-			.card-img.placeholder {
-				height: 8px;
-			}
-
-			.card-body {
-				display: flex;
-				flex-direction: column;
-				padding: var(--uui-size-space-5);
-				flex: 1 1 auto;
-				justify-content: space-between;
-				gap: var(--uui-size-space-3, 9px);
-			}
-
-			.card-title {
-				margin: 0;
-			}
-
-			.card-text > p {
-				margin: 0;
-			}
-
-			.normal-priority {
-				display: block;
-				border: 1px solid var(--uui-color-divider);
-				border-radius: var(--uui-border-radius, 8px);
-				text-decoration: none;
-				color: inherit;
-				overflow: hidden;
-
-				.card-body {
-					gap: 0;
-				}
-			}
-
-			.card-actions {
-				align-self: end;
-			}
 		`,
 	];
 }

From 4a504e8c954b0408bfeefbe898b0a5ebf702968b Mon Sep 17 00:00:00 2001
From: Jacob Overgaard <752371+iOvergaard@users.noreply.github.com>
Date: Thu, 16 Oct 2025 16:38:26 +0200
Subject: [PATCH 040/155] Extensions: Adds `@provideContext` and
 `@consumeContext` decorators for a better developer experience (#20510)

* feat: adds first draft of a context consume decorator

* feat: uses an options pattern

* feat: changes approach to use `addInitializer` and `queueMicroTask` instead

* feat: adds extra warning if context is consumed on disconnected controllers

* feat: example implementation of consume decorator

* feat: adds support for 'subscribe'

* feat: initial work on provide decorator

* docs: adds license to consume decorator

* feat: adds support for umbraco controllers with `hostConnected`

* feat: uses asPromise to handle one-time subscription instead

* test: adds unit tests for consume decorator

* feat: adds support for controllers through hostConnected injection

* feat: adds support for controllers through hostConnected injection

* test: adds unit tests for provide decorator

* docs: adds more documentation around usage and adds a few warnings in console when it detects wrong usage

* feat: removes unused controllerMap

* docs: adds wording on standard vs legacy decorators

* docs: clarifies usage around internal state

* feat: adds proper return types for decorators

* docs: adds more types

* feat: makes element optional

* feat: makes element optional

* feat: uses @consume in the log viewer to showcase

* chore: cleans up debug info

* feat: renames to `consumeContext` and `provideContext` to stay inline with our own methods

* chore: removes unneeded typings

* chore: removes not needed check

* chore: removes not needed check

* test: adds test for rendered value

* feat: splits up code into several smaller functions

* Apply suggestion from @Copilot

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

* Apply suggestion from @Copilot

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

* Apply suggestion from @Copilot

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

* Apply suggestion from @Copilot

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

* docs: augments code example for creating a context

* Update src/Umbraco.Web.UI.Client/src/packages/log-viewer/workspace/views/search/components/log-viewer-search-input.element.ts

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

---------

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
---
 .../consume/context-consume.decorator.test.ts | 133 ++++++++
 .../consume/context-consume.decorator.ts      | 289 ++++++++++++++++++
 .../context-api/consume/context-consumer.ts   |  10 +-
 .../src/libs/context-api/consume/index.ts     |   1 +
 .../provide/context-provide.decorator.test.ts | 111 +++++++
 .../provide/context-provide.decorator.ts      | 258 ++++++++++++++++
 .../src/libs/context-api/provide/index.ts     |   1 +
 .../src/mocks/data/log-viewer.data.ts         |   2 +-
 .../log-viewer-date-range-selector.element.ts |  27 +-
 .../log-viewer-log-level-overview.element.ts  |  24 +-
 .../log-viewer-log-types-chart.element.ts     |  23 +-
 ...ewer-message-templates-overview.element.ts |  25 +-
 ...-viewer-saved-searches-overview.element.ts |  24 +-
 .../overview/log-overview-view.element.ts     |  31 +-
 ...og-viewer-log-level-filter-menu.element.ts |  23 +-
 .../log-viewer-messages-list.element.ts       |  41 ++-
 .../log-viewer-polling-button.element.ts      |  32 +-
 .../log-viewer-search-input.element.ts        |  36 ++-
 .../views/search/log-search-view.element.ts   |  24 +-
 19 files changed, 959 insertions(+), 156 deletions(-)
 create mode 100644 src/Umbraco.Web.UI.Client/src/libs/context-api/consume/context-consume.decorator.test.ts
 create mode 100644 src/Umbraco.Web.UI.Client/src/libs/context-api/consume/context-consume.decorator.ts
 create mode 100644 src/Umbraco.Web.UI.Client/src/libs/context-api/provide/context-provide.decorator.test.ts
 create mode 100644 src/Umbraco.Web.UI.Client/src/libs/context-api/provide/context-provide.decorator.ts

diff --git a/src/Umbraco.Web.UI.Client/src/libs/context-api/consume/context-consume.decorator.test.ts b/src/Umbraco.Web.UI.Client/src/libs/context-api/consume/context-consume.decorator.test.ts
new file mode 100644
index 000000000000..a61cb08b1ebe
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/libs/context-api/consume/context-consume.decorator.test.ts
@@ -0,0 +1,133 @@
+import { UmbContextToken } from '../token/context-token.js';
+import type { UmbContextMinimal } from '../types.js';
+import { UmbContextProvider } from '../provide/context-provider.js';
+import { consumeContext } from './context-consume.decorator.js';
+import { aTimeout, elementUpdated, expect, fixture } from '@open-wc/testing';
+import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element';
+import { UmbControllerBase } from '@umbraco-cms/backoffice/class-api';
+import { html, state } from '@umbraco-cms/backoffice/external/lit';
+
+class UmbTestContextConsumerClass implements UmbContextMinimal {
+	public prop: string = 'value from provider';
+	getHostElement() {
+		return undefined as any;
+	}
+}
+
+const testToken = new UmbContextToken<UmbTestContextConsumerClass>('my-test-context');
+
+class MyTestElement extends UmbLitElement {
+	@consumeContext({
+		context: testToken,
+	})
+	@state()
+	contextValue?: UmbTestContextConsumerClass;
+
+	override render() {
+		return html`<div>${this.contextValue?.prop ?? 'no context'}</div>`;
+	}
+}
+
+customElements.define('my-consume-test-element', MyTestElement);
+
+describe('@consume decorator', () => {
+	let provider: UmbContextProvider;
+	let element: MyTestElement;
+
+	beforeEach(async () => {
+		provider = new UmbContextProvider(document.body, testToken, new UmbTestContextConsumerClass());
+		provider.hostConnected();
+
+		element = await fixture<MyTestElement>(`<my-consume-test-element></my-consume-test-element>`);
+	});
+
+	afterEach(() => {
+		provider.destroy();
+		(provider as any) = undefined;
+	});
+
+	it('should receive a context value when provided on the host', () => {
+		expect(element.contextValue).to.equal(provider.providerInstance());
+		expect(element.contextValue?.prop).to.equal('value from provider');
+	});
+
+	it('should render the value from the context', async () => {
+		expect(element).shadowDom.to.equal('<div>value from provider</div>');
+	});
+
+	it('should work when the decorator is used in a controller', async () => {
+		class MyController extends UmbControllerBase {
+			@consumeContext({ context: testToken })
+			contextValue?: UmbTestContextConsumerClass;
+		}
+
+		const controller = new MyController(element);
+
+		await elementUpdated(element);
+
+		expect(element.contextValue).to.equal(provider.providerInstance());
+		expect(controller.contextValue).to.equal(provider.providerInstance());
+	});
+
+	it('should have called the callback first', async () => {
+		let callbackCalled = false;
+
+		class MyCallbackTestElement extends UmbLitElement {
+			@consumeContext({
+				context: testToken,
+				callback: () => {
+					callbackCalled = true;
+				},
+			})
+			contextValue?: UmbTestContextConsumerClass;
+		}
+
+		customElements.define('my-callback-consume-test-element', MyCallbackTestElement);
+
+		const callbackElement = await fixture<MyCallbackTestElement>(
+			`<my-callback-consume-test-element></my-callback-consume-test-element>`,
+		);
+
+		await elementUpdated(callbackElement);
+
+		expect(callbackCalled).to.be.true;
+		expect(callbackElement.contextValue).to.equal(provider.providerInstance());
+	});
+
+	it('should update the context value when the provider instance changes', async () => {
+		const newProviderInstance = new UmbTestContextConsumerClass();
+		newProviderInstance.prop = 'new value from provider';
+
+		const newProvider = new UmbContextProvider(element, testToken, newProviderInstance);
+		newProvider.hostConnected();
+
+		await elementUpdated(element);
+
+		expect(element.contextValue).to.equal(newProvider.providerInstance());
+		expect(element.contextValue?.prop).to.equal(newProviderInstance.prop);
+	});
+
+	it('should be able to consume without subscribing', async () => {
+		class MyNoSubscribeTestController extends UmbControllerBase {
+			@consumeContext({ context: testToken, subscribe: false })
+			contextValue?: UmbTestContextConsumerClass;
+		}
+
+		const controller = new MyNoSubscribeTestController(element);
+		await aTimeout(0); // Wait a tick for promise to resolve
+
+		expect(controller.contextValue).to.equal(provider.providerInstance());
+
+		const newProviderInstance = new UmbTestContextConsumerClass();
+		newProviderInstance.prop = 'new value from provider';
+
+		const newProvider = new UmbContextProvider(element, testToken, newProviderInstance);
+		newProvider.hostConnected();
+
+		await aTimeout(0); // Wait a tick for promise to resolve
+
+		// Should still be the old value
+		expect(controller.contextValue).to.not.equal(newProvider.providerInstance());
+		expect(controller.contextValue?.prop).to.equal('value from provider');
+	});
+});
diff --git a/src/Umbraco.Web.UI.Client/src/libs/context-api/consume/context-consume.decorator.ts b/src/Umbraco.Web.UI.Client/src/libs/context-api/consume/context-consume.decorator.ts
new file mode 100644
index 000000000000..717c460d93f9
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/libs/context-api/consume/context-consume.decorator.ts
@@ -0,0 +1,289 @@
+/*
+ * Portions of this code are adapted from @lit/context
+ * Copyright 2017 Google LLC
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
+ * Original source: https://github.com/lit/lit/tree/main/packages/context
+ *
+ * @license BSD-3-Clause
+ */
+
+/* eslint-disable @typescript-eslint/no-explicit-any */
+import type { UmbContextToken } from '../token/index.js';
+import type { UmbContextMinimal } from '../types.js';
+import { UmbContextConsumerController } from './context-consumer.controller.js';
+import type { UmbContextCallback } from './context-request.event.js';
+
+export interface UmbConsumeOptions<
+	BaseType extends UmbContextMinimal = UmbContextMinimal,
+	ResultType extends BaseType = BaseType,
+> {
+	/**
+	 * The context to consume, either as a string alias or an UmbContextToken.
+	 */
+	context: string | UmbContextToken<BaseType, ResultType>;
+
+	/**
+	 * An optional callback that is invoked when the context value is set or changes.
+	 * Note, the class instance is probably not fully constructed when this is first invoked.
+	 * If you need to ensure the class is fully constructed, consider using a setter on the property instead.
+	 */
+	callback?: UmbContextCallback<ResultType>;
+
+	/**
+	 * If true, the context consumer will stay active and invoke the callback on context changes.
+	 * If false, the context consumer will use asPromise() to get the value once and then clean up.
+	 * @default true
+	 */
+	subscribe?: boolean;
+}
+
+/**
+ * A property decorator that adds an UmbContextConsumerController to the component
+ * which will try and retrieve a value for the property via the Umbraco Context API.
+ *
+ * This decorator supports both modern "standard" decorators (Stage 3 TC39 proposal) and
+ * legacy TypeScript experimental decorators for backward compatibility.
+ *
+ * @param {UmbConsumeOptions} options Configuration object containing context, callback, and subscribe options
+ *
+ * @example
+ * ```ts
+ * import {consumeContext} from '@umbraco-cms/backoffice/context-api';
+ * import {UMB_WORKSPACE_CONTEXT} from './workspace.context-token.js';
+ *
+ * class MyElement extends UmbLitElement {
+ *   // Standard decorators (with 'accessor' keyword) - Modern approach
+ *   @consumeContext({context: UMB_WORKSPACE_CONTEXT})
+ *   accessor workspaceContext?: UmbWorkspaceContext;
+ *
+ *   // Legacy decorators (without 'accessor') - Works with @state/@property
+ *   @consumeContext({context: UMB_USER_CONTEXT, subscribe: false})
+ *   @state()
+ *   currentUser?: UmbUserContext;
+ * }
+ * ```
+ * @returns {ConsumeDecorator<ResultType>} A property decorator function
+ */
+export function consumeContext<
+	BaseType extends UmbContextMinimal = UmbContextMinimal,
+	ResultType extends BaseType = BaseType,
+>(options: UmbConsumeOptions<BaseType, ResultType>): ConsumeDecorator<ResultType> {
+	const { context, callback, subscribe = true } = options;
+
+	return ((protoOrTarget: any, nameOrContext: PropertyKey | ClassAccessorDecoratorContext<any, ResultType>) => {
+		if (typeof nameOrContext === 'object') {
+			setupStandardDecorator(protoOrTarget, nameOrContext, context, callback, subscribe);
+			return;
+		}
+
+		setupLegacyDecorator(protoOrTarget, nameOrContext as string, context, callback, subscribe);
+	}) as ConsumeDecorator<ResultType>;
+}
+
+/**
+ * Sets up a standard decorator (Stage 3 TC39 proposal) for auto-accessors.
+ * This branch is used when decorating with the 'accessor' keyword.
+ * Example: @consumeContext({context: TOKEN}) accessor myProp?: Type;
+ *
+ * The decorator receives a ClassAccessorDecoratorContext object which provides
+ * addInitializer() to run code during class construction.
+ *
+ * This is the modern, standardized decorator API that will be the standard
+ * when Lit 4.x is released.
+ *
+ * Note: Standard decorators currently don't work with @state()/@property()
+ * decorators, which is why we still need the legacy branch.
+ */
+function setupStandardDecorator<BaseType extends UmbContextMinimal, ResultType extends BaseType>(
+	protoOrTarget: any,
+	decoratorContext: ClassAccessorDecoratorContext<any, ResultType>,
+	context: string | UmbContextToken<BaseType, ResultType>,
+	callback: UmbContextCallback<ResultType> | undefined,
+	subscribe: boolean,
+): void {
+	if (!('addInitializer' in decoratorContext)) {
+		console.warn(
+			'@consumeContext decorator: Standard decorator context does not support addInitializer. ' +
+				'This should not happen with modern decorators.',
+		);
+		return;
+	}
+
+	decoratorContext.addInitializer(function () {
+		queueMicrotask(() => {
+			if (subscribe) {
+				// Continuous subscription - stays active and updates property on context changes
+				new UmbContextConsumerController(this, context, (value) => {
+					protoOrTarget.set.call(this, value);
+					callback?.(value);
+				});
+			} else {
+				// One-time consumption - uses asPromise() to get the value once and then cleans up
+				const controller = new UmbContextConsumerController(this, context, callback);
+				controller.asPromise().then((value) => {
+					protoOrTarget.set.call(this, value);
+				});
+			}
+		});
+	});
+}
+
+/**
+ * Sets up a legacy decorator (TypeScript experimental) for regular properties.
+ * This branch is used when decorating without the 'accessor' keyword.
+ * Example: @consumeContext({context: TOKEN}) @state() myProp?: Type;
+ *
+ * The decorator receives:
+ * - protoOrTarget: The class prototype
+ * - propertyKey: The property name (string)
+ *
+ * This is the older TypeScript experimental decorator API, still widely used
+ * in Umbraco because it works with @state() and @property() decorators.
+ * The 'accessor' keyword is not compatible with these decorators yet.
+ *
+ * We support three initialization strategies:
+ * 1. addInitializer (if available, e.g., on LitElement classes)
+ * 2. hostConnected wrapper (for UmbController classes)
+ * 3. Warning (if neither is available)
+ */
+function setupLegacyDecorator<BaseType extends UmbContextMinimal, ResultType extends BaseType>(
+	protoOrTarget: any,
+	propertyKey: string,
+	context: string | UmbContextToken<BaseType, ResultType>,
+	callback: UmbContextCallback<ResultType> | undefined,
+	subscribe: boolean,
+): void {
+	const constructor = protoOrTarget.constructor as any;
+
+	// Strategy 1: Use addInitializer if available (LitElement classes)
+	if (constructor.addInitializer) {
+		constructor.addInitializer((element: any): void => {
+			queueMicrotask(() => {
+				if (subscribe) {
+					// Continuous subscription
+					new UmbContextConsumerController(element, context, (value) => {
+						element[propertyKey] = value;
+						callback?.(value);
+					});
+				} else {
+					// One-time consumption using asPromise()
+					const controller = new UmbContextConsumerController(element, context, callback);
+					controller.asPromise().then((value) => {
+						element[propertyKey] = value;
+					});
+				}
+			});
+		});
+		return;
+	}
+
+	// Strategy 2: Wrap hostConnected for UmbController classes without addInitializer
+	if ('hostConnected' in protoOrTarget && typeof protoOrTarget.hostConnected === 'function') {
+		const originalHostConnected = protoOrTarget.hostConnected;
+
+		protoOrTarget.hostConnected = function (this: any) {
+			// Set up consumer once, using a flag to prevent multiple setups
+			if (!this.__consumeControllers) {
+				this.__consumeControllers = new Map();
+			}
+
+			if (!this.__consumeControllers.has(propertyKey)) {
+				if (subscribe) {
+					// Continuous subscription
+					const controller = new UmbContextConsumerController(this, context, (value) => {
+						this[propertyKey] = value;
+						callback?.(value);
+					});
+					this.__consumeControllers.set(propertyKey, controller);
+				} else {
+					// One-time consumption using asPromise()
+					const controller = new UmbContextConsumerController(this, context, callback);
+					controller.asPromise().then((value) => {
+						this[propertyKey] = value;
+					});
+					// Don't store in map since it cleans itself up
+				}
+			}
+
+			// Call original hostConnected if it exists
+			originalHostConnected?.call(this);
+		};
+		return;
+	}
+
+	// Strategy 3: No supported initialization method available
+	console.warn(
+		`@consumeContext applied to ${constructor.name}.${propertyKey} but neither addInitializer nor hostConnected is available. ` +
+			`Make sure the class extends UmbLitElement, UmbControllerBase, or implements UmbController with hostConnected.`,
+	);
+}
+
+/**
+ * Generates a public interface type that removes private and protected fields.
+ * This allows accepting otherwise incompatible versions of the type (e.g. from
+ * multiple copies of the same package in `node_modules`).
+ */
+type Interface<T> = {
+	[K in keyof T]: T[K];
+};
+
+declare class ReactiveElement {
+	static addInitializer?: (initializer: (instance: any) => void) => void;
+}
+
+declare class ReactiveController {
+	hostConnected?: () => void;
+}
+
+/**
+ * A type representing the base class of which the decorator should work
+ * requiring either addInitializer (UmbLitElement) or hostConnected (UmbController).
+ */
+type ReactiveEntity = ReactiveElement | ReactiveController;
+
+type ConsumeDecorator<ValueType> = {
+	// legacy
+	<K extends PropertyKey, Proto extends Interface<ReactiveEntity>>(
+		protoOrDescriptor: Proto,
+		name?: K,
+	): FieldMustMatchProvidedType<Proto, K, ValueType>;
+
+	// standard
+	<C extends Interface<ReactiveEntity>, V extends ValueType>(
+		value: ClassAccessorDecoratorTarget<C, V>,
+		context: ClassAccessorDecoratorContext<C, V>,
+	): void;
+};
+
+// Note TypeScript requires the return type of a decorator to be `void | any`
+type DecoratorReturn = void | any;
+
+type FieldMustMatchProvidedType<Obj, Key extends PropertyKey, ProvidedType> =
+	// First we check whether the object has the property as a required field
+	Obj extends Record<Key, infer ConsumingType>
+		? // Ok, it does, just check whether it's ok to assign the
+			// provided type to the consuming field
+			[ProvidedType] extends [ConsumingType]
+			? DecoratorReturn
+			: {
+					message: 'provided type not assignable to consuming field';
+					provided: ProvidedType;
+					consuming: ConsumingType;
+				}
+		: // Next we check whether the object has the property as an optional field
+			Obj extends Partial<Record<Key, infer ConsumingType>>
+			? // Check assignability again. Note that we have to include undefined
+				// here on the consuming type because it's optional.
+				[ProvidedType] extends [ConsumingType | undefined]
+				? DecoratorReturn
+				: {
+						message: 'provided type not assignable to consuming field';
+						provided: ProvidedType;
+						consuming: ConsumingType | undefined;
+					}
+			: // Ok, the field isn't present, so either someone's using consume
+				// manually, i.e. not as a decorator (maybe don't do that! but if you do,
+				// you're on your own for your type checking, sorry), or the field is
+				// private, in which case we can't check it.
+				DecoratorReturn;
diff --git a/src/Umbraco.Web.UI.Client/src/libs/context-api/consume/context-consumer.ts b/src/Umbraco.Web.UI.Client/src/libs/context-api/consume/context-consumer.ts
index bcc6ded36097..4372b6937792 100644
--- a/src/Umbraco.Web.UI.Client/src/libs/context-api/consume/context-consumer.ts
+++ b/src/Umbraco.Web.UI.Client/src/libs/context-api/consume/context-consumer.ts
@@ -191,13 +191,21 @@ export class UmbContextConsumer<
 			cancelAnimationFrame(this.#raf);
 		}
 
+		const hostElement = this._retrieveHost();
+
+		// Add connection check to prevent requesting on disconnected elements
+		if (hostElement && !hostElement.isConnected) {
+			console.warn('UmbContextConsumer: Attempting to request context on disconnected element', hostElement);
+			return;
+		}
+
 		const event = new UmbContextRequestEventImplementation(
 			this.#contextAlias,
 			this.#apiAlias,
 			this._onResponse,
 			this.#stopAtContextMatch,
 		);
-		(this.#skipHost ? this._retrieveHost()?.parentNode : this._retrieveHost())?.dispatchEvent(event);
+		(this.#skipHost ? hostElement?.parentNode : hostElement)?.dispatchEvent(event);
 
 		if (this.#promiseResolver && this.#promiseOptions?.preventTimeout !== true) {
 			this.#raf = requestAnimationFrame(() => {
diff --git a/src/Umbraco.Web.UI.Client/src/libs/context-api/consume/index.ts b/src/Umbraco.Web.UI.Client/src/libs/context-api/consume/index.ts
index bc1302658ce4..0f2ec13c2050 100644
--- a/src/Umbraco.Web.UI.Client/src/libs/context-api/consume/index.ts
+++ b/src/Umbraco.Web.UI.Client/src/libs/context-api/consume/index.ts
@@ -1,3 +1,4 @@
+export * from './context-consume.decorator.js';
 export * from './context-consumer.controller.js';
 export * from './context-consumer.js';
 export * from './context-request.event.js';
diff --git a/src/Umbraco.Web.UI.Client/src/libs/context-api/provide/context-provide.decorator.test.ts b/src/Umbraco.Web.UI.Client/src/libs/context-api/provide/context-provide.decorator.test.ts
new file mode 100644
index 000000000000..9965e827237b
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/libs/context-api/provide/context-provide.decorator.test.ts
@@ -0,0 +1,111 @@
+import { UmbContextToken } from '../token/context-token.js';
+import type { UmbContextMinimal } from '../types.js';
+import { provideContext } from './context-provide.decorator.js';
+import { aTimeout, elementUpdated, expect, fixture } from '@open-wc/testing';
+import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element';
+import { UmbControllerBase } from '@umbraco-cms/backoffice/class-api';
+
+class UmbTestContextConsumerClass implements UmbContextMinimal {
+	public prop: string;
+
+	constructor(initialValue = 'value from provider') {
+		this.prop = initialValue;
+	}
+
+	getHostElement() {
+		return document.body;
+	}
+}
+
+const testToken = new UmbContextToken<UmbTestContextConsumerClass>('my-test-context', 'testApi');
+
+class MyTestRootElement extends UmbLitElement {
+	@provideContext({ context: testToken })
+	providerInstance = new UmbTestContextConsumerClass();
+}
+
+customElements.define('my-provide-test-element', MyTestRootElement);
+
+class MyTestElement extends UmbLitElement {
+	contextValue?: UmbTestContextConsumerClass;
+
+	constructor() {
+		super();
+
+		this.consumeContext(testToken, (value) => {
+			this.contextValue = value;
+		});
+	}
+}
+
+customElements.define('my-consume-test-element', MyTestElement);
+
+describe('@provide decorator', () => {
+	let rootElement: MyTestRootElement;
+	let element: MyTestElement;
+
+	beforeEach(async () => {
+		rootElement = await fixture<MyTestRootElement>(
+			`<my-provide-test-element><my-consume-test-element></my-consume-test-element></my-provide-test-element>`,
+		);
+		element = rootElement.querySelector('my-consume-test-element') as MyTestElement;
+	});
+
+	afterEach(() => {});
+
+	it('should receive a context value when provided on the host', () => {
+		expect(element.contextValue).to.equal(rootElement.providerInstance);
+	});
+
+	it('should work when the decorator is used in a controller', async () => {
+		class MyController extends UmbControllerBase {
+			@provideContext({ context: testToken })
+			providerInstance = new UmbTestContextConsumerClass('new value');
+		}
+
+		const controller = new MyController(element);
+
+		await elementUpdated(element);
+
+		expect(element.contextValue).to.equal(controller.providerInstance);
+		expect(controller.providerInstance.prop).to.equal('new value');
+	});
+
+	it('should not update the instance when the property changes', async () => {
+		// we do not support setting a new value on a provided property
+		// as it would require a lot more logic to handle updating the context consumers
+		// So for now we just warn the user that this is not supported
+		// This might be revisited in the future if there is a need for it
+
+		const originalProviderInstance = rootElement.providerInstance;
+
+		const newProviderInstance = new UmbTestContextConsumerClass('new value from provider');
+		rootElement.providerInstance = newProviderInstance;
+
+		await aTimeout(0);
+
+		expect(element.contextValue).to.equal(originalProviderInstance);
+		expect(element.contextValue?.prop).to.equal(originalProviderInstance.prop);
+	});
+
+	it('should update the context value when the provider instance is replaced', async () => {
+		const newProviderInstance = new UmbTestContextConsumerClass();
+		newProviderInstance.prop = 'new value from provider';
+
+		class MyUpdateTestElement extends UmbLitElement {
+			@provideContext({ context: testToken })
+			providerInstance = newProviderInstance;
+		}
+		customElements.define('my-update-provide-test-element', MyUpdateTestElement);
+
+		const newProvider = await fixture<MyUpdateTestElement>(
+			`<my-update-provide-test-element><my-consume-test-element></my-consume-test-element></my-update-provide-test-element>`,
+		);
+		const element = newProvider.querySelector('my-consume-test-element') as MyTestElement;
+
+		await elementUpdated(element);
+
+		expect(element.contextValue).to.equal(newProviderInstance);
+		expect(element.contextValue?.prop).to.equal(newProviderInstance.prop);
+	});
+});
diff --git a/src/Umbraco.Web.UI.Client/src/libs/context-api/provide/context-provide.decorator.ts b/src/Umbraco.Web.UI.Client/src/libs/context-api/provide/context-provide.decorator.ts
new file mode 100644
index 000000000000..621009856209
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/libs/context-api/provide/context-provide.decorator.ts
@@ -0,0 +1,258 @@
+/*
+ * Portions of this code are adapted from @lit/context
+ * Copyright 2017 Google LLC
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
+ * Original source: https://github.com/lit/lit/tree/main/packages/context
+ *
+ * @license BSD-3-Clause
+ */
+
+/* eslint-disable @typescript-eslint/no-explicit-any */
+import type { UmbContextToken } from '../token/index.js';
+import type { UmbContextMinimal } from '../types.js';
+import { UmbContextProviderController } from './context-provider.controller.js';
+
+export interface UmbProvideOptions<BaseType extends UmbContextMinimal, ResultType extends BaseType> {
+	context: string | UmbContextToken<BaseType, ResultType>;
+}
+
+/**
+ * A property decorator that creates an UmbContextProviderController to provide
+ * a context value to child elements via the Umbraco Context API.
+ *
+ * This decorator supports both modern "standard" decorators (Stage 3 TC39 proposal) and
+ * legacy TypeScript experimental decorators for backward compatibility.
+ *
+ * The provider is created once during initialization with the property's initial value.
+ * To update the provided value dynamically, keep a state inside the provided context instance
+ * and update that state as needed. The context instance itself should remain the same.
+ * You can use any of the Umb{*}State classes.
+ *
+ * @param {UmbProvideOptions} options Configuration object containing the context token
+ *
+ * @example
+ * ```ts
+ * import {provideContext} from '@umbraco-cms/backoffice/context-api';
+ * import {UMB_WORKSPACE_CONTEXT} from './workspace.context-token.js';
+ *
+ * class MyWorkspaceElement extends UmbLitElement {
+ *   // Standard decorators - requires 'accessor' keyword
+ *   @provideContext({context: UMB_WORKSPACE_CONTEXT})
+ *   accessor workspaceContext = new UmbWorkspaceContext(this);
+ *
+ *   // Legacy decorators - works without 'accessor'
+ *   @provideContext({context: UMB_WORKSPACE_CONTEXT})
+ *   workspaceContext = new UmbWorkspaceContext(this);
+ * }
+ * ```
+ *
+ * @example
+ * ```ts
+ * // For dynamic updates, store the state inside the context instance
+ * class MyContext extends UmbControllerBase {
+ *   someProperty = new UmbStringState('initial value');
+ * }
+ *
+ * class MyElement extends UmbLitElement {
+ *   @provideContext({context: MY_CONTEXT})
+ *   private _myContext = new MyContext(this);
+ *
+ *   updateValue(newValue: string) {
+ *     this._myContext.someProperty.setValue(newValue);
+ *   }
+ * }
+ * ```
+ *
+ * @returns {ProvideDecorator<InstanceType>} A property decorator function
+ */
+export function provideContext<
+	BaseType extends UmbContextMinimal = UmbContextMinimal,
+	ResultType extends BaseType = BaseType,
+	InstanceType extends ResultType = ResultType,
+>(options: UmbProvideOptions<BaseType, ResultType>): ProvideDecorator<InstanceType> {
+	const { context } = options;
+
+	return ((
+		protoOrTarget: any,
+		nameOrContext: PropertyKey | ClassAccessorDecoratorContext<any, InstanceType>,
+	): void | any => {
+		if (typeof nameOrContext === 'object') {
+			return setupStandardDecorator(protoOrTarget, context);
+		}
+
+		setupLegacyDecorator(protoOrTarget, nameOrContext as string, context);
+	}) as ProvideDecorator<ResultType>;
+}
+
+/**
+ * Sets up a standard decorator (Stage 3 TC39 proposal) for auto-accessors.
+ * This branch is used when decorating with the 'accessor' keyword.
+ * Example: @provideContext({context: TOKEN}) accessor myProp = new MyContext();
+ *
+ * The decorator receives a ClassAccessorDecoratorContext object and returns
+ * an accessor descriptor that intercepts the property initialization.
+ *
+ * This is the modern, standardized decorator API that will be the standard
+ * when Lit 4.x is released.
+ *
+ * Note: Standard decorators currently don't work with @state()/@property()
+ * decorators, which is why we still need the legacy branch.
+ */
+function setupStandardDecorator<
+	BaseType extends UmbContextMinimal,
+	ResultType extends BaseType,
+	InstanceType extends ResultType,
+>(protoOrTarget: any, context: string | UmbContextToken<BaseType, ResultType>) {
+	return {
+		get(this: any) {
+			return protoOrTarget.get.call(this);
+		},
+		set(this: any, value: InstanceType) {
+			return protoOrTarget.set.call(this, value);
+		},
+		init(this: any, value: InstanceType) {
+			// Defer controller creation to avoid timing issues with private fields
+			queueMicrotask(() => {
+				new UmbContextProviderController<BaseType, ResultType, InstanceType>(this, context, value);
+			});
+			return value;
+		},
+	};
+}
+
+/**
+ * Sets up a legacy decorator (TypeScript experimental) for regular properties.
+ * This branch is used when decorating without the 'accessor' keyword.
+ * Example: @provideContext({context: TOKEN}) myProp = new MyContext();
+ *
+ * The decorator receives:
+ * - protoOrTarget: The class prototype
+ * - propertyKey: The property name (string)
+ *
+ * This is the older TypeScript experimental decorator API, still widely used
+ * in Umbraco because it works with @state() and @property() decorators.
+ * The 'accessor' keyword is not compatible with these decorators yet.
+ *
+ * We support three initialization strategies:
+ * 1. addInitializer (if available, e.g., on LitElement classes)
+ * 2. hostConnected wrapper (for UmbController classes)
+ * 3. Warning (if neither is available)
+ */
+function setupLegacyDecorator<
+	BaseType extends UmbContextMinimal,
+	ResultType extends BaseType,
+	InstanceType extends ResultType,
+>(protoOrTarget: any, propertyKey: string, context: string | UmbContextToken<BaseType, ResultType>): void {
+	const constructor = protoOrTarget.constructor as any;
+
+	// Strategy 1: Use addInitializer if available (LitElement classes)
+	if (constructor.addInitializer) {
+		constructor.addInitializer((element: any): void => {
+			// Defer controller creation to avoid timing issues with private fields
+			queueMicrotask(() => {
+				const initialValue = element[propertyKey];
+				new UmbContextProviderController<BaseType, ResultType, InstanceType>(element, context, initialValue);
+			});
+		});
+		return;
+	}
+
+	// Strategy 2: Wrap hostConnected for UmbController classes without addInitializer
+	if ('hostConnected' in protoOrTarget && typeof protoOrTarget.hostConnected === 'function') {
+		const originalHostConnected = protoOrTarget.hostConnected;
+
+		protoOrTarget.hostConnected = function (this: any) {
+			// Set up provider once, using a flag to prevent multiple setups
+			if (!this.__provideControllers) {
+				this.__provideControllers = new Map();
+			}
+
+			if (!this.__provideControllers.has(propertyKey)) {
+				const initialValue = this[propertyKey];
+				new UmbContextProviderController<BaseType, ResultType, InstanceType>(this, context, initialValue);
+				// Mark as set up to prevent duplicate providers
+				this.__provideControllers.set(propertyKey, true);
+			}
+
+			// Call original hostConnected if it exists
+			originalHostConnected?.call(this);
+		};
+		return;
+	}
+
+	// Strategy 3: No supported initialization method available
+	console.warn(
+		`@provideContext applied to ${constructor.name}.${propertyKey} but neither addInitializer nor hostConnected is available. ` +
+			`Make sure the class extends UmbLitElement, UmbControllerBase, or implements UmbController with hostConnected.`,
+	);
+}
+
+/**
+ * Generates a public interface type that removes private and protected fields.
+ * This allows accepting otherwise compatible versions of the type (e.g. from
+ * multiple copies of the same package in `node_modules`).
+ */
+type Interface<T> = {
+	[K in keyof T]: T[K];
+};
+
+declare class ReactiveElement {
+	static addInitializer?: (initializer: (instance: any) => void) => void;
+}
+
+declare class ReactiveController {
+	hostConnected?: () => void;
+}
+
+/**
+ * A type representing the base class of which the decorator should work
+ * requiring either addInitializer (UmbLitElement) or hostConnected (UmbController).
+ */
+type ReactiveEntity = ReactiveElement | ReactiveController;
+
+type ProvideDecorator<ContextType> = {
+	// legacy
+	<K extends PropertyKey, Proto extends Interface<ReactiveEntity>>(
+		protoOrDescriptor: Proto,
+		name?: K,
+	): FieldMustMatchContextType<Proto, K, ContextType>;
+
+	// standard
+	<C extends Interface<ReactiveEntity>, V extends ContextType>(
+		value: ClassAccessorDecoratorTarget<C, V>,
+		context: ClassAccessorDecoratorContext<C, V>,
+	): void;
+};
+
+// Note TypeScript requires the return type of a decorator to be `void | any`
+type DecoratorReturn = void | any;
+
+type FieldMustMatchContextType<Obj, Key extends PropertyKey, ContextType> =
+	// First we check whether the object has the property as a required field
+	Obj extends Record<Key, infer ProvidingType>
+		? // Ok, it does, just check whether it's ok to assign the
+			// provided type to the consuming field
+			[ProvidingType] extends [ContextType]
+			? DecoratorReturn
+			: {
+					message: 'providing field not assignable to context';
+					context: ContextType;
+					provided: ProvidingType;
+				}
+		: // Next we check whether the object has the property as an optional field
+			Obj extends Partial<Record<Key, infer Providing>>
+			? // Check assignability again. Note that we have to include undefined
+				// here on the providing type because it's optional.
+				[Providing | undefined] extends [ContextType]
+				? DecoratorReturn
+				: {
+						message: 'providing field not assignable to context';
+						context: ContextType;
+						consuming: Providing | undefined;
+					}
+			: // Ok, the field isn't present, so either someone's using provide
+				// manually, i.e. not as a decorator (maybe don't do that! but if you do,
+				// you're on your own for your type checking, sorry), or the field is
+				// private, in which case we can't check it.
+				DecoratorReturn;
diff --git a/src/Umbraco.Web.UI.Client/src/libs/context-api/provide/index.ts b/src/Umbraco.Web.UI.Client/src/libs/context-api/provide/index.ts
index 3690c440fd8e..ecad303f1961 100644
--- a/src/Umbraco.Web.UI.Client/src/libs/context-api/provide/index.ts
+++ b/src/Umbraco.Web.UI.Client/src/libs/context-api/provide/index.ts
@@ -1,3 +1,4 @@
+export * from './context-provide.decorator.js';
 export * from './context-boundary.js';
 export * from './context-boundary.controller.js';
 export * from './context-provide.event.js';
diff --git a/src/Umbraco.Web.UI.Client/src/mocks/data/log-viewer.data.ts b/src/Umbraco.Web.UI.Client/src/mocks/data/log-viewer.data.ts
index fa179f05e791..96872fa203a9 100644
--- a/src/Umbraco.Web.UI.Client/src/mocks/data/log-viewer.data.ts
+++ b/src/Umbraco.Web.UI.Client/src/mocks/data/log-viewer.data.ts
@@ -44,7 +44,7 @@ class UmbLogViewerMessagesData extends UmbMockDBBase<LogMessageResponseModel> {
 	}
 
 	getLevelCount() {
-		const levels = this.data.map((log) => log.level ?? 'unknown');
+		const levels = this.data.map((log) => log.level?.toLowerCase() ?? 'unknown');
 		const counts = {};
 		levels.forEach((level: string) => {
 			//eslint-disable-next-line @typescript-eslint/ban-ts-comment
diff --git a/src/Umbraco.Web.UI.Client/src/packages/log-viewer/components/log-viewer-date-range-selector.element.ts b/src/Umbraco.Web.UI.Client/src/packages/log-viewer/components/log-viewer-date-range-selector.element.ts
index e07e40afd4e4..71d6c6c8440e 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/log-viewer/components/log-viewer-date-range-selector.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/log-viewer/components/log-viewer-date-range-selector.element.ts
@@ -1,10 +1,11 @@
-import type { UmbLogViewerDateRange, UmbLogViewerWorkspaceContext } from '../workspace/logviewer-workspace.context.js';
+import type { UmbLogViewerDateRange } from '../workspace/logviewer-workspace.context.js';
 import { UMB_APP_LOG_VIEWER_CONTEXT } from '../workspace/logviewer-workspace.context-token.js';
 import { UmbTextStyles } from '@umbraco-cms/backoffice/style';
 import { css, html, customElement, property, state } from '@umbraco-cms/backoffice/external/lit';
 import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element';
 import { query as getQuery, path, toQueryString } from '@umbraco-cms/backoffice/router';
 import type { UUIInputEvent } from '@umbraco-cms/backoffice/external/uui';
+import { consumeContext } from '@umbraco-cms/backoffice/context-api';
 
 @customElement('umb-log-viewer-date-range-selector')
 export class UmbLogViewerDateRangeSelectorElement extends UmbLitElement {
@@ -17,20 +18,20 @@ export class UmbLogViewerDateRangeSelectorElement extends UmbLitElement {
 	@property({ type: Boolean, reflect: true })
 	horizontal = false;
 
-	#logViewerContext?: UmbLogViewerWorkspaceContext;
+	#logViewerContext?: typeof UMB_APP_LOG_VIEWER_CONTEXT.TYPE;
 
-	constructor() {
-		super();
-		this.consumeContext(UMB_APP_LOG_VIEWER_CONTEXT, (instance) => {
-			this.#logViewerContext = instance;
-			this.#observeStuff();
-		});
+	@consumeContext({ context: UMB_APP_LOG_VIEWER_CONTEXT })
+	private set _logViewerContext(value) {
+		this.#logViewerContext = value;
+		this.#observeStuff();
+	}
+	private get _logViewerContext() {
+		return this.#logViewerContext;
 	}
 
 	#observeStuff() {
-		if (!this.#logViewerContext) return;
 		this.observe(
-			this.#logViewerContext.dateRange,
+			this._logViewerContext?.dateRange,
 			(dateRange: UmbLogViewerDateRange) => {
 				this._startDate = dateRange.startDate;
 				this._endDate = dateRange.endDate;
@@ -50,7 +51,7 @@ export class UmbLogViewerDateRangeSelectorElement extends UmbLitElement {
 	}
 
 	#updateFiltered() {
-		this.#logViewerContext?.setDateRange({ startDate: this._startDate, endDate: this._endDate });
+		this._logViewerContext?.setDateRange({ startDate: this._startDate, endDate: this._endDate });
 
 		const query = getQuery();
 		const qs = toQueryString({
@@ -71,7 +72,7 @@ export class UmbLogViewerDateRangeSelectorElement extends UmbLitElement {
 					id="start-date"
 					type="date"
 					label="From"
-					.max=${this.#logViewerContext?.today ?? ''}
+					.max=${this._logViewerContext?.today ?? ''}
 					.value=${this._startDate}></umb-input-date>
 			</div>
 			<div class="input-container">
@@ -82,7 +83,7 @@ export class UmbLogViewerDateRangeSelectorElement extends UmbLitElement {
 					type="date"
 					label="To"
 					.min=${this._startDate}
-					.max=${this.#logViewerContext?.today ?? ''}
+					.max=${this._logViewerContext?.today ?? ''}
 					.value=${this._endDate}></umb-input-date>
 			</div>
 		`;
diff --git a/src/Umbraco.Web.UI.Client/src/packages/log-viewer/workspace/views/overview/components/log-viewer-log-level-overview.element.ts b/src/Umbraco.Web.UI.Client/src/packages/log-viewer/workspace/views/overview/components/log-viewer-log-level-overview.element.ts
index ee03bf2a66d3..4fff8dedcc6a 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/log-viewer/workspace/views/overview/components/log-viewer-log-level-overview.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/log-viewer/workspace/views/overview/components/log-viewer-log-level-overview.element.ts
@@ -1,23 +1,26 @@
-import type { UmbLogViewerWorkspaceContext } from '../../../logviewer-workspace.context.js';
 import { UMB_APP_LOG_VIEWER_CONTEXT } from '../../../logviewer-workspace.context-token.js';
 import { html, nothing, customElement, property, state } from '@umbraco-cms/backoffice/external/lit';
 import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element';
 import type { LoggerResponseModel } from '@umbraco-cms/backoffice/external/backend-api';
+import { consumeContext } from '@umbraco-cms/backoffice/context-api';
 
 @customElement('umb-log-viewer-log-level-overview')
 export class UmbLogViewerLogLevelOverviewElement extends UmbLitElement {
-	#logViewerContext?: UmbLogViewerWorkspaceContext;
-	constructor() {
-		super();
-		this.consumeContext(UMB_APP_LOG_VIEWER_CONTEXT, (instance) => {
-			this.#logViewerContext = instance;
-			this.#logViewerContext?.getSavedSearches();
-			this.#observeLogLevels();
-		});
+	#logViewerContext?: typeof UMB_APP_LOG_VIEWER_CONTEXT.TYPE;
+
+	@consumeContext({ context: UMB_APP_LOG_VIEWER_CONTEXT })
+	private set _logViewerContext(value) {
+		this.#logViewerContext = value;
+		this.#logViewerContext?.getSavedSearches();
+		this.#observeLogLevels();
+	}
+	private get _logViewerContext() {
+		return this.#logViewerContext;
 	}
 
 	@state()
 	private _loggers: LoggerResponseModel[] = [];
+
 	/**
 	 * The name of the logger to get the level for. Defaults to 'Global'.
 	 * @memberof UmbLogViewerLogLevelOverviewElement
@@ -26,8 +29,7 @@ export class UmbLogViewerLogLevelOverviewElement extends UmbLitElement {
 	loggerName = 'Global';
 
 	#observeLogLevels() {
-		if (!this.#logViewerContext) return;
-		this.observe(this.#logViewerContext.loggers, (loggers) => {
+		this.observe(this._logViewerContext?.loggers, (loggers) => {
 			this._loggers = loggers ?? [];
 		});
 	}
diff --git a/src/Umbraco.Web.UI.Client/src/packages/log-viewer/workspace/views/overview/components/log-viewer-log-types-chart.element.ts b/src/Umbraco.Web.UI.Client/src/packages/log-viewer/workspace/views/overview/components/log-viewer-log-types-chart.element.ts
index fbc61d9b126f..c314fa23e6c2 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/log-viewer/workspace/views/overview/components/log-viewer-log-types-chart.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/log-viewer/workspace/views/overview/components/log-viewer-log-types-chart.element.ts
@@ -1,19 +1,21 @@
-import type { UmbLogViewerWorkspaceContext } from '../../../logviewer-workspace.context.js';
 import { UMB_APP_LOG_VIEWER_CONTEXT } from '../../../logviewer-workspace.context-token.js';
 import { css, html, customElement, state } from '@umbraco-cms/backoffice/external/lit';
 import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element';
 import type { LogLevelCountsReponseModel } from '@umbraco-cms/backoffice/external/backend-api';
+import { consumeContext } from '@umbraco-cms/backoffice/context-api';
 
 @customElement('umb-log-viewer-log-types-chart')
 export class UmbLogViewerLogTypesChartElement extends UmbLitElement {
-	#logViewerContext?: UmbLogViewerWorkspaceContext;
-	constructor() {
-		super();
-		this.consumeContext(UMB_APP_LOG_VIEWER_CONTEXT, (instance) => {
-			this.#logViewerContext = instance;
-			this.#logViewerContext?.getLogCount();
-			this.#observeStuff();
-		});
+	#logViewerContext?: typeof UMB_APP_LOG_VIEWER_CONTEXT.TYPE;
+
+	@consumeContext({ context: UMB_APP_LOG_VIEWER_CONTEXT })
+	private set _logViewerContext(value) {
+		this.#logViewerContext = value;
+		this.#logViewerContext?.getLogCount();
+		this.#observeStuff();
+	}
+	private get _logViewerContext() {
+		return this.#logViewerContext;
 	}
 
 	@state()
@@ -47,8 +49,7 @@ export class UmbLogViewerLogTypesChartElement extends UmbLitElement {
 	}
 
 	#observeStuff() {
-		if (!this.#logViewerContext) return;
-		this.observe(this.#logViewerContext.logCount, (logLevel) => {
+		this.observe(this._logViewerContext?.logCount, (logLevel) => {
 			this._logLevelCountResponse = logLevel ?? null;
 			this.setLogLevelCount();
 		});
diff --git a/src/Umbraco.Web.UI.Client/src/packages/log-viewer/workspace/views/overview/components/log-viewer-message-templates-overview.element.ts b/src/Umbraco.Web.UI.Client/src/packages/log-viewer/workspace/views/overview/components/log-viewer-message-templates-overview.element.ts
index 41dfc298c6c6..35c00a5fe501 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/log-viewer/workspace/views/overview/components/log-viewer-message-templates-overview.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/log-viewer/workspace/views/overview/components/log-viewer-message-templates-overview.element.ts
@@ -1,10 +1,10 @@
-import type { UmbLogViewerWorkspaceContext } from '../../../logviewer-workspace.context.js';
 import { UMB_APP_LOG_VIEWER_CONTEXT } from '../../../logviewer-workspace.context-token.js';
 import { UmbTextStyles } from '@umbraco-cms/backoffice/style';
 import { css, html, customElement, state, nothing } from '@umbraco-cms/backoffice/external/lit';
 import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element';
 import type { LogTemplateResponseModel } from '@umbraco-cms/backoffice/external/backend-api';
 import type { UUIPaginationEvent } from '@umbraco-cms/backoffice/external/uui';
+import { consumeContext } from '@umbraco-cms/backoffice/context-api';
 
 @customElement('umb-log-viewer-message-templates-overview')
 export class UmbLogViewerMessageTemplatesOverviewElement extends UmbLitElement {
@@ -17,19 +17,20 @@ export class UmbLogViewerMessageTemplatesOverviewElement extends UmbLitElement {
 	@state()
 	private _messageTemplates: Array<LogTemplateResponseModel> = [];
 
-	#logViewerContext?: UmbLogViewerWorkspaceContext;
-	constructor() {
-		super();
-		this.consumeContext(UMB_APP_LOG_VIEWER_CONTEXT, (instance) => {
-			this.#logViewerContext = instance;
-			this.#logViewerContext?.getMessageTemplates(0, this.#itemsPerPage);
-			this.#observeStuff();
-		});
+	#logViewerContext?: typeof UMB_APP_LOG_VIEWER_CONTEXT.TYPE;
+
+	@consumeContext({ context: UMB_APP_LOG_VIEWER_CONTEXT })
+	private set _logViewerContext(value) {
+		this.#logViewerContext = value;
+		this.#getMessageTemplates();
+		this.#observeStuff();
+	}
+	private get _logViewerContext() {
+		return this.#logViewerContext;
 	}
 
 	#observeStuff() {
-		if (!this.#logViewerContext) return;
-		this.observe(this.#logViewerContext.messageTemplates, (templates) => {
+		this.observe(this._logViewerContext?.messageTemplates, (templates) => {
 			this._messageTemplates = templates?.items ?? [];
 			this._total = templates?.total ?? 0;
 		});
@@ -37,7 +38,7 @@ export class UmbLogViewerMessageTemplatesOverviewElement extends UmbLitElement {
 
 	#getMessageTemplates() {
 		const skip = this.#currentPage * this.#itemsPerPage - this.#itemsPerPage;
-		this.#logViewerContext?.getMessageTemplates(skip, this.#itemsPerPage);
+		this._logViewerContext?.getMessageTemplates(skip, this.#itemsPerPage);
 	}
 
 	#onChangePage(event: UUIPaginationEvent) {
diff --git a/src/Umbraco.Web.UI.Client/src/packages/log-viewer/workspace/views/overview/components/log-viewer-saved-searches-overview.element.ts b/src/Umbraco.Web.UI.Client/src/packages/log-viewer/workspace/views/overview/components/log-viewer-saved-searches-overview.element.ts
index beb1753f6191..226a3676f06b 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/log-viewer/workspace/views/overview/components/log-viewer-saved-searches-overview.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/log-viewer/workspace/views/overview/components/log-viewer-saved-searches-overview.element.ts
@@ -1,10 +1,10 @@
-import type { UmbLogViewerWorkspaceContext } from '../../../logviewer-workspace.context.js';
 import { UMB_APP_LOG_VIEWER_CONTEXT } from '../../../logviewer-workspace.context-token.js';
 import { UmbTextStyles } from '@umbraco-cms/backoffice/style';
 import { css, html, customElement, state, nothing } from '@umbraco-cms/backoffice/external/lit';
 import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element';
 import type { SavedLogSearchResponseModel } from '@umbraco-cms/backoffice/external/backend-api';
 import type { UUIPaginationEvent } from '@umbraco-cms/backoffice/external/uui';
+import { consumeContext } from '@umbraco-cms/backoffice/context-api';
 
 @customElement('umb-log-viewer-saved-searches-overview')
 export class UmbLogViewerSavedSearchesOverviewElement extends UmbLitElement {
@@ -17,20 +17,20 @@ export class UmbLogViewerSavedSearchesOverviewElement extends UmbLitElement {
 	@state()
 	private _total = 0;
 
-	#logViewerContext?: UmbLogViewerWorkspaceContext;
+	#logViewerContext?: typeof UMB_APP_LOG_VIEWER_CONTEXT.TYPE;
 
-	constructor() {
-		super();
-		this.consumeContext(UMB_APP_LOG_VIEWER_CONTEXT, (instance) => {
-			this.#logViewerContext = instance;
-			this.#logViewerContext?.getSavedSearches({ skip: 0, take: this.#itemsPerPage });
-			this.#observeStuff();
-		});
+	@consumeContext({ context: UMB_APP_LOG_VIEWER_CONTEXT })
+	private set _logViewerContext(value) {
+		this.#logViewerContext = value;
+		this.#getSavedSearches();
+		this.#observeStuff();
+	}
+	private get _logViewerContext() {
+		return this.#logViewerContext;
 	}
 
 	#observeStuff() {
-		if (!this.#logViewerContext) return;
-		this.observe(this.#logViewerContext.savedSearches, (savedSearches) => {
+		this.observe(this._logViewerContext?.savedSearches, (savedSearches) => {
 			this._savedSearches = savedSearches?.items ?? [];
 			this._total = savedSearches?.total ?? 0;
 		});
@@ -38,7 +38,7 @@ export class UmbLogViewerSavedSearchesOverviewElement extends UmbLitElement {
 
 	#getSavedSearches() {
 		const skip = this.#currentPage * this.#itemsPerPage - this.#itemsPerPage;
-		this.#logViewerContext?.getSavedSearches({ skip, take: this.#itemsPerPage });
+		this._logViewerContext?.getSavedSearches({ skip, take: this.#itemsPerPage });
 	}
 
 	#onChangePage(event: UUIPaginationEvent) {
diff --git a/src/Umbraco.Web.UI.Client/src/packages/log-viewer/workspace/views/overview/log-overview-view.element.ts b/src/Umbraco.Web.UI.Client/src/packages/log-viewer/workspace/views/overview/log-overview-view.element.ts
index 19ebd64195c0..1c0ec1b9711b 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/log-viewer/workspace/views/overview/log-overview-view.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/log-viewer/workspace/views/overview/log-overview-view.element.ts
@@ -1,7 +1,7 @@
-import type { UmbLogViewerWorkspaceContext } from '../../logviewer-workspace.context.js';
 import { UMB_APP_LOG_VIEWER_CONTEXT } from '../../logviewer-workspace.context-token.js';
 import { css, html, customElement, state } from '@umbraco-cms/backoffice/external/lit';
 import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element';
+import { consumeContext } from '@umbraco-cms/backoffice/context-api';
 
 //TODO: add a disabled attribute to the show more button when the total number of items is correctly returned from the endpoint
 @customElement('umb-log-viewer-overview-view')
@@ -12,28 +12,29 @@ export class UmbLogViewerOverviewViewElement extends UmbLitElement {
 	@state()
 	private _canShowLogs = false;
 
-	#logViewerContext?: UmbLogViewerWorkspaceContext;
-	constructor() {
-		super();
-		this.consumeContext(UMB_APP_LOG_VIEWER_CONTEXT, (instance) => {
-			this.#logViewerContext = instance;
-			this.#observeErrorCount();
-			this.#observeCanShowLogs();
-			this.#logViewerContext?.getLogLevels(0, 100);
-		});
+	#logViewerContext?: typeof UMB_APP_LOG_VIEWER_CONTEXT.TYPE;
+
+	@consumeContext({
+		context: UMB_APP_LOG_VIEWER_CONTEXT,
+	})
+	private set _logViewerContext(value) {
+		this.#logViewerContext = value;
+		this.#observeErrorCount();
+		this.#observeCanShowLogs();
+		value?.getLogLevels(0, 100);
+	}
+	private get _logViewerContext() {
+		return this.#logViewerContext;
 	}
 
 	#observeErrorCount() {
-		if (!this.#logViewerContext) return;
-
-		this.observe(this.#logViewerContext.logCount, (logLevelCount) => {
+		this.observe(this._logViewerContext?.logCount, (logLevelCount) => {
 			this._errorCount = logLevelCount?.error;
 		});
 	}
 
 	#observeCanShowLogs() {
-		if (!this.#logViewerContext) return;
-		this.observe(this.#logViewerContext.canShowLogs, (canShowLogs) => {
+		this.observe(this._logViewerContext?.canShowLogs, (canShowLogs) => {
 			this._canShowLogs = canShowLogs ?? false;
 		});
 	}
diff --git a/src/Umbraco.Web.UI.Client/src/packages/log-viewer/workspace/views/search/components/log-viewer-log-level-filter-menu.element.ts b/src/Umbraco.Web.UI.Client/src/packages/log-viewer/workspace/views/search/components/log-viewer-log-level-filter-menu.element.ts
index 1db43e7f7e1a..f2a69a2d9be8 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/log-viewer/workspace/views/search/components/log-viewer-log-level-filter-menu.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/log-viewer/workspace/views/search/components/log-viewer-log-level-filter-menu.element.ts
@@ -1,4 +1,3 @@
-import type { UmbLogViewerWorkspaceContext } from '../../../logviewer-workspace.context.js';
 import { UMB_APP_LOG_VIEWER_CONTEXT } from '../../../logviewer-workspace.context-token.js';
 import type { UUICheckboxElement } from '@umbraco-cms/backoffice/external/uui';
 import { css, html, customElement, queryAll, state } from '@umbraco-cms/backoffice/external/lit';
@@ -6,6 +5,7 @@ import { debounce } from '@umbraco-cms/backoffice/utils';
 import { LogLevelModel } from '@umbraco-cms/backoffice/external/backend-api';
 import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element';
 import { path, query, toQueryString } from '@umbraco-cms/backoffice/router';
+import { consumeContext } from '@umbraco-cms/backoffice/context-api';
 
 @customElement('umb-log-viewer-log-level-filter-menu')
 export class UmbLogViewerLogLevelFilterMenuElement extends UmbLitElement {
@@ -15,27 +15,24 @@ export class UmbLogViewerLogLevelFilterMenuElement extends UmbLitElement {
 	@state()
 	private _logLevelFilter: LogLevelModel[] = [];
 
-	#logViewerContext?: UmbLogViewerWorkspaceContext;
+	#logViewerContext?: typeof UMB_APP_LOG_VIEWER_CONTEXT.TYPE;
 
-	constructor() {
-		super();
-		this.consumeContext(UMB_APP_LOG_VIEWER_CONTEXT, (instance) => {
-			this.#logViewerContext = instance;
-			this.#observeLogLevelFilter();
-		});
+	@consumeContext({ context: UMB_APP_LOG_VIEWER_CONTEXT })
+	private set _logViewerContext(value) {
+		this.#logViewerContext = value;
+		this.#observeLogLevelFilter();
+	}
+	private get _logViewerContext() {
+		return this.#logViewerContext;
 	}
 
 	#observeLogLevelFilter() {
-		if (!this.#logViewerContext) return;
-
-		this.observe(this.#logViewerContext.logLevelsFilter, (levelsFilter) => {
+		this.observe(this._logViewerContext?.logLevelsFilter, (levelsFilter) => {
 			this._logLevelFilter = levelsFilter ?? [];
 		});
 	}
 
 	#setLogLevel() {
-		if (!this.#logViewerContext) return;
-
 		const logLevels = Array.from(this._logLevelSelectorCheckboxes)
 			.filter((checkbox) => checkbox.checked)
 			.map((checkbox) => checkbox.value as LogLevelModel);
diff --git a/src/Umbraco.Web.UI.Client/src/packages/log-viewer/workspace/views/search/components/log-viewer-messages-list.element.ts b/src/Umbraco.Web.UI.Client/src/packages/log-viewer/workspace/views/search/components/log-viewer-messages-list.element.ts
index c404cc622ec8..3e1bed642ee1 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/log-viewer/workspace/views/search/components/log-viewer-messages-list.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/log-viewer/workspace/views/search/components/log-viewer-messages-list.element.ts
@@ -1,10 +1,10 @@
-import type { UmbLogViewerWorkspaceContext } from '../../../logviewer-workspace.context.js';
 import { UMB_APP_LOG_VIEWER_CONTEXT } from '../../../logviewer-workspace.context-token.js';
 import type { UUIScrollContainerElement, UUIPaginationElement } from '@umbraco-cms/backoffice/external/uui';
 import { css, html, customElement, query, state } from '@umbraco-cms/backoffice/external/lit';
 import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element';
 import type { LogMessageResponseModel } from '@umbraco-cms/backoffice/external/backend-api';
 import { DirectionModel } from '@umbraco-cms/backoffice/external/backend-api';
+import { consumeContext } from '@umbraco-cms/backoffice/context-api';
 
 @customElement('umb-log-viewer-messages-list')
 export class UmbLogViewerMessagesListElement extends UmbLitElement {
@@ -23,46 +23,45 @@ export class UmbLogViewerMessagesListElement extends UmbLitElement {
 	@state()
 	private _isLoading = true;
 
-	#logViewerContext?: UmbLogViewerWorkspaceContext;
+	#logViewerContext?: typeof UMB_APP_LOG_VIEWER_CONTEXT.TYPE;
 
-	constructor() {
-		super();
-		this.consumeContext(UMB_APP_LOG_VIEWER_CONTEXT, (instance) => {
-			this.#logViewerContext = instance;
-			this.#observeLogs();
-		});
+	@consumeContext({ context: UMB_APP_LOG_VIEWER_CONTEXT })
+	private set _logViewerContext(value) {
+		this.#logViewerContext = value;
+		this.#observeLogs();
+	}
+	private get _logViewerContext() {
+		return this.#logViewerContext;
 	}
 
 	#observeLogs() {
-		if (!this.#logViewerContext) return;
-
-		this.observe(this.#logViewerContext.logs, (logs) => {
+		this.observe(this._logViewerContext?.logs, (logs) => {
 			this._logs = logs ?? [];
 		});
 
-		this.observe(this.#logViewerContext.isLoadingLogs, (isLoading) => {
-			this._isLoading = isLoading === null ? this._isLoading : isLoading;
+		this.observe(this._logViewerContext?.isLoadingLogs, (isLoading) => {
+			this._isLoading = isLoading ?? this._isLoading;
 		});
 
-		this.observe(this.#logViewerContext.logsTotal, (total) => {
+		this.observe(this._logViewerContext?.logsTotal, (total) => {
 			this._logsTotal = total ?? 0;
 		});
 
-		this.observe(this.#logViewerContext.sortingDirection, (direction) => {
-			this._sortingDirection = direction;
+		this.observe(this._logViewerContext?.sortingDirection, (direction) => {
+			this._sortingDirection = direction ?? this._sortingDirection;
 		});
 	}
 
 	#sortLogs() {
-		this.#logViewerContext?.toggleSortOrder();
-		this.#logViewerContext?.setCurrentPage(1);
-		this.#logViewerContext?.getLogs();
+		this._logViewerContext?.toggleSortOrder();
+		this._logViewerContext?.setCurrentPage(1);
+		this._logViewerContext?.getLogs();
 	}
 
 	#onPageChange(event: Event): void {
 		const current = (event.target as UUIPaginationElement).current;
-		this.#logViewerContext?.setCurrentPage(current);
-		this.#logViewerContext?.getLogs();
+		this._logViewerContext?.setCurrentPage(current);
+		this._logViewerContext?.getLogs();
 		this._logsScrollContainer.scrollTop = 0;
 	}
 
diff --git a/src/Umbraco.Web.UI.Client/src/packages/log-viewer/workspace/views/search/components/log-viewer-polling-button.element.ts b/src/Umbraco.Web.UI.Client/src/packages/log-viewer/workspace/views/search/components/log-viewer-polling-button.element.ts
index 5bef958d4504..6955c832285e 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/log-viewer/workspace/views/search/components/log-viewer-polling-button.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/log-viewer/workspace/views/search/components/log-viewer-polling-button.element.ts
@@ -1,12 +1,9 @@
-import type {
-	UmbPoolingConfig,
-	UmbPoolingInterval,
-	UmbLogViewerWorkspaceContext,
-} from '../../../logviewer-workspace.context.js';
+import type { UmbPoolingConfig, UmbPoolingInterval } from '../../../logviewer-workspace.context.js';
 import { UMB_APP_LOG_VIEWER_CONTEXT } from '../../../logviewer-workspace.context-token.js';
 import { css, html, customElement, query, state } from '@umbraco-cms/backoffice/external/lit';
 import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element';
 import type { UmbDropdownElement } from '@umbraco-cms/backoffice/components';
+import { consumeContext } from '@umbraco-cms/backoffice/context-api';
 
 @customElement('umb-log-viewer-polling-button')
 export class UmbLogViewerPollingButtonElement extends UmbLitElement {
@@ -18,30 +15,29 @@ export class UmbLogViewerPollingButtonElement extends UmbLitElement {
 
 	#pollingIntervals: UmbPoolingInterval[] = [2000, 5000, 10000, 20000, 30000];
 
-	#logViewerContext?: UmbLogViewerWorkspaceContext;
+	#logViewerContext?: typeof UMB_APP_LOG_VIEWER_CONTEXT.TYPE;
 
-	constructor() {
-		super();
-		this.consumeContext(UMB_APP_LOG_VIEWER_CONTEXT, (instance) => {
-			this.#logViewerContext = instance;
-			this.#observePoolingConfig();
-		});
+	@consumeContext({ context: UMB_APP_LOG_VIEWER_CONTEXT })
+	private set _logViewerContext(value) {
+		this.#logViewerContext = value;
+		this.#observePoolingConfig();
+	}
+	private get _logViewerContext() {
+		return this.#logViewerContext;
 	}
 
 	#observePoolingConfig() {
-		if (!this.#logViewerContext) return;
-
-		this.observe(this.#logViewerContext.polling, (poolingConfig) => {
-			this._poolingConfig = { ...poolingConfig };
+		this.observe(this._logViewerContext?.polling, (poolingConfig) => {
+			this._poolingConfig = poolingConfig ? { ...poolingConfig } : { enabled: false, interval: 0 };
 		});
 	}
 
 	#togglePolling() {
-		this.#logViewerContext?.togglePolling();
+		this._logViewerContext?.togglePolling();
 	}
 
 	#setPolingInterval = (interval: UmbPoolingInterval) => {
-		this.#logViewerContext?.setPollingInterval(interval);
+		this._logViewerContext?.setPollingInterval(interval);
 
 		this.#closePoolingPopover();
 	};
diff --git a/src/Umbraco.Web.UI.Client/src/packages/log-viewer/workspace/views/search/components/log-viewer-search-input.element.ts b/src/Umbraco.Web.UI.Client/src/packages/log-viewer/workspace/views/search/components/log-viewer-search-input.element.ts
index 55ad9b74e79c..e4563d976123 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/log-viewer/workspace/views/search/components/log-viewer-search-input.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/log-viewer/workspace/views/search/components/log-viewer-search-input.element.ts
@@ -1,4 +1,3 @@
-import type { UmbLogViewerWorkspaceContext } from '../../../logviewer-workspace.context.js';
 import { UMB_APP_LOG_VIEWER_CONTEXT } from '../../../logviewer-workspace.context-token.js';
 import { UMB_LOG_VIEWER_SAVE_SEARCH_MODAL } from './log-viewer-search-input-modal.modal-token.js';
 import { css, html, customElement, query, state } from '@umbraco-cms/backoffice/external/lit';
@@ -12,6 +11,7 @@ import type { UmbDropdownElement } from '@umbraco-cms/backoffice/components';
 import type { UUIInputElement } from '@umbraco-cms/backoffice/external/uui';
 
 import './log-viewer-search-input-modal.element.js';
+import { consumeContext } from '@umbraco-cms/backoffice/context-api';
 
 @customElement('umb-log-viewer-search-input')
 export class UmbLogViewerSearchInputElement extends UmbLitElement {
@@ -33,15 +33,20 @@ export class UmbLogViewerSearchInputElement extends UmbLitElement {
 	// TODO: Revisit this code, to not use RxJS directly:
 	#inputQuery$ = new Subject<string>();
 
-	#logViewerContext?: UmbLogViewerWorkspaceContext;
+	#logViewerContext?: typeof UMB_APP_LOG_VIEWER_CONTEXT.TYPE;
+
+	@consumeContext({ context: UMB_APP_LOG_VIEWER_CONTEXT })
+	private set _logViewerContext(value) {
+		this.#logViewerContext = value;
+		this.#observeStuff();
+		this.#logViewerContext?.getSavedSearches();
+	}
+	private get _logViewerContext() {
+		return this.#logViewerContext;
+	}
 
 	constructor() {
 		super();
-		this.consumeContext(UMB_APP_LOG_VIEWER_CONTEXT, (instance) => {
-			this.#logViewerContext = instance;
-			this.#observeStuff();
-			this.#logViewerContext?.getSavedSearches();
-		});
 
 		this.#inputQuery$
 			.pipe(
@@ -49,7 +54,7 @@ export class UmbLogViewerSearchInputElement extends UmbLitElement {
 				debounceTime(250),
 			)
 			.subscribe((query) => {
-				this.#logViewerContext?.setFilterExpression(query);
+				this._logViewerContext?.setFilterExpression(query);
 				this.#persist(query);
 				this._isQuerySaved = this._savedSearches.some((search) => search.query === query);
 				this._showLoader = false;
@@ -57,15 +62,14 @@ export class UmbLogViewerSearchInputElement extends UmbLitElement {
 	}
 
 	#observeStuff() {
-		if (!this.#logViewerContext) return;
-		this.observe(this.#logViewerContext.savedSearches, (savedSearches) => {
+		this.observe(this._logViewerContext?.savedSearches, (savedSearches) => {
 			this._savedSearches = savedSearches?.items ?? [];
 			this._isQuerySaved = this._savedSearches.some((search) => search.query === this._inputQuery);
 		});
 
-		this.observe(this.#logViewerContext.filterExpression, (query) => {
-			this._inputQuery = query;
-			this._isQuerySaved = this._savedSearches.some((search) => search.query === query);
+		this.observe(this._logViewerContext?.filterExpression, (query) => {
+			this._inputQuery = query ?? '';
+			this._isQuerySaved = this._savedSearches.some((search) => search.query === this._inputQuery);
 		});
 	}
 
@@ -92,11 +96,11 @@ export class UmbLogViewerSearchInputElement extends UmbLitElement {
 
 	#clearQuery() {
 		this.#inputQuery$.next('');
-		this.#logViewerContext?.setFilterExpression('');
+		this._logViewerContext?.setFilterExpression('');
 	}
 
 	#saveSearch(savedSearch: SavedLogSearchResponseModel) {
-		this.#logViewerContext?.saveSearch(savedSearch);
+		this._logViewerContext?.saveSearch(savedSearch);
 	}
 
 	async #removeSearch(name: string) {
@@ -107,7 +111,7 @@ export class UmbLogViewerSearchInputElement extends UmbLitElement {
 			confirmLabel: 'Delete',
 		});
 
-		this.#logViewerContext?.removeSearch({ name });
+		this._logViewerContext?.removeSearch({ name });
 		//this.dispatchEvent(new UmbDeleteEvent());
 	}
 
diff --git a/src/Umbraco.Web.UI.Client/src/packages/log-viewer/workspace/views/search/log-search-view.element.ts b/src/Umbraco.Web.UI.Client/src/packages/log-viewer/workspace/views/search/log-search-view.element.ts
index b7e9e1d1c123..317711c2e51a 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/log-viewer/workspace/views/search/log-search-view.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/log-viewer/workspace/views/search/log-search-view.element.ts
@@ -1,32 +1,32 @@
-import type { UmbLogViewerWorkspaceContext } from '../../logviewer-workspace.context.js';
 import { UMB_APP_LOG_VIEWER_CONTEXT } from '../../logviewer-workspace.context-token.js';
 import { UmbTextStyles } from '@umbraco-cms/backoffice/style';
 import { css, html, customElement, state } from '@umbraco-cms/backoffice/external/lit';
 import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element';
 import type { UmbObserverController } from '@umbraco-cms/backoffice/observable-api';
+import { consumeContext } from '@umbraco-cms/backoffice/context-api';
 
 @customElement('umb-log-viewer-search-view')
 export class UmbLogViewerSearchViewElement extends UmbLitElement {
 	@state()
 	private _canShowLogs = true;
 
-	#logViewerContext?: UmbLogViewerWorkspaceContext;
+	#logViewerContext?: typeof UMB_APP_LOG_VIEWER_CONTEXT.TYPE;
 
-	#canShowLogsObserver?: UmbObserverController<boolean | null>;
-
-	constructor() {
-		super();
-		this.consumeContext(UMB_APP_LOG_VIEWER_CONTEXT, (instance) => {
-			this.#logViewerContext = instance;
-			this.#observeCanShowLogs();
-		});
+	@consumeContext({ context: UMB_APP_LOG_VIEWER_CONTEXT })
+	private set _logViewerContext(value) {
+		this.#logViewerContext = value;
+		this.#observeCanShowLogs();
 	}
+	private get _logViewerContext() {
+		return this.#logViewerContext;
+	}
+
+	#canShowLogsObserver?: UmbObserverController<boolean | null>;
 
 	#observeCanShowLogs() {
 		if (this.#canShowLogsObserver) this.#canShowLogsObserver.destroy();
-		if (!this.#logViewerContext) return;
 
-		this.#canShowLogsObserver = this.observe(this.#logViewerContext.canShowLogs, (canShowLogs) => {
+		this.#canShowLogsObserver = this.observe(this._logViewerContext?.canShowLogs, (canShowLogs) => {
 			this._canShowLogs = canShowLogs ?? this._canShowLogs;
 		});
 	}

From 62edad17a1f6c2c170395431a93901bde492ea0b Mon Sep 17 00:00:00 2001
From: Andy Butland <abutland73@gmail.com>
Date: Thu, 16 Oct 2025 20:50:59 +0200
Subject: [PATCH 041/155] Bumped version to 16.3.1.

---
 src/Umbraco.Web.UI.Client/package.json | 2 +-
 version.json                           | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/package.json b/src/Umbraco.Web.UI.Client/package.json
index de785cc2058b..766ffa96baea 100644
--- a/src/Umbraco.Web.UI.Client/package.json
+++ b/src/Umbraco.Web.UI.Client/package.json
@@ -1,7 +1,7 @@
 {
 	"name": "@umbraco-cms/backoffice",
 	"license": "MIT",
-	"version": "16.3.0",
+	"version": "16.3.1",
 	"type": "module",
 	"exports": {
 		".": null,
diff --git a/version.json b/version.json
index e71c12fcd95b..922b55eca9ce 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": "16.3.0",
+  "version": "16.3.1",
   "assemblyVersion": {
     "precision": "build"
   },

From 31bcbc1147f66cab1837a9afe4732ad0bb35b959 Mon Sep 17 00:00:00 2001
From: Ben White <ben.white27@hotmail.co.uk>
Date: Thu, 16 Oct 2025 20:06:10 +0100
Subject: [PATCH 042/155] Don't use non-generic ILogger as a fallback in
 BlockEditorPropertyValueEditor (#20532)

Update logger service retrieval in BlockEditorPropertyValueEditor
---
 .../PropertyEditors/BlockEditorPropertyValueEditor.cs           | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Umbraco.Infrastructure/PropertyEditors/BlockEditorPropertyValueEditor.cs b/src/Umbraco.Infrastructure/PropertyEditors/BlockEditorPropertyValueEditor.cs
index 10c752088bec..84299d63992a 100644
--- a/src/Umbraco.Infrastructure/PropertyEditors/BlockEditorPropertyValueEditor.cs
+++ b/src/Umbraco.Infrastructure/PropertyEditors/BlockEditorPropertyValueEditor.cs
@@ -51,7 +51,7 @@ protected BlockEditorPropertyValueEditor(
               languageService,
               ioHelper,
               attribute,
-              StaticServiceProvider.Instance.GetRequiredService<ILogger>())
+              StaticServiceProvider.Instance.GetRequiredService<ILogger<BlockEditorPropertyValueEditor<TValue, TLayout>>>())
     {
     }
 

From 6458bb40f9eaf3a88318cc38268f3e522acf8f0c Mon Sep 17 00:00:00 2001
From: Ben White <ben.white27@hotmail.co.uk>
Date: Thu, 16 Oct 2025 20:06:10 +0100
Subject: [PATCH 043/155] Don't use non-generic ILogger as a fallback in
 BlockEditorPropertyValueEditor (#20532)

Update logger service retrieval in BlockEditorPropertyValueEditor
---
 .../PropertyEditors/BlockEditorPropertyValueEditor.cs           | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Umbraco.Infrastructure/PropertyEditors/BlockEditorPropertyValueEditor.cs b/src/Umbraco.Infrastructure/PropertyEditors/BlockEditorPropertyValueEditor.cs
index 10c752088bec..84299d63992a 100644
--- a/src/Umbraco.Infrastructure/PropertyEditors/BlockEditorPropertyValueEditor.cs
+++ b/src/Umbraco.Infrastructure/PropertyEditors/BlockEditorPropertyValueEditor.cs
@@ -51,7 +51,7 @@ protected BlockEditorPropertyValueEditor(
               languageService,
               ioHelper,
               attribute,
-              StaticServiceProvider.Instance.GetRequiredService<ILogger>())
+              StaticServiceProvider.Instance.GetRequiredService<ILogger<BlockEditorPropertyValueEditor<TValue, TLayout>>>())
     {
     }
 

From d17ba805b2f42a68dded771fab8fbcd558737ad4 Mon Sep 17 00:00:00 2001
From: Jacob Overgaard <752371+iOvergaard@users.noreply.github.com>
Date: Fri, 17 Oct 2025 09:09:15 +0200
Subject: [PATCH 044/155] build(deps): bumps @umbraco-ui/uui from 1.16.0-rc.0
 to 1.16.0

---
 src/Umbraco.Web.UI.Client/package-lock.json   | 970 +++++++++---------
 .../src/external/uui/package.json             |   4 +-
 2 files changed, 487 insertions(+), 487 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/package-lock.json b/src/Umbraco.Web.UI.Client/package-lock.json
index c9c1c2115b6c..b2657a2a273b 100644
--- a/src/Umbraco.Web.UI.Client/package-lock.json
+++ b/src/Umbraco.Web.UI.Client/package-lock.json
@@ -3753,909 +3753,909 @@
 			"link": true
 		},
 		"node_modules/@umbraco-ui/uui": {
-			"version": "1.16.0-rc.0",
-			"resolved": "https://registry.npmjs.org/@umbraco-ui/uui/-/uui-1.16.0-rc.0.tgz",
-			"integrity": "sha512-iTz/KfvxkO/gxxz9x19glpVTIZ4mZXRU3/EM2oENXCJw8sbmMkGecwO2PLFLSbq8YXmOmq5b5dUSVsTRpa91iQ==",
-			"license": "MIT",
-			"dependencies": {
-				"@umbraco-ui/uui-action-bar": "1.16.0-rc.0",
-				"@umbraco-ui/uui-avatar": "1.16.0-rc.0",
-				"@umbraco-ui/uui-avatar-group": "1.16.0-rc.0",
-				"@umbraco-ui/uui-badge": "1.16.0-rc.0",
-				"@umbraco-ui/uui-base": "1.16.0-rc.0",
-				"@umbraco-ui/uui-boolean-input": "1.16.0-rc.0",
-				"@umbraco-ui/uui-box": "1.16.0-rc.0",
-				"@umbraco-ui/uui-breadcrumbs": "1.16.0-rc.0",
-				"@umbraco-ui/uui-button": "1.16.0-rc.0",
-				"@umbraco-ui/uui-button-copy-text": "1.16.0-rc.0",
-				"@umbraco-ui/uui-button-group": "1.16.0-rc.0",
-				"@umbraco-ui/uui-button-inline-create": "1.16.0-rc.0",
-				"@umbraco-ui/uui-card": "1.16.0-rc.0",
-				"@umbraco-ui/uui-card-block-type": "1.16.0-rc.0",
-				"@umbraco-ui/uui-card-content-node": "1.16.0-rc.0",
-				"@umbraco-ui/uui-card-media": "1.16.0-rc.0",
-				"@umbraco-ui/uui-card-user": "1.16.0-rc.0",
-				"@umbraco-ui/uui-caret": "1.16.0-rc.0",
-				"@umbraco-ui/uui-checkbox": "1.16.0-rc.0",
-				"@umbraco-ui/uui-color-area": "1.16.0-rc.0",
-				"@umbraco-ui/uui-color-picker": "1.16.0-rc.0",
-				"@umbraco-ui/uui-color-slider": "1.16.0-rc.0",
-				"@umbraco-ui/uui-color-swatch": "1.16.0-rc.0",
-				"@umbraco-ui/uui-color-swatches": "1.16.0-rc.0",
-				"@umbraco-ui/uui-combobox": "1.16.0-rc.0",
-				"@umbraco-ui/uui-combobox-list": "1.16.0-rc.0",
-				"@umbraco-ui/uui-css": "1.16.0-rc.0",
-				"@umbraco-ui/uui-dialog": "1.16.0-rc.0",
-				"@umbraco-ui/uui-dialog-layout": "1.16.0-rc.0",
-				"@umbraco-ui/uui-file-dropzone": "1.16.0-rc.0",
-				"@umbraco-ui/uui-file-preview": "1.16.0-rc.0",
-				"@umbraco-ui/uui-form": "1.16.0-rc.0",
-				"@umbraco-ui/uui-form-layout-item": "1.16.0-rc.0",
-				"@umbraco-ui/uui-form-validation-message": "1.16.0-rc.0",
-				"@umbraco-ui/uui-icon": "1.16.0-rc.0",
-				"@umbraco-ui/uui-icon-registry": "1.16.0-rc.0",
-				"@umbraco-ui/uui-icon-registry-essential": "1.16.0-rc.0",
-				"@umbraco-ui/uui-input": "1.16.0-rc.0",
-				"@umbraco-ui/uui-input-file": "1.16.0-rc.0",
-				"@umbraco-ui/uui-input-lock": "1.16.0-rc.0",
-				"@umbraco-ui/uui-input-password": "1.16.0-rc.0",
-				"@umbraco-ui/uui-keyboard-shortcut": "1.16.0-rc.0",
-				"@umbraco-ui/uui-label": "1.16.0-rc.0",
-				"@umbraco-ui/uui-loader": "1.16.0-rc.0",
-				"@umbraco-ui/uui-loader-bar": "1.16.0-rc.0",
-				"@umbraco-ui/uui-loader-circle": "1.16.0-rc.0",
-				"@umbraco-ui/uui-menu-item": "1.16.0-rc.0",
-				"@umbraco-ui/uui-modal": "1.16.0-rc.0",
-				"@umbraco-ui/uui-pagination": "1.16.0-rc.0",
-				"@umbraco-ui/uui-popover": "1.16.0-rc.0",
-				"@umbraco-ui/uui-popover-container": "1.16.0-rc.0",
-				"@umbraco-ui/uui-progress-bar": "1.16.0-rc.0",
-				"@umbraco-ui/uui-radio": "1.16.0-rc.0",
-				"@umbraco-ui/uui-range-slider": "1.16.0-rc.0",
-				"@umbraco-ui/uui-ref": "1.16.0-rc.0",
-				"@umbraco-ui/uui-ref-list": "1.16.0-rc.0",
-				"@umbraco-ui/uui-ref-node": "1.16.0-rc.0",
-				"@umbraco-ui/uui-ref-node-data-type": "1.16.0-rc.0",
-				"@umbraco-ui/uui-ref-node-document-type": "1.16.0-rc.0",
-				"@umbraco-ui/uui-ref-node-form": "1.16.0-rc.0",
-				"@umbraco-ui/uui-ref-node-member": "1.16.0-rc.0",
-				"@umbraco-ui/uui-ref-node-package": "1.16.0-rc.0",
-				"@umbraco-ui/uui-ref-node-user": "1.16.0-rc.0",
-				"@umbraco-ui/uui-scroll-container": "1.16.0-rc.0",
-				"@umbraco-ui/uui-select": "1.16.0-rc.0",
-				"@umbraco-ui/uui-slider": "1.16.0-rc.0",
-				"@umbraco-ui/uui-symbol-expand": "1.16.0-rc.0",
-				"@umbraco-ui/uui-symbol-file": "1.16.0-rc.0",
-				"@umbraco-ui/uui-symbol-file-dropzone": "1.16.0-rc.0",
-				"@umbraco-ui/uui-symbol-file-thumbnail": "1.16.0-rc.0",
-				"@umbraco-ui/uui-symbol-folder": "1.16.0-rc.0",
-				"@umbraco-ui/uui-symbol-lock": "1.16.0-rc.0",
-				"@umbraco-ui/uui-symbol-more": "1.16.0-rc.0",
-				"@umbraco-ui/uui-symbol-sort": "1.16.0-rc.0",
-				"@umbraco-ui/uui-table": "1.16.0-rc.0",
-				"@umbraco-ui/uui-tabs": "1.16.0-rc.0",
-				"@umbraco-ui/uui-tag": "1.16.0-rc.0",
-				"@umbraco-ui/uui-textarea": "1.16.0-rc.0",
-				"@umbraco-ui/uui-toast-notification": "1.16.0-rc.0",
-				"@umbraco-ui/uui-toast-notification-container": "1.16.0-rc.0",
-				"@umbraco-ui/uui-toast-notification-layout": "1.16.0-rc.0",
-				"@umbraco-ui/uui-toggle": "1.16.0-rc.0",
-				"@umbraco-ui/uui-visually-hidden": "1.16.0-rc.0"
+			"version": "1.16.0",
+			"resolved": "https://registry.npmjs.org/@umbraco-ui/uui/-/uui-1.16.0.tgz",
+			"integrity": "sha512-aWHFSTf+FkPiMirT25UjmUD7wcyQqxvO7btO3AeA7Ogx7R3KiVNulHpPNPgTsyaHFWRcVmxhWDHaib4GHoOJXQ==",
+			"license": "MIT",
+			"dependencies": {
+				"@umbraco-ui/uui-action-bar": "1.16.0",
+				"@umbraco-ui/uui-avatar": "1.16.0",
+				"@umbraco-ui/uui-avatar-group": "1.16.0",
+				"@umbraco-ui/uui-badge": "1.16.0",
+				"@umbraco-ui/uui-base": "1.16.0",
+				"@umbraco-ui/uui-boolean-input": "1.16.0",
+				"@umbraco-ui/uui-box": "1.16.0",
+				"@umbraco-ui/uui-breadcrumbs": "1.16.0",
+				"@umbraco-ui/uui-button": "1.16.0",
+				"@umbraco-ui/uui-button-copy-text": "1.16.0",
+				"@umbraco-ui/uui-button-group": "1.16.0",
+				"@umbraco-ui/uui-button-inline-create": "1.16.0",
+				"@umbraco-ui/uui-card": "1.16.0",
+				"@umbraco-ui/uui-card-block-type": "1.16.0",
+				"@umbraco-ui/uui-card-content-node": "1.16.0",
+				"@umbraco-ui/uui-card-media": "1.16.0",
+				"@umbraco-ui/uui-card-user": "1.16.0",
+				"@umbraco-ui/uui-caret": "1.16.0",
+				"@umbraco-ui/uui-checkbox": "1.16.0",
+				"@umbraco-ui/uui-color-area": "1.16.0",
+				"@umbraco-ui/uui-color-picker": "1.16.0",
+				"@umbraco-ui/uui-color-slider": "1.16.0",
+				"@umbraco-ui/uui-color-swatch": "1.16.0",
+				"@umbraco-ui/uui-color-swatches": "1.16.0",
+				"@umbraco-ui/uui-combobox": "1.16.0",
+				"@umbraco-ui/uui-combobox-list": "1.16.0",
+				"@umbraco-ui/uui-css": "1.16.0",
+				"@umbraco-ui/uui-dialog": "1.16.0",
+				"@umbraco-ui/uui-dialog-layout": "1.16.0",
+				"@umbraco-ui/uui-file-dropzone": "1.16.0",
+				"@umbraco-ui/uui-file-preview": "1.16.0",
+				"@umbraco-ui/uui-form": "1.16.0",
+				"@umbraco-ui/uui-form-layout-item": "1.16.0",
+				"@umbraco-ui/uui-form-validation-message": "1.16.0",
+				"@umbraco-ui/uui-icon": "1.16.0",
+				"@umbraco-ui/uui-icon-registry": "1.16.0",
+				"@umbraco-ui/uui-icon-registry-essential": "1.16.0",
+				"@umbraco-ui/uui-input": "1.16.0",
+				"@umbraco-ui/uui-input-file": "1.16.0",
+				"@umbraco-ui/uui-input-lock": "1.16.0",
+				"@umbraco-ui/uui-input-password": "1.16.0",
+				"@umbraco-ui/uui-keyboard-shortcut": "1.16.0",
+				"@umbraco-ui/uui-label": "1.16.0",
+				"@umbraco-ui/uui-loader": "1.16.0",
+				"@umbraco-ui/uui-loader-bar": "1.16.0",
+				"@umbraco-ui/uui-loader-circle": "1.16.0",
+				"@umbraco-ui/uui-menu-item": "1.16.0",
+				"@umbraco-ui/uui-modal": "1.16.0",
+				"@umbraco-ui/uui-pagination": "1.16.0",
+				"@umbraco-ui/uui-popover": "1.16.0",
+				"@umbraco-ui/uui-popover-container": "1.16.0",
+				"@umbraco-ui/uui-progress-bar": "1.16.0",
+				"@umbraco-ui/uui-radio": "1.16.0",
+				"@umbraco-ui/uui-range-slider": "1.16.0",
+				"@umbraco-ui/uui-ref": "1.16.0",
+				"@umbraco-ui/uui-ref-list": "1.16.0",
+				"@umbraco-ui/uui-ref-node": "1.16.0",
+				"@umbraco-ui/uui-ref-node-data-type": "1.16.0",
+				"@umbraco-ui/uui-ref-node-document-type": "1.16.0",
+				"@umbraco-ui/uui-ref-node-form": "1.16.0",
+				"@umbraco-ui/uui-ref-node-member": "1.16.0",
+				"@umbraco-ui/uui-ref-node-package": "1.16.0",
+				"@umbraco-ui/uui-ref-node-user": "1.16.0",
+				"@umbraco-ui/uui-scroll-container": "1.16.0",
+				"@umbraco-ui/uui-select": "1.16.0",
+				"@umbraco-ui/uui-slider": "1.16.0",
+				"@umbraco-ui/uui-symbol-expand": "1.16.0",
+				"@umbraco-ui/uui-symbol-file": "1.16.0",
+				"@umbraco-ui/uui-symbol-file-dropzone": "1.16.0",
+				"@umbraco-ui/uui-symbol-file-thumbnail": "1.16.0",
+				"@umbraco-ui/uui-symbol-folder": "1.16.0",
+				"@umbraco-ui/uui-symbol-lock": "1.16.0",
+				"@umbraco-ui/uui-symbol-more": "1.16.0",
+				"@umbraco-ui/uui-symbol-sort": "1.16.0",
+				"@umbraco-ui/uui-table": "1.16.0",
+				"@umbraco-ui/uui-tabs": "1.16.0",
+				"@umbraco-ui/uui-tag": "1.16.0",
+				"@umbraco-ui/uui-textarea": "1.16.0",
+				"@umbraco-ui/uui-toast-notification": "1.16.0",
+				"@umbraco-ui/uui-toast-notification-container": "1.16.0",
+				"@umbraco-ui/uui-toast-notification-layout": "1.16.0",
+				"@umbraco-ui/uui-toggle": "1.16.0",
+				"@umbraco-ui/uui-visually-hidden": "1.16.0"
 			}
 		},
 		"node_modules/@umbraco-ui/uui-action-bar": {
-			"version": "1.16.0-rc.0",
-			"resolved": "https://registry.npmjs.org/@umbraco-ui/uui-action-bar/-/uui-action-bar-1.16.0-rc.0.tgz",
-			"integrity": "sha512-7uGyzPQIaW5PKwXhsHY5ZfdOB3D254YOEyazh/ls7J3GcxIKiqzSflYn/d8BXrjWP2qsDovAcbghS7oDxZf3rw==",
+			"version": "1.16.0",
+			"resolved": "https://registry.npmjs.org/@umbraco-ui/uui-action-bar/-/uui-action-bar-1.16.0.tgz",
+			"integrity": "sha512-WM08j2cGcJcbXWS6Pb9FdhaKDz3+EUSuoxrsZoGkJBJMriZLv4gq9EcE5RIstUbT8JmDPQ7uT3SDT2gZWl07MQ==",
 			"license": "MIT",
 			"dependencies": {
-				"@umbraco-ui/uui-base": "1.16.0-rc.0",
-				"@umbraco-ui/uui-button-group": "1.16.0-rc.0"
+				"@umbraco-ui/uui-base": "1.16.0",
+				"@umbraco-ui/uui-button-group": "1.16.0"
 			}
 		},
 		"node_modules/@umbraco-ui/uui-avatar": {
-			"version": "1.16.0-rc.0",
-			"resolved": "https://registry.npmjs.org/@umbraco-ui/uui-avatar/-/uui-avatar-1.16.0-rc.0.tgz",
-			"integrity": "sha512-C51NWbKtNTvurRYU9Ni4GCk2CL+yM4+cMNP3sPlLJCj3Epu6nOiYD0txSguTCj1TcBxmQLW5lkuEV3+5IqxZAQ==",
+			"version": "1.16.0",
+			"resolved": "https://registry.npmjs.org/@umbraco-ui/uui-avatar/-/uui-avatar-1.16.0.tgz",
+			"integrity": "sha512-1u6+hOLy5NrFh5/Z4Kp88y3Mhq+FYCZRwPb+5lSutm+aMy27dehRKkZqlbptWn/qocUCibDxQpruvu/UMtVQtg==",
 			"license": "MIT",
 			"dependencies": {
-				"@umbraco-ui/uui-base": "1.16.0-rc.0"
+				"@umbraco-ui/uui-base": "1.16.0"
 			}
 		},
 		"node_modules/@umbraco-ui/uui-avatar-group": {
-			"version": "1.16.0-rc.0",
-			"resolved": "https://registry.npmjs.org/@umbraco-ui/uui-avatar-group/-/uui-avatar-group-1.16.0-rc.0.tgz",
-			"integrity": "sha512-C0/5gHU6lIZPrgvizZicsI5Z8P7f8Kulq9buzc7E5c6r/vgCTl5JTR8cjcl5P5KXDEg/RgPgrcNyGep+Qt8cGQ==",
+			"version": "1.16.0",
+			"resolved": "https://registry.npmjs.org/@umbraco-ui/uui-avatar-group/-/uui-avatar-group-1.16.0.tgz",
+			"integrity": "sha512-509UZzUSD/JhJEVLEpT5ltccHpEw8RxoZbG+hJeg23Oh3jNuRrKvuiyOut5c6JfjMdawHw6vPivVwjqCmbZG5g==",
 			"license": "MIT",
 			"dependencies": {
-				"@umbraco-ui/uui-avatar": "1.16.0-rc.0",
-				"@umbraco-ui/uui-base": "1.16.0-rc.0"
+				"@umbraco-ui/uui-avatar": "1.16.0",
+				"@umbraco-ui/uui-base": "1.16.0"
 			}
 		},
 		"node_modules/@umbraco-ui/uui-badge": {
-			"version": "1.16.0-rc.0",
-			"resolved": "https://registry.npmjs.org/@umbraco-ui/uui-badge/-/uui-badge-1.16.0-rc.0.tgz",
-			"integrity": "sha512-ChOkIJWoecMpdBTNj4q0l4WkhzMW5qTX5UFy2500veE7HNKv8yIZHYgyFlNNrl10oAsASeSx1uP/kVv1Jxmy9A==",
+			"version": "1.16.0",
+			"resolved": "https://registry.npmjs.org/@umbraco-ui/uui-badge/-/uui-badge-1.16.0.tgz",
+			"integrity": "sha512-sHo71JOxxk0EufgYfCl9miuYgM1LDSnmtHedvDGs776htMFkLo3W/cFWgIXabAHZeSj4R5UWMGDNsugwv03R+w==",
 			"license": "MIT",
 			"dependencies": {
-				"@umbraco-ui/uui-base": "1.16.0-rc.0"
+				"@umbraco-ui/uui-base": "1.16.0"
 			}
 		},
 		"node_modules/@umbraco-ui/uui-base": {
-			"version": "1.16.0-rc.0",
-			"resolved": "https://registry.npmjs.org/@umbraco-ui/uui-base/-/uui-base-1.16.0-rc.0.tgz",
-			"integrity": "sha512-SjW0yfUhGy17dbpB6gYujR70bbQPW5aGjGTzI8XcIZ2A+GcCuvWjfAR9WUfFzqJk3dQn0SZjaCOIzN+5qazysw==",
+			"version": "1.16.0",
+			"resolved": "https://registry.npmjs.org/@umbraco-ui/uui-base/-/uui-base-1.16.0.tgz",
+			"integrity": "sha512-8i9bdcSrdR/4lWm0xetr3R3w3Rod3YVbIddHqbb3iVrr0TmPDTVA48tnOsJyQFAvTrh2LZjiETvEve7pBy4WQA==",
 			"license": "MIT",
 			"peerDependencies": {
 				"lit": ">=2.8.0"
 			}
 		},
 		"node_modules/@umbraco-ui/uui-boolean-input": {
-			"version": "1.16.0-rc.0",
-			"resolved": "https://registry.npmjs.org/@umbraco-ui/uui-boolean-input/-/uui-boolean-input-1.16.0-rc.0.tgz",
-			"integrity": "sha512-MHJS6MxRn35H9PJk1PKnCQZFln/2m+T07F4Kfb93KT4cARgTgYgntI8PDi1xK5YdlW77mGunNdEYgFmUBNOLlQ==",
+			"version": "1.16.0",
+			"resolved": "https://registry.npmjs.org/@umbraco-ui/uui-boolean-input/-/uui-boolean-input-1.16.0.tgz",
+			"integrity": "sha512-IRU2z3GV+WzyjUvIMeErYeOE/0GyOpItsXxfmxsEENT/7qq4UMk28fIxY9IdDfI285WP0N3kezWkPBPlCKBcNQ==",
 			"license": "MIT",
 			"dependencies": {
-				"@umbraco-ui/uui-base": "1.16.0-rc.0"
+				"@umbraco-ui/uui-base": "1.16.0"
 			}
 		},
 		"node_modules/@umbraco-ui/uui-box": {
-			"version": "1.16.0-rc.0",
-			"resolved": "https://registry.npmjs.org/@umbraco-ui/uui-box/-/uui-box-1.16.0-rc.0.tgz",
-			"integrity": "sha512-Cuvlccf8LTgBVDiXdA3Ba8hvHJb3np3YyFyqFmbTdyGgpQ2/tBtbhgcA7LD2mvOK+I2vFybyHSPzI8gWBR60AA==",
+			"version": "1.16.0",
+			"resolved": "https://registry.npmjs.org/@umbraco-ui/uui-box/-/uui-box-1.16.0.tgz",
+			"integrity": "sha512-/Wgnv2jr6wKG436WNjBdGq6x+aExiZhZgLPnzrTcaevy85MM5pJZWgY1+aI+pJclgU6WtRMii2+C8MZL2Qmh0w==",
 			"license": "MIT",
 			"dependencies": {
-				"@umbraco-ui/uui-base": "1.16.0-rc.0",
-				"@umbraco-ui/uui-css": "1.16.0-rc.0"
+				"@umbraco-ui/uui-base": "1.16.0",
+				"@umbraco-ui/uui-css": "1.16.0"
 			}
 		},
 		"node_modules/@umbraco-ui/uui-breadcrumbs": {
-			"version": "1.16.0-rc.0",
-			"resolved": "https://registry.npmjs.org/@umbraco-ui/uui-breadcrumbs/-/uui-breadcrumbs-1.16.0-rc.0.tgz",
-			"integrity": "sha512-7/UFyLRR+m4MeuOscclhr/8zzbLGl1D1+uYaIfK6rysP0MkAOOJf7yVjKbEzml58P1XYIMnnT1lcJE0DoyfKkg==",
+			"version": "1.16.0",
+			"resolved": "https://registry.npmjs.org/@umbraco-ui/uui-breadcrumbs/-/uui-breadcrumbs-1.16.0.tgz",
+			"integrity": "sha512-PuLcxG+3ZeSXKH3M0Kkh3eVYOEJPwLfg+6+b4UXxV/O9p0tUFbNPc8ciggL/1ZBXYXjsQnFTaOQWV4zGpnCnFQ==",
 			"license": "MIT",
 			"dependencies": {
-				"@umbraco-ui/uui-base": "1.16.0-rc.0"
+				"@umbraco-ui/uui-base": "1.16.0"
 			}
 		},
 		"node_modules/@umbraco-ui/uui-button": {
-			"version": "1.16.0-rc.0",
-			"resolved": "https://registry.npmjs.org/@umbraco-ui/uui-button/-/uui-button-1.16.0-rc.0.tgz",
-			"integrity": "sha512-02a3PDDJCcRdTkhLyvmrK3WUGZA25rZ6QQChBhUf1p2DsJU01k+vc54VJ7C984IMFiPuvMEkxig9Ks8aZhxcxg==",
+			"version": "1.16.0",
+			"resolved": "https://registry.npmjs.org/@umbraco-ui/uui-button/-/uui-button-1.16.0.tgz",
+			"integrity": "sha512-0nTAx/GVOdGvlekkIxZp1nJs2E1DRzbdUnARl6RN5Oc40HowW9oO5oJvDIpoZcsWqkqWzFTQqVgE1z1PafKHZw==",
 			"license": "MIT",
 			"dependencies": {
-				"@umbraco-ui/uui-base": "1.16.0-rc.0",
-				"@umbraco-ui/uui-icon-registry-essential": "1.16.0-rc.0"
+				"@umbraco-ui/uui-base": "1.16.0",
+				"@umbraco-ui/uui-icon-registry-essential": "1.16.0"
 			}
 		},
 		"node_modules/@umbraco-ui/uui-button-copy-text": {
-			"version": "1.16.0-rc.0",
-			"resolved": "https://registry.npmjs.org/@umbraco-ui/uui-button-copy-text/-/uui-button-copy-text-1.16.0-rc.0.tgz",
-			"integrity": "sha512-Chk3qIVQ11OEx0UscNmvhqSwW+M1NDikHt34ynriJKsXhONFvjSE12K06zSNhB2kbbkS+aVmJ/PzalkExMfjIw==",
+			"version": "1.16.0",
+			"resolved": "https://registry.npmjs.org/@umbraco-ui/uui-button-copy-text/-/uui-button-copy-text-1.16.0.tgz",
+			"integrity": "sha512-CXjJzLbedqHtlza2zspSWNZCw5XhHV5QkPFzRI5Zd8FwFZop1/UgM2GQeSrMaWdfpznbWvfUqnvSYt9wYEubVg==",
 			"license": "MIT",
 			"dependencies": {
-				"@umbraco-ui/uui-base": "1.16.0-rc.0",
-				"@umbraco-ui/uui-button": "1.16.0-rc.0"
+				"@umbraco-ui/uui-base": "1.16.0",
+				"@umbraco-ui/uui-button": "1.16.0"
 			}
 		},
 		"node_modules/@umbraco-ui/uui-button-group": {
-			"version": "1.16.0-rc.0",
-			"resolved": "https://registry.npmjs.org/@umbraco-ui/uui-button-group/-/uui-button-group-1.16.0-rc.0.tgz",
-			"integrity": "sha512-vUwWO82yvuj2Db5bp7oFC/EV3jQpkxQPhR460AGyh68UlS2qTgUR5rsB+AOfUsH/UIbHjrhh+Wn6DcF2hEZzTg==",
+			"version": "1.16.0",
+			"resolved": "https://registry.npmjs.org/@umbraco-ui/uui-button-group/-/uui-button-group-1.16.0.tgz",
+			"integrity": "sha512-ygici33P70SJqa2SSjdSVd8paSKqHwewKJMcyIF/IehDepnDP0ngSHWA23B/sEzJNJgq0Zngo9g3jlhZz6H6GA==",
 			"license": "MIT",
 			"dependencies": {
-				"@umbraco-ui/uui-base": "1.16.0-rc.0"
+				"@umbraco-ui/uui-base": "1.16.0"
 			}
 		},
 		"node_modules/@umbraco-ui/uui-button-inline-create": {
-			"version": "1.16.0-rc.0",
-			"resolved": "https://registry.npmjs.org/@umbraco-ui/uui-button-inline-create/-/uui-button-inline-create-1.16.0-rc.0.tgz",
-			"integrity": "sha512-tGLxtmafqWwQoYgbm3QdbRri0iq7gv+89n9LwTK/NcFq3bDbqcKV0xw4LV/XC6kweAoOjtFAO3hzOuow/+/vnw==",
+			"version": "1.16.0",
+			"resolved": "https://registry.npmjs.org/@umbraco-ui/uui-button-inline-create/-/uui-button-inline-create-1.16.0.tgz",
+			"integrity": "sha512-To9K/mYXLm4SGih3uA8/jbZd/ewWKVvYH6b26F5fvEDVT+X9fjJchKT7J/u0a4C7wghvVNT+os7H0rxS3yTXiQ==",
 			"license": "MIT",
 			"dependencies": {
-				"@umbraco-ui/uui-base": "1.16.0-rc.0"
+				"@umbraco-ui/uui-base": "1.16.0"
 			}
 		},
 		"node_modules/@umbraco-ui/uui-card": {
-			"version": "1.16.0-rc.0",
-			"resolved": "https://registry.npmjs.org/@umbraco-ui/uui-card/-/uui-card-1.16.0-rc.0.tgz",
-			"integrity": "sha512-bAEAgemTDebXF8VX5KO9Oh/i7n5ZyuGb+EzRCDGpKlw33to0jcyqRFTdS5XRdPcoD6T8awO87145KBTxCMk10Q==",
+			"version": "1.16.0",
+			"resolved": "https://registry.npmjs.org/@umbraco-ui/uui-card/-/uui-card-1.16.0.tgz",
+			"integrity": "sha512-o/8vDLT03WnQsJKyD8r7PzxvhD3loRI7pL3tZU1BeSDcFAOZPPWIudQ/OwYeJnMI1iHkd2eTu0h22B/sXOfIIQ==",
 			"license": "MIT",
 			"dependencies": {
-				"@umbraco-ui/uui-base": "1.16.0-rc.0",
-				"@umbraco-ui/uui-checkbox": "1.16.0-rc.0"
+				"@umbraco-ui/uui-base": "1.16.0",
+				"@umbraco-ui/uui-checkbox": "1.16.0"
 			}
 		},
 		"node_modules/@umbraco-ui/uui-card-block-type": {
-			"version": "1.16.0-rc.0",
-			"resolved": "https://registry.npmjs.org/@umbraco-ui/uui-card-block-type/-/uui-card-block-type-1.16.0-rc.0.tgz",
-			"integrity": "sha512-jRV4BQpG/BgIX/yctW+eZHJ1Ncdu3H7gNTLsh40UOlHHR0T0aAkUFp2jub74Wq8yZjeTr2cT5/eQy4aHnusNkg==",
+			"version": "1.16.0",
+			"resolved": "https://registry.npmjs.org/@umbraco-ui/uui-card-block-type/-/uui-card-block-type-1.16.0.tgz",
+			"integrity": "sha512-Xpq/kB/ofSn067teaOyS4hEsEt/WUlrJ0opTFgkwHxsWg9rvMzUtg2nc2JGMoIqJ64/40Axcx0jmmchIDUcbsQ==",
 			"license": "MIT",
 			"dependencies": {
-				"@umbraco-ui/uui-base": "1.16.0-rc.0",
-				"@umbraco-ui/uui-card": "1.16.0-rc.0"
+				"@umbraco-ui/uui-base": "1.16.0",
+				"@umbraco-ui/uui-card": "1.16.0"
 			}
 		},
 		"node_modules/@umbraco-ui/uui-card-content-node": {
-			"version": "1.16.0-rc.0",
-			"resolved": "https://registry.npmjs.org/@umbraco-ui/uui-card-content-node/-/uui-card-content-node-1.16.0-rc.0.tgz",
-			"integrity": "sha512-oWLiU6IjibpCU+ANUuSLZ81cA1QFKRs5qJO5kDmzlW8EFfec3xYQefnmU+mQ9M9nueXMhFPBS4cNXaTvW/oyWA==",
+			"version": "1.16.0",
+			"resolved": "https://registry.npmjs.org/@umbraco-ui/uui-card-content-node/-/uui-card-content-node-1.16.0.tgz",
+			"integrity": "sha512-VPRDFrZSPLDGE3kAarW78dZHIFBhwXakyj7PM278tcXGdfSM7M9HsLXME6DhlleOYfSV07wHXm0UXKieqO7vgw==",
 			"license": "MIT",
 			"dependencies": {
-				"@umbraco-ui/uui-base": "1.16.0-rc.0",
-				"@umbraco-ui/uui-card": "1.16.0-rc.0",
-				"@umbraco-ui/uui-icon": "1.16.0-rc.0"
+				"@umbraco-ui/uui-base": "1.16.0",
+				"@umbraco-ui/uui-card": "1.16.0",
+				"@umbraco-ui/uui-icon": "1.16.0"
 			}
 		},
 		"node_modules/@umbraco-ui/uui-card-media": {
-			"version": "1.16.0-rc.0",
-			"resolved": "https://registry.npmjs.org/@umbraco-ui/uui-card-media/-/uui-card-media-1.16.0-rc.0.tgz",
-			"integrity": "sha512-ZXDsQ6ciuf9ordiVG9DtSxO5jhMejG3PZALf1e+v17YOEacCWoKooTcKGV1PHI+59lljbLvzgDHp883zX1difQ==",
+			"version": "1.16.0",
+			"resolved": "https://registry.npmjs.org/@umbraco-ui/uui-card-media/-/uui-card-media-1.16.0.tgz",
+			"integrity": "sha512-IHFCnXr4Bdpj/aUn+jpmlYx9L0FzeWTwt+cb29b4oP0cjIiVaJIrkOCSIl3SF8ncrKfMlTjlgBe0t0sP4mjeug==",
 			"license": "MIT",
 			"dependencies": {
-				"@umbraco-ui/uui-base": "1.16.0-rc.0",
-				"@umbraco-ui/uui-card": "1.16.0-rc.0",
-				"@umbraco-ui/uui-symbol-file": "1.16.0-rc.0",
-				"@umbraco-ui/uui-symbol-folder": "1.16.0-rc.0"
+				"@umbraco-ui/uui-base": "1.16.0",
+				"@umbraco-ui/uui-card": "1.16.0",
+				"@umbraco-ui/uui-symbol-file": "1.16.0",
+				"@umbraco-ui/uui-symbol-folder": "1.16.0"
 			}
 		},
 		"node_modules/@umbraco-ui/uui-card-user": {
-			"version": "1.16.0-rc.0",
-			"resolved": "https://registry.npmjs.org/@umbraco-ui/uui-card-user/-/uui-card-user-1.16.0-rc.0.tgz",
-			"integrity": "sha512-PgHiWqe430Q/RS7nq2iJ35iVNMwsIhx3BnI7KOQQ8YwyLCpLef/TYV9tzGkTw9De27G1yKUaXn5/Wu+C8tccZw==",
+			"version": "1.16.0",
+			"resolved": "https://registry.npmjs.org/@umbraco-ui/uui-card-user/-/uui-card-user-1.16.0.tgz",
+			"integrity": "sha512-Ne64+ssQrpP9zJvlJhH1Y5xlEDMW1lG17Orj6XH99iDtGdrnug9FjRE4vpNfAVRIb9P1pf7xNJtq2XqCJHvqOQ==",
 			"license": "MIT",
 			"dependencies": {
-				"@umbraco-ui/uui-avatar": "1.16.0-rc.0",
-				"@umbraco-ui/uui-base": "1.16.0-rc.0",
-				"@umbraco-ui/uui-card": "1.16.0-rc.0"
+				"@umbraco-ui/uui-avatar": "1.16.0",
+				"@umbraco-ui/uui-base": "1.16.0",
+				"@umbraco-ui/uui-card": "1.16.0"
 			}
 		},
 		"node_modules/@umbraco-ui/uui-caret": {
-			"version": "1.16.0-rc.0",
-			"resolved": "https://registry.npmjs.org/@umbraco-ui/uui-caret/-/uui-caret-1.16.0-rc.0.tgz",
-			"integrity": "sha512-sP64XZBB+60pyMdIKPERF02PrRYeOZqC/l6P5h2KnygSqUCmHQwTg2KcsoJ61UW5l9PjIdI5YlzCrHStuwZzaA==",
+			"version": "1.16.0",
+			"resolved": "https://registry.npmjs.org/@umbraco-ui/uui-caret/-/uui-caret-1.16.0.tgz",
+			"integrity": "sha512-B3xNrwkQBwye9ydlrvnYfbJyiLqwQEbpldfaJnjLvlW9xVhOFps2NfeRyXcdsvruaIwjml7aB18GVYDCd/PSlw==",
 			"license": "MIT",
 			"dependencies": {
-				"@umbraco-ui/uui-base": "1.16.0-rc.0"
+				"@umbraco-ui/uui-base": "1.16.0"
 			}
 		},
 		"node_modules/@umbraco-ui/uui-checkbox": {
-			"version": "1.16.0-rc.0",
-			"resolved": "https://registry.npmjs.org/@umbraco-ui/uui-checkbox/-/uui-checkbox-1.16.0-rc.0.tgz",
-			"integrity": "sha512-KussDn46ZlBKTYBT+eiEK7rV4KEMmsDt5oi/LY+ZxqwKt8Ctn8Ubc/zB8dM08ihGFACAVmS+R2X3vmeHG8rYLw==",
+			"version": "1.16.0",
+			"resolved": "https://registry.npmjs.org/@umbraco-ui/uui-checkbox/-/uui-checkbox-1.16.0.tgz",
+			"integrity": "sha512-4z8XrZ0InVArdHKO7L7uwAMwUwHyQKqSYShE74VHHWOibySciJ/zPx3hFO3eQ7EBL3Kj+4raun5Ah5jHUlDZwA==",
 			"license": "MIT",
 			"dependencies": {
-				"@umbraco-ui/uui-base": "1.16.0-rc.0",
-				"@umbraco-ui/uui-boolean-input": "1.16.0-rc.0",
-				"@umbraco-ui/uui-icon-registry-essential": "1.16.0-rc.0"
+				"@umbraco-ui/uui-base": "1.16.0",
+				"@umbraco-ui/uui-boolean-input": "1.16.0",
+				"@umbraco-ui/uui-icon-registry-essential": "1.16.0"
 			}
 		},
 		"node_modules/@umbraco-ui/uui-color-area": {
-			"version": "1.16.0-rc.0",
-			"resolved": "https://registry.npmjs.org/@umbraco-ui/uui-color-area/-/uui-color-area-1.16.0-rc.0.tgz",
-			"integrity": "sha512-vKj1faPcp1yl2YWKzrkBC0s+gexzjBE5WxTVMS7n7rnvz9Ngxd0DvQADsiTS/Q2/WrEnORG7nXC3SlFvp/bigA==",
+			"version": "1.16.0",
+			"resolved": "https://registry.npmjs.org/@umbraco-ui/uui-color-area/-/uui-color-area-1.16.0.tgz",
+			"integrity": "sha512-wiK9WNZWZ5yFd3ouTZOcoUSm+2iNZIFlGTaTScnG/DiLCBs6DUvdbSbVHueY1cGWbOx/R8N01kZBls1fk8kaHw==",
 			"license": "MIT",
 			"dependencies": {
-				"@umbraco-ui/uui-base": "1.16.0-rc.0",
+				"@umbraco-ui/uui-base": "1.16.0",
 				"colord": "^2.9.3"
 			}
 		},
 		"node_modules/@umbraco-ui/uui-color-picker": {
-			"version": "1.16.0-rc.0",
-			"resolved": "https://registry.npmjs.org/@umbraco-ui/uui-color-picker/-/uui-color-picker-1.16.0-rc.0.tgz",
-			"integrity": "sha512-54EDVEXmk2cWRf6DvogFxEwtzbo4e9TdwY+s+L7DSA2VkKNM25tml7hC/ItHGVN+qrmz01KIVEJFtOwdXt+krw==",
+			"version": "1.16.0",
+			"resolved": "https://registry.npmjs.org/@umbraco-ui/uui-color-picker/-/uui-color-picker-1.16.0.tgz",
+			"integrity": "sha512-IilZw7Qn+2QF80OXktnoY1RI45ggl8o+QyF5a6zjd2gl5BfwAVx/uFCnpDfjH6LKtRw9WvuPKHQyM0/mfi5I4g==",
 			"license": "MIT",
 			"dependencies": {
-				"@umbraco-ui/uui-base": "1.16.0-rc.0",
-				"@umbraco-ui/uui-popover-container": "1.16.0-rc.0",
+				"@umbraco-ui/uui-base": "1.16.0",
+				"@umbraco-ui/uui-popover-container": "1.16.0",
 				"colord": "^2.9.3"
 			}
 		},
 		"node_modules/@umbraco-ui/uui-color-slider": {
-			"version": "1.16.0-rc.0",
-			"resolved": "https://registry.npmjs.org/@umbraco-ui/uui-color-slider/-/uui-color-slider-1.16.0-rc.0.tgz",
-			"integrity": "sha512-47ixTPpZIcpqNSzkSKXymuZDYyMQXRJkYFNi2B78bIOmekH+aab5TkQOYdhQ7O1c8+O0TxDWsCQBBgrHHVSMOQ==",
+			"version": "1.16.0",
+			"resolved": "https://registry.npmjs.org/@umbraco-ui/uui-color-slider/-/uui-color-slider-1.16.0.tgz",
+			"integrity": "sha512-GDlAv+75efrOq9K/mZSKLwmc/ZG82hCaRMpWI4guKKvJhcukIcg7Bt/jQrDrtEGKCYvMJpNzbqZ41b+x23EQEg==",
 			"license": "MIT",
 			"dependencies": {
-				"@umbraco-ui/uui-base": "1.16.0-rc.0"
+				"@umbraco-ui/uui-base": "1.16.0"
 			}
 		},
 		"node_modules/@umbraco-ui/uui-color-swatch": {
-			"version": "1.16.0-rc.0",
-			"resolved": "https://registry.npmjs.org/@umbraco-ui/uui-color-swatch/-/uui-color-swatch-1.16.0-rc.0.tgz",
-			"integrity": "sha512-iub68xyjyf6fyBcG8HvTbp00NjTQDr1JadeYRCrCxepNfSQN531MFTVZnMz0OdI8qH69tKYQFyokghZ00iPJ6w==",
+			"version": "1.16.0",
+			"resolved": "https://registry.npmjs.org/@umbraco-ui/uui-color-swatch/-/uui-color-swatch-1.16.0.tgz",
+			"integrity": "sha512-I+0iEkIGXzoDfLUj0duUJsdf71FC1EBqNzAH/X5noiWc+RZiAAw5EvXm7rZO69oDNOQMwt/yMCBLJQp2kYOQTA==",
 			"license": "MIT",
 			"dependencies": {
-				"@umbraco-ui/uui-base": "1.16.0-rc.0",
-				"@umbraco-ui/uui-icon-registry-essential": "1.16.0-rc.0",
+				"@umbraco-ui/uui-base": "1.16.0",
+				"@umbraco-ui/uui-icon-registry-essential": "1.16.0",
 				"colord": "^2.9.3"
 			}
 		},
 		"node_modules/@umbraco-ui/uui-color-swatches": {
-			"version": "1.16.0-rc.0",
-			"resolved": "https://registry.npmjs.org/@umbraco-ui/uui-color-swatches/-/uui-color-swatches-1.16.0-rc.0.tgz",
-			"integrity": "sha512-ypN5CNzngFvpqCXrkiNHCrQS7XEqhMyaKmDSUc065uVs7Py0FFhXpsr8HQGWuNx5ER4oakdxiAtp8MEMCggbyQ==",
+			"version": "1.16.0",
+			"resolved": "https://registry.npmjs.org/@umbraco-ui/uui-color-swatches/-/uui-color-swatches-1.16.0.tgz",
+			"integrity": "sha512-i58T2PRYzViBTo7OtJAGi5inVF8jxVYBmLL7nb3dpNjUFTZZufRKTr3AsVS7+pCGEogFmyNbcNztmmEMdU4ekA==",
 			"license": "MIT",
 			"dependencies": {
-				"@umbraco-ui/uui-base": "1.16.0-rc.0",
-				"@umbraco-ui/uui-color-swatch": "1.16.0-rc.0"
+				"@umbraco-ui/uui-base": "1.16.0",
+				"@umbraco-ui/uui-color-swatch": "1.16.0"
 			}
 		},
 		"node_modules/@umbraco-ui/uui-combobox": {
-			"version": "1.16.0-rc.0",
-			"resolved": "https://registry.npmjs.org/@umbraco-ui/uui-combobox/-/uui-combobox-1.16.0-rc.0.tgz",
-			"integrity": "sha512-gk89KBira+Yh29KUS5nb6yaQILdI6YF/TMpXtDL6OlUlaIeaSWpCmIKtX/MzqZH4Ov/fspRKxjRFnYVPxU8Qbg==",
+			"version": "1.16.0",
+			"resolved": "https://registry.npmjs.org/@umbraco-ui/uui-combobox/-/uui-combobox-1.16.0.tgz",
+			"integrity": "sha512-zjeNG+7r5J4UgdeWh8Osktkjk/Uret5tu8mUtpp0Z6LIbxISUKEt9QlbjPPorxB3V0ENKUJ2c5KZZtpj7mLihQ==",
 			"license": "MIT",
 			"dependencies": {
-				"@umbraco-ui/uui-base": "1.16.0-rc.0",
-				"@umbraco-ui/uui-button": "1.16.0-rc.0",
-				"@umbraco-ui/uui-combobox-list": "1.16.0-rc.0",
-				"@umbraco-ui/uui-icon": "1.16.0-rc.0",
-				"@umbraco-ui/uui-popover-container": "1.16.0-rc.0",
-				"@umbraco-ui/uui-scroll-container": "1.16.0-rc.0",
-				"@umbraco-ui/uui-symbol-expand": "1.16.0-rc.0"
+				"@umbraco-ui/uui-base": "1.16.0",
+				"@umbraco-ui/uui-button": "1.16.0",
+				"@umbraco-ui/uui-combobox-list": "1.16.0",
+				"@umbraco-ui/uui-icon": "1.16.0",
+				"@umbraco-ui/uui-popover-container": "1.16.0",
+				"@umbraco-ui/uui-scroll-container": "1.16.0",
+				"@umbraco-ui/uui-symbol-expand": "1.16.0"
 			}
 		},
 		"node_modules/@umbraco-ui/uui-combobox-list": {
-			"version": "1.16.0-rc.0",
-			"resolved": "https://registry.npmjs.org/@umbraco-ui/uui-combobox-list/-/uui-combobox-list-1.16.0-rc.0.tgz",
-			"integrity": "sha512-j1y3NxbH+emmpIEr3eSWAcYQDB/QjFThfZANoOPI88VeCPCT12szoeWNC18ymEed3HblC+dxZ9XQ+ILApVlyFw==",
+			"version": "1.16.0",
+			"resolved": "https://registry.npmjs.org/@umbraco-ui/uui-combobox-list/-/uui-combobox-list-1.16.0.tgz",
+			"integrity": "sha512-gNFheYUtzMvQudvzoRhDgJk9zziFTxSyu92aYzyoyhh7M098gJfqU+fo7Teqqiuyb0NEiZPThcNrUT9MD2LD3A==",
 			"license": "MIT",
 			"dependencies": {
-				"@umbraco-ui/uui-base": "1.16.0-rc.0"
+				"@umbraco-ui/uui-base": "1.16.0"
 			}
 		},
 		"node_modules/@umbraco-ui/uui-css": {
-			"version": "1.16.0-rc.0",
-			"resolved": "https://registry.npmjs.org/@umbraco-ui/uui-css/-/uui-css-1.16.0-rc.0.tgz",
-			"integrity": "sha512-jQgQfo2+bdTzj6BbW3ETL8YDrnBQzvoAVp4G7P/XApupgo9DLdhWgU13jiJ+j9fr2LzegTRYN1U1rQ8rXrnUfw==",
+			"version": "1.16.0",
+			"resolved": "https://registry.npmjs.org/@umbraco-ui/uui-css/-/uui-css-1.16.0.tgz",
+			"integrity": "sha512-uyr5zWOfqSH2z1He+i8vZVYZk8Bq4iKMXqCerKHuiNoCZOaW9Kg8n+mJXhQ3Kz5+r9RXUbJThMJO/6/8NFYvbQ==",
 			"license": "MIT",
 			"peerDependencies": {
 				"lit": ">=2.8.0"
 			}
 		},
 		"node_modules/@umbraco-ui/uui-dialog": {
-			"version": "1.16.0-rc.0",
-			"resolved": "https://registry.npmjs.org/@umbraco-ui/uui-dialog/-/uui-dialog-1.16.0-rc.0.tgz",
-			"integrity": "sha512-t0dOuBlBXuzFr2B4U9qPaH38FFFgKDt+rUiNmKInCcE1uiPq7e7hcrpOlTg2iVMjTzJGXWhUgdykNXOXKoQAKA==",
+			"version": "1.16.0",
+			"resolved": "https://registry.npmjs.org/@umbraco-ui/uui-dialog/-/uui-dialog-1.16.0.tgz",
+			"integrity": "sha512-dq+daSQKAIdsP+2QhM6HmU9Nr5VVzbxwQEYLVvAcmYcw4K98TVpP6AyHu5dPDP9vl4EBBXUrrZuXFjU+Mh8/xQ==",
 			"license": "MIT",
 			"dependencies": {
-				"@umbraco-ui/uui-base": "1.16.0-rc.0",
-				"@umbraco-ui/uui-css": "1.16.0-rc.0"
+				"@umbraco-ui/uui-base": "1.16.0",
+				"@umbraco-ui/uui-css": "1.16.0"
 			}
 		},
 		"node_modules/@umbraco-ui/uui-dialog-layout": {
-			"version": "1.16.0-rc.0",
-			"resolved": "https://registry.npmjs.org/@umbraco-ui/uui-dialog-layout/-/uui-dialog-layout-1.16.0-rc.0.tgz",
-			"integrity": "sha512-3HN3brJW28MWRn/klpvwgWPSrZzgoyouv2SiLSaTeLJM7bGfB8iVOU7WkkgVBujKR7wzXsWmzBuuSNAVLoX4XA==",
+			"version": "1.16.0",
+			"resolved": "https://registry.npmjs.org/@umbraco-ui/uui-dialog-layout/-/uui-dialog-layout-1.16.0.tgz",
+			"integrity": "sha512-iRpmlzp1PAUpF6Ol2EWubdABIgpJE6QmBzaQONm3Mmwe1wLxMGp5+o33wHU9WSTh8kDrH/U5mWtua6Xtyf5JFA==",
 			"license": "MIT",
 			"dependencies": {
-				"@umbraco-ui/uui-base": "1.16.0-rc.0"
+				"@umbraco-ui/uui-base": "1.16.0"
 			}
 		},
 		"node_modules/@umbraco-ui/uui-file-dropzone": {
-			"version": "1.16.0-rc.0",
-			"resolved": "https://registry.npmjs.org/@umbraco-ui/uui-file-dropzone/-/uui-file-dropzone-1.16.0-rc.0.tgz",
-			"integrity": "sha512-iUe8NFW9V/2Vj4ysdWlwKpHvPegFqCkggsyT+TmH2iG4BA4h5GMDRwO6j6ooOKJAuZqzg33YRAwL74Mts43KgA==",
+			"version": "1.16.0",
+			"resolved": "https://registry.npmjs.org/@umbraco-ui/uui-file-dropzone/-/uui-file-dropzone-1.16.0.tgz",
+			"integrity": "sha512-B3Zy6jlyK68ntaC4idv7fzd9NVyc4VVjn68DgkvnHR76Mp8zmOgT0g7K7/WM33IPw/n/ZfBhM1KEb+ry3i9/bg==",
 			"license": "MIT",
 			"dependencies": {
-				"@umbraco-ui/uui-base": "1.16.0-rc.0",
-				"@umbraco-ui/uui-symbol-file-dropzone": "1.16.0-rc.0"
+				"@umbraco-ui/uui-base": "1.16.0",
+				"@umbraco-ui/uui-symbol-file-dropzone": "1.16.0"
 			}
 		},
 		"node_modules/@umbraco-ui/uui-file-preview": {
-			"version": "1.16.0-rc.0",
-			"resolved": "https://registry.npmjs.org/@umbraco-ui/uui-file-preview/-/uui-file-preview-1.16.0-rc.0.tgz",
-			"integrity": "sha512-jEH0ZaRvexLCQwvUxa9+JaIM7aqV4FWaAMLOQNKE3aJuFJhOYmCkR6txU/Ed7IMEavvSaQpMspBqQTXq8gom1g==",
+			"version": "1.16.0",
+			"resolved": "https://registry.npmjs.org/@umbraco-ui/uui-file-preview/-/uui-file-preview-1.16.0.tgz",
+			"integrity": "sha512-A+jych/xEUOssZjqWtW04nD1GcVOHnonTlPdrDaFh9PhwQAL0PREBbHZnkLJBS4z+HKWhsXOUeQ9ju0YAtbRuQ==",
 			"license": "MIT",
 			"dependencies": {
-				"@umbraco-ui/uui-base": "1.16.0-rc.0",
-				"@umbraco-ui/uui-symbol-file": "1.16.0-rc.0",
-				"@umbraco-ui/uui-symbol-file-thumbnail": "1.16.0-rc.0",
-				"@umbraco-ui/uui-symbol-folder": "1.16.0-rc.0"
+				"@umbraco-ui/uui-base": "1.16.0",
+				"@umbraco-ui/uui-symbol-file": "1.16.0",
+				"@umbraco-ui/uui-symbol-file-thumbnail": "1.16.0",
+				"@umbraco-ui/uui-symbol-folder": "1.16.0"
 			}
 		},
 		"node_modules/@umbraco-ui/uui-form": {
-			"version": "1.16.0-rc.0",
-			"resolved": "https://registry.npmjs.org/@umbraco-ui/uui-form/-/uui-form-1.16.0-rc.0.tgz",
-			"integrity": "sha512-352RWarESuFiFj76LJ8mUEd849ErexOSdm8zEwpsHYlZxbBlICiTRkWQrykPb50SwOoZpHeBp0ZH/dqu2vRA+A==",
+			"version": "1.16.0",
+			"resolved": "https://registry.npmjs.org/@umbraco-ui/uui-form/-/uui-form-1.16.0.tgz",
+			"integrity": "sha512-mZVeqQtKirPHCES6TcTywELJi3raBgSKRt2XKCmHMDzclK9P11qPuOve335Jd8WPISsqbbcw4mIAGQpww7TxIg==",
 			"license": "MIT",
 			"dependencies": {
-				"@umbraco-ui/uui-base": "1.16.0-rc.0"
+				"@umbraco-ui/uui-base": "1.16.0"
 			}
 		},
 		"node_modules/@umbraco-ui/uui-form-layout-item": {
-			"version": "1.16.0-rc.0",
-			"resolved": "https://registry.npmjs.org/@umbraco-ui/uui-form-layout-item/-/uui-form-layout-item-1.16.0-rc.0.tgz",
-			"integrity": "sha512-/7oKi/ufCN+2a3STTeAEPunhKq52J7RY0im2Oucy96XU87z1wDIrH3kLtqihX5nzyH6gr2XHksX019tUF4zdWQ==",
+			"version": "1.16.0",
+			"resolved": "https://registry.npmjs.org/@umbraco-ui/uui-form-layout-item/-/uui-form-layout-item-1.16.0.tgz",
+			"integrity": "sha512-g1xYut9TQzAK1w0fijWyV2PlXJnaMw3MYgytvsEu3XD93hPut4XvkifM8Ja6YxpkRcKQpRRLa4WHroQ6OQY6LQ==",
 			"license": "MIT",
 			"dependencies": {
-				"@umbraco-ui/uui-base": "1.16.0-rc.0",
-				"@umbraco-ui/uui-form-validation-message": "1.16.0-rc.0"
+				"@umbraco-ui/uui-base": "1.16.0",
+				"@umbraco-ui/uui-form-validation-message": "1.16.0"
 			}
 		},
 		"node_modules/@umbraco-ui/uui-form-validation-message": {
-			"version": "1.16.0-rc.0",
-			"resolved": "https://registry.npmjs.org/@umbraco-ui/uui-form-validation-message/-/uui-form-validation-message-1.16.0-rc.0.tgz",
-			"integrity": "sha512-t/jvsWTb+KuXSpMjkgUvodmF+r23bmZJXBNyVcE+DPu9CuukCvpNgPJfipndew0312Hjb06nJm1Ht+QqtdqRjw==",
+			"version": "1.16.0",
+			"resolved": "https://registry.npmjs.org/@umbraco-ui/uui-form-validation-message/-/uui-form-validation-message-1.16.0.tgz",
+			"integrity": "sha512-55+WAkF02Im+bG1Xl1AABA7KIGXr5CZTgHbr3MsVVHJMtHv+gQZ04h+0TkvDzKZDSg8ucCXJKyD44Y4gOyS2oA==",
 			"license": "MIT",
 			"dependencies": {
-				"@umbraco-ui/uui-base": "1.16.0-rc.0"
+				"@umbraco-ui/uui-base": "1.16.0"
 			}
 		},
 		"node_modules/@umbraco-ui/uui-icon": {
-			"version": "1.16.0-rc.0",
-			"resolved": "https://registry.npmjs.org/@umbraco-ui/uui-icon/-/uui-icon-1.16.0-rc.0.tgz",
-			"integrity": "sha512-lSVveGqkEevLgfivHBwxT2atKxEXQhtpA6pJTA3MZ+xpvjx2IS45NML+roN34jDikEIdz9UOTXGuWPHAhd9vOg==",
+			"version": "1.16.0",
+			"resolved": "https://registry.npmjs.org/@umbraco-ui/uui-icon/-/uui-icon-1.16.0.tgz",
+			"integrity": "sha512-x7HX9OnKOTgjbFbSSZ9Pk0+Lf6yo8ggLe6XTnPClu3ByN2fl9/QqshI5lx4oz5Adr/ItSj3zqnNB2JbyM56TLA==",
 			"license": "MIT",
 			"dependencies": {
-				"@umbraco-ui/uui-base": "1.16.0-rc.0"
+				"@umbraco-ui/uui-base": "1.16.0"
 			}
 		},
 		"node_modules/@umbraco-ui/uui-icon-registry": {
-			"version": "1.16.0-rc.0",
-			"resolved": "https://registry.npmjs.org/@umbraco-ui/uui-icon-registry/-/uui-icon-registry-1.16.0-rc.0.tgz",
-			"integrity": "sha512-TBALLQRgaH43XURzNxo/YSnI1Bm3O+1P4of96P1Lgl8BiffLbmOsAZOb9bchasnCpFSmAGtf9xyqY+i3uHw5KQ==",
+			"version": "1.16.0",
+			"resolved": "https://registry.npmjs.org/@umbraco-ui/uui-icon-registry/-/uui-icon-registry-1.16.0.tgz",
+			"integrity": "sha512-o4l2bEYKdBcxAlSwEPO+cfnNvkGuGcZRyca026xvIz+nufbc/BBzskzS1UWIIjkFPu64rHEfxP/3KbSld64HYA==",
 			"license": "MIT",
 			"dependencies": {
-				"@umbraco-ui/uui-base": "1.16.0-rc.0",
-				"@umbraco-ui/uui-icon": "1.16.0-rc.0"
+				"@umbraco-ui/uui-base": "1.16.0",
+				"@umbraco-ui/uui-icon": "1.16.0"
 			}
 		},
 		"node_modules/@umbraco-ui/uui-icon-registry-essential": {
-			"version": "1.16.0-rc.0",
-			"resolved": "https://registry.npmjs.org/@umbraco-ui/uui-icon-registry-essential/-/uui-icon-registry-essential-1.16.0-rc.0.tgz",
-			"integrity": "sha512-90Q1YY8/T0mAbPIdyOpFHCl5J9xObV/0WNqGjm35nDpf56Xb3JG3Vt18xYFgT9zUKskEsV6nTjxtGNLrK4+1rA==",
+			"version": "1.16.0",
+			"resolved": "https://registry.npmjs.org/@umbraco-ui/uui-icon-registry-essential/-/uui-icon-registry-essential-1.16.0.tgz",
+			"integrity": "sha512-HI4cnYhWpPtWFFgfEltjV6PPhOd3NQ58BhqfbCpRbwmHZUZ0OBzGRl4QgsPNKuhQqmcXene+Twfy8eoRk1/5nQ==",
 			"license": "MIT",
 			"dependencies": {
-				"@umbraco-ui/uui-base": "1.16.0-rc.0",
-				"@umbraco-ui/uui-icon-registry": "1.16.0-rc.0"
+				"@umbraco-ui/uui-base": "1.16.0",
+				"@umbraco-ui/uui-icon-registry": "1.16.0"
 			}
 		},
 		"node_modules/@umbraco-ui/uui-input": {
-			"version": "1.16.0-rc.0",
-			"resolved": "https://registry.npmjs.org/@umbraco-ui/uui-input/-/uui-input-1.16.0-rc.0.tgz",
-			"integrity": "sha512-EUSoym4GUpD94XhIDsjBnQx55Gvd4EjkxqrhPJz9QY5BJ3mjT/l8udcYxtmBeHkFf1vTwJD8eIJcEX/MkPj+yg==",
+			"version": "1.16.0",
+			"resolved": "https://registry.npmjs.org/@umbraco-ui/uui-input/-/uui-input-1.16.0.tgz",
+			"integrity": "sha512-2Mp15ObjyAuRD3bOTs/zuUHqaaMiuDhmGsjeK8ViOrlSMnz/bVUme5scN1OMkNIryVHkENshC4NK7x6++X0/qw==",
 			"license": "MIT",
 			"dependencies": {
-				"@umbraco-ui/uui-base": "1.16.0-rc.0"
+				"@umbraco-ui/uui-base": "1.16.0"
 			}
 		},
 		"node_modules/@umbraco-ui/uui-input-file": {
-			"version": "1.16.0-rc.0",
-			"resolved": "https://registry.npmjs.org/@umbraco-ui/uui-input-file/-/uui-input-file-1.16.0-rc.0.tgz",
-			"integrity": "sha512-IQP5ZeWIrDTWduNiwf6j0GJxl4GwG6KE3CDuAOxjAqt7NJ28AciyaHg1paomZ2mAz+mnvbGt7chwfSuH+Vmb2A==",
+			"version": "1.16.0",
+			"resolved": "https://registry.npmjs.org/@umbraco-ui/uui-input-file/-/uui-input-file-1.16.0.tgz",
+			"integrity": "sha512-AxepSUJe0LmY4QmBA9UlzhZBBrVF+z88fFUWIH15PICFX0jfsPNIeiwQKlv7cN5pEInUh6qCRN64z8icf8fcdw==",
 			"license": "MIT",
 			"dependencies": {
-				"@umbraco-ui/uui-action-bar": "1.16.0-rc.0",
-				"@umbraco-ui/uui-base": "1.16.0-rc.0",
-				"@umbraco-ui/uui-button": "1.16.0-rc.0",
-				"@umbraco-ui/uui-file-dropzone": "1.16.0-rc.0",
-				"@umbraco-ui/uui-icon": "1.16.0-rc.0",
-				"@umbraco-ui/uui-icon-registry-essential": "1.16.0-rc.0"
+				"@umbraco-ui/uui-action-bar": "1.16.0",
+				"@umbraco-ui/uui-base": "1.16.0",
+				"@umbraco-ui/uui-button": "1.16.0",
+				"@umbraco-ui/uui-file-dropzone": "1.16.0",
+				"@umbraco-ui/uui-icon": "1.16.0",
+				"@umbraco-ui/uui-icon-registry-essential": "1.16.0"
 			}
 		},
 		"node_modules/@umbraco-ui/uui-input-lock": {
-			"version": "1.16.0-rc.0",
-			"resolved": "https://registry.npmjs.org/@umbraco-ui/uui-input-lock/-/uui-input-lock-1.16.0-rc.0.tgz",
-			"integrity": "sha512-x+Y/yRR3mo+4a0RsOiCcP0KYMp9tESSzkAIETKNyEUuN7aPx6Z0F+3qH40mNMznQ3GBzSnjW8+RsLlNK5rKO5g==",
+			"version": "1.16.0",
+			"resolved": "https://registry.npmjs.org/@umbraco-ui/uui-input-lock/-/uui-input-lock-1.16.0.tgz",
+			"integrity": "sha512-FTLj/2s+VImEtKe1GPSkAC2pmTabz5cGzvaFB/7xrJj/1evVxXGu8qQyyL96WoDe+RAmBNYfrnGx7OUSVhEyRw==",
 			"license": "MIT",
 			"dependencies": {
-				"@umbraco-ui/uui-base": "1.16.0-rc.0",
-				"@umbraco-ui/uui-button": "1.16.0-rc.0",
-				"@umbraco-ui/uui-icon": "1.16.0-rc.0",
-				"@umbraco-ui/uui-input": "1.16.0-rc.0"
+				"@umbraco-ui/uui-base": "1.16.0",
+				"@umbraco-ui/uui-button": "1.16.0",
+				"@umbraco-ui/uui-icon": "1.16.0",
+				"@umbraco-ui/uui-input": "1.16.0"
 			}
 		},
 		"node_modules/@umbraco-ui/uui-input-password": {
-			"version": "1.16.0-rc.0",
-			"resolved": "https://registry.npmjs.org/@umbraco-ui/uui-input-password/-/uui-input-password-1.16.0-rc.0.tgz",
-			"integrity": "sha512-z7pAOTwPvv3oP8/mV46suC5CB+Wq3EiLVeVBbIktQAWhwhd7LbpaLlNjIq+Cxih/67A6g35PdW8JEsUtqCXNaw==",
+			"version": "1.16.0",
+			"resolved": "https://registry.npmjs.org/@umbraco-ui/uui-input-password/-/uui-input-password-1.16.0.tgz",
+			"integrity": "sha512-0gg8nAVHsMYlQscG76PN4L8ha3CpW15crlzgj4TMaW24OIgZ0khV18ZImJ5n9wv/zrq8LsrwJTyZ5/a/soaKyQ==",
 			"license": "MIT",
 			"dependencies": {
-				"@umbraco-ui/uui-base": "1.16.0-rc.0",
-				"@umbraco-ui/uui-icon-registry-essential": "1.16.0-rc.0",
-				"@umbraco-ui/uui-input": "1.16.0-rc.0"
+				"@umbraco-ui/uui-base": "1.16.0",
+				"@umbraco-ui/uui-icon-registry-essential": "1.16.0",
+				"@umbraco-ui/uui-input": "1.16.0"
 			}
 		},
 		"node_modules/@umbraco-ui/uui-keyboard-shortcut": {
-			"version": "1.16.0-rc.0",
-			"resolved": "https://registry.npmjs.org/@umbraco-ui/uui-keyboard-shortcut/-/uui-keyboard-shortcut-1.16.0-rc.0.tgz",
-			"integrity": "sha512-1MH3TK/FERmFzLFQodJ9Eas7Fl0oyrDKXXdFJiDQGfad9Ai8IZ0FtAqACnKtiGjXqsoxvT/JLQtmfDoLbpHvPQ==",
+			"version": "1.16.0",
+			"resolved": "https://registry.npmjs.org/@umbraco-ui/uui-keyboard-shortcut/-/uui-keyboard-shortcut-1.16.0.tgz",
+			"integrity": "sha512-z9wlhONxtwkUCkPEKqt/vSH1qOTwHCIM2Cj/DQ21+bfWcywUR7cAp0vRveapymDn4eHSuRra5lrG7xgLYsYuVg==",
 			"license": "MIT",
 			"dependencies": {
-				"@umbraco-ui/uui-base": "1.16.0-rc.0"
+				"@umbraco-ui/uui-base": "1.16.0"
 			}
 		},
 		"node_modules/@umbraco-ui/uui-label": {
-			"version": "1.16.0-rc.0",
-			"resolved": "https://registry.npmjs.org/@umbraco-ui/uui-label/-/uui-label-1.16.0-rc.0.tgz",
-			"integrity": "sha512-fER5gC8+ptPctkbc4qXkESDe4Pt2DEMZ/pePtI4HGpJV/r2F4FZPaezwBmRvXmoEW7klWT7+7+Je6BSHizKZcA==",
+			"version": "1.16.0",
+			"resolved": "https://registry.npmjs.org/@umbraco-ui/uui-label/-/uui-label-1.16.0.tgz",
+			"integrity": "sha512-1vQAKUR+frDEth8AMLS5KKpVK2LHD61lWUG95yMypF5C2+YBmzXb70QEakOubTMsmLnYcU3hfORfA5Wp9cYPnw==",
 			"license": "MIT",
 			"dependencies": {
-				"@umbraco-ui/uui-base": "1.16.0-rc.0"
+				"@umbraco-ui/uui-base": "1.16.0"
 			}
 		},
 		"node_modules/@umbraco-ui/uui-loader": {
-			"version": "1.16.0-rc.0",
-			"resolved": "https://registry.npmjs.org/@umbraco-ui/uui-loader/-/uui-loader-1.16.0-rc.0.tgz",
-			"integrity": "sha512-AUodPdxCky8D8uxvO2N23cE16aK7k+rbJ6Ky0m+H4dI+bZWwJP6fUJHexiEnENURSm6gUGYQv6gXEka0SAWJ2w==",
+			"version": "1.16.0",
+			"resolved": "https://registry.npmjs.org/@umbraco-ui/uui-loader/-/uui-loader-1.16.0.tgz",
+			"integrity": "sha512-wcFUljPcrAR6YYuj5XLmtMpZBvzTBcakr9p+vISOoC3ta8UlE+OOLiQn+XYzTuV/ZbM77EHh5EEyiO5L45fQew==",
 			"license": "MIT",
 			"dependencies": {
-				"@umbraco-ui/uui-base": "1.16.0-rc.0"
+				"@umbraco-ui/uui-base": "1.16.0"
 			}
 		},
 		"node_modules/@umbraco-ui/uui-loader-bar": {
-			"version": "1.16.0-rc.0",
-			"resolved": "https://registry.npmjs.org/@umbraco-ui/uui-loader-bar/-/uui-loader-bar-1.16.0-rc.0.tgz",
-			"integrity": "sha512-hVM/YNsrlMWqbGBp1YihtNbZ3IPJCBh4VXWHD4Ht6dHSCQtCOcmB1NVReWsTv6TnAsYClWYrloAqtqqcVdqwUQ==",
+			"version": "1.16.0",
+			"resolved": "https://registry.npmjs.org/@umbraco-ui/uui-loader-bar/-/uui-loader-bar-1.16.0.tgz",
+			"integrity": "sha512-xh6RCS60WPWPzf0dAA+lTTt0rF8hksQsYBLwITBsR/5k3qswhT9Ctu/2LvqUXoLPyEFTecA4fyqZK+NzhjZrdQ==",
 			"license": "MIT",
 			"dependencies": {
-				"@umbraco-ui/uui-base": "1.16.0-rc.0"
+				"@umbraco-ui/uui-base": "1.16.0"
 			}
 		},
 		"node_modules/@umbraco-ui/uui-loader-circle": {
-			"version": "1.16.0-rc.0",
-			"resolved": "https://registry.npmjs.org/@umbraco-ui/uui-loader-circle/-/uui-loader-circle-1.16.0-rc.0.tgz",
-			"integrity": "sha512-NrOVwTwKdzpJKiH0YfLj3Fm7ye9QXEI6T+K9NKfQafkXKxUo0v8Om7FkEhBBFIbn3YOXrxNL51+EQX3UCb+nww==",
+			"version": "1.16.0",
+			"resolved": "https://registry.npmjs.org/@umbraco-ui/uui-loader-circle/-/uui-loader-circle-1.16.0.tgz",
+			"integrity": "sha512-jawUHoiUwwZkp5YOLFlF00WvZ5yPowfbi22TufSyfls5hMajJM/p21IrCTStrc4ZimqyheaaYe/AqdGLDimfSQ==",
 			"license": "MIT",
 			"dependencies": {
-				"@umbraco-ui/uui-base": "1.16.0-rc.0"
+				"@umbraco-ui/uui-base": "1.16.0"
 			}
 		},
 		"node_modules/@umbraco-ui/uui-menu-item": {
-			"version": "1.16.0-rc.0",
-			"resolved": "https://registry.npmjs.org/@umbraco-ui/uui-menu-item/-/uui-menu-item-1.16.0-rc.0.tgz",
-			"integrity": "sha512-l0pfSWj5W6ieNlBxPlntvCadXYIkKQPiD7n9Uy18lirpJcp2NUwlAKbzxaQOFPvUrZtGc9aD+4I6fmRJqWBeZQ==",
+			"version": "1.16.0",
+			"resolved": "https://registry.npmjs.org/@umbraco-ui/uui-menu-item/-/uui-menu-item-1.16.0.tgz",
+			"integrity": "sha512-tyyuehJSj1BU/EEsQ1LHN8eg+gcAKCzqGMwwpepEtKZDd7p1/Ioq1KEn2e20UOihXab5rFv5UNEWSeyEYRqL4Q==",
 			"license": "MIT",
 			"dependencies": {
-				"@umbraco-ui/uui-base": "1.16.0-rc.0",
-				"@umbraco-ui/uui-loader-bar": "1.16.0-rc.0",
-				"@umbraco-ui/uui-symbol-expand": "1.16.0-rc.0"
+				"@umbraco-ui/uui-base": "1.16.0",
+				"@umbraco-ui/uui-loader-bar": "1.16.0",
+				"@umbraco-ui/uui-symbol-expand": "1.16.0"
 			}
 		},
 		"node_modules/@umbraco-ui/uui-modal": {
-			"version": "1.16.0-rc.0",
-			"resolved": "https://registry.npmjs.org/@umbraco-ui/uui-modal/-/uui-modal-1.16.0-rc.0.tgz",
-			"integrity": "sha512-x/IlGqxwED6+JNwOnH9o1+d/PgdPnsBbLOKIRxGl7QDWvwTTrHEezdh6Q9//SBmEsQSVLmvw8ILPYugrN+JZVg==",
+			"version": "1.16.0",
+			"resolved": "https://registry.npmjs.org/@umbraco-ui/uui-modal/-/uui-modal-1.16.0.tgz",
+			"integrity": "sha512-hqlXHjlGxEWEeX5c7W0xNlH25xDbb8vdgBIfYGUkBfrYrgO3j+AJ/B7OvmgWJogFTOHRRaPUvKDi8DkDnDH4zw==",
 			"license": "MIT",
 			"dependencies": {
-				"@umbraco-ui/uui-base": "1.16.0-rc.0"
+				"@umbraco-ui/uui-base": "1.16.0"
 			}
 		},
 		"node_modules/@umbraco-ui/uui-pagination": {
-			"version": "1.16.0-rc.0",
-			"resolved": "https://registry.npmjs.org/@umbraco-ui/uui-pagination/-/uui-pagination-1.16.0-rc.0.tgz",
-			"integrity": "sha512-NqBliIc726/L9wfPpuXnFASIFHeZ9t6DRhjg/zhwpozsuudjGlvLfrbnm2f4qim6+uvozGwxT83WZ9T83b2biQ==",
+			"version": "1.16.0",
+			"resolved": "https://registry.npmjs.org/@umbraco-ui/uui-pagination/-/uui-pagination-1.16.0.tgz",
+			"integrity": "sha512-bZQl5BwiYHSQqc0bjajQbu8ZX+z4qe56t6PiT6s+VUj6huXOOrT72hpY2u+ZE22sAWPaIu42Kg9ulxNV2pulRw==",
 			"license": "MIT",
 			"dependencies": {
-				"@umbraco-ui/uui-base": "1.16.0-rc.0",
-				"@umbraco-ui/uui-button": "1.16.0-rc.0",
-				"@umbraco-ui/uui-button-group": "1.16.0-rc.0"
+				"@umbraco-ui/uui-base": "1.16.0",
+				"@umbraco-ui/uui-button": "1.16.0",
+				"@umbraco-ui/uui-button-group": "1.16.0"
 			}
 		},
 		"node_modules/@umbraco-ui/uui-popover": {
-			"version": "1.16.0-rc.0",
-			"resolved": "https://registry.npmjs.org/@umbraco-ui/uui-popover/-/uui-popover-1.16.0-rc.0.tgz",
-			"integrity": "sha512-zt2n2KYYjTDczgyxw7AJgWgqDYljwBSAwBp5VoEcckx4aDqtgm5u2YmwwapOa8zWj6Nz5O55oPbEGrXsIHc9Rg==",
+			"version": "1.16.0",
+			"resolved": "https://registry.npmjs.org/@umbraco-ui/uui-popover/-/uui-popover-1.16.0.tgz",
+			"integrity": "sha512-ZtHPdupRjxwuSHmY5EiiGtZMBi5UsAyHOucn5SxMgdyHT7bRxrV1ebCblDu4eikXg/xx1nTDSFmmW4rXLftULg==",
 			"license": "MIT",
 			"dependencies": {
-				"@umbraco-ui/uui-base": "1.16.0-rc.0"
+				"@umbraco-ui/uui-base": "1.16.0"
 			}
 		},
 		"node_modules/@umbraco-ui/uui-popover-container": {
-			"version": "1.16.0-rc.0",
-			"resolved": "https://registry.npmjs.org/@umbraco-ui/uui-popover-container/-/uui-popover-container-1.16.0-rc.0.tgz",
-			"integrity": "sha512-RDSnm//hsxTDKsklaM4uGk/EOWnxMRjn9dOjY5+S2WH6ehrhn8ULxxKpmvh4J8PQo3cgmlhDxiZLN2Jhx54tbQ==",
+			"version": "1.16.0",
+			"resolved": "https://registry.npmjs.org/@umbraco-ui/uui-popover-container/-/uui-popover-container-1.16.0.tgz",
+			"integrity": "sha512-3N8M4hPQFcthVfqfhdCMX9B4q+0sG2zizoQf2SvDoLp3GAqND2zw2cwYClMy8HJh3XH9JINljz3PliyKMXVaXw==",
 			"license": "MIT",
 			"dependencies": {
-				"@umbraco-ui/uui-base": "1.16.0-rc.0"
+				"@umbraco-ui/uui-base": "1.16.0"
 			}
 		},
 		"node_modules/@umbraco-ui/uui-progress-bar": {
-			"version": "1.16.0-rc.0",
-			"resolved": "https://registry.npmjs.org/@umbraco-ui/uui-progress-bar/-/uui-progress-bar-1.16.0-rc.0.tgz",
-			"integrity": "sha512-2hJcUx4cli1NYESx6Vo3T0X/EY5XqekcjFBLGRR78zowzZshTiMjOg9CsItsl1pYfO9iYPF5FhH0j0q29bG0lw==",
+			"version": "1.16.0",
+			"resolved": "https://registry.npmjs.org/@umbraco-ui/uui-progress-bar/-/uui-progress-bar-1.16.0.tgz",
+			"integrity": "sha512-GE/ZW5Rq82LgVbArppIG8Zkd6QFmCTGEV4Iq5V4KPOl5iSVu2yuYJCDD77aR1LgclSjk1YiJ1/oge94RXqAtOA==",
 			"license": "MIT",
 			"dependencies": {
-				"@umbraco-ui/uui-base": "1.16.0-rc.0"
+				"@umbraco-ui/uui-base": "1.16.0"
 			}
 		},
 		"node_modules/@umbraco-ui/uui-radio": {
-			"version": "1.16.0-rc.0",
-			"resolved": "https://registry.npmjs.org/@umbraco-ui/uui-radio/-/uui-radio-1.16.0-rc.0.tgz",
-			"integrity": "sha512-nVPLbC2o15EJE1G/R8cscqbwxdq8Rik9CDEy+BSuTEnWvoUXjwZJJYxXswEH1HE+bOSXBzpPYAmDfGFoIYCgNw==",
+			"version": "1.16.0",
+			"resolved": "https://registry.npmjs.org/@umbraco-ui/uui-radio/-/uui-radio-1.16.0.tgz",
+			"integrity": "sha512-r3JmVGeGzCzUPEKdOzxunsoRO2q7zGoI5eUtrSXdLSFiR2klW+hti/fjvqvruqzRZRjB0oumbJfMU4IxHcZblw==",
 			"license": "MIT",
 			"dependencies": {
-				"@umbraco-ui/uui-base": "1.16.0-rc.0"
+				"@umbraco-ui/uui-base": "1.16.0"
 			}
 		},
 		"node_modules/@umbraco-ui/uui-range-slider": {
-			"version": "1.16.0-rc.0",
-			"resolved": "https://registry.npmjs.org/@umbraco-ui/uui-range-slider/-/uui-range-slider-1.16.0-rc.0.tgz",
-			"integrity": "sha512-MALLdv/GGdGxe4wRAYcjcgJkFySf98IDunFklLGOY4/fDjGOj4u84Jc01W7EZpLe40IMbY8usjOKpmc/YRfa8A==",
+			"version": "1.16.0",
+			"resolved": "https://registry.npmjs.org/@umbraco-ui/uui-range-slider/-/uui-range-slider-1.16.0.tgz",
+			"integrity": "sha512-9qx3Qj8kmIyHRbcVNexWTs4eGjsxs9FkjP7czpC1P0CPJFIt8LzeB6gBwSS/nJGuIo06RQ42qOc8FOza2tN+jA==",
 			"license": "MIT",
 			"dependencies": {
-				"@umbraco-ui/uui-base": "1.16.0-rc.0"
+				"@umbraco-ui/uui-base": "1.16.0"
 			}
 		},
 		"node_modules/@umbraco-ui/uui-ref": {
-			"version": "1.16.0-rc.0",
-			"resolved": "https://registry.npmjs.org/@umbraco-ui/uui-ref/-/uui-ref-1.16.0-rc.0.tgz",
-			"integrity": "sha512-Iv9Tx5a6ryIDiI3E8nE5aL51J4+3GoWbmmQnLegNw3y3KcoYfiLVpby5axPFwRKON+Wzk//+AXlyCpJGC11QWw==",
+			"version": "1.16.0",
+			"resolved": "https://registry.npmjs.org/@umbraco-ui/uui-ref/-/uui-ref-1.16.0.tgz",
+			"integrity": "sha512-+ptIzEx8a3Oy4XL6TFibR5Q5lWDpjCSPCN2DgIitBj9C0R8zWbBo8sxj2iLGP4RsBiHeTUbDiJlSY1seo2E+Ew==",
 			"license": "MIT",
 			"dependencies": {
-				"@umbraco-ui/uui-base": "1.16.0-rc.0"
+				"@umbraco-ui/uui-base": "1.16.0"
 			}
 		},
 		"node_modules/@umbraco-ui/uui-ref-list": {
-			"version": "1.16.0-rc.0",
-			"resolved": "https://registry.npmjs.org/@umbraco-ui/uui-ref-list/-/uui-ref-list-1.16.0-rc.0.tgz",
-			"integrity": "sha512-twilSHIC951ld55HC+S2cvsh4wqmlEcFLdB4ilsvaZs5O8aW1Zrl/T1jDzvqpYRlcFl/jkqLn1vH7hjR9LEC0Q==",
+			"version": "1.16.0",
+			"resolved": "https://registry.npmjs.org/@umbraco-ui/uui-ref-list/-/uui-ref-list-1.16.0.tgz",
+			"integrity": "sha512-MRxTX8CDvquBkkEGfpPsX5ttnsPGJ+Kb1KfR+arueXazQ9XfqyoFCAWWXfOxGL7A5txGTMnKEfj59dyLeCec5Q==",
 			"license": "MIT",
 			"dependencies": {
-				"@umbraco-ui/uui-base": "1.16.0-rc.0"
+				"@umbraco-ui/uui-base": "1.16.0"
 			}
 		},
 		"node_modules/@umbraco-ui/uui-ref-node": {
-			"version": "1.16.0-rc.0",
-			"resolved": "https://registry.npmjs.org/@umbraco-ui/uui-ref-node/-/uui-ref-node-1.16.0-rc.0.tgz",
-			"integrity": "sha512-Kb8nrc1z6AaK41W+7rBhZwEJ9vo1c9vjEzY/zzgpT/3RfzaXPAooFT6QoXSbruvm/75jKM4RxbRHEdFo70rZjQ==",
+			"version": "1.16.0",
+			"resolved": "https://registry.npmjs.org/@umbraco-ui/uui-ref-node/-/uui-ref-node-1.16.0.tgz",
+			"integrity": "sha512-4IO02sBoJLlErxXPeFBXTtOZzQeFbCf0flpHCjMZ+vWKZ6GarlUMSvbXjuzh5SBEveVxWYhjd7Z7lP+g2pOHGw==",
 			"license": "MIT",
 			"dependencies": {
-				"@umbraco-ui/uui-base": "1.16.0-rc.0",
-				"@umbraco-ui/uui-icon": "1.16.0-rc.0",
-				"@umbraco-ui/uui-ref": "1.16.0-rc.0"
+				"@umbraco-ui/uui-base": "1.16.0",
+				"@umbraco-ui/uui-icon": "1.16.0",
+				"@umbraco-ui/uui-ref": "1.16.0"
 			}
 		},
 		"node_modules/@umbraco-ui/uui-ref-node-data-type": {
-			"version": "1.16.0-rc.0",
-			"resolved": "https://registry.npmjs.org/@umbraco-ui/uui-ref-node-data-type/-/uui-ref-node-data-type-1.16.0-rc.0.tgz",
-			"integrity": "sha512-uf6mJJYHEqbSdi5C5d+tc7VcPNrUbanGF36dW58mMBIkBJoDlB8C05iCkwxSRpr9P1QLgvLst/WQYKH+n0q2bw==",
+			"version": "1.16.0",
+			"resolved": "https://registry.npmjs.org/@umbraco-ui/uui-ref-node-data-type/-/uui-ref-node-data-type-1.16.0.tgz",
+			"integrity": "sha512-0yRbSOoKl5gSAnRIEXTdFYlrt4NSvuLx1+TuQyeE/CV8lfObGqM1+y+ueX0AgPuNTXAf7j5rPIRLsVJHfCs2MA==",
 			"license": "MIT",
 			"dependencies": {
-				"@umbraco-ui/uui-base": "1.16.0-rc.0",
-				"@umbraco-ui/uui-ref-node": "1.16.0-rc.0"
+				"@umbraco-ui/uui-base": "1.16.0",
+				"@umbraco-ui/uui-ref-node": "1.16.0"
 			}
 		},
 		"node_modules/@umbraco-ui/uui-ref-node-document-type": {
-			"version": "1.16.0-rc.0",
-			"resolved": "https://registry.npmjs.org/@umbraco-ui/uui-ref-node-document-type/-/uui-ref-node-document-type-1.16.0-rc.0.tgz",
-			"integrity": "sha512-nCGqXRM6fYUwzpS0u5cXVmSJoFe3ZCGKu0G9qjoCEDVmKBaW5sAWZdEwWhbPiCVzfKaGQjbO9/DbXsGqZsc6Ag==",
+			"version": "1.16.0",
+			"resolved": "https://registry.npmjs.org/@umbraco-ui/uui-ref-node-document-type/-/uui-ref-node-document-type-1.16.0.tgz",
+			"integrity": "sha512-ORBBH6GRq5VFTNZd++f7dXCLJdgEGhtd1rcdbxjqtYnJrKeJ0dBNhJkF3kLoSQ1MiOG1SHOckGUZr5nLMUhc/w==",
 			"license": "MIT",
 			"dependencies": {
-				"@umbraco-ui/uui-base": "1.16.0-rc.0",
-				"@umbraco-ui/uui-ref-node": "1.16.0-rc.0"
+				"@umbraco-ui/uui-base": "1.16.0",
+				"@umbraco-ui/uui-ref-node": "1.16.0"
 			}
 		},
 		"node_modules/@umbraco-ui/uui-ref-node-form": {
-			"version": "1.16.0-rc.0",
-			"resolved": "https://registry.npmjs.org/@umbraco-ui/uui-ref-node-form/-/uui-ref-node-form-1.16.0-rc.0.tgz",
-			"integrity": "sha512-bnNs29oxXelvb2rh3CEvWGawk6QkuxB+GBrnnfxLi4KHAHMmL5y6eCUm1gxg9gLtB+iS1ArQdNuHAJfd+BJP8g==",
+			"version": "1.16.0",
+			"resolved": "https://registry.npmjs.org/@umbraco-ui/uui-ref-node-form/-/uui-ref-node-form-1.16.0.tgz",
+			"integrity": "sha512-Z3m2toN+LcZOXVe/3q6d9kyPyWXR9l8CJSk1NkEn/ojMYrRzmo5AW92xWw/twHV8bRsEBDSeKxSKMVGnJVyUHg==",
 			"license": "MIT",
 			"dependencies": {
-				"@umbraco-ui/uui-base": "1.16.0-rc.0",
-				"@umbraco-ui/uui-ref-node": "1.16.0-rc.0"
+				"@umbraco-ui/uui-base": "1.16.0",
+				"@umbraco-ui/uui-ref-node": "1.16.0"
 			}
 		},
 		"node_modules/@umbraco-ui/uui-ref-node-member": {
-			"version": "1.16.0-rc.0",
-			"resolved": "https://registry.npmjs.org/@umbraco-ui/uui-ref-node-member/-/uui-ref-node-member-1.16.0-rc.0.tgz",
-			"integrity": "sha512-zsL1+dytz4a+AxjCIaxLWYHCeLImH/zufkRtNR6lk2XcKSG6uiP3E901CJCMr7LB9yN+pV4A8Y1WKXFL3/rWDQ==",
+			"version": "1.16.0",
+			"resolved": "https://registry.npmjs.org/@umbraco-ui/uui-ref-node-member/-/uui-ref-node-member-1.16.0.tgz",
+			"integrity": "sha512-v9m/e5krM1IPV1gI/9dqVKgGYthyWXDlq9lCdiigpTfzv7xkCF+LPEmVksDZaKD498gGYtbYJReCXUxCwjxGTA==",
 			"license": "MIT",
 			"dependencies": {
-				"@umbraco-ui/uui-base": "1.16.0-rc.0",
-				"@umbraco-ui/uui-ref-node": "1.16.0-rc.0"
+				"@umbraco-ui/uui-base": "1.16.0",
+				"@umbraco-ui/uui-ref-node": "1.16.0"
 			}
 		},
 		"node_modules/@umbraco-ui/uui-ref-node-package": {
-			"version": "1.16.0-rc.0",
-			"resolved": "https://registry.npmjs.org/@umbraco-ui/uui-ref-node-package/-/uui-ref-node-package-1.16.0-rc.0.tgz",
-			"integrity": "sha512-EWvIHt0d6gMBR1x2QDLy+rTtyuWZ6w+lnkNl7WXEBUwGO1u/c1YFZVmC6WLivFe0UuROZEObDnmjz/Ai5rwF+w==",
+			"version": "1.16.0",
+			"resolved": "https://registry.npmjs.org/@umbraco-ui/uui-ref-node-package/-/uui-ref-node-package-1.16.0.tgz",
+			"integrity": "sha512-6z/oa4qX+L746nEet0EDx88roSTcfjnzQj5fH2ebW4WJ6Arh/b+QmPOE3UEn2QiqjJLovkIhNcwf0m9PM7rSSw==",
 			"license": "MIT",
 			"dependencies": {
-				"@umbraco-ui/uui-base": "1.16.0-rc.0",
-				"@umbraco-ui/uui-ref-node": "1.16.0-rc.0"
+				"@umbraco-ui/uui-base": "1.16.0",
+				"@umbraco-ui/uui-ref-node": "1.16.0"
 			}
 		},
 		"node_modules/@umbraco-ui/uui-ref-node-user": {
-			"version": "1.16.0-rc.0",
-			"resolved": "https://registry.npmjs.org/@umbraco-ui/uui-ref-node-user/-/uui-ref-node-user-1.16.0-rc.0.tgz",
-			"integrity": "sha512-xiuDaxr4/o6X5iCbBx0MfstEIOphXYTBOx4GHtJrBsVBnuw9dGVaod5oTKwV9WyRoACcXt7u/TasLUHcQOJU3A==",
+			"version": "1.16.0",
+			"resolved": "https://registry.npmjs.org/@umbraco-ui/uui-ref-node-user/-/uui-ref-node-user-1.16.0.tgz",
+			"integrity": "sha512-TdYTh+1pZfOFD9dKBtti1oDF1Pk5Bp3PyNKf1JLtcPm8uD/UPDxRkIYV7It04E6P7VWusdRabdlv/q9PRimA5g==",
 			"license": "MIT",
 			"dependencies": {
-				"@umbraco-ui/uui-base": "1.16.0-rc.0",
-				"@umbraco-ui/uui-ref-node": "1.16.0-rc.0"
+				"@umbraco-ui/uui-base": "1.16.0",
+				"@umbraco-ui/uui-ref-node": "1.16.0"
 			}
 		},
 		"node_modules/@umbraco-ui/uui-scroll-container": {
-			"version": "1.16.0-rc.0",
-			"resolved": "https://registry.npmjs.org/@umbraco-ui/uui-scroll-container/-/uui-scroll-container-1.16.0-rc.0.tgz",
-			"integrity": "sha512-r4EOhTs+EtDrpi9yBbYRB5fz9fAgdTJU/xSin913k0iL2ciS+ATBZlptCH87KXVpJyydughyiDmvFcQ+4oceDw==",
+			"version": "1.16.0",
+			"resolved": "https://registry.npmjs.org/@umbraco-ui/uui-scroll-container/-/uui-scroll-container-1.16.0.tgz",
+			"integrity": "sha512-+ArdQO09sGB1t24rzi+rk3YsZZayZRr5aKny53qAKkklJg0IDCJ+Vme9DvuSk0HBEzCe0YF313lv5mYjxFwCzQ==",
 			"license": "MIT",
 			"dependencies": {
-				"@umbraco-ui/uui-base": "1.16.0-rc.0"
+				"@umbraco-ui/uui-base": "1.16.0"
 			}
 		},
 		"node_modules/@umbraco-ui/uui-select": {
-			"version": "1.16.0-rc.0",
-			"resolved": "https://registry.npmjs.org/@umbraco-ui/uui-select/-/uui-select-1.16.0-rc.0.tgz",
-			"integrity": "sha512-tad1sbagCnUwL91jVrbryw6BL3vG0VUf/QMGB8eqkY1CkkETA85RjLn0oMOSpFw2Qbly019pU8pMB8eloftHtg==",
+			"version": "1.16.0",
+			"resolved": "https://registry.npmjs.org/@umbraco-ui/uui-select/-/uui-select-1.16.0.tgz",
+			"integrity": "sha512-/tXty/HSqTAwnqsmLIsDc8LsE7XW0pZaCu+B/Ov3FjYQSb312AqXBwP7Z59gAbh2M0XvI3qxcA/sLcFndqN1oA==",
 			"license": "MIT",
 			"dependencies": {
-				"@umbraco-ui/uui-base": "1.16.0-rc.0"
+				"@umbraco-ui/uui-base": "1.16.0"
 			}
 		},
 		"node_modules/@umbraco-ui/uui-slider": {
-			"version": "1.16.0-rc.0",
-			"resolved": "https://registry.npmjs.org/@umbraco-ui/uui-slider/-/uui-slider-1.16.0-rc.0.tgz",
-			"integrity": "sha512-VNyHsqqTIXYO+NptMS1kAzrp1uDGvGg1s0ABmFC+Aln2imCj1m91R0VBccGIK1+zXQvbbK6tTmA4vZ87ozYrug==",
+			"version": "1.16.0",
+			"resolved": "https://registry.npmjs.org/@umbraco-ui/uui-slider/-/uui-slider-1.16.0.tgz",
+			"integrity": "sha512-zWXe+SOzXbhO2tN+DnVXbefEWICZ+FHCR1EGldZdab3hQO53M4HOKqTBd1akE6iFli7FN4BOnELGjnMnupaqvw==",
 			"license": "MIT",
 			"dependencies": {
-				"@umbraco-ui/uui-base": "1.16.0-rc.0"
+				"@umbraco-ui/uui-base": "1.16.0"
 			}
 		},
 		"node_modules/@umbraco-ui/uui-symbol-expand": {
-			"version": "1.16.0-rc.0",
-			"resolved": "https://registry.npmjs.org/@umbraco-ui/uui-symbol-expand/-/uui-symbol-expand-1.16.0-rc.0.tgz",
-			"integrity": "sha512-hbIO7WioBAMGuib8KqGLCIiOB4C3yCZAOPEtfUMY8scSvMNtTJ74Z/BJA5AS4vtQmKHROafa7eHlq+tDubZwyA==",
+			"version": "1.16.0",
+			"resolved": "https://registry.npmjs.org/@umbraco-ui/uui-symbol-expand/-/uui-symbol-expand-1.16.0.tgz",
+			"integrity": "sha512-w9i+deCNhZ3TzwgMx2glGbpyvXQHyP0kCmuazXi4cYGFtEXM48d1OScm/PrGs04ICNuqEIwY/IZ+PGfRSI27lA==",
 			"license": "MIT",
 			"dependencies": {
-				"@umbraco-ui/uui-base": "1.16.0-rc.0"
+				"@umbraco-ui/uui-base": "1.16.0"
 			}
 		},
 		"node_modules/@umbraco-ui/uui-symbol-file": {
-			"version": "1.16.0-rc.0",
-			"resolved": "https://registry.npmjs.org/@umbraco-ui/uui-symbol-file/-/uui-symbol-file-1.16.0-rc.0.tgz",
-			"integrity": "sha512-jJw7W2N+phKv7Sq18skqhWNSnri6tJWfxvHebZ5515Hd1r2ACg9O13Hq5Ih8hrhn8vmpbm4/K7xOpaRnTNh0hg==",
+			"version": "1.16.0",
+			"resolved": "https://registry.npmjs.org/@umbraco-ui/uui-symbol-file/-/uui-symbol-file-1.16.0.tgz",
+			"integrity": "sha512-8iyZCjVAFvKrz1m0RTPiZmbXYLyb0Gs2blgg/uPyBzpNvptnXgx29UVTzITu2xvqVvwvureFNcxqeYL5WsfCiA==",
 			"license": "MIT",
 			"dependencies": {
-				"@umbraco-ui/uui-base": "1.16.0-rc.0"
+				"@umbraco-ui/uui-base": "1.16.0"
 			}
 		},
 		"node_modules/@umbraco-ui/uui-symbol-file-dropzone": {
-			"version": "1.16.0-rc.0",
-			"resolved": "https://registry.npmjs.org/@umbraco-ui/uui-symbol-file-dropzone/-/uui-symbol-file-dropzone-1.16.0-rc.0.tgz",
-			"integrity": "sha512-J4Ufk1pC6u6Tz6Ygh1vpXNzJIP8DC8hpk1yNguwsbyX1d85MznQ4JfQfYGmaS9rpY9ypG6FmG39jHzxbPYCQ+A==",
+			"version": "1.16.0",
+			"resolved": "https://registry.npmjs.org/@umbraco-ui/uui-symbol-file-dropzone/-/uui-symbol-file-dropzone-1.16.0.tgz",
+			"integrity": "sha512-d9VJQTEBKwTHrvgPAXLgG4m3quDbxg1EhJhE03cxZr/yrZ81I2TD3wd4Pt9uxL1kvpZ95mP2vDfbedUfm/0fww==",
 			"license": "MIT",
 			"dependencies": {
-				"@umbraco-ui/uui-base": "1.16.0-rc.0"
+				"@umbraco-ui/uui-base": "1.16.0"
 			}
 		},
 		"node_modules/@umbraco-ui/uui-symbol-file-thumbnail": {
-			"version": "1.16.0-rc.0",
-			"resolved": "https://registry.npmjs.org/@umbraco-ui/uui-symbol-file-thumbnail/-/uui-symbol-file-thumbnail-1.16.0-rc.0.tgz",
-			"integrity": "sha512-B1LmDRCbcSbE7cRCwGtb8MZucd48X1uNfvhfs7CzZdK67P0ngHV0n2Dkujmi3ueAkcd7EMre645IUFI7IG91pQ==",
+			"version": "1.16.0",
+			"resolved": "https://registry.npmjs.org/@umbraco-ui/uui-symbol-file-thumbnail/-/uui-symbol-file-thumbnail-1.16.0.tgz",
+			"integrity": "sha512-PMm3lTtIAwyE+6Erz2xiamKPuHhqazk2aWHgqC9fzD/0ROlWQMYEP3M99onp8/YCIprzfvXPuH6ofs6kq9bY7Q==",
 			"license": "MIT",
 			"dependencies": {
-				"@umbraco-ui/uui-base": "1.16.0-rc.0"
+				"@umbraco-ui/uui-base": "1.16.0"
 			}
 		},
 		"node_modules/@umbraco-ui/uui-symbol-folder": {
-			"version": "1.16.0-rc.0",
-			"resolved": "https://registry.npmjs.org/@umbraco-ui/uui-symbol-folder/-/uui-symbol-folder-1.16.0-rc.0.tgz",
-			"integrity": "sha512-QpBJTEVUW9ZSPJIgAtm88rqZK3Bcxr/pUN8JDLSH9uVa4azs8jBuvvgETZNQBBG2S9b+xHK34WJ9CQOOJVJK5Q==",
+			"version": "1.16.0",
+			"resolved": "https://registry.npmjs.org/@umbraco-ui/uui-symbol-folder/-/uui-symbol-folder-1.16.0.tgz",
+			"integrity": "sha512-vATvt+AcfP9pZxh99DKaq/wrD60EN4nvdtZ/BpHH6MOhX32T8LEboh57XisHmGamUSGbm2jQhASJTt+7cvjI/w==",
 			"license": "MIT",
 			"dependencies": {
-				"@umbraco-ui/uui-base": "1.16.0-rc.0"
+				"@umbraco-ui/uui-base": "1.16.0"
 			}
 		},
 		"node_modules/@umbraco-ui/uui-symbol-lock": {
-			"version": "1.16.0-rc.0",
-			"resolved": "https://registry.npmjs.org/@umbraco-ui/uui-symbol-lock/-/uui-symbol-lock-1.16.0-rc.0.tgz",
-			"integrity": "sha512-eoupPfJdl7YWMllAWf7KmjaEt29choRL0bVsVRJiype9E+5C6BFXPAC6Oa47Rtbo7Pe8SUYkWYQUnmscTMWq0g==",
+			"version": "1.16.0",
+			"resolved": "https://registry.npmjs.org/@umbraco-ui/uui-symbol-lock/-/uui-symbol-lock-1.16.0.tgz",
+			"integrity": "sha512-mAFnPdUzlddfdLMTkBetCTnShV3QTWMpjqaG5fCaauizWmReye/rCwDur51URL+VkWMIWp29JvfYIIm8Yk+ZGg==",
 			"license": "MIT",
 			"dependencies": {
-				"@umbraco-ui/uui-base": "1.16.0-rc.0"
+				"@umbraco-ui/uui-base": "1.16.0"
 			}
 		},
 		"node_modules/@umbraco-ui/uui-symbol-more": {
-			"version": "1.16.0-rc.0",
-			"resolved": "https://registry.npmjs.org/@umbraco-ui/uui-symbol-more/-/uui-symbol-more-1.16.0-rc.0.tgz",
-			"integrity": "sha512-1R5GF7QBz56Ogpgx4gOpC3lNGi++cPKxGF3qKwq2IUPfQjCjgXhuzPYyytiLs3/1ONUfnh0O04k+5Tz8DPt7og==",
+			"version": "1.16.0",
+			"resolved": "https://registry.npmjs.org/@umbraco-ui/uui-symbol-more/-/uui-symbol-more-1.16.0.tgz",
+			"integrity": "sha512-WBd/6SNLVP04WU0Em8Uc9/GXsKYpYdHzlEjh7w5oU1TfbDEiNq1lXkOlpuvL79wJtd/2fTKfqui02+i79KU7ig==",
 			"license": "MIT",
 			"dependencies": {
-				"@umbraco-ui/uui-base": "1.16.0-rc.0"
+				"@umbraco-ui/uui-base": "1.16.0"
 			}
 		},
 		"node_modules/@umbraco-ui/uui-symbol-sort": {
-			"version": "1.16.0-rc.0",
-			"resolved": "https://registry.npmjs.org/@umbraco-ui/uui-symbol-sort/-/uui-symbol-sort-1.16.0-rc.0.tgz",
-			"integrity": "sha512-PEfAji9t+9P7JEXLwWWB+B0vhW4VtQgTwdXR1Ncny9fGsPgu1fxkfB+Cwcsn6eJG4jNumu/ftIAR6fdY/nDDQQ==",
+			"version": "1.16.0",
+			"resolved": "https://registry.npmjs.org/@umbraco-ui/uui-symbol-sort/-/uui-symbol-sort-1.16.0.tgz",
+			"integrity": "sha512-hBhvUmkPc5WgFcjKDm6jtQq2USCO+ysveJRI1oJReiZkyj06IjU5mYddUL/sOG4L7Ud6OFqVbY002Uw+j9QpYQ==",
 			"license": "MIT",
 			"dependencies": {
-				"@umbraco-ui/uui-base": "1.16.0-rc.0"
+				"@umbraco-ui/uui-base": "1.16.0"
 			}
 		},
 		"node_modules/@umbraco-ui/uui-table": {
-			"version": "1.16.0-rc.0",
-			"resolved": "https://registry.npmjs.org/@umbraco-ui/uui-table/-/uui-table-1.16.0-rc.0.tgz",
-			"integrity": "sha512-ub5v+vdQEh2/VMsAqWkHJeMc/hp+HM3Jz61PRMWF0nXDvoapbg1vwOIT5+cfd1QS1dYX4hkP2cyV6JGhIfMIBw==",
+			"version": "1.16.0",
+			"resolved": "https://registry.npmjs.org/@umbraco-ui/uui-table/-/uui-table-1.16.0.tgz",
+			"integrity": "sha512-cVq84cwbgOvjoTn+5L4eboXPGkYdcIkWm/oU8GxbR1OdUtgPtqnPwB51Ial6ylyIHqvYbCDmDMzrjjnrB/qfJw==",
 			"license": "MIT",
 			"dependencies": {
-				"@umbraco-ui/uui-base": "1.16.0-rc.0"
+				"@umbraco-ui/uui-base": "1.16.0"
 			}
 		},
 		"node_modules/@umbraco-ui/uui-tabs": {
-			"version": "1.16.0-rc.0",
-			"resolved": "https://registry.npmjs.org/@umbraco-ui/uui-tabs/-/uui-tabs-1.16.0-rc.0.tgz",
-			"integrity": "sha512-Od2W8ohRfFRzogceMmcAc/Rv2SkA8G2QR1AxukZfBSqin9uR1NUkpknBOy/rt0IvqGhS/cwuX08cU0BXX+tn6A==",
+			"version": "1.16.0",
+			"resolved": "https://registry.npmjs.org/@umbraco-ui/uui-tabs/-/uui-tabs-1.16.0.tgz",
+			"integrity": "sha512-FBToNg7zgB9paPQPbpnuC66KAMz3iR/F+tmLhjWnwGSit7ubFspPqgrReSjVS9zdd+zbi7wTJOcmKnHmoyP1bw==",
 			"license": "MIT",
 			"dependencies": {
-				"@umbraco-ui/uui-base": "1.16.0-rc.0",
-				"@umbraco-ui/uui-button": "1.16.0-rc.0",
-				"@umbraco-ui/uui-popover-container": "1.16.0-rc.0",
-				"@umbraco-ui/uui-symbol-more": "1.16.0-rc.0"
+				"@umbraco-ui/uui-base": "1.16.0",
+				"@umbraco-ui/uui-button": "1.16.0",
+				"@umbraco-ui/uui-popover-container": "1.16.0",
+				"@umbraco-ui/uui-symbol-more": "1.16.0"
 			}
 		},
 		"node_modules/@umbraco-ui/uui-tag": {
-			"version": "1.16.0-rc.0",
-			"resolved": "https://registry.npmjs.org/@umbraco-ui/uui-tag/-/uui-tag-1.16.0-rc.0.tgz",
-			"integrity": "sha512-PMRDeBN+VkYmiYyNC5jxVKVAH9i2cKuUz5PlaHrQcoKHr6oOui5/zQQaFF2cPasohOVbHCj8RK+vP10/dFuxSg==",
+			"version": "1.16.0",
+			"resolved": "https://registry.npmjs.org/@umbraco-ui/uui-tag/-/uui-tag-1.16.0.tgz",
+			"integrity": "sha512-u6pBhOEvXYvUNTxNO1Ftcnflii1CmeuvNAXxuIj8TMmTXGXWmap0W5cGmzlEbbLAMGLv56AJXdz3rKDrWNyTvg==",
 			"license": "MIT",
 			"dependencies": {
-				"@umbraco-ui/uui-base": "1.16.0-rc.0"
+				"@umbraco-ui/uui-base": "1.16.0"
 			}
 		},
 		"node_modules/@umbraco-ui/uui-textarea": {
-			"version": "1.16.0-rc.0",
-			"resolved": "https://registry.npmjs.org/@umbraco-ui/uui-textarea/-/uui-textarea-1.16.0-rc.0.tgz",
-			"integrity": "sha512-assLyciYpCfC0gWndyZnG7y54lDeo0V2eB06W/qTMIWIoJ68oPneigwGdkS17jD+XPWHhROWrlh2N4IORSracw==",
+			"version": "1.16.0",
+			"resolved": "https://registry.npmjs.org/@umbraco-ui/uui-textarea/-/uui-textarea-1.16.0.tgz",
+			"integrity": "sha512-xTO4i/m4Q7wEeaxmV1bxT5e1bnLRJ1CoG+awe2FKGq6xw2ZHgksSrm6j3Ddbm5WzV019hIeVl22bnVQ5gOwrww==",
 			"license": "MIT",
 			"dependencies": {
-				"@umbraco-ui/uui-base": "1.16.0-rc.0"
+				"@umbraco-ui/uui-base": "1.16.0"
 			}
 		},
 		"node_modules/@umbraco-ui/uui-toast-notification": {
-			"version": "1.16.0-rc.0",
-			"resolved": "https://registry.npmjs.org/@umbraco-ui/uui-toast-notification/-/uui-toast-notification-1.16.0-rc.0.tgz",
-			"integrity": "sha512-UDy9pODVkkqZWhAotFuJ8fWtYVBfPmVIHBsNYBMZSRVCZ/zs+WrR+IEew9rDYGiHNew2ZUoGz7C6HfJXIJd7rQ==",
+			"version": "1.16.0",
+			"resolved": "https://registry.npmjs.org/@umbraco-ui/uui-toast-notification/-/uui-toast-notification-1.16.0.tgz",
+			"integrity": "sha512-ziOJ4uyQpIVCBym2RlZFJOuOb2feNr1sP0RxUjhXToREJdG2MH2bgYyy76K0OCZ7a+JKCsHdaBH4XquXIH93VA==",
 			"license": "MIT",
 			"dependencies": {
-				"@umbraco-ui/uui-base": "1.16.0-rc.0",
-				"@umbraco-ui/uui-button": "1.16.0-rc.0",
-				"@umbraco-ui/uui-css": "1.16.0-rc.0",
-				"@umbraco-ui/uui-icon": "1.16.0-rc.0",
-				"@umbraco-ui/uui-icon-registry-essential": "1.16.0-rc.0"
+				"@umbraco-ui/uui-base": "1.16.0",
+				"@umbraco-ui/uui-button": "1.16.0",
+				"@umbraco-ui/uui-css": "1.16.0",
+				"@umbraco-ui/uui-icon": "1.16.0",
+				"@umbraco-ui/uui-icon-registry-essential": "1.16.0"
 			}
 		},
 		"node_modules/@umbraco-ui/uui-toast-notification-container": {
-			"version": "1.16.0-rc.0",
-			"resolved": "https://registry.npmjs.org/@umbraco-ui/uui-toast-notification-container/-/uui-toast-notification-container-1.16.0-rc.0.tgz",
-			"integrity": "sha512-2Vksc0dDaOzj9WfQfWye8rHrVJqfLq6yboDLWugha0kVBp0d9FyH4jL3nj9sG1YfhBr56pv05ws5Otlr/y7Q6Q==",
+			"version": "1.16.0",
+			"resolved": "https://registry.npmjs.org/@umbraco-ui/uui-toast-notification-container/-/uui-toast-notification-container-1.16.0.tgz",
+			"integrity": "sha512-8HwiYkOA8Rsxpp2ZGsDTq16odV7Ja7xAAp/0BcdosdQYn6L4KUbSimulGaP/Q1KATUCFT7QflQiv0gnwuPpngQ==",
 			"license": "MIT",
 			"dependencies": {
-				"@umbraco-ui/uui-base": "1.16.0-rc.0",
-				"@umbraco-ui/uui-toast-notification": "1.16.0-rc.0"
+				"@umbraco-ui/uui-base": "1.16.0",
+				"@umbraco-ui/uui-toast-notification": "1.16.0"
 			}
 		},
 		"node_modules/@umbraco-ui/uui-toast-notification-layout": {
-			"version": "1.16.0-rc.0",
-			"resolved": "https://registry.npmjs.org/@umbraco-ui/uui-toast-notification-layout/-/uui-toast-notification-layout-1.16.0-rc.0.tgz",
-			"integrity": "sha512-u9tCH9eqnVJecnPM0gpxGIb14VbOZHNtLR/9bJauw8P8X34t1mP/6zgnkc9+WL6UiJ0Ljxc5YxzjZfOwA7mbyA==",
+			"version": "1.16.0",
+			"resolved": "https://registry.npmjs.org/@umbraco-ui/uui-toast-notification-layout/-/uui-toast-notification-layout-1.16.0.tgz",
+			"integrity": "sha512-OTrTAGUPe8EQRuCWJD8GsCw8MfNJuXx50NLZLDDZKzw3TlDiWMxUD0c4l6zOMy4ih7n7D5sMekHqonW5x6lVuA==",
 			"license": "MIT",
 			"dependencies": {
-				"@umbraco-ui/uui-base": "1.16.0-rc.0",
-				"@umbraco-ui/uui-css": "1.16.0-rc.0"
+				"@umbraco-ui/uui-base": "1.16.0",
+				"@umbraco-ui/uui-css": "1.16.0"
 			}
 		},
 		"node_modules/@umbraco-ui/uui-toggle": {
-			"version": "1.16.0-rc.0",
-			"resolved": "https://registry.npmjs.org/@umbraco-ui/uui-toggle/-/uui-toggle-1.16.0-rc.0.tgz",
-			"integrity": "sha512-6OoCkSkfbHo1Rt2INE2/TId7KEb/Cr8Dpra1cIVdIW+zF2zwi1xsY2wf2fK7TZ8QQynjF2cgGneCvEKjVZD5sg==",
+			"version": "1.16.0",
+			"resolved": "https://registry.npmjs.org/@umbraco-ui/uui-toggle/-/uui-toggle-1.16.0.tgz",
+			"integrity": "sha512-opFdwN0LlH6l1xlzEv+e9tvLgySXRr4Ug5LBlzNRJKC/WhinUSq/okerIVyUJgk4oKdZV/y7T7u/07LiekCTAA==",
 			"license": "MIT",
 			"dependencies": {
-				"@umbraco-ui/uui-base": "1.16.0-rc.0",
-				"@umbraco-ui/uui-boolean-input": "1.16.0-rc.0"
+				"@umbraco-ui/uui-base": "1.16.0",
+				"@umbraco-ui/uui-boolean-input": "1.16.0"
 			}
 		},
 		"node_modules/@umbraco-ui/uui-visually-hidden": {
-			"version": "1.16.0-rc.0",
-			"resolved": "https://registry.npmjs.org/@umbraco-ui/uui-visually-hidden/-/uui-visually-hidden-1.16.0-rc.0.tgz",
-			"integrity": "sha512-O8DvV+5tg9fc+y5zArjVb8EpVD/Spx+2W6P/DX1SsTgf7LJr1mPGxoCYn0Vnd3kK9PgHxRFzDIK1DEJCHXaeQQ==",
+			"version": "1.16.0",
+			"resolved": "https://registry.npmjs.org/@umbraco-ui/uui-visually-hidden/-/uui-visually-hidden-1.16.0.tgz",
+			"integrity": "sha512-fqcv9gZUey2FkE2IRWuDgpk+D5XCdC1gnmQ4bIlAs03cMhl2BWP7U04Zo1u78jcWCbjxfnp60rfE6h11ukd5sg==",
 			"license": "MIT",
 			"dependencies": {
-				"@umbraco-ui/uui-base": "1.16.0-rc.0"
+				"@umbraco-ui/uui-base": "1.16.0"
 			}
 		},
 		"node_modules/@vitest/expect": {
@@ -17043,8 +17043,8 @@
 		"src/external/uui": {
 			"name": "@umbraco-backoffice/uui",
 			"dependencies": {
-				"@umbraco-ui/uui": "^1.16.0-rc.0",
-				"@umbraco-ui/uui-css": "^1.16.0-rc.0"
+				"@umbraco-ui/uui": "^1.16.0",
+				"@umbraco-ui/uui-css": "^1.16.0"
 			}
 		},
 		"src/packages/block": {
diff --git a/src/Umbraco.Web.UI.Client/src/external/uui/package.json b/src/Umbraco.Web.UI.Client/src/external/uui/package.json
index 6bc495b29351..a871f79a8e4c 100644
--- a/src/Umbraco.Web.UI.Client/src/external/uui/package.json
+++ b/src/Umbraco.Web.UI.Client/src/external/uui/package.json
@@ -6,7 +6,7 @@
 		"build": "vite build"
 	},
 	"dependencies": {
-		"@umbraco-ui/uui": "^1.16.0-rc.0",
-		"@umbraco-ui/uui-css": "^1.16.0-rc.0"
+		"@umbraco-ui/uui": "^1.16.0",
+		"@umbraco-ui/uui-css": "^1.16.0"
 	}
 }

From a3a8be47172f9ad6bb64121dc5b4643a44a4b9dc Mon Sep 17 00:00:00 2001
From: Andy Butland <abutland73@gmail.com>
Date: Fri, 17 Oct 2025 10:46:54 +0200
Subject: [PATCH 045/155] Templates: Retain layout from file when loading
 template (closes #20524) (#20529)

Retain layout from file when loading template.
---
 .../template-workspace-editor.element.ts      |  4 ++--
 .../workspace/template-workspace.context.ts   | 23 ++++++++++++++-----
 2 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/packages/templating/templates/workspace/template-workspace-editor.element.ts b/src/Umbraco.Web.UI.Client/src/packages/templating/templates/workspace/template-workspace-editor.element.ts
index a81f4c0f54f4..a40e9c4b06a8 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/templating/templates/workspace/template-workspace-editor.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/templating/templates/workspace/template-workspace-editor.element.ts
@@ -102,7 +102,7 @@ export class UmbTemplateWorkspaceEditorElement extends UmbLitElement {
 	}
 
 	#resetMasterTemplate() {
-		this.#templateWorkspaceContext?.setMasterTemplate(null);
+		this.#templateWorkspaceContext?.setMasterTemplate(null, true);
 	}
 
 	#openMasterTemplatePicker() {
@@ -121,7 +121,7 @@ export class UmbTemplateWorkspaceEditorElement extends UmbLitElement {
 			?.onSubmit()
 			.then((value) => {
 				if (!value?.selection) return;
-				this.#templateWorkspaceContext?.setMasterTemplate(value.selection[0] ?? null);
+				this.#templateWorkspaceContext?.setMasterTemplate(value.selection[0] ?? null, true);
 			})
 			.catch(() => undefined);
 	}
diff --git a/src/Umbraco.Web.UI.Client/src/packages/templating/templates/workspace/template-workspace.context.ts b/src/Umbraco.Web.UI.Client/src/packages/templating/templates/workspace/template-workspace.context.ts
index 35ff79bb43d8..0ea8f97d8cdd 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/templating/templates/workspace/template-workspace.context.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/templating/templates/workspace/template-workspace.context.ts
@@ -67,7 +67,15 @@ export class UmbTemplateWorkspaceContext
 
 	override async load(unique: string) {
 		const response = await super.load(unique);
-		await this.setMasterTemplate(response.data?.masterTemplate?.unique ?? null);
+
+		// On load we want to set the master template details but not update the layout block in the Razor file.
+		// This is because you can still set a layout in code by setting `Layout = "_Layout.cshtml";` in the template file.
+		// This gets set automatically if you create a template under a parent, but you don't have to do that, you can
+		// just set  the `Layout` property in the Razor template file itself.
+		// So even if there's no master template set by there being a parent, there may still be one set in the Razor
+		// code, and we shouldn't overwrite it.
+		await this.setMasterTemplate(response.data?.masterTemplate?.unique ?? null, false);
+
 		return response;
 	}
 
@@ -79,9 +87,9 @@ export class UmbTemplateWorkspaceContext
 			},
 		});
 
-		// Set or reset the master template
-		// This is important to reset when a new template is created so the UI reflects the correct state
-		await this.setMasterTemplate(parent.unique);
+		// On create set or reset the master template depending on whether the template is being created under a parent.
+		// This is important to reset when a new template is created so the UI reflects the correct state.
+		await this.setMasterTemplate(parent.unique, true);
 
 		return data;
 	}
@@ -102,7 +110,7 @@ export class UmbTemplateWorkspaceContext
 		return this.getData()?.content ? this.getLayoutBlockRegexPattern().test(this.getData()?.content as string) : false;
 	}
 
-	async setMasterTemplate(unique: string | null) {
+	async setMasterTemplate(unique: string | null, updateLayoutBlock: boolean) {
 		if (unique === null) {
 			this.#masterTemplate.setValue(null);
 		} else {
@@ -113,7 +121,10 @@ export class UmbTemplateWorkspaceContext
 			}
 		}
 
-		this.#updateMasterTemplateLayoutBlock();
+		if (updateLayoutBlock) {
+			this.#updateMasterTemplateLayoutBlock();
+		}
+
 		this._data.updateCurrent({ masterTemplate: unique ? { unique } : null });
 
 		return unique;

From 105cb9da4158d6edd2b3d743926bda22c9ce0d36 Mon Sep 17 00:00:00 2001
From: Anders Reus <88318565+andersreus@users.noreply.github.com>
Date: Fri, 17 Oct 2025 14:40:18 +0200
Subject: [PATCH 046/155] Added trashed state so when requesting content from
 the recycle bin via the management api it will return trashed instead of
 published state (#20542)

Added trashed state so when requesting content from the recycle bin via the management api, the state will be trashed instead of published.
---
 .../Content/DocumentVariantStateHelper.cs     |  9 +++-
 .../Document/DocumentVariantState.cs          |  5 ++
 .../DocumentVariantStateHelperTests.cs        | 54 ++++++++++---------
 3 files changed, 43 insertions(+), 25 deletions(-)

diff --git a/src/Umbraco.Cms.Api.Management/Mapping/Content/DocumentVariantStateHelper.cs b/src/Umbraco.Cms.Api.Management/Mapping/Content/DocumentVariantStateHelper.cs
index 6d7539b82584..f565b9cdf027 100644
--- a/src/Umbraco.Cms.Api.Management/Mapping/Content/DocumentVariantStateHelper.cs
+++ b/src/Umbraco.Cms.Api.Management/Mapping/Content/DocumentVariantStateHelper.cs
@@ -12,6 +12,7 @@ internal static DocumentVariantState GetState(IContent content, string? culture)
             culture,
             content.Edited,
             content.Published,
+            content.Trashed,
             content.AvailableCultures,
             content.EditedCultures ?? Enumerable.Empty<string>(),
             content.PublishedCultures);
@@ -22,17 +23,23 @@ internal static DocumentVariantState GetState(IDocumentEntitySlim content, strin
             culture,
             content.Edited,
             content.Published,
+            content.Trashed,
             content.CultureNames.Keys,
             content.EditedCultures,
             content.PublishedCultures);
 
-    private static DocumentVariantState GetState(IEntity entity, string? culture, bool edited, bool published, IEnumerable<string> availableCultures, IEnumerable<string> editedCultures, IEnumerable<string> publishedCultures)
+    private static DocumentVariantState GetState(IEntity entity, string? culture, bool edited, bool published, bool trashed, IEnumerable<string> availableCultures, IEnumerable<string> editedCultures, IEnumerable<string> publishedCultures)
     {
         if (entity.Id <= 0 || (culture is not null && availableCultures.Contains(culture) is false))
         {
             return DocumentVariantState.NotCreated;
         }
 
+        if (trashed)
+        {
+            return DocumentVariantState.Trashed;
+        }
+
         var isDraft = published is false ||
                       (culture != null && publishedCultures.Contains(culture) is false);
         if (isDraft)
diff --git a/src/Umbraco.Cms.Api.Management/ViewModels/Document/DocumentVariantState.cs b/src/Umbraco.Cms.Api.Management/ViewModels/Document/DocumentVariantState.cs
index 3ed51114e100..d3edd54cd93b 100644
--- a/src/Umbraco.Cms.Api.Management/ViewModels/Document/DocumentVariantState.cs
+++ b/src/Umbraco.Cms.Api.Management/ViewModels/Document/DocumentVariantState.cs
@@ -24,4 +24,9 @@ public enum DocumentVariantState
     ///     The item is published and there are pending changes
     /// </summary>
     PublishedPendingChanges = 4,
+
+    /// <summary>
+    ///     The item is in the recycle bin
+    /// </summary>
+    Trashed = 5,
 }
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Cms.Api.Management/Mapping/Content/DocumentVariantStateHelperTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Cms.Api.Management/Mapping/Content/DocumentVariantStateHelperTests.cs
index d63eda2eed37..f3c0fe9f7026 100644
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.Cms.Api.Management/Mapping/Content/DocumentVariantStateHelperTests.cs
+++ b/tests/Umbraco.Tests.UnitTests/Umbraco.Cms.Api.Management/Mapping/Content/DocumentVariantStateHelperTests.cs
@@ -11,13 +11,14 @@ namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Cms.Api.Management.Mapping.Content
 [TestFixture]
 public class DocumentVariantStateHelperTests
 {
-    [TestCase(false, false, DocumentVariantState.Draft)]
-    [TestCase(false, true, DocumentVariantState.Published)]
-    [TestCase(true, false, DocumentVariantState.Draft)]
-    [TestCase(true, true, DocumentVariantState.PublishedPendingChanges)]
-    public void Culture_Invariant_Content_State(bool edited, bool published, DocumentVariantState expectedResult)
+    [TestCase(false, false, false, DocumentVariantState.Draft)]
+    [TestCase(false, true, false, DocumentVariantState.Published)]
+    [TestCase(true, false, false, DocumentVariantState.Draft)]
+    [TestCase(true, true, false, DocumentVariantState.PublishedPendingChanges)]
+    [TestCase(true, false, true, DocumentVariantState.Trashed)]
+    public void Culture_Invariant_Content_State(bool edited, bool published, bool trashed, DocumentVariantState expectedResult)
     {
-        var content = Mock.Of<IContent>(c => c.Id == 1 && c.Published == published && c.Edited == edited);
+        var content = Mock.Of<IContent>(c => c.Id == 1 && c.Published == published && c.Edited == edited && c.Trashed == trashed);
         Assert.AreEqual(expectedResult, DocumentVariantStateHelper.GetState(content, culture: null));
     }
 
@@ -31,11 +32,12 @@ public void Culture_Invariant_Content_Not_Created_State(bool edited, bool publis
         Assert.AreEqual(DocumentVariantState.NotCreated, DocumentVariantStateHelper.GetState(content, culture: null));
     }
 
-    [TestCase(false, false, DocumentVariantState.Draft)]
-    [TestCase(false, true, DocumentVariantState.Published)]
-    [TestCase(true, false, DocumentVariantState.Draft)]
-    [TestCase(true, true, DocumentVariantState.PublishedPendingChanges)]
-    public void Culture_Variant_Content_Existing_Culture_State(bool edited, bool published, DocumentVariantState expectedResult)
+    [TestCase(false, false, false, DocumentVariantState.Draft)]
+    [TestCase(false, true, false, DocumentVariantState.Published)]
+    [TestCase(true, false, false, DocumentVariantState.Draft)]
+    [TestCase(true, true, false, DocumentVariantState.PublishedPendingChanges)]
+    [TestCase(true, false, true, DocumentVariantState.Trashed)]
+    public void Culture_Variant_Content_Existing_Culture_State(bool edited, bool published, bool trashed, DocumentVariantState expectedResult)
     {
         const string culture = "en";
         var content = Mock.Of<IContent>(c =>
@@ -43,7 +45,8 @@ public void Culture_Variant_Content_Existing_Culture_State(bool edited, bool pub
             && c.AvailableCultures == new[] { culture }
             && c.EditedCultures == (edited ? new[] { culture } : Enumerable.Empty<string>())
             && c.Published == published
-            && c.PublishedCultures == (published ? new[] { culture } : Enumerable.Empty<string>()));
+            && c.PublishedCultures == (published ? new[] { culture } : Enumerable.Empty<string>())
+            && c.Trashed == trashed);
         Assert.AreEqual(expectedResult, DocumentVariantStateHelper.GetState(content, culture));
     }
 
@@ -63,13 +66,14 @@ public void Culture_Variant_Content_Missing_Culture_State(bool edited, bool publ
         Assert.AreEqual(DocumentVariantState.NotCreated, DocumentVariantStateHelper.GetState(content, "dk"));
     }
 
-    [TestCase(false, false, DocumentVariantState.Draft)]
-    [TestCase(false, true, DocumentVariantState.Published)]
-    [TestCase(true, false, DocumentVariantState.Draft)]
-    [TestCase(true, true, DocumentVariantState.PublishedPendingChanges)]
-    public void Culture_Invariant_DocumentEntitySlim_State(bool edited, bool published, DocumentVariantState expectedResult)
+    [TestCase(false, false, false, DocumentVariantState.Draft)]
+    [TestCase(false, true, false, DocumentVariantState.Published)]
+    [TestCase(true, false, false, DocumentVariantState.Draft)]
+    [TestCase(true, true, false, DocumentVariantState.PublishedPendingChanges)]
+    [TestCase(true, false, true, DocumentVariantState.Trashed)]
+    public void Culture_Invariant_DocumentEntitySlim_State(bool edited, bool published, bool trashed, DocumentVariantState expectedResult)
     {
-        var entity = Mock.Of<IDocumentEntitySlim>(c => c.Id == 1 && c.Published == published && c.Edited == edited && c.CultureNames == new Dictionary<string, string>());
+        var entity = Mock.Of<IDocumentEntitySlim>(c => c.Id == 1 && c.Published == published && c.Edited == edited && c.CultureNames == new Dictionary<string, string>() && c.Trashed == trashed);
         Assert.AreEqual(expectedResult, DocumentVariantStateHelper.GetState(entity, culture: null));
     }
 
@@ -83,11 +87,12 @@ public void Culture_Invariant_DocumentEntitySlim_Not_Created_State(bool edited,
         Assert.AreEqual(DocumentVariantState.NotCreated, DocumentVariantStateHelper.GetState(entity, culture: null));
     }
 
-    [TestCase(false, false, DocumentVariantState.Draft)]
-    [TestCase(false, true, DocumentVariantState.Published)]
-    [TestCase(true, false, DocumentVariantState.Draft)]
-    [TestCase(true, true, DocumentVariantState.PublishedPendingChanges)]
-    public void Culture_Variant_DocumentEntitySlim_Existing_Culture_State(bool edited, bool published, DocumentVariantState expectedResult)
+    [TestCase(false, false, false, DocumentVariantState.Draft)]
+    [TestCase(false, true, false, DocumentVariantState.Published)]
+    [TestCase(true, false, false, DocumentVariantState.Draft)]
+    [TestCase(true, true, false, DocumentVariantState.PublishedPendingChanges)]
+    [TestCase(true, false, true, DocumentVariantState.Trashed)]
+    public void Culture_Variant_DocumentEntitySlim_Existing_Culture_State(bool edited, bool published, bool trashed, DocumentVariantState expectedResult)
     {
         const string culture = "en";
         var entity = Mock.Of<IDocumentEntitySlim>(c =>
@@ -95,7 +100,8 @@ public void Culture_Variant_DocumentEntitySlim_Existing_Culture_State(bool edite
             && c.CultureNames == new Dictionary<string, string> { { culture, "value does not matter" } }
             && c.EditedCultures == (edited ? new[] { culture } : Enumerable.Empty<string>())
             && c.Published == published
-            && c.PublishedCultures == (published ? new[] { culture } : Enumerable.Empty<string>()));
+            && c.PublishedCultures == (published ? new[] { culture } : Enumerable.Empty<string>())
+            && c.Trashed == trashed);
         Assert.AreEqual(expectedResult, DocumentVariantStateHelper.GetState(entity, culture));
     }
 

From 5a65eb1758a28af18efbc7ca3f62ecd1b908333c Mon Sep 17 00:00:00 2001
From: Andy Butland <abutland73@gmail.com>
Date: Fri, 17 Oct 2025 15:01:09 +0200
Subject: [PATCH 047/155] Update OpenApi.json and client-side models.

---
 src/Umbraco.Cms.Api.Management/OpenApi.json   | 56 +++++++++++++++++--
 .../packages/core/backend-api/types.gen.ts    | 20 +++++--
 .../src/packages/documents/documents/utils.ts |  1 +
 ...ace-split-view-variant-selector.element.ts |  1 +
 4 files changed, 67 insertions(+), 11 deletions(-)

diff --git a/src/Umbraco.Cms.Api.Management/OpenApi.json b/src/Umbraco.Cms.Api.Management/OpenApi.json
index 35de8ff74eee..f4d4118c94d3 100644
--- a/src/Umbraco.Cms.Api.Management/OpenApi.json
+++ b/src/Umbraco.Cms.Api.Management/OpenApi.json
@@ -37322,6 +37322,9 @@
                 {
                   "$ref": "#/components/schemas/DocumentPropertyValuePermissionPresentationModel"
                 },
+                {
+                  "$ref": "#/components/schemas/DocumentTypePermissionPresentationModel"
+                },
                 {
                   "$ref": "#/components/schemas/UnknownTypePermissionPresentationModel"
                 }
@@ -37608,6 +37611,9 @@
                 {
                   "$ref": "#/components/schemas/DocumentPropertyValuePermissionPresentationModel"
                 },
+                {
+                  "$ref": "#/components/schemas/DocumentTypePermissionPresentationModel"
+                },
                 {
                   "$ref": "#/components/schemas/UnknownTypePermissionPresentationModel"
                 }
@@ -38444,7 +38450,8 @@
             "type": "boolean"
           },
           "allowNonExistingSegmentsCreation": {
-            "type": "boolean"
+            "type": "boolean",
+            "deprecated": true
           }
         },
         "additionalProperties": false
@@ -39088,6 +39095,36 @@
         },
         "additionalProperties": false
       },
+      "DocumentTypePermissionPresentationModel": {
+        "required": [
+          "$type",
+          "documentTypeAlias",
+          "verbs"
+        ],
+        "type": "object",
+        "properties": {
+          "$type": {
+            "type": "string"
+          },
+          "verbs": {
+            "uniqueItems": true,
+            "type": "array",
+            "items": {
+              "type": "string"
+            }
+          },
+          "documentTypeAlias": {
+            "type": "string"
+          }
+        },
+        "additionalProperties": false,
+        "discriminator": {
+          "propertyName": "$type",
+          "mapping": {
+            "DocumentTypePermissionPresentationModel": "#/components/schemas/DocumentTypePermissionPresentationModel"
+          }
+        }
+      },
       "DocumentTypePropertyTypeContainerResponseModel": {
         "required": [
           "id",
@@ -39683,7 +39720,8 @@
           "NotCreated",
           "Draft",
           "Published",
-          "PublishedPendingChanges"
+          "PublishedPendingChanges",
+          "Trashed"
         ],
         "type": "string"
       },
@@ -40178,7 +40216,7 @@
           },
           "actionParameters": {
             "type": "object",
-            "additionalProperties": { },
+            "additionalProperties": {},
             "nullable": true
           }
         },
@@ -40803,7 +40841,7 @@
           },
           "extensions": {
             "type": "array",
-            "items": { }
+            "items": {}
           }
         },
         "additionalProperties": false
@@ -44640,7 +44678,7 @@
             "nullable": true
           }
         },
-        "additionalProperties": { }
+        "additionalProperties": {}
       },
       "ProblemDetailsBuilderModel": {
         "type": "object",
@@ -47813,6 +47851,9 @@
                 {
                   "$ref": "#/components/schemas/DocumentPropertyValuePermissionPresentationModel"
                 },
+                {
+                  "$ref": "#/components/schemas/DocumentTypePermissionPresentationModel"
+                },
                 {
                   "$ref": "#/components/schemas/UnknownTypePermissionPresentationModel"
                 }
@@ -48250,6 +48291,9 @@
                 {
                   "$ref": "#/components/schemas/DocumentPropertyValuePermissionPresentationModel"
                 },
+                {
+                  "$ref": "#/components/schemas/DocumentTypePermissionPresentationModel"
+                },
                 {
                   "$ref": "#/components/schemas/UnknownTypePermissionPresentationModel"
                 }
@@ -48932,4 +48976,4 @@
       }
     }
   }
-}
\ No newline at end of file
+}
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/backend-api/types.gen.ts b/src/Umbraco.Web.UI.Client/src/packages/core/backend-api/types.gen.ts
index 8050b8555623..94facac6498b 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/backend-api/types.gen.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/backend-api/types.gen.ts
@@ -412,7 +412,7 @@ export type CreateUserGroupRequestModel = {
     mediaStartNode?: ReferenceByIdModel | null;
     mediaRootAccess: boolean;
     fallbackPermissions: Array<string>;
-    permissions: Array<DocumentPermissionPresentationModel | DocumentPropertyValuePermissionPresentationModel | UnknownTypePermissionPresentationModel>;
+    permissions: Array<DocumentPermissionPresentationModel | DocumentPropertyValuePermissionPresentationModel | DocumentTypePermissionPresentationModel | UnknownTypePermissionPresentationModel>;
     id?: string | null;
 };
 
@@ -471,7 +471,7 @@ export type CurrentUserResponseModel = {
     hasAccessToAllLanguages: boolean;
     hasAccessToSensitiveData: boolean;
     fallbackPermissions: Array<string>;
-    permissions: Array<DocumentPermissionPresentationModel | DocumentPropertyValuePermissionPresentationModel | UnknownTypePermissionPresentationModel>;
+    permissions: Array<DocumentPermissionPresentationModel | DocumentPropertyValuePermissionPresentationModel | DocumentTypePermissionPresentationModel | UnknownTypePermissionPresentationModel>;
     allowedSections: Array<string>;
     isAdmin: boolean;
 };
@@ -659,6 +659,9 @@ export type DocumentConfigurationResponseModel = {
     disableDeleteWhenReferenced: boolean;
     disableUnpublishWhenReferenced: boolean;
     allowEditInvariantFromNonDefault: boolean;
+    /**
+     * @deprecated
+     */
     allowNonExistingSegmentsCreation: boolean;
 };
 
@@ -791,6 +794,12 @@ export type DocumentTypeItemResponseModel = {
     description?: string | null;
 };
 
+export type DocumentTypePermissionPresentationModel = {
+    $type: string;
+    verbs: Array<string>;
+    documentTypeAlias: string;
+};
+
 export type DocumentTypePropertyTypeContainerResponseModel = {
     id: string;
     parent?: ReferenceByIdModel | null;
@@ -920,7 +929,8 @@ export enum DocumentVariantStateModel {
     NOT_CREATED = 'NotCreated',
     DRAFT = 'Draft',
     PUBLISHED = 'Published',
-    PUBLISHED_PENDING_CHANGES = 'PublishedPendingChanges'
+    PUBLISHED_PENDING_CHANGES = 'PublishedPendingChanges',
+    TRASHED = 'Trashed'
 }
 
 export type DocumentVersionItemResponseModel = {
@@ -2822,7 +2832,7 @@ export type UpdateUserGroupRequestModel = {
     mediaStartNode?: ReferenceByIdModel | null;
     mediaRootAccess: boolean;
     fallbackPermissions: Array<string>;
-    permissions: Array<DocumentPermissionPresentationModel | DocumentPropertyValuePermissionPresentationModel | UnknownTypePermissionPresentationModel>;
+    permissions: Array<DocumentPermissionPresentationModel | DocumentPropertyValuePermissionPresentationModel | DocumentTypePermissionPresentationModel | UnknownTypePermissionPresentationModel>;
 };
 
 export type UpdateUserGroupsOnUserRequestModel = {
@@ -2923,7 +2933,7 @@ export type UserGroupResponseModel = {
     mediaStartNode?: ReferenceByIdModel | null;
     mediaRootAccess: boolean;
     fallbackPermissions: Array<string>;
-    permissions: Array<DocumentPermissionPresentationModel | DocumentPropertyValuePermissionPresentationModel | UnknownTypePermissionPresentationModel>;
+    permissions: Array<DocumentPermissionPresentationModel | DocumentPropertyValuePermissionPresentationModel | DocumentTypePermissionPresentationModel | UnknownTypePermissionPresentationModel>;
     id: string;
     isDeletable: boolean;
     aliasCanBeChanged: boolean;
diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/utils.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/utils.ts
index 3622652b5111..531bca043e55 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/utils.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/utils.ts
@@ -8,6 +8,7 @@ const variantStatesOrder = {
 	[DocumentVariantStateModel.PUBLISHED]: 1,
 	[DocumentVariantStateModel.DRAFT]: 2,
 	[DocumentVariantStateModel.NOT_CREATED]: 3,
+	[DocumentVariantStateModel.TRASHED]: 4,
 };
 
 const getVariantStateOrderValue = (variant?: UmbDocumentVariantOptionModel['variant']) => {
diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/workspace/document-workspace-split-view-variant-selector.element.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/workspace/document-workspace-split-view-variant-selector.element.ts
index 45ef5f33bc7f..5be90a4278b5 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/workspace/document-workspace-split-view-variant-selector.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/workspace/document-workspace-split-view-variant-selector.element.ts
@@ -22,6 +22,7 @@ export class UmbDocumentWorkspaceSplitViewVariantSelectorElement extends UmbWork
 		// We should also make our own state model for this
 		[DocumentVariantStateModel.PUBLISHED_PENDING_CHANGES]: 'content_published',
 		[DocumentVariantStateModel.NOT_CREATED]: 'content_notCreated',
+		[DocumentVariantStateModel.TRASHED]: 'mediaPicker_trashed',
 	};
 
 	constructor() {

From 8b1f18699d8f5eeb6cbc67fc01a1d24d2f554bd5 Mon Sep 17 00:00:00 2001
From: Andy Butland <abutland73@gmail.com>
Date: Fri, 17 Oct 2025 15:20:01 +0200
Subject: [PATCH 048/155] Update OpenApi.json and client-side models.

---
 src/Umbraco.Cms.Api.Management/OpenApi.json                    | 3 ++-
 .../src/packages/core/backend-api/types.gen.ts                 | 3 ++-
 .../src/packages/documents/documents/utils.ts                  | 1 +
 .../document-workspace-split-view-variant-selector.element.ts  | 1 +
 4 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/Umbraco.Cms.Api.Management/OpenApi.json b/src/Umbraco.Cms.Api.Management/OpenApi.json
index 5f13509f568b..51a57abdbd93 100644
--- a/src/Umbraco.Cms.Api.Management/OpenApi.json
+++ b/src/Umbraco.Cms.Api.Management/OpenApi.json
@@ -40166,7 +40166,8 @@
           "NotCreated",
           "Draft",
           "Published",
-          "PublishedPendingChanges"
+          "PublishedPendingChanges",
+          "Trashed"
         ],
         "type": "string"
       },
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/backend-api/types.gen.ts b/src/Umbraco.Web.UI.Client/src/packages/core/backend-api/types.gen.ts
index 0bd3f90ea53e..9ea9d69e5616 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/backend-api/types.gen.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/backend-api/types.gen.ts
@@ -910,7 +910,8 @@ export enum DocumentVariantStateModel {
     NOT_CREATED = 'NotCreated',
     DRAFT = 'Draft',
     PUBLISHED = 'Published',
-    PUBLISHED_PENDING_CHANGES = 'PublishedPendingChanges'
+    PUBLISHED_PENDING_CHANGES = 'PublishedPendingChanges',
+    TRASHED = 'Trashed'
 }
 
 export type DocumentVersionItemResponseModel = {
diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/utils.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/utils.ts
index 3622652b5111..531bca043e55 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/utils.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/utils.ts
@@ -8,6 +8,7 @@ const variantStatesOrder = {
 	[DocumentVariantStateModel.PUBLISHED]: 1,
 	[DocumentVariantStateModel.DRAFT]: 2,
 	[DocumentVariantStateModel.NOT_CREATED]: 3,
+	[DocumentVariantStateModel.TRASHED]: 4,
 };
 
 const getVariantStateOrderValue = (variant?: UmbDocumentVariantOptionModel['variant']) => {
diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/workspace/document-workspace-split-view-variant-selector.element.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/workspace/document-workspace-split-view-variant-selector.element.ts
index 45ef5f33bc7f..5be90a4278b5 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/workspace/document-workspace-split-view-variant-selector.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/workspace/document-workspace-split-view-variant-selector.element.ts
@@ -22,6 +22,7 @@ export class UmbDocumentWorkspaceSplitViewVariantSelectorElement extends UmbWork
 		// We should also make our own state model for this
 		[DocumentVariantStateModel.PUBLISHED_PENDING_CHANGES]: 'content_published',
 		[DocumentVariantStateModel.NOT_CREATED]: 'content_notCreated',
+		[DocumentVariantStateModel.TRASHED]: 'mediaPicker_trashed',
 	};
 
 	constructor() {

From ae2c59b7032e7958ff3a46fc44ab863022cd241f Mon Sep 17 00:00:00 2001
From: Kenn Jacobsen <kja@umbraco.dk>
Date: Fri, 17 Oct 2025 15:45:03 +0200
Subject: [PATCH 049/155] Make the indexing batch size configurable (#20543)

* Introduce configurable batch size for indexing

* Stop using Examine indexing events for reporting index rebuild operation completeness (it is volatile)
---
 .../Configuration/Models/IndexingSettings.cs  |  6 +++
 .../Examine/ContentIndexPopulator.cs          | 47 ++++++++++++++++---
 .../Examine/DeliveryApiContentIndexHelper.cs  | 21 +++++++--
 .../Examine/MediaIndexPopulator.cs            | 35 +++++++++++---
 .../Examine/PublishedContentIndexPopulator.cs | 13 +++++
 .../Services/IndexingRebuilderService.cs      | 23 ---------
 .../UmbracoExamine/IndexInitializer.cs        | 10 ++--
 7 files changed, 113 insertions(+), 42 deletions(-)

diff --git a/src/Umbraco.Core/Configuration/Models/IndexingSettings.cs b/src/Umbraco.Core/Configuration/Models/IndexingSettings.cs
index ff3bebd9894a..282d6c57fb8e 100644
--- a/src/Umbraco.Core/Configuration/Models/IndexingSettings.cs
+++ b/src/Umbraco.Core/Configuration/Models/IndexingSettings.cs
@@ -9,10 +9,16 @@ namespace Umbraco.Cms.Core.Configuration.Models;
 public class IndexingSettings
 {
     private const bool StaticExplicitlyIndexEachNestedProperty = false;
+    private const int StaticBatchSize = 10000;
 
     /// <summary>
     /// Gets or sets a value for whether each nested property should have it's own indexed value. Requires a rebuild of indexes when changed.
     /// </summary>
     [DefaultValue(StaticExplicitlyIndexEachNestedProperty)]
     public bool ExplicitlyIndexEachNestedProperty { get; set; } = StaticExplicitlyIndexEachNestedProperty;
+
+    /// <summary>
+    /// Gets or sets a value for how many items to index at a time.
+    /// </summary>
+    public int BatchSize { get; set; } = StaticBatchSize;
 }
diff --git a/src/Umbraco.Infrastructure/Examine/ContentIndexPopulator.cs b/src/Umbraco.Infrastructure/Examine/ContentIndexPopulator.cs
index eb9e9f135fdd..e912728feef7 100644
--- a/src/Umbraco.Infrastructure/Examine/ContentIndexPopulator.cs
+++ b/src/Umbraco.Infrastructure/Examine/ContentIndexPopulator.cs
@@ -1,5 +1,9 @@
 using Examine;
+using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Options;
+using Umbraco.Cms.Core.Configuration.Models;
+using Umbraco.Cms.Core.DependencyInjection;
 using Umbraco.Cms.Core.Models;
 using Umbraco.Cms.Core.Persistence.Querying;
 using Umbraco.Cms.Core.Services;
@@ -20,11 +24,23 @@ public class ContentIndexPopulator : IndexPopulator<IUmbracoContentIndex>
     private readonly bool _publishedValuesOnly;
     private readonly IUmbracoDatabaseFactory _umbracoDatabaseFactory;
 
+    private IndexingSettings _indexingSettings;
+
     /// <summary>
     ///     This is a static query, it's parameters don't change so store statically
     /// </summary>
     private IQuery<IContent>? _publishedQuery;
 
+    [Obsolete("Please use the non-obsolete constructor. Scheduled for removal in V19.")]
+    public ContentIndexPopulator(
+        ILogger<ContentIndexPopulator> logger,
+        IContentService contentService,
+        IUmbracoDatabaseFactory umbracoDatabaseFactory,
+        IContentValueSetBuilder contentValueSetBuilder)
+        : this(logger, false, null, contentService, umbracoDatabaseFactory, contentValueSetBuilder, StaticServiceProvider.Instance.GetRequiredService<IOptionsMonitor<IndexingSettings>>())
+    {
+    }
+
     /// <summary>
     ///     Default constructor to lookup all content data
     /// </summary>
@@ -32,8 +48,21 @@ public ContentIndexPopulator(
         ILogger<ContentIndexPopulator> logger,
         IContentService contentService,
         IUmbracoDatabaseFactory umbracoDatabaseFactory,
-        IContentValueSetBuilder contentValueSetBuilder)
-        : this(logger, false, null, contentService, umbracoDatabaseFactory, contentValueSetBuilder)
+        IContentValueSetBuilder contentValueSetBuilder,
+        IOptionsMonitor<IndexingSettings> indexingSettings)
+        : this(logger, false, null, contentService, umbracoDatabaseFactory, contentValueSetBuilder, indexingSettings)
+    {
+    }
+
+    [Obsolete("Please use the non-obsolete constructor. Scheduled for removal in V19.")]
+    public ContentIndexPopulator(
+        ILogger<ContentIndexPopulator> logger,
+        bool publishedValuesOnly,
+        int? parentId,
+        IContentService contentService,
+        IUmbracoDatabaseFactory umbracoDatabaseFactory,
+        IValueSetBuilder<IContent> contentValueSetBuilder)
+        : this(logger, publishedValuesOnly, parentId, contentService, umbracoDatabaseFactory, contentValueSetBuilder, StaticServiceProvider.Instance.GetRequiredService<IOptionsMonitor<IndexingSettings>>())
     {
     }
 
@@ -46,7 +75,8 @@ public ContentIndexPopulator(
         int? parentId,
         IContentService contentService,
         IUmbracoDatabaseFactory umbracoDatabaseFactory,
-        IValueSetBuilder<IContent> contentValueSetBuilder)
+        IValueSetBuilder<IContent> contentValueSetBuilder,
+        IOptionsMonitor<IndexingSettings> indexingSettings)
     {
         _contentService = contentService ?? throw new ArgumentNullException(nameof(contentService));
         _umbracoDatabaseFactory = umbracoDatabaseFactory ?? throw new ArgumentNullException(nameof(umbracoDatabaseFactory));
@@ -54,6 +84,12 @@ public ContentIndexPopulator(
         _logger = logger ?? throw new ArgumentNullException(nameof(logger));
         _publishedValuesOnly = publishedValuesOnly;
         _parentId = parentId;
+        _indexingSettings = indexingSettings.CurrentValue;
+
+        indexingSettings.OnChange(change =>
+        {
+            _indexingSettings = change;
+        });
     }
 
     private IQuery<IContent> PublishedQuery => _publishedQuery ??=
@@ -75,7 +111,6 @@ protected override void PopulateIndexes(IReadOnlyList<IIndex> indexes)
             return;
         }
 
-        const int pageSize = 10000;
         var pageIndex = 0;
 
         var contentParentId = -1;
@@ -86,11 +121,11 @@ protected override void PopulateIndexes(IReadOnlyList<IIndex> indexes)
 
         if (_publishedValuesOnly)
         {
-            IndexPublishedContent(contentParentId, pageIndex, pageSize, indexes);
+            IndexPublishedContent(contentParentId, pageIndex, _indexingSettings.BatchSize, indexes);
         }
         else
         {
-            IndexAllContent(contentParentId, pageIndex, pageSize, indexes);
+            IndexAllContent(contentParentId, pageIndex, _indexingSettings.BatchSize, indexes);
         }
     }
 
diff --git a/src/Umbraco.Infrastructure/Examine/DeliveryApiContentIndexHelper.cs b/src/Umbraco.Infrastructure/Examine/DeliveryApiContentIndexHelper.cs
index d7f2fc0c69af..2747773e1134 100644
--- a/src/Umbraco.Infrastructure/Examine/DeliveryApiContentIndexHelper.cs
+++ b/src/Umbraco.Infrastructure/Examine/DeliveryApiContentIndexHelper.cs
@@ -1,5 +1,7 @@
+using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Options;
 using Umbraco.Cms.Core.Configuration.Models;
+using Umbraco.Cms.Core.DependencyInjection;
 using Umbraco.Cms.Core.Models;
 using Umbraco.Cms.Core.Persistence.Querying;
 using Umbraco.Cms.Core.Services;
@@ -14,22 +16,33 @@ internal sealed class DeliveryApiContentIndexHelper : IDeliveryApiContentIndexHe
     private readonly IUmbracoDatabaseFactory _umbracoDatabaseFactory;
     private DeliveryApiSettings _deliveryApiSettings;
 
+    private IndexingSettings _indexingSettings;
+
+    [Obsolete("Please use the non-obsolete constructor. Scheduled for removal in V19.")]
     public DeliveryApiContentIndexHelper(
         IContentService contentService,
         IUmbracoDatabaseFactory umbracoDatabaseFactory,
         IOptionsMonitor<DeliveryApiSettings> deliveryApiSettings)
+        : this(contentService,  umbracoDatabaseFactory, deliveryApiSettings, StaticServiceProvider.Instance.GetRequiredService<IOptionsMonitor<IndexingSettings>>())
+    {
+    }
+
+    public DeliveryApiContentIndexHelper(
+        IContentService contentService,
+        IUmbracoDatabaseFactory umbracoDatabaseFactory,
+        IOptionsMonitor<DeliveryApiSettings> deliveryApiSettings,
+        IOptionsMonitor<IndexingSettings> indexingSettings)
     {
         _contentService = contentService;
         _umbracoDatabaseFactory = umbracoDatabaseFactory;
         _deliveryApiSettings = deliveryApiSettings.CurrentValue;
+        _indexingSettings = indexingSettings.CurrentValue;
         deliveryApiSettings.OnChange(settings => _deliveryApiSettings = settings);
+        indexingSettings.OnChange(settings => _indexingSettings = settings);
     }
 
     public void EnumerateApplicableDescendantsForContentIndex(int rootContentId, Action<IContent[]> actionToPerform)
-    {
-        const int pageSize = 10000;
-        EnumerateApplicableDescendantsForContentIndex(rootContentId, actionToPerform, pageSize);
-    }
+        => EnumerateApplicableDescendantsForContentIndex(rootContentId, actionToPerform, _indexingSettings.BatchSize);
 
     internal void EnumerateApplicableDescendantsForContentIndex(int rootContentId, Action<IContent[]> actionToPerform, int pageSize)
     {
diff --git a/src/Umbraco.Infrastructure/Examine/MediaIndexPopulator.cs b/src/Umbraco.Infrastructure/Examine/MediaIndexPopulator.cs
index 6f4a4db4a3a9..b9872da5c8ae 100644
--- a/src/Umbraco.Infrastructure/Examine/MediaIndexPopulator.cs
+++ b/src/Umbraco.Infrastructure/Examine/MediaIndexPopulator.cs
@@ -1,5 +1,9 @@
 using Examine;
+using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Options;
+using Umbraco.Cms.Core.Configuration.Models;
+using Umbraco.Cms.Core.DependencyInjection;
 using Umbraco.Cms.Core.Models;
 using Umbraco.Cms.Core.Services;
 
@@ -15,23 +19,43 @@ public class MediaIndexPopulator : IndexPopulator<IUmbracoContentIndex>
     private readonly IValueSetBuilder<IMedia> _mediaValueSetBuilder;
     private readonly int? _parentId;
 
+    private IndexingSettings _indexingSettings;
+
+    [Obsolete("Please use the non-obsolete constructor. Scheduled for removal in V19.")]
+    public MediaIndexPopulator(ILogger<MediaIndexPopulator> logger, IMediaService mediaService, IValueSetBuilder<IMedia> mediaValueSetBuilder)
+        : this(logger, null, mediaService, mediaValueSetBuilder, StaticServiceProvider.Instance.GetRequiredService<IOptionsMonitor<IndexingSettings>>())
+    {
+    }
+
     /// <summary>
     ///     Default constructor to lookup all content data
     /// </summary>
-    public MediaIndexPopulator(ILogger<MediaIndexPopulator> logger, IMediaService mediaService, IValueSetBuilder<IMedia> mediaValueSetBuilder)
-        : this(logger, null, mediaService, mediaValueSetBuilder)
+    public MediaIndexPopulator(ILogger<MediaIndexPopulator> logger, IMediaService mediaService, IValueSetBuilder<IMedia> mediaValueSetBuilder, IOptionsMonitor<IndexingSettings> indexingSettings)
+        : this(logger, null, mediaService, mediaValueSetBuilder, indexingSettings)
+    {
+    }
+
+    [Obsolete("Please use the non-obsolete constructor. Scheduled for removal in V19.")]
+    public MediaIndexPopulator(ILogger<MediaIndexPopulator> logger, int? parentId, IMediaService mediaService, IValueSetBuilder<IMedia> mediaValueSetBuilder)
+        : this(logger, parentId, mediaService, mediaValueSetBuilder, StaticServiceProvider.Instance.GetRequiredService<IOptionsMonitor<IndexingSettings>>())
     {
     }
 
     /// <summary>
     ///     Optional constructor allowing specifying custom query parameters
     /// </summary>
-    public MediaIndexPopulator(ILogger<MediaIndexPopulator> logger, int? parentId, IMediaService mediaService, IValueSetBuilder<IMedia> mediaValueSetBuilder)
+    public MediaIndexPopulator(ILogger<MediaIndexPopulator> logger, int? parentId, IMediaService mediaService, IValueSetBuilder<IMedia> mediaValueSetBuilder, IOptionsMonitor<IndexingSettings> indexingSettings)
     {
         _logger = logger;
         _parentId = parentId;
         _mediaService = mediaService;
         _mediaValueSetBuilder = mediaValueSetBuilder;
+        _indexingSettings = indexingSettings.CurrentValue;
+
+        indexingSettings.OnChange(change =>
+        {
+            _indexingSettings = change;
+        });
     }
 
     protected override void PopulateIndexes(IReadOnlyList<IIndex> indexes)
@@ -46,7 +70,6 @@ protected override void PopulateIndexes(IReadOnlyList<IIndex> indexes)
             return;
         }
 
-        const int pageSize = 10000;
         var pageIndex = 0;
 
         var mediaParentId = -1;
@@ -60,7 +83,7 @@ protected override void PopulateIndexes(IReadOnlyList<IIndex> indexes)
 
         do
         {
-            media = _mediaService.GetPagedDescendants(mediaParentId, pageIndex, pageSize, out _).ToArray();
+            media = _mediaService.GetPagedDescendants(mediaParentId, pageIndex, _indexingSettings.BatchSize, out _).ToArray();
 
             // ReSharper disable once PossibleMultipleEnumeration
             foreach (IIndex index in indexes)
@@ -70,6 +93,6 @@ protected override void PopulateIndexes(IReadOnlyList<IIndex> indexes)
 
             pageIndex++;
         }
-        while (media.Length == pageSize);
+        while (media.Length == _indexingSettings.BatchSize);
     }
 }
diff --git a/src/Umbraco.Infrastructure/Examine/PublishedContentIndexPopulator.cs b/src/Umbraco.Infrastructure/Examine/PublishedContentIndexPopulator.cs
index 67d59d02d9c8..4f07a7283f03 100644
--- a/src/Umbraco.Infrastructure/Examine/PublishedContentIndexPopulator.cs
+++ b/src/Umbraco.Infrastructure/Examine/PublishedContentIndexPopulator.cs
@@ -1,4 +1,6 @@
 using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Options;
+using Umbraco.Cms.Core.Configuration.Models;
 using Umbraco.Cms.Core.Services;
 using Umbraco.Cms.Infrastructure.Persistence;
 
@@ -15,6 +17,7 @@ namespace Umbraco.Cms.Infrastructure.Examine;
 /// </remarks>
 public class PublishedContentIndexPopulator : ContentIndexPopulator
 {
+    [Obsolete("Please use the non-obsolete constructor. Scheduled for removal in V19.")]
     public PublishedContentIndexPopulator(
         ILogger<PublishedContentIndexPopulator> logger,
         IContentService contentService,
@@ -23,4 +26,14 @@ public PublishedContentIndexPopulator(
         : base(logger, true, null, contentService, umbracoDatabaseFactory, contentValueSetBuilder)
     {
     }
+
+    public PublishedContentIndexPopulator(
+        ILogger<PublishedContentIndexPopulator> logger,
+        IContentService contentService,
+        IUmbracoDatabaseFactory umbracoDatabaseFactory,
+        IPublishedContentValueSetBuilder contentValueSetBuilder,
+        IOptionsMonitor<IndexingSettings> indexingSettings)
+        : base(logger, true, null, contentService, umbracoDatabaseFactory, contentValueSetBuilder, indexingSettings)
+    {
+    }
 }
diff --git a/src/Umbraco.Infrastructure/Services/IndexingRebuilderService.cs b/src/Umbraco.Infrastructure/Services/IndexingRebuilderService.cs
index 1263f52e5e4c..aaab2497ffb0 100644
--- a/src/Umbraco.Infrastructure/Services/IndexingRebuilderService.cs
+++ b/src/Umbraco.Infrastructure/Services/IndexingRebuilderService.cs
@@ -42,12 +42,6 @@ public bool TryRebuild(IIndex index, string indexName)
     /// <inheritdoc />
     public async Task<bool> TryRebuildAsync(IIndex index, string indexName)
     {
-        // Remove it in case there's a handler there already
-        index.IndexOperationComplete -= Indexer_IndexOperationComplete;
-
-        // Now add a single handler
-        index.IndexOperationComplete += Indexer_IndexOperationComplete;
-
         try
         {
             Attempt<IndexRebuildResult> attempt = await _indexRebuilder.RebuildIndexAsync(indexName);
@@ -55,8 +49,6 @@ public async Task<bool> TryRebuildAsync(IIndex index, string indexName)
         }
         catch (Exception exception)
         {
-            // Ensure it's not listening
-            index.IndexOperationComplete -= Indexer_IndexOperationComplete;
             _logger.LogError(exception, "An error occurred rebuilding index");
             return false;
         }
@@ -70,19 +62,4 @@ public bool IsRebuilding(string indexName)
     /// <inheritdoc />
     public Task<bool> IsRebuildingAsync(string indexName)
         => _indexRebuilder.IsRebuildingAsync(indexName);
-
-    private void Indexer_IndexOperationComplete(object? sender, EventArgs e)
-    {
-        var indexer = (IIndex?)sender;
-
-        _logger.LogDebug("Logging operation completed for index {IndexName}", indexer?.Name);
-
-        if (indexer is not null)
-        {
-            //ensure it's not listening anymore
-            indexer.IndexOperationComplete -= Indexer_IndexOperationComplete;
-        }
-
-        _logger.LogInformation("Rebuilding index '{IndexerName}' done.", indexer?.Name);
-    }
 }
diff --git a/tests/Umbraco.Tests.Integration/Umbraco.Examine.Lucene/UmbracoExamine/IndexInitializer.cs b/tests/Umbraco.Tests.Integration/Umbraco.Examine.Lucene/UmbracoExamine/IndexInitializer.cs
index 1d7cf2e8418e..0b1f6029073e 100644
--- a/tests/Umbraco.Tests.Integration/Umbraco.Examine.Lucene/UmbracoExamine/IndexInitializer.cs
+++ b/tests/Umbraco.Tests.Integration/Umbraco.Examine.Lucene/UmbracoExamine/IndexInitializer.cs
@@ -39,6 +39,7 @@ public class IndexInitializer
     private readonly IContentTypeService _contentTypeService;
     private readonly IDocumentUrlService _documentUrlService;
     private readonly ILanguageService _languageService;
+    private readonly IOptionsMonitor<IndexingSettings> _indexSettings;
 
     public IndexInitializer(
         IShortStringHelper shortStringHelper,
@@ -50,7 +51,8 @@ public IndexInitializer(
         ILocalizationService localizationService,
         IContentTypeService contentTypeService,
         IDocumentUrlService documentUrlService,
-        ILanguageService languageService)
+        ILanguageService languageService,
+        IOptionsMonitor<IndexingSettings> indexSettings)
     {
         _shortStringHelper = shortStringHelper;
         _propertyEditors = propertyEditors;
@@ -62,6 +64,7 @@ public IndexInitializer(
         _contentTypeService = contentTypeService;
         _documentUrlService = documentUrlService;
         _languageService = languageService;
+        _indexSettings = indexSettings;
     }
 
     public ContentValueSetBuilder GetContentValueSetBuilder(bool publishedValuesOnly)
@@ -91,7 +94,8 @@ public ContentIndexPopulator GetContentIndexRebuilder(IContentService contentSer
             null,
             contentService,
             umbracoDatabaseFactory,
-            contentValueSetBuilder);
+            contentValueSetBuilder,
+            _indexSettings);
         return contentIndexDataSource;
     }
 
@@ -105,7 +109,7 @@ public MediaIndexPopulator GetMediaIndexRebuilder(IMediaService mediaService)
             _shortStringHelper,
             _contentSettings,
             StaticServiceProvider.Instance.GetRequiredService<IContentTypeService>());
-        var mediaIndexDataSource = new MediaIndexPopulator(null, mediaService, mediaValueSetBuilder);
+        var mediaIndexDataSource = new MediaIndexPopulator(null, mediaService, mediaValueSetBuilder, _indexSettings);
         return mediaIndexDataSource;
     }
 

From d5a2f0572edf9a842c05247cde3a8f9b6285c0e8 Mon Sep 17 00:00:00 2001
From: Lee Kelleher <leekelleher@users.noreply.github.com>
Date: Mon, 20 Oct 2025 10:51:38 +0100
Subject: [PATCH 050/155] Preview: Redirect to published URL on exit (#20556)

* Preview Exit: Gets the page's published URL on exit for redirect

* Preview Open Website: Uses the page's published URL

* Tweaked the published URL logic

* Code amends based on @copilot's suggestions
---
 .../apps/preview/apps/preview-exit.element.ts |  2 +-
 .../apps/preview-open-website.element.ts      |  2 +-
 .../src/apps/preview/preview.context.ts       | 35 ++++++++++++++++---
 3 files changed, 32 insertions(+), 7 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/apps/preview/apps/preview-exit.element.ts b/src/Umbraco.Web.UI.Client/src/apps/preview/apps/preview-exit.element.ts
index 95e907a38a87..26af65490ba7 100644
--- a/src/Umbraco.Web.UI.Client/src/apps/preview/apps/preview-exit.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/apps/preview/apps/preview-exit.element.ts
@@ -6,7 +6,7 @@ import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element';
 export class UmbPreviewExitElement extends UmbLitElement {
 	async #onClick() {
 		const previewContext = await this.getContext(UMB_PREVIEW_CONTEXT);
-		previewContext?.exitPreview(0);
+		await previewContext?.exitPreview(0);
 	}
 
 	override render() {
diff --git a/src/Umbraco.Web.UI.Client/src/apps/preview/apps/preview-open-website.element.ts b/src/Umbraco.Web.UI.Client/src/apps/preview/apps/preview-open-website.element.ts
index aba28768e5c1..4a77454df8f5 100644
--- a/src/Umbraco.Web.UI.Client/src/apps/preview/apps/preview-open-website.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/apps/preview/apps/preview-open-website.element.ts
@@ -6,7 +6,7 @@ import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element';
 export class UmbPreviewOpenWebsiteElement extends UmbLitElement {
 	async #onClick() {
 		const previewContext = await this.getContext(UMB_PREVIEW_CONTEXT);
-		previewContext?.openWebsite();
+		await previewContext?.openWebsite();
 	}
 
 	override render() {
diff --git a/src/Umbraco.Web.UI.Client/src/apps/preview/preview.context.ts b/src/Umbraco.Web.UI.Client/src/apps/preview/preview.context.ts
index 21899e41f859..75de96a38c5f 100644
--- a/src/Umbraco.Web.UI.Client/src/apps/preview/preview.context.ts
+++ b/src/Umbraco.Web.UI.Client/src/apps/preview/preview.context.ts
@@ -1,10 +1,12 @@
-import { UmbBooleanState, UmbStringState } from '@umbraco-cms/backoffice/observable-api';
+import { tryExecute } from '@umbraco-cms/backoffice/resources';
 import { umbConfirmModal } from '@umbraco-cms/backoffice/modal';
+import { DocumentService } from '@umbraco-cms/backoffice/external/backend-api';
+import { UmbBooleanState, UmbStringState } from '@umbraco-cms/backoffice/observable-api';
 import { UmbContextBase } from '@umbraco-cms/backoffice/class-api';
 import { UmbContextToken } from '@umbraco-cms/backoffice/context-api';
 import { UmbDocumentPreviewRepository } from '@umbraco-cms/backoffice/document';
-import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api';
 import { UMB_SERVER_CONTEXT } from '@umbraco-cms/backoffice/server';
+import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api';
 
 const UMB_LOCALSTORAGE_SESSION_KEY = 'umb:previewSessions';
 
@@ -89,6 +91,19 @@ export class UmbPreviewContext extends UmbContextBase {
 		});
 	}
 
+	async #getPublishedUrl(): Promise<string | null> {
+		if (!this.#unique) return null;
+
+		// NOTE: We should be reusing `UmbDocumentUrlRepository` here, but the preview app doesn't register the `itemStore` extensions, so can't resolve/consume `UMB_DOCUMENT_URL_STORE_CONTEXT`. [LK]
+		const { data } = await tryExecute(this, DocumentService.getDocumentUrls({ query: { id: [this.#unique] } }));
+
+		if (!data?.length) return null;
+		const urlInfo = this.#culture ? data[0].urlInfos.find((x) => x.culture === this.#culture) : data[0].urlInfos[0];
+
+		if (!urlInfo?.url) return null;
+		return urlInfo.url.startsWith('/') ? `${this.#serverUrl}${urlInfo.url}` : urlInfo.url;
+	}
+
 	#getSessionCount(): number {
 		return Math.max(Number(localStorage.getItem(UMB_LOCALSTORAGE_SESSION_KEY)), 0) || 0;
 	}
@@ -170,7 +185,12 @@ export class UmbPreviewContext extends UmbContextBase {
 			this.#webSocket = undefined;
 		}
 
-		const url = this.#previewUrl.getValue() as string;
+		let url = await this.#getPublishedUrl();
+
+		if (!url) {
+			url = this.#previewUrl.getValue() as string;
+		}
+
 		window.location.replace(url);
 	}
 
@@ -190,8 +210,13 @@ export class UmbPreviewContext extends UmbContextBase {
 		return this.getHostElement().shadowRoot?.querySelector('#wrapper') as HTMLElement;
 	}
 
-	openWebsite() {
-		const url = this.#previewUrl.getValue() as string;
+	async openWebsite() {
+		let url = await this.#getPublishedUrl();
+
+		if (!url) {
+			url = this.#previewUrl.getValue() as string;
+		}
+
 		window.open(url, '_blank');
 	}
 

From 7751e40ba859be33f3eb8924329c8ccd60961c91 Mon Sep 17 00:00:00 2001
From: Nhu Dinh <150406148+nhudinh0309@users.noreply.github.com>
Date: Tue, 21 Oct 2025 13:50:13 +0700
Subject: [PATCH 051/155] E2E: QA Fixed the flaky tests related to publishing
 content with image cropper (#20577)

Added more waits
---
 .../tests/DefaultConfig/Content/ContentWithImageCropper.spec.ts | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/ContentWithImageCropper.spec.ts b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/ContentWithImageCropper.spec.ts
index 717fc227c30f..21da07d52fce 100644
--- a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/ContentWithImageCropper.spec.ts
+++ b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/ContentWithImageCropper.spec.ts
@@ -60,6 +60,8 @@ test('can publish content with the image cropper data type', {tag: '@smoke'}, as
   // Act
   await umbracoUi.content.goToContentWithName(contentName);
   await umbracoUi.content.uploadFile(imageFilePath);
+  // Wait for the upload to complete
+  await umbracoUi.waitForTimeout(1000); 
   await umbracoUi.content.clickSaveAndPublishButton();
 
   // Assert

From 5337c38f2c7e8126b7a247dcc5710d82ea6a221f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 20 Oct 2025 22:56:59 +0000
Subject: [PATCH 052/155] Bump vite from 7.1.9 to 7.1.11 in
 /src/Umbraco.Web.UI.Client

Bumps [vite](https://github.com/vitejs/vite/tree/HEAD/packages/vite) from 7.1.9 to 7.1.11.
- [Release notes](https://github.com/vitejs/vite/releases)
- [Changelog](https://github.com/vitejs/vite/blob/main/packages/vite/CHANGELOG.md)
- [Commits](https://github.com/vitejs/vite/commits/v7.1.11/packages/vite)

---
updated-dependencies:
- dependency-name: vite
  dependency-version: 7.1.11
  dependency-type: direct:development
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 src/Umbraco.Web.UI.Client/package-lock.json | 8 ++++----
 src/Umbraco.Web.UI.Client/package.json      | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/package-lock.json b/src/Umbraco.Web.UI.Client/package-lock.json
index b2657a2a273b..cf63f6c06461 100644
--- a/src/Umbraco.Web.UI.Client/package-lock.json
+++ b/src/Umbraco.Web.UI.Client/package-lock.json
@@ -58,7 +58,7 @@
 				"typescript": "5.9.3",
 				"typescript-eslint": "^8.45.0",
 				"typescript-json-schema": "^0.65.1",
-				"vite": "^7.1.9",
+				"vite": "^7.1.11",
 				"vite-plugin-static-copy": "^3.1.3",
 				"vite-tsconfig-paths": "^5.1.4",
 				"web-component-analyzer": "^2.0.0"
@@ -16364,9 +16364,9 @@
 			}
 		},
 		"node_modules/vite": {
-			"version": "7.1.9",
-			"resolved": "https://registry.npmjs.org/vite/-/vite-7.1.9.tgz",
-			"integrity": "sha512-4nVGliEpxmhCL8DslSAUdxlB6+SMrhB0a1v5ijlh1xB1nEPuy1mxaHxysVucLHuWryAxLWg6a5ei+U4TLn/rFg==",
+			"version": "7.1.11",
+			"resolved": "https://registry.npmjs.org/vite/-/vite-7.1.11.tgz",
+			"integrity": "sha512-uzcxnSDVjAopEUjljkWh8EIrg6tlzrjFUfMcR1EVsRDGwf/ccef0qQPRyOrROwhrTDaApueq+ja+KLPlzR/zdg==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
diff --git a/src/Umbraco.Web.UI.Client/package.json b/src/Umbraco.Web.UI.Client/package.json
index d9145b2732a8..f9ce4923ea42 100644
--- a/src/Umbraco.Web.UI.Client/package.json
+++ b/src/Umbraco.Web.UI.Client/package.json
@@ -261,7 +261,7 @@
 		"typescript": "5.9.3",
 		"typescript-eslint": "^8.45.0",
 		"typescript-json-schema": "^0.65.1",
-		"vite": "^7.1.9",
+		"vite": "^7.1.11",
 		"vite-plugin-static-copy": "^3.1.3",
 		"vite-tsconfig-paths": "^5.1.4",
 		"web-component-analyzer": "^2.0.0"

From ae41438a366aec1198d3529b4c4051f10d05201c Mon Sep 17 00:00:00 2001
From: Lee Kelleher <leekelleher@users.noreply.github.com>
Date: Tue, 21 Oct 2025 08:28:01 +0100
Subject: [PATCH 053/155] Tiptap RTE: Allow removal of unregistered extensions
 (#20571)

* Tiptap toolbar config: enable removal of unregistered extensions

* Tiptap statusbar config: enable removal of unregistered extensions

* Tiptap toolbar config: Typescript tidy-up

* Tiptap toolbar sorting amend

Removed the need for the `tiptap-toolbar-alias` attribute,
we can reuse the `data-mark`.

* Tiptap extension config UI amend

If the extension doesn't have a `description`,
then add the `alias` to the title/tooltip, to give a DX hint.

* Tiptap toolbar: adds `title` to placeholder skeleton

* Added missing `forExtensions` for Style Select and Horizontal Rule toolbar extensions

* Update src/Umbraco.Web.UI.Client/src/packages/tiptap/property-editors/toolbar-configuration/property-editor-ui-tiptap-toolbar-configuration.element.ts

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

* Update src/Umbraco.Web.UI.Client/src/packages/tiptap/property-editors/statusbar-configuration/property-editor-ui-tiptap-statusbar-configuration.element.ts

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

---------

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
---
 .../toolbar/tiptap-toolbar.element.ts         |  6 +-
 .../extensions/horizontal-rule/manifests.ts   |  1 +
 .../extensions/style-select/manifests.ts      |  1 +
 ...tiptap-extensions-configuration.element.ts | 14 +---
 ...-tiptap-statusbar-configuration.element.ts | 64 +++++++++++--------
 .../tiptap-statusbar-configuration.context.ts |  5 +-
 ...ui-tiptap-toolbar-configuration.element.ts |  4 +-
 .../tiptap-toolbar-configuration.context.ts   |  4 +-
 ...tap-toolbar-group-configuration.element.ts | 42 ++++++------
 .../packages/tiptap/property-editors/types.ts |  9 +--
 10 files changed, 80 insertions(+), 70 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/packages/tiptap/components/toolbar/tiptap-toolbar.element.ts b/src/Umbraco.Web.UI.Client/src/packages/tiptap/components/toolbar/tiptap-toolbar.element.ts
index 50e548eec36b..0627c2c3e7ac 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/tiptap/components/toolbar/tiptap-toolbar.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/tiptap/components/toolbar/tiptap-toolbar.element.ts
@@ -92,11 +92,11 @@ export class UmbTiptapToolbarElement extends UmbLitElement {
 	}
 
 	#renderActions(aliases: Array<string>) {
-		return repeat(aliases, (alias) => this.#lookup?.get(alias) ?? this.#renderActionPlaceholder());
+		return repeat(aliases, (alias) => this.#lookup?.get(alias) ?? this.#renderActionPlaceholder(alias));
 	}
 
-	#renderActionPlaceholder() {
-		return html`<span class="skeleton" role="none"></span>`;
+	#renderActionPlaceholder(alias: string) {
+		return html`<span class="skeleton" role="none" title="Loading '${alias}'"></span>`;
 	}
 
 	static override readonly styles = css`
diff --git a/src/Umbraco.Web.UI.Client/src/packages/tiptap/extensions/horizontal-rule/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/tiptap/extensions/horizontal-rule/manifests.ts
index 47523bb921b5..86ec324126d4 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/tiptap/extensions/horizontal-rule/manifests.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/tiptap/extensions/horizontal-rule/manifests.ts
@@ -16,6 +16,7 @@ export const manifests: Array<UmbExtensionManifest> = [
 		alias: 'Umb.Tiptap.Toolbar.HorizontalRule',
 		name: 'Horizontal Rule Tiptap Toolbar Extension',
 		api: () => import('./horizontal-rule.tiptap-toolbar-api.js'),
+		forExtensions: ['Umb.Tiptap.HorizontalRule'],
 		meta: {
 			alias: 'horizontalRule',
 			icon: 'icon-horizontal-rule',
diff --git a/src/Umbraco.Web.UI.Client/src/packages/tiptap/extensions/style-select/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/tiptap/extensions/style-select/manifests.ts
index 60c0894e842a..b6a98f1ddf5f 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/tiptap/extensions/style-select/manifests.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/tiptap/extensions/style-select/manifests.ts
@@ -4,6 +4,7 @@ export const manifests: Array<UmbExtensionManifest> = [
 		kind: 'styleMenu',
 		alias: 'Umb.Tiptap.Toolbar.StyleSelect',
 		name: 'Style Select Tiptap Extension',
+		forExtensions: ['Umb.Tiptap.Heading', 'Umb.Tiptap.Blockquote', 'Umb.Tiptap.CodeBlock'],
 		items: [
 			{
 				label: 'Headers',
diff --git a/src/Umbraco.Web.UI.Client/src/packages/tiptap/property-editors/extensions-configuration/property-editor-ui-tiptap-extensions-configuration.element.ts b/src/Umbraco.Web.UI.Client/src/packages/tiptap/property-editors/extensions-configuration/property-editor-ui-tiptap-extensions-configuration.element.ts
index ad71fe55681f..89ac81a68f9b 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/tiptap/property-editors/extensions-configuration/property-editor-ui-tiptap-extensions-configuration.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/tiptap/property-editors/extensions-configuration/property-editor-ui-tiptap-extensions-configuration.element.ts
@@ -1,14 +1,4 @@
-import {
-	css,
-	customElement,
-	html,
-	ifDefined,
-	nothing,
-	property,
-	state,
-	repeat,
-	when,
-} from '@umbraco-cms/backoffice/external/lit';
+import { css, customElement, html, nothing, property, state, repeat, when } from '@umbraco-cms/backoffice/external/lit';
 import { umbExtensionsRegistry } from '@umbraco-cms/backoffice/extension-registry';
 import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element';
 import type { PropertyValueMap } from '@umbraco-cms/backoffice/external/lit';
@@ -166,7 +156,7 @@ export class UmbPropertyEditorUiTiptapExtensionsConfigurationElement
 							${repeat(
 								group.extensions,
 								(item) => html`
-									<li title=${ifDefined(item.description)}>
+									<li title=${item.description ?? item.alias}>
 										<uui-checkbox
 											label=${this.localize.string(item.label)}
 											value=${item.alias}
diff --git a/src/Umbraco.Web.UI.Client/src/packages/tiptap/property-editors/statusbar-configuration/property-editor-ui-tiptap-statusbar-configuration.element.ts b/src/Umbraco.Web.UI.Client/src/packages/tiptap/property-editors/statusbar-configuration/property-editor-ui-tiptap-statusbar-configuration.element.ts
index f5559b825b17..d8f9d019cb0b 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/tiptap/property-editors/statusbar-configuration/property-editor-ui-tiptap-statusbar-configuration.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/tiptap/property-editors/statusbar-configuration/property-editor-ui-tiptap-statusbar-configuration.element.ts
@@ -161,7 +161,7 @@ export class UmbPropertyEditorUiTiptapStatusbarConfigurationElement
 			<uui-button
 				compact
 				class=${forbidden ? 'forbidden' : ''}
-				data-mark="tiptap-toolbar-item:${item.alias}"
+				data-mark="tiptap-statusbar-item:${item.alias}"
 				draggable="true"
 				label=${label}
 				look=${forbidden ? 'placeholder' : 'outline'}
@@ -212,30 +212,44 @@ export class UmbPropertyEditorUiTiptapStatusbarConfigurationElement
 
 	#renderItem(alias: string, areaIndex = 0, itemIndex = 0) {
 		const item = this.#context?.getExtensionByAlias(alias);
-		if (!item) return nothing;
 
 		const forbidden = !this.#context?.isExtensionEnabled(item.alias);
-		const label = this.localize.string(item.label);
-
-		return html`
-			<uui-button
-				compact
-				class=${forbidden ? 'forbidden' : ''}
-				data-mark="tiptap-toolbar-item:${item.alias}"
-				draggable="true"
-				label=${label}
-				look=${forbidden ? 'placeholder' : 'outline'}
-				title=${label}
-				?disabled=${forbidden}
-				@click=${() => this.#context.removeStatusbarItem([areaIndex, itemIndex])}
-				@dragend=${this.#onDragEnd}
-				@dragstart=${(e: DragEvent) => this.#onDragStart(e, alias, [areaIndex, itemIndex])}>
-				<div class="inner">
-					${when(item.icon, (icon) => html`<umb-icon .name=${icon}></umb-icon>`)}
-					<span>${label}</span>
-				</div>
-			</uui-button>
-		`;
+		const label = this.localize.string(item.label) || item.alias;
+
+		switch (item.kind) {
+			case 'unknown':
+				return html`
+					<uui-button
+						compact
+						class="missing"
+						data-mark="tiptap-statusbar-item:${item.alias}"
+						color="danger"
+						look="placeholder"
+						label="Missing extension"
+						title="Missing extension: ${item.alias}"
+						@click=${() => this.#context.removeStatusbarItem([areaIndex, itemIndex])}></uui-button>
+				`;
+
+			default:
+				return html`
+					<uui-button
+						compact
+						class=${forbidden ? 'forbidden' : ''}
+						data-mark="tiptap-statusbar-item:${item.alias}"
+						draggable="true"
+						label=${label}
+						look=${forbidden ? 'placeholder' : 'outline'}
+						title=${label}
+						@click=${() => this.#context.removeStatusbarItem([areaIndex, itemIndex])}
+						@dragend=${this.#onDragEnd}
+						@dragstart=${(e: DragEvent) => this.#onDragStart(e, alias, [areaIndex, itemIndex])}>
+						<div class="inner">
+							${when(item.icon, (icon) => html`<umb-icon .name=${icon}></umb-icon>`)}
+							<span>${label}</span>
+						</div>
+					</uui-button>
+				`;
+		}
 	}
 
 	static override readonly styles = [
@@ -303,8 +317,8 @@ export class UmbPropertyEditorUiTiptapStatusbarConfigurationElement
 						--color-standalone: var(--uui-color-danger-standalone);
 						--color-emphasis: var(--uui-color-danger-emphasis);
 						--color-contrast: var(--uui-color-danger);
-						--uui-button-contrast-disabled: var(--uui-color-danger);
-						--uui-button-border-color-disabled: var(--uui-color-danger);
+						--uui-button-contrast: var(--uui-color-danger);
+						--uui-button-border-color: var(--uui-color-danger);
 					}
 
 					div {
diff --git a/src/Umbraco.Web.UI.Client/src/packages/tiptap/property-editors/statusbar-configuration/tiptap-statusbar-configuration.context.ts b/src/Umbraco.Web.UI.Client/src/packages/tiptap/property-editors/statusbar-configuration/tiptap-statusbar-configuration.context.ts
index 8b3e29cf6eae..84844d673f7a 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/tiptap/property-editors/statusbar-configuration/tiptap-statusbar-configuration.context.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/tiptap/property-editors/statusbar-configuration/tiptap-statusbar-configuration.context.ts
@@ -31,6 +31,7 @@ export class UmbTiptapStatusbarConfigurationContext extends UmbContextBase {
 			const _extensions = extensions
 				.sort((a, b) => a.alias.localeCompare(b.alias))
 				.map((ext) => ({
+					kind: 'default',
 					alias: ext.alias,
 					label: ext.meta.label,
 					icon: ext.meta.icon,
@@ -75,8 +76,8 @@ export class UmbTiptapStatusbarConfigurationContext extends UmbContextBase {
 			.filter((ext) => ext.alias?.toLowerCase().includes(query) || ext.label?.toLowerCase().includes(query));
 	}
 
-	public getExtensionByAlias(alias: string): UmbTiptapStatusbarExtension | undefined {
-		return this.#lookup?.get(alias);
+	public getExtensionByAlias(alias: string): UmbTiptapStatusbarExtension {
+		return this.#lookup?.get(alias) ?? { label: '', alias, icon: '', kind: 'unknown' };
 	}
 
 	public isExtensionEnabled(alias: string): boolean {
diff --git a/src/Umbraco.Web.UI.Client/src/packages/tiptap/property-editors/toolbar-configuration/property-editor-ui-tiptap-toolbar-configuration.element.ts b/src/Umbraco.Web.UI.Client/src/packages/tiptap/property-editors/toolbar-configuration/property-editor-ui-tiptap-toolbar-configuration.element.ts
index bb000b6d7c96..cebfc2463c07 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/tiptap/property-editors/toolbar-configuration/property-editor-ui-tiptap-toolbar-configuration.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/tiptap/property-editors/toolbar-configuration/property-editor-ui-tiptap-toolbar-configuration.element.ts
@@ -255,9 +255,7 @@ export class UmbPropertyEditorUiTiptapToolbarConfigurationElement
 	#renderGroup(group?: UmbTiptapToolbarGroupViewModel, rowIndex = 0, groupIndex = 0) {
 		if (!group) return nothing;
 		const showActionBar = this._toolbar[rowIndex].data.length > 1 && group.data.length === 0;
-		const items: UmbTiptapToolbarExtension[] = group!.data
-			.map((alias) => this.#context?.getExtensionByAlias(alias))
-			.filter((item): item is UmbTiptapToolbarExtension => !!item);
+		const items = group.data.map((alias) => this.#context?.getExtensionByAlias(alias));
 		return html`
 			<div
 				class="group"
diff --git a/src/Umbraco.Web.UI.Client/src/packages/tiptap/property-editors/toolbar-configuration/tiptap-toolbar-configuration.context.ts b/src/Umbraco.Web.UI.Client/src/packages/tiptap/property-editors/toolbar-configuration/tiptap-toolbar-configuration.context.ts
index 7206a7d33572..72409ab622e6 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/tiptap/property-editors/toolbar-configuration/tiptap-toolbar-configuration.context.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/tiptap/property-editors/toolbar-configuration/tiptap-toolbar-configuration.context.ts
@@ -80,8 +80,8 @@ export class UmbTiptapToolbarConfigurationContext extends UmbContextBase {
 			.filter((ext) => ext.alias?.toLowerCase().includes(query) || ext.label?.toLowerCase().includes(query));
 	}
 
-	public getExtensionByAlias(alias: string): UmbTiptapToolbarExtension | undefined {
-		return this.#lookup?.get(alias);
+	public getExtensionByAlias(alias: string): UmbTiptapToolbarExtension {
+		return this.#lookup?.get(alias) ?? { label: '', alias, icon: '', kind: 'unknown' };
 	}
 
 	public isExtensionEnabled(alias: string): boolean {
diff --git a/src/Umbraco.Web.UI.Client/src/packages/tiptap/property-editors/toolbar-configuration/tiptap-toolbar-group-configuration.element.ts b/src/Umbraco.Web.UI.Client/src/packages/tiptap/property-editors/toolbar-configuration/tiptap-toolbar-group-configuration.element.ts
index cc7b02d45c37..dd8eba4ac8da 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/tiptap/property-editors/toolbar-configuration/tiptap-toolbar-group-configuration.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/tiptap/property-editors/toolbar-configuration/tiptap-toolbar-group-configuration.element.ts
@@ -10,9 +10,9 @@ export class UmbTiptapToolbarGroupConfigurationElement<
 	TiptapToolbarItem extends UmbTiptapToolbarExtension = UmbTiptapToolbarExtension,
 > extends UmbLitElement {
 	#sorter = new UmbSorterController<TiptapToolbarItem, HTMLElement>(this, {
-		getUniqueOfElement: (element) => element.getAttribute('tiptap-toolbar-alias'),
-		getUniqueOfModel: (modelEntry) => modelEntry.alias!,
-		itemSelector: 'uui-button',
+		getUniqueOfElement: (element) => element.dataset.mark,
+		getUniqueOfModel: (modelEntry) => `tiptap-toolbar-item:${modelEntry.alias}`,
+		itemSelector: '.draggable',
 		identifier: 'umb-tiptap-toolbar-sorter',
 		containerSelector: '.items',
 		resolvePlacement: UmbSorterResolvePlacementAsGrid,
@@ -71,7 +71,7 @@ export class UmbTiptapToolbarGroupConfigurationElement<
 	}
 
 	#renderItem(item: TiptapToolbarItem, index = 0) {
-		const label = this.localize.string(item.label);
+		const label = this.localize.string(item.label) || item.alias;
 		const forbidden = !this.#context?.isExtensionEnabled(item.alias);
 
 		switch (item.kind) {
@@ -80,13 +80,11 @@ export class UmbTiptapToolbarGroupConfigurationElement<
 				return html`
 					<uui-button
 						compact
-						class=${forbidden ? 'forbidden' : ''}
+						class="draggable ${forbidden ? 'forbidden' : ''}"
 						data-mark="tiptap-toolbar-item:${item.alias}"
 						look=${forbidden ? 'placeholder' : 'outline'}
 						label=${label}
 						title=${label}
-						?disabled=${forbidden}
-						tiptap-toolbar-alias=${item.alias}
 						@click=${() => this.#onRequestRemove(item, index)}>
 						<div class="inner">
 							<span>${label}</span>
@@ -95,18 +93,29 @@ export class UmbTiptapToolbarGroupConfigurationElement<
 					</uui-button>
 				`;
 
+			case 'unknown':
+				return html`
+					<uui-button
+						compact
+						data-mark="tiptap-toolbar-item:${item.alias}"
+						color="danger"
+						look="placeholder"
+						label="Missing extension"
+						title="Missing extension: ${item.alias}"
+						@click=${() => this.#onRequestRemove(item, index)}></uui-button>
+				`;
+
 			case 'button':
+			case 'colorPickerButton':
 			default:
 				return html`
 					<uui-button
 						compact
-						class=${forbidden ? 'forbidden' : ''}
+						class="draggable ${forbidden ? 'forbidden' : ''}"
 						data-mark="tiptap-toolbar-item:${item.alias}"
 						look=${forbidden ? 'placeholder' : 'outline'}
 						label=${label}
 						title=${label}
-						?disabled=${forbidden}
-						tiptap-toolbar-alias=${item.alias}
 						@click=${() => this.#onRequestRemove(item, index)}>
 						<div class="inner">
 							${when(
@@ -131,23 +140,18 @@ export class UmbTiptapToolbarGroupConfigurationElement<
 				uui-button {
 					--uui-button-font-weight: normal;
 
-					&[draggable='true'],
-					&[draggable='true'] > .inner {
+					&.draggable,
+					&.draggable > .inner {
 						cursor: move;
 					}
 
-					&[disabled],
-					&[disabled] > .inner {
-						cursor: not-allowed;
-					}
-
 					&.forbidden {
 						--color: var(--uui-color-danger);
 						--color-standalone: var(--uui-color-danger-standalone);
 						--color-emphasis: var(--uui-color-danger-emphasis);
 						--color-contrast: var(--uui-color-danger);
-						--uui-button-contrast-disabled: var(--uui-color-danger);
-						--uui-button-border-color-disabled: var(--uui-color-danger);
+						--uui-button-contrast: var(--uui-color-danger);
+						--uui-button-border-color: var(--uui-color-danger);
 					}
 
 					div {
diff --git a/src/Umbraco.Web.UI.Client/src/packages/tiptap/property-editors/types.ts b/src/Umbraco.Web.UI.Client/src/packages/tiptap/property-editors/types.ts
index c7c80b8c23a9..a6572054c925 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/tiptap/property-editors/types.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/tiptap/property-editors/types.ts
@@ -1,17 +1,18 @@
 export type UmbTiptapSortableViewModel<T> = { unique: string; data: T };
 
-export type UmbTiptapStatusbarExtension = {
+export type UmbTiptapExtensionBase = {
+	kind?: string;
 	alias: string;
 	label: string;
 	icon: string;
 	dependencies?: Array<string>;
 };
 
+export type UmbTiptapStatusbarExtension = UmbTiptapExtensionBase;
+
 export type UmbTiptapStatusbarViewModel = UmbTiptapSortableViewModel<Array<string>>;
 
-export type UmbTiptapToolbarExtension = UmbTiptapStatusbarExtension & {
-	kind?: string;
-};
+export type UmbTiptapToolbarExtension = UmbTiptapExtensionBase;
 
 export type UmbTiptapToolbarRowViewModel = UmbTiptapSortableViewModel<Array<UmbTiptapToolbarGroupViewModel>>;
 export type UmbTiptapToolbarGroupViewModel = UmbTiptapSortableViewModel<Array<string>>;

From 81a8a0c191a56921e2bda536e50d01e95910324d Mon Sep 17 00:00:00 2001
From: Andy Butland <abutland73@gmail.com>
Date: Tue, 21 Oct 2025 09:57:29 +0200
Subject: [PATCH 054/155] Hybrid Cache: Resolve start-up errors with
 mis-matched types (#20554)

* Be consistent in use of GetOrCreateAsync overload in exists and retrieval.
Ensure nullability of ContentCacheNode is consistent in exists and retrieval.

* Applied suggestion from code review.

* Move seeding to Umbraco application starting rather than started, ensuring an initial request is served.

* Tighten up hybrid cache exists check with locking around check and remove, and use of cancellation token.
---
 .../UmbracoBuilderExtensions.cs               |  3 +-
 .../Extensions/HybridCacheExtensions.cs       | 67 +++++++++++++------
 .../SeedingNotificationHandler.cs             |  6 +-
 .../Services/DocumentCacheService.cs          |  4 +-
 .../Services/MediaCacheService.cs             |  4 +-
 .../DocumentHybridCacheTests.cs               | 60 ++++++++++++++++-
 .../Extensions/HybridCacheExtensionsTests.cs  | 55 +++++++--------
 7 files changed, 141 insertions(+), 58 deletions(-)

diff --git a/src/Umbraco.PublishedCache.HybridCache/DependencyInjection/UmbracoBuilderExtensions.cs b/src/Umbraco.PublishedCache.HybridCache/DependencyInjection/UmbracoBuilderExtensions.cs
index ca625dacdf5c..e97c60fd6253 100644
--- a/src/Umbraco.PublishedCache.HybridCache/DependencyInjection/UmbracoBuilderExtensions.cs
+++ b/src/Umbraco.PublishedCache.HybridCache/DependencyInjection/UmbracoBuilderExtensions.cs
@@ -1,4 +1,3 @@
-
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Options;
 using Umbraco.Cms.Core.Configuration.Models;
@@ -74,7 +73,7 @@ public static IUmbracoBuilder AddUmbracoHybridCache(this IUmbracoBuilder builder
         builder.AddNotificationAsyncHandler<ContentTypeDeletedNotification, CacheRefreshingNotificationHandler>();
         builder.AddNotificationAsyncHandler<MediaTypeRefreshedNotification, CacheRefreshingNotificationHandler>();
         builder.AddNotificationAsyncHandler<MediaTypeDeletedNotification, CacheRefreshingNotificationHandler>();
-        builder.AddNotificationAsyncHandler<UmbracoApplicationStartedNotification, SeedingNotificationHandler>();
+        builder.AddNotificationAsyncHandler<UmbracoApplicationStartingNotification, SeedingNotificationHandler>();
         builder.AddCacheSeeding();
         return builder;
     }
diff --git a/src/Umbraco.PublishedCache.HybridCache/Extensions/HybridCacheExtensions.cs b/src/Umbraco.PublishedCache.HybridCache/Extensions/HybridCacheExtensions.cs
index ee1b7aefda05..ccd5897494eb 100644
--- a/src/Umbraco.PublishedCache.HybridCache/Extensions/HybridCacheExtensions.cs
+++ b/src/Umbraco.PublishedCache.HybridCache/Extensions/HybridCacheExtensions.cs
@@ -1,3 +1,4 @@
+using System.Collections.Concurrent;
 using Microsoft.Extensions.Caching.Hybrid;
 
 namespace Umbraco.Cms.Infrastructure.HybridCache.Extensions;
@@ -7,19 +8,24 @@ namespace Umbraco.Cms.Infrastructure.HybridCache.Extensions;
 /// </summary>
 internal static class HybridCacheExtensions
 {
+    // Per-key semaphores to ensure the GetOrCreateAsync + RemoveAsync sequence
+    // executes atomically for a given cache key.
+    private static readonly ConcurrentDictionary<string, SemaphoreSlim> _keyLocks = new();
+
     /// <summary>
     /// Returns true if the cache contains an item with a matching key.
     /// </summary>
     /// <param name="cache">An instance of <see cref="Microsoft.Extensions.Caching.Hybrid.HybridCache"/></param>
     /// <param name="key">The name (key) of the item to search for in the cache.</param>
+    /// <param name="token">The cancellation token.</param>
     /// <returns>True if the item exists already. False if it doesn't.</returns>
     /// <remarks>
     /// Hat-tip: https://github.com/dotnet/aspnetcore/discussions/57191
     /// Will never add or alter the state of any items in the cache.
     /// </remarks>
-    public static async Task<bool> ExistsAsync<T>(this Microsoft.Extensions.Caching.Hybrid.HybridCache cache, string key)
+    public static async Task<bool> ExistsAsync<T>(this Microsoft.Extensions.Caching.Hybrid.HybridCache cache, string key, CancellationToken token)
     {
-        (bool exists, _) = await TryGetValueAsync<T>(cache, key);
+        (bool exists, _) = await TryGetValueAsync<T>(cache, key, token).ConfigureAwait(false);
         return exists;
     }
 
@@ -29,34 +35,55 @@ public static async Task<bool> ExistsAsync<T>(this Microsoft.Extensions.Caching.
     /// <typeparam name="T">The type of the value of the item in the cache.</typeparam>
     /// <param name="cache">An instance of <see cref="Microsoft.Extensions.Caching.Hybrid.HybridCache"/></param>
     /// <param name="key">The name (key) of the item to search for in the cache.</param>
+    /// <param name="token">The cancellation token.</param>
     /// <returns>A tuple of <see cref="bool"/> and the object (if found) retrieved from the cache.</returns>
     /// <remarks>
     /// Hat-tip: https://github.com/dotnet/aspnetcore/discussions/57191
     /// Will never add or alter the state of any items in the cache.
     /// </remarks>
-    public static async Task<(bool Exists, T? Value)> TryGetValueAsync<T>(this Microsoft.Extensions.Caching.Hybrid.HybridCache cache, string key)
+    public static async Task<(bool Exists, T? Value)> TryGetValueAsync<T>(this Microsoft.Extensions.Caching.Hybrid.HybridCache cache, string key, CancellationToken token)
     {
         var exists = true;
 
-        T? result = await cache.GetOrCreateAsync<object, T>(
-            key,
-            null!,
-            (_, _) =>
-            {
-                exists = false;
-                return new ValueTask<T>(default(T)!);
-            },
-            new HybridCacheEntryOptions(),
-            null,
-            CancellationToken.None);
-
-        // In checking for the existence of the item, if not found, we will have created a cache entry with a null value.
-        // So remove it again.
-        if (exists is false)
+        // Acquire a per-key semaphore so that GetOrCreateAsync and the possible RemoveAsync
+        // complete without another thread retrieving/creating the same key in-between.
+        SemaphoreSlim sem = _keyLocks.GetOrAdd(key, _ => new SemaphoreSlim(1, 1));
+
+        await sem.WaitAsync().ConfigureAwait(false);
+
+        try
         {
-            await cache.RemoveAsync(key);
+            T? result = await cache.GetOrCreateAsync<T?>(
+                key,
+                cancellationToken =>
+                {
+                    exists = false;
+                    return default;
+                },
+                new HybridCacheEntryOptions(),
+                null,
+                token).ConfigureAwait(false);
+
+            // In checking for the existence of the item, if not found, we will have created a cache entry with a null value.
+            // So remove it again. Because we're holding the per-key lock there is no chance another thread
+            // will observe the temporary entry between GetOrCreateAsync and RemoveAsync.
+            if (exists is false)
+            {
+                await cache.RemoveAsync(key).ConfigureAwait(false);
+            }
+
+            return (exists, result);
         }
+        finally
+        {
+            sem.Release();
 
-        return (exists, result);
+            // Only remove the semaphore mapping if it still points to the same instance we used.
+            // This avoids removing another thread's semaphore or corrupting the map.
+            if (_keyLocks.TryGetValue(key, out SemaphoreSlim? current) && ReferenceEquals(current, sem))
+            {
+                _keyLocks.TryRemove(key, out _);
+            }
+        }
     }
 }
diff --git a/src/Umbraco.PublishedCache.HybridCache/NotificationHandlers/SeedingNotificationHandler.cs b/src/Umbraco.PublishedCache.HybridCache/NotificationHandlers/SeedingNotificationHandler.cs
index 0581bd26542c..38a6618c7019 100644
--- a/src/Umbraco.PublishedCache.HybridCache/NotificationHandlers/SeedingNotificationHandler.cs
+++ b/src/Umbraco.PublishedCache.HybridCache/NotificationHandlers/SeedingNotificationHandler.cs
@@ -1,4 +1,4 @@
-using Microsoft.Extensions.Options;
+using Microsoft.Extensions.Options;
 using Umbraco.Cms.Core;
 using Umbraco.Cms.Core.Configuration.Models;
 using Umbraco.Cms.Core.Events;
@@ -9,7 +9,7 @@
 
 namespace Umbraco.Cms.Infrastructure.HybridCache.NotificationHandlers;
 
-internal sealed class SeedingNotificationHandler : INotificationAsyncHandler<UmbracoApplicationStartedNotification>
+internal sealed class SeedingNotificationHandler : INotificationAsyncHandler<UmbracoApplicationStartingNotification>
 {
     private readonly IDocumentCacheService _documentCacheService;
     private readonly IMediaCacheService _mediaCacheService;
@@ -24,7 +24,7 @@ public SeedingNotificationHandler(IDocumentCacheService documentCacheService, IM
         _globalSettings = globalSettings.Value;
     }
 
-    public async Task HandleAsync(UmbracoApplicationStartedNotification notification,
+    public async Task HandleAsync(UmbracoApplicationStartingNotification notification,
         CancellationToken cancellationToken)
     {
 
diff --git a/src/Umbraco.PublishedCache.HybridCache/Services/DocumentCacheService.cs b/src/Umbraco.PublishedCache.HybridCache/Services/DocumentCacheService.cs
index 1675cb05cfb2..2879be5c8d7f 100644
--- a/src/Umbraco.PublishedCache.HybridCache/Services/DocumentCacheService.cs
+++ b/src/Umbraco.PublishedCache.HybridCache/Services/DocumentCacheService.cs
@@ -205,7 +205,7 @@ public async Task SeedAsync(CancellationToken cancellationToken)
 
                 var cacheKey = GetCacheKey(key, false);
 
-                var existsInCache = await _hybridCache.ExistsAsync<ContentCacheNode>(cacheKey);
+                var existsInCache = await _hybridCache.ExistsAsync<ContentCacheNode?>(cacheKey, cancellationToken).ConfigureAwait(false);
                 if (existsInCache is false)
                 {
                     uncachedKeys.Add(key);
@@ -278,7 +278,7 @@ public async Task<bool> HasContentByIdAsync(int id, bool preview = false)
             return false;
         }
 
-        return await _hybridCache.ExistsAsync<ContentCacheNode>(GetCacheKey(keyAttempt.Result, preview));
+        return await _hybridCache.ExistsAsync<ContentCacheNode?>(GetCacheKey(keyAttempt.Result, preview), CancellationToken.None);
     }
 
     public async Task RefreshContentAsync(IContent content)
diff --git a/src/Umbraco.PublishedCache.HybridCache/Services/MediaCacheService.cs b/src/Umbraco.PublishedCache.HybridCache/Services/MediaCacheService.cs
index 65b8f91945a5..46d782bdbecb 100644
--- a/src/Umbraco.PublishedCache.HybridCache/Services/MediaCacheService.cs
+++ b/src/Umbraco.PublishedCache.HybridCache/Services/MediaCacheService.cs
@@ -133,7 +133,7 @@ public async Task<bool> HasContentByIdAsync(int id)
             return false;
         }
 
-        return await _hybridCache.ExistsAsync<ContentCacheNode>($"{keyAttempt.Result}");
+        return await _hybridCache.ExistsAsync<ContentCacheNode?>($"{keyAttempt.Result}", CancellationToken.None);
     }
 
     public async Task RefreshMediaAsync(IMedia media)
@@ -170,7 +170,7 @@ public async Task SeedAsync(CancellationToken cancellationToken)
 
                 var cacheKey = GetCacheKey(key, false);
 
-                var existsInCache = await _hybridCache.ExistsAsync<ContentCacheNode>(cacheKey);
+                var existsInCache = await _hybridCache.ExistsAsync<ContentCacheNode?>(cacheKey, CancellationToken.None);
                 if (existsInCache is false)
                 {
                     uncachedKeys.Add(key);
diff --git a/tests/Umbraco.Tests.Integration/Umbraco.PublishedCache.HybridCache/DocumentHybridCacheTests.cs b/tests/Umbraco.Tests.Integration/Umbraco.PublishedCache.HybridCache/DocumentHybridCacheTests.cs
index 0c4207331a0e..088f14cd319a 100644
--- a/tests/Umbraco.Tests.Integration/Umbraco.PublishedCache.HybridCache/DocumentHybridCacheTests.cs
+++ b/tests/Umbraco.Tests.Integration/Umbraco.PublishedCache.HybridCache/DocumentHybridCacheTests.cs
@@ -7,6 +7,7 @@
 using Umbraco.Cms.Core.PublishedCache;
 using Umbraco.Cms.Core.Services;
 using Umbraco.Cms.Core.Sync;
+using Umbraco.Cms.Tests.Common.Builders;
 using Umbraco.Cms.Tests.Common.Testing;
 using Umbraco.Cms.Tests.Integration.Testing;
 using Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Services;
@@ -25,10 +26,10 @@ protected override void CustomTestSetup(IUmbracoBuilder builder)
 
     private IPublishedContentCache PublishedContentHybridCache => GetRequiredService<IPublishedContentCache>();
 
-    private IContentEditingService ContentEditingService => GetRequiredService<IContentEditingService>();
-
     private IContentPublishingService ContentPublishingService => GetRequiredService<IContentPublishingService>();
 
+    private IDocumentCacheService DocumentCacheService => GetRequiredService<IDocumentCacheService>();
+
     private const string NewName = "New Name";
     private const string NewTitle = "New Title";
 
@@ -460,6 +461,61 @@ public async Task Can_Not_Get_Deleted_Published_Content_By_Key(bool preview)
         Assert.IsNull(textPage);
     }
 
+    [Test]
+    public async Task Can_Get_Published_Content_By_Id_After_Previous_Check_Where_Not_Found()
+    {
+        // Arrange
+        var testPageKey = Guid.NewGuid();
+
+        // Act & Assert
+        // - assert we cannot get the content that doesn't yet exist from the cache
+        var testPage = await PublishedContentHybridCache.GetByIdAsync(testPageKey);
+        Assert.IsNull(testPage);
+
+        testPage = await PublishedContentHybridCache.GetByIdAsync(testPageKey);
+        Assert.IsNull(testPage);
+
+        // - create and publish the content
+        var testPageContent = ContentEditingBuilder.CreateBasicContent(ContentType.Key, testPageKey);
+        var createResult = await ContentEditingService.CreateAsync(testPageContent, Constants.Security.SuperUserKey);
+        Assert.IsTrue(createResult.Success);
+        var publishResult = await ContentPublishingService.PublishAsync(testPageKey, CultureAndSchedule, Constants.Security.SuperUserKey);
+        Assert.IsTrue(publishResult.Success);
+
+        // - assert we can now get the content from the cache
+        testPage = await PublishedContentHybridCache.GetByIdAsync(testPageKey);
+        Assert.IsNotNull(testPage);
+    }
+
+    [Test]
+    public async Task Can_Get_Published_Content_By_Id_After_Previous_Exists_Check()
+    {
+        // Act
+        var hasContentForTextPageCached = await DocumentCacheService.HasContentByIdAsync(PublishedTextPageId);
+        Assert.IsTrue(hasContentForTextPageCached);
+        var textPage = await PublishedContentHybridCache.GetByIdAsync(PublishedTextPageId);
+
+        // Assert
+        AssertPublishedTextPage(textPage);
+    }
+
+    [Test]
+    public async Task Can_Do_Exists_Check_On_Created_Published_Content()
+    {
+        var testPageKey = Guid.NewGuid();
+        var testPageContent = ContentEditingBuilder.CreateBasicContent(ContentType.Key, testPageKey);
+        var createResult = await ContentEditingService.CreateAsync(testPageContent, Constants.Security.SuperUserKey);
+        Assert.IsTrue(createResult.Success);
+        var publishResult = await ContentPublishingService.PublishAsync(testPageKey, CultureAndSchedule, Constants.Security.SuperUserKey);
+        Assert.IsTrue(publishResult.Success);
+
+        var testPage = await PublishedContentHybridCache.GetByIdAsync(testPageKey);
+        Assert.IsNotNull(testPage);
+
+        var hasContentForTextPageCached = await DocumentCacheService.HasContentByIdAsync(testPage.Id);
+        Assert.IsTrue(hasContentForTextPageCached);
+    }
+
     private void AssertTextPage(IPublishedContent textPage)
     {
         Assert.Multiple(() =>
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.PublishedCache.HybridCache/Extensions/HybridCacheExtensionsTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.PublishedCache.HybridCache/Extensions/HybridCacheExtensionsTests.cs
index 152fe28b4ef6..8da30cd11883 100644
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.PublishedCache.HybridCache/Extensions/HybridCacheExtensionsTests.cs
+++ b/tests/Umbraco.Tests.UnitTests/Umbraco.PublishedCache.HybridCache/Extensions/HybridCacheExtensionsTests.cs
@@ -1,3 +1,4 @@
+using System;
 using Microsoft.Extensions.Caching.Hybrid;
 using Moq;
 using NUnit.Framework;
@@ -33,15 +34,15 @@ public async Task ExistsAsync_WhenKeyExists_ShouldReturnTrue()
         _cacheMock
             .Setup(cache => cache.GetOrCreateAsync(
                 key,
-                null!,
-                It.IsAny<Func<object, CancellationToken, ValueTask<ContentCacheNode>>>(),
+                It.IsAny<Func<CancellationToken, ValueTask<ContentCacheNode?>>>(),
+                It.IsAny<Func<Func<CancellationToken, ValueTask<ContentCacheNode?>>, CancellationToken, ValueTask<ContentCacheNode?>>>(),
                 It.IsAny<HybridCacheEntryOptions>(),
                 null,
                 CancellationToken.None))
             .ReturnsAsync(expectedValue);
 
         // Act
-        var exists = await HybridCacheExtensions.ExistsAsync<ContentCacheNode>(_cacheMock.Object, key);
+        var exists = await HybridCacheExtensions.ExistsAsync<ContentCacheNode?>(_cacheMock.Object, key, CancellationToken.None);
 
         // Assert
         Assert.IsTrue(exists);
@@ -56,24 +57,24 @@ public async Task ExistsAsync_WhenKeyDoesNotExist_ShouldReturnFalse()
         _cacheMock
             .Setup(cache => cache.GetOrCreateAsync(
                 key,
-                null!,
-                It.IsAny<Func<object, CancellationToken, ValueTask<ContentCacheNode>>>(),
+                It.IsAny<Func<CancellationToken, ValueTask<ContentCacheNode?>>>(),
+                It.IsAny<Func<Func<CancellationToken, ValueTask<ContentCacheNode?>>, CancellationToken, ValueTask<ContentCacheNode?>>>(),
                 It.IsAny<HybridCacheEntryOptions>(),
                 null,
                 CancellationToken.None))
             .Returns((
                 string key,
-                object? state,
-                Func<object, CancellationToken, ValueTask<ContentCacheNode>> factory,
+                Func<CancellationToken, ValueTask<ContentCacheNode?>> state,
+                Func<Func<CancellationToken, ValueTask<ContentCacheNode?>>, CancellationToken, ValueTask<ContentCacheNode?>> factory,
                 HybridCacheEntryOptions? options,
                 IEnumerable<string>? tags,
                 CancellationToken token) =>
             {
-                return factory(state!, token);
+                return factory(state, token);
             });
 
         // Act
-        var exists = await HybridCacheExtensions.ExistsAsync<ContentCacheNode>(_cacheMock.Object, key);
+        var exists = await HybridCacheExtensions.ExistsAsync<ContentCacheNode?>(_cacheMock.Object, key, CancellationToken.None);
 
         // Assert
         Assert.IsFalse(exists);
@@ -89,15 +90,15 @@ public async Task TryGetValueAsync_WhenKeyExists_ShouldReturnTrueAndValueAsStrin
         _cacheMock
             .Setup(cache => cache.GetOrCreateAsync(
                 key,
-                null!,
-                It.IsAny<Func<object, CancellationToken, ValueTask<string>>>(),
+                It.IsAny<Func<CancellationToken, ValueTask<string>>>(),
+                It.IsAny<Func<Func<CancellationToken, ValueTask<string>>, CancellationToken, ValueTask<string>>>(),
                 It.IsAny<HybridCacheEntryOptions>(),
                 null,
                 CancellationToken.None))
             .ReturnsAsync(expectedValue);
 
         // Act
-        var (exists, value) = await HybridCacheExtensions.TryGetValueAsync<string>(_cacheMock.Object, key);
+        var (exists, value) = await HybridCacheExtensions.TryGetValueAsync<string>(_cacheMock.Object, key, CancellationToken.None);
 
         // Assert
         Assert.IsTrue(exists);
@@ -114,15 +115,15 @@ public async Task TryGetValueAsync_WhenKeyExists_ShouldReturnTrueAndValueAsInteg
         _cacheMock
             .Setup(cache => cache.GetOrCreateAsync(
                 key,
-                null!,
-                It.IsAny<Func<object, CancellationToken, ValueTask<int>>>(),
+                It.IsAny<Func<CancellationToken, ValueTask<int>>>(),
+                It.IsAny<Func<Func<CancellationToken, ValueTask<int>>, CancellationToken, ValueTask<int>>>(),
                 It.IsAny<HybridCacheEntryOptions>(),
                 null,
                 CancellationToken.None))
             .ReturnsAsync(expectedValue);
 
         // Act
-        var (exists, value) = await HybridCacheExtensions.TryGetValueAsync<int>(_cacheMock.Object, key);
+        var (exists, value) = await HybridCacheExtensions.TryGetValueAsync<int>(_cacheMock.Object, key, CancellationToken.None);
 
         // Assert
         Assert.IsTrue(exists);
@@ -138,15 +139,15 @@ public async Task TryGetValueAsync_WhenKeyExistsButValueIsNull_ShouldReturnTrueA
         _cacheMock
             .Setup(cache => cache.GetOrCreateAsync(
                 key,
-                null!,
-                It.IsAny<Func<object, CancellationToken, ValueTask<object>>>(),
+                It.IsAny<Func<CancellationToken, ValueTask<object>>>(),
+                It.IsAny<Func<Func<CancellationToken, ValueTask<object>>, CancellationToken, ValueTask<object>>>(),
                 It.IsAny<HybridCacheEntryOptions>(),
                 null,
                 CancellationToken.None))
             .ReturnsAsync(null!);
 
         // Act
-        var (exists, value) = await HybridCacheExtensions.TryGetValueAsync<int?>(_cacheMock.Object, key);
+        var (exists, value) = await HybridCacheExtensions.TryGetValueAsync<int?>(_cacheMock.Object, key, CancellationToken.None);
 
         // Assert
         Assert.IsTrue(exists);
@@ -160,16 +161,16 @@ public async Task TryGetValueAsync_WhenKeyDoesNotExist_ShouldReturnFalseAndNull(
         string key = "test-key";
 
         _cacheMock.Setup(cache => cache.GetOrCreateAsync(
-            key,
-            null,
-            It.IsAny<Func<object?, CancellationToken, ValueTask<string>>>(),
-            It.IsAny<HybridCacheEntryOptions>(),
-            null,
-            CancellationToken.None))
+                key,
+                It.IsAny<Func<CancellationToken, ValueTask<object>>>(),
+                It.IsAny<Func<Func<CancellationToken, ValueTask<object>>, CancellationToken, ValueTask<object>>>(),
+                It.IsAny<HybridCacheEntryOptions>(),
+                null,
+                CancellationToken.None))
             .Returns((
                 string key,
-                object? state,
-                Func<object?, CancellationToken, ValueTask<string>> factory,
+                Func<CancellationToken, ValueTask<object>> state,
+                Func<Func<CancellationToken, ValueTask<object>>, CancellationToken, ValueTask<object>> factory,
                 HybridCacheEntryOptions? options,
                 IEnumerable<string>? tags,
                 CancellationToken token) =>
@@ -178,7 +179,7 @@ public async Task TryGetValueAsync_WhenKeyDoesNotExist_ShouldReturnFalseAndNull(
             });
 
         // Act
-        var (exists, value) = await HybridCacheExtensions.TryGetValueAsync<string>(_cacheMock.Object, key);
+        var (exists, value) = await HybridCacheExtensions.TryGetValueAsync<object>(_cacheMock.Object, key, CancellationToken.None);
 
         // Assert
         Assert.IsFalse(exists);

From 1ceec183a3d28409b924b972a9bb88a360a9abd0 Mon Sep 17 00:00:00 2001
From: Andy Butland <abutland73@gmail.com>
Date: Tue, 21 Oct 2025 11:38:01 +0200
Subject: [PATCH 055/155] Media: Fixes SQL error to ensure database relation
 between user group media start folder and deleted media item is removed
 (closes #20555) (#20572)

Fixes SQL error to ensure database relation between user group media start folder and deleted media item is removed.
---
 .../Persistence/Repositories/Implement/MediaRepository.cs       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Umbraco.Infrastructure/Persistence/Repositories/Implement/MediaRepository.cs b/src/Umbraco.Infrastructure/Persistence/Repositories/Implement/MediaRepository.cs
index 75dc8a3eb786..7dd53cbeb43e 100644
--- a/src/Umbraco.Infrastructure/Persistence/Repositories/Implement/MediaRepository.cs
+++ b/src/Umbraco.Infrastructure/Persistence/Repositories/Implement/MediaRepository.cs
@@ -270,7 +270,7 @@ protected override IEnumerable<string> GetDeleteClauses()
             "DELETE FROM " + Constants.DatabaseSchema.Tables.UserGroup2GranularPermission + " WHERE uniqueId IN (SELECT uniqueId FROM umbracoNode WHERE id = @id)",
             "DELETE FROM " + Constants.DatabaseSchema.Tables.UserStartNode + " WHERE startNode = @id",
             "UPDATE " + Constants.DatabaseSchema.Tables.UserGroup +
-            " SET startContentId = NULL WHERE startContentId = @id",
+            " SET startMediaId = NULL WHERE startMediaId = @id",
             "DELETE FROM " + Constants.DatabaseSchema.Tables.Relation + " WHERE parentId = @id",
             "DELETE FROM " + Constants.DatabaseSchema.Tables.Relation + " WHERE childId = @id",
             "DELETE FROM " + Constants.DatabaseSchema.Tables.TagRelationship + " WHERE nodeId = @id",

From daace4b4a02d7a215fa23d00e5aebae37f352cc3 Mon Sep 17 00:00:00 2001
From: Andy Butland <abutland73@gmail.com>
Date: Tue, 21 Oct 2025 12:05:10 +0200
Subject: [PATCH 056/155] Publishing: Resolve exceptions on publish branch
 (#20464)

* Reduce log level of image cropper converter to avoid flooding logs with expected exceptions.

* Don't run publish branch long running operation on a background thread such that UmbracoContext is available.

* Revert to background thread and use EnsureUmbracoContext to ensure we can get an IUmbracoContext in the URL providers.

* Updated tests.

* Applied suggestion from code review.

* Clarified comment.
---
 .../Services/ContentPublishingService.cs             | 12 ++++++++++--
 .../ValueConverters/ImageCropperValueConverter.cs    |  7 ++++---
 2 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/src/Umbraco.Core/Services/ContentPublishingService.cs b/src/Umbraco.Core/Services/ContentPublishingService.cs
index 698efbda917c..b46608aa14df 100644
--- a/src/Umbraco.Core/Services/ContentPublishingService.cs
+++ b/src/Umbraco.Core/Services/ContentPublishingService.cs
@@ -8,6 +8,7 @@
 using Umbraco.Cms.Core.Models.ContentPublishing;
 using Umbraco.Cms.Core.Scoping;
 using Umbraco.Cms.Core.Services.OperationStatus;
+using Umbraco.Cms.Core.Web;
 using Umbraco.Extensions;
 
 namespace Umbraco.Cms.Core.Services;
@@ -26,6 +27,7 @@ internal sealed class ContentPublishingService : IContentPublishingService
     private readonly IRelationService _relationService;
     private readonly ILogger<ContentPublishingService> _logger;
     private readonly ILongRunningOperationService _longRunningOperationService;
+    private readonly IUmbracoContextFactory _umbracoContextFactory;
 
     public ContentPublishingService(
         ICoreScopeProvider coreScopeProvider,
@@ -37,7 +39,8 @@ public ContentPublishingService(
         IOptionsMonitor<ContentSettings> optionsMonitor,
         IRelationService relationService,
         ILogger<ContentPublishingService> logger,
-        ILongRunningOperationService longRunningOperationService)
+        ILongRunningOperationService longRunningOperationService,
+        IUmbracoContextFactory umbracoContextFactory)
     {
         _coreScopeProvider = coreScopeProvider;
         _contentService = contentService;
@@ -53,6 +56,7 @@ public ContentPublishingService(
         {
             _contentSettings = contentSettings;
         });
+        _umbracoContextFactory = umbracoContextFactory;
     }
 
     /// <inheritdoc />
@@ -290,7 +294,7 @@ Attempt<ContentPublishingBranchInternalResult, ContentPublishingOperationStatus>
             return MapInternalPublishingAttempt(minimalAttempt);
         }
 
-        _logger.LogInformation("Starting async background thread for publishing branch.");
+        _logger.LogDebug("Starting long running operation for publishing branch {Key} on background thread.", key);
         Attempt<Guid, LongRunningOperationEnqueueStatus> enqueueAttempt = await _longRunningOperationService.RunAsync(
             PublishBranchOperationType,
             async _ => await PerformPublishBranchAsync(key, cultures, publishBranchFilter, userKey, returnContent: false),
@@ -324,6 +328,10 @@ private async Task<Attempt<ContentPublishingBranchInternalResult, ContentPublish
         Guid userKey,
         bool returnContent)
     {
+        // Ensure we have an UmbracoContext in case running on a background thread so operations that run in the published notification handlers
+        // have access to this (e.g. webhooks).
+        using UmbracoContextReference umbracoContextReference = _umbracoContextFactory.EnsureUmbracoContext();
+
         using ICoreScope scope = _coreScopeProvider.CreateCoreScope();
         IContent? content = _contentService.GetById(key);
         if (content is null)
diff --git a/src/Umbraco.Infrastructure/PropertyEditors/ValueConverters/ImageCropperValueConverter.cs b/src/Umbraco.Infrastructure/PropertyEditors/ValueConverters/ImageCropperValueConverter.cs
index 9cb5d57474f2..0218a10b63a4 100644
--- a/src/Umbraco.Infrastructure/PropertyEditors/ValueConverters/ImageCropperValueConverter.cs
+++ b/src/Umbraco.Infrastructure/PropertyEditors/ValueConverters/ImageCropperValueConverter.cs
@@ -1,6 +1,7 @@
 // Copyright (c) Umbraco.
 // See LICENSE for more details.
 
+using System.Text.Json;
 using Microsoft.Extensions.Logging;
 using Umbraco.Cms.Core.Models.DeliveryApi;
 using Umbraco.Cms.Core.Models.PublishedContent;
@@ -53,10 +54,10 @@ public override PropertyCacheLevel GetPropertyCacheLevel(IPublishedPropertyType
         {
             value = _jsonSerializer.Deserialize<ImageCropperValue>(sourceString);
         }
-        catch (Exception ex)
+        catch (JsonException ex)
         {
-            // cannot deserialize, assume it may be a raw image URL
-            _logger.LogError(ex, "Could not deserialize string '{JsonString}' into an image cropper value.", sourceString);
+            // Cannot deserialize, assume it may be a raw image URL.
+            _logger.LogDebug(ex, "Could not deserialize string '{JsonString}' into an image cropper value.", sourceString);
             value = new ImageCropperValue { Src = sourceString };
         }
 

From 5488c77e0e960899c28f64fd51bffd8759a533cd Mon Sep 17 00:00:00 2001
From: Andy Butland <abutland73@gmail.com>
Date: Tue, 21 Oct 2025 15:26:29 +0200
Subject: [PATCH 057/155] Bumped version to 16.3.2.

---
 src/Umbraco.Web.UI.Client/package.json | 2 +-
 version.json                           | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/package.json b/src/Umbraco.Web.UI.Client/package.json
index 766ffa96baea..74bf09f5a9cf 100644
--- a/src/Umbraco.Web.UI.Client/package.json
+++ b/src/Umbraco.Web.UI.Client/package.json
@@ -1,7 +1,7 @@
 {
 	"name": "@umbraco-cms/backoffice",
 	"license": "MIT",
-	"version": "16.3.1",
+	"version": "16.3.2",
 	"type": "module",
 	"exports": {
 		".": null,
diff --git a/version.json b/version.json
index 922b55eca9ce..7167818c6d67 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": "16.3.1",
+  "version": "16.3.2",
   "assemblyVersion": {
     "precision": "build"
   },

From 8aa9dc8f1938aae457d4e22dcf5c96272b627057 Mon Sep 17 00:00:00 2001
From: Andy Butland <abutland73@gmail.com>
Date: Tue, 21 Oct 2025 09:57:29 +0200
Subject: [PATCH 058/155] Hybrid Cache: Resolve start-up errors with
 mis-matched types (#20554)

* Be consistent in use of GetOrCreateAsync overload in exists and retrieval.
Ensure nullability of ContentCacheNode is consistent in exists and retrieval.

* Applied suggestion from code review.

* Move seeding to Umbraco application starting rather than started, ensuring an initial request is served.

* Tighten up hybrid cache exists check with locking around check and remove, and use of cancellation token.
---
 .../UmbracoBuilderExtensions.cs               |  3 +-
 .../Extensions/HybridCacheExtensions.cs       | 67 +++++++++++++------
 .../SeedingNotificationHandler.cs             |  6 +-
 .../Services/DocumentCacheService.cs          |  4 +-
 .../Services/MediaCacheService.cs             |  4 +-
 .../DocumentHybridCacheTests.cs               | 60 ++++++++++++++++-
 .../Extensions/HybridCacheExtensionsTests.cs  | 55 +++++++--------
 7 files changed, 141 insertions(+), 58 deletions(-)

diff --git a/src/Umbraco.PublishedCache.HybridCache/DependencyInjection/UmbracoBuilderExtensions.cs b/src/Umbraco.PublishedCache.HybridCache/DependencyInjection/UmbracoBuilderExtensions.cs
index ca625dacdf5c..e97c60fd6253 100644
--- a/src/Umbraco.PublishedCache.HybridCache/DependencyInjection/UmbracoBuilderExtensions.cs
+++ b/src/Umbraco.PublishedCache.HybridCache/DependencyInjection/UmbracoBuilderExtensions.cs
@@ -1,4 +1,3 @@
-
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Options;
 using Umbraco.Cms.Core.Configuration.Models;
@@ -74,7 +73,7 @@ public static IUmbracoBuilder AddUmbracoHybridCache(this IUmbracoBuilder builder
         builder.AddNotificationAsyncHandler<ContentTypeDeletedNotification, CacheRefreshingNotificationHandler>();
         builder.AddNotificationAsyncHandler<MediaTypeRefreshedNotification, CacheRefreshingNotificationHandler>();
         builder.AddNotificationAsyncHandler<MediaTypeDeletedNotification, CacheRefreshingNotificationHandler>();
-        builder.AddNotificationAsyncHandler<UmbracoApplicationStartedNotification, SeedingNotificationHandler>();
+        builder.AddNotificationAsyncHandler<UmbracoApplicationStartingNotification, SeedingNotificationHandler>();
         builder.AddCacheSeeding();
         return builder;
     }
diff --git a/src/Umbraco.PublishedCache.HybridCache/Extensions/HybridCacheExtensions.cs b/src/Umbraco.PublishedCache.HybridCache/Extensions/HybridCacheExtensions.cs
index ee1b7aefda05..ccd5897494eb 100644
--- a/src/Umbraco.PublishedCache.HybridCache/Extensions/HybridCacheExtensions.cs
+++ b/src/Umbraco.PublishedCache.HybridCache/Extensions/HybridCacheExtensions.cs
@@ -1,3 +1,4 @@
+using System.Collections.Concurrent;
 using Microsoft.Extensions.Caching.Hybrid;
 
 namespace Umbraco.Cms.Infrastructure.HybridCache.Extensions;
@@ -7,19 +8,24 @@ namespace Umbraco.Cms.Infrastructure.HybridCache.Extensions;
 /// </summary>
 internal static class HybridCacheExtensions
 {
+    // Per-key semaphores to ensure the GetOrCreateAsync + RemoveAsync sequence
+    // executes atomically for a given cache key.
+    private static readonly ConcurrentDictionary<string, SemaphoreSlim> _keyLocks = new();
+
     /// <summary>
     /// Returns true if the cache contains an item with a matching key.
     /// </summary>
     /// <param name="cache">An instance of <see cref="Microsoft.Extensions.Caching.Hybrid.HybridCache"/></param>
     /// <param name="key">The name (key) of the item to search for in the cache.</param>
+    /// <param name="token">The cancellation token.</param>
     /// <returns>True if the item exists already. False if it doesn't.</returns>
     /// <remarks>
     /// Hat-tip: https://github.com/dotnet/aspnetcore/discussions/57191
     /// Will never add or alter the state of any items in the cache.
     /// </remarks>
-    public static async Task<bool> ExistsAsync<T>(this Microsoft.Extensions.Caching.Hybrid.HybridCache cache, string key)
+    public static async Task<bool> ExistsAsync<T>(this Microsoft.Extensions.Caching.Hybrid.HybridCache cache, string key, CancellationToken token)
     {
-        (bool exists, _) = await TryGetValueAsync<T>(cache, key);
+        (bool exists, _) = await TryGetValueAsync<T>(cache, key, token).ConfigureAwait(false);
         return exists;
     }
 
@@ -29,34 +35,55 @@ public static async Task<bool> ExistsAsync<T>(this Microsoft.Extensions.Caching.
     /// <typeparam name="T">The type of the value of the item in the cache.</typeparam>
     /// <param name="cache">An instance of <see cref="Microsoft.Extensions.Caching.Hybrid.HybridCache"/></param>
     /// <param name="key">The name (key) of the item to search for in the cache.</param>
+    /// <param name="token">The cancellation token.</param>
     /// <returns>A tuple of <see cref="bool"/> and the object (if found) retrieved from the cache.</returns>
     /// <remarks>
     /// Hat-tip: https://github.com/dotnet/aspnetcore/discussions/57191
     /// Will never add or alter the state of any items in the cache.
     /// </remarks>
-    public static async Task<(bool Exists, T? Value)> TryGetValueAsync<T>(this Microsoft.Extensions.Caching.Hybrid.HybridCache cache, string key)
+    public static async Task<(bool Exists, T? Value)> TryGetValueAsync<T>(this Microsoft.Extensions.Caching.Hybrid.HybridCache cache, string key, CancellationToken token)
     {
         var exists = true;
 
-        T? result = await cache.GetOrCreateAsync<object, T>(
-            key,
-            null!,
-            (_, _) =>
-            {
-                exists = false;
-                return new ValueTask<T>(default(T)!);
-            },
-            new HybridCacheEntryOptions(),
-            null,
-            CancellationToken.None);
-
-        // In checking for the existence of the item, if not found, we will have created a cache entry with a null value.
-        // So remove it again.
-        if (exists is false)
+        // Acquire a per-key semaphore so that GetOrCreateAsync and the possible RemoveAsync
+        // complete without another thread retrieving/creating the same key in-between.
+        SemaphoreSlim sem = _keyLocks.GetOrAdd(key, _ => new SemaphoreSlim(1, 1));
+
+        await sem.WaitAsync().ConfigureAwait(false);
+
+        try
         {
-            await cache.RemoveAsync(key);
+            T? result = await cache.GetOrCreateAsync<T?>(
+                key,
+                cancellationToken =>
+                {
+                    exists = false;
+                    return default;
+                },
+                new HybridCacheEntryOptions(),
+                null,
+                token).ConfigureAwait(false);
+
+            // In checking for the existence of the item, if not found, we will have created a cache entry with a null value.
+            // So remove it again. Because we're holding the per-key lock there is no chance another thread
+            // will observe the temporary entry between GetOrCreateAsync and RemoveAsync.
+            if (exists is false)
+            {
+                await cache.RemoveAsync(key).ConfigureAwait(false);
+            }
+
+            return (exists, result);
         }
+        finally
+        {
+            sem.Release();
 
-        return (exists, result);
+            // Only remove the semaphore mapping if it still points to the same instance we used.
+            // This avoids removing another thread's semaphore or corrupting the map.
+            if (_keyLocks.TryGetValue(key, out SemaphoreSlim? current) && ReferenceEquals(current, sem))
+            {
+                _keyLocks.TryRemove(key, out _);
+            }
+        }
     }
 }
diff --git a/src/Umbraco.PublishedCache.HybridCache/NotificationHandlers/SeedingNotificationHandler.cs b/src/Umbraco.PublishedCache.HybridCache/NotificationHandlers/SeedingNotificationHandler.cs
index 0581bd26542c..38a6618c7019 100644
--- a/src/Umbraco.PublishedCache.HybridCache/NotificationHandlers/SeedingNotificationHandler.cs
+++ b/src/Umbraco.PublishedCache.HybridCache/NotificationHandlers/SeedingNotificationHandler.cs
@@ -1,4 +1,4 @@
-using Microsoft.Extensions.Options;
+using Microsoft.Extensions.Options;
 using Umbraco.Cms.Core;
 using Umbraco.Cms.Core.Configuration.Models;
 using Umbraco.Cms.Core.Events;
@@ -9,7 +9,7 @@
 
 namespace Umbraco.Cms.Infrastructure.HybridCache.NotificationHandlers;
 
-internal sealed class SeedingNotificationHandler : INotificationAsyncHandler<UmbracoApplicationStartedNotification>
+internal sealed class SeedingNotificationHandler : INotificationAsyncHandler<UmbracoApplicationStartingNotification>
 {
     private readonly IDocumentCacheService _documentCacheService;
     private readonly IMediaCacheService _mediaCacheService;
@@ -24,7 +24,7 @@ public SeedingNotificationHandler(IDocumentCacheService documentCacheService, IM
         _globalSettings = globalSettings.Value;
     }
 
-    public async Task HandleAsync(UmbracoApplicationStartedNotification notification,
+    public async Task HandleAsync(UmbracoApplicationStartingNotification notification,
         CancellationToken cancellationToken)
     {
 
diff --git a/src/Umbraco.PublishedCache.HybridCache/Services/DocumentCacheService.cs b/src/Umbraco.PublishedCache.HybridCache/Services/DocumentCacheService.cs
index 1675cb05cfb2..2879be5c8d7f 100644
--- a/src/Umbraco.PublishedCache.HybridCache/Services/DocumentCacheService.cs
+++ b/src/Umbraco.PublishedCache.HybridCache/Services/DocumentCacheService.cs
@@ -205,7 +205,7 @@ public async Task SeedAsync(CancellationToken cancellationToken)
 
                 var cacheKey = GetCacheKey(key, false);
 
-                var existsInCache = await _hybridCache.ExistsAsync<ContentCacheNode>(cacheKey);
+                var existsInCache = await _hybridCache.ExistsAsync<ContentCacheNode?>(cacheKey, cancellationToken).ConfigureAwait(false);
                 if (existsInCache is false)
                 {
                     uncachedKeys.Add(key);
@@ -278,7 +278,7 @@ public async Task<bool> HasContentByIdAsync(int id, bool preview = false)
             return false;
         }
 
-        return await _hybridCache.ExistsAsync<ContentCacheNode>(GetCacheKey(keyAttempt.Result, preview));
+        return await _hybridCache.ExistsAsync<ContentCacheNode?>(GetCacheKey(keyAttempt.Result, preview), CancellationToken.None);
     }
 
     public async Task RefreshContentAsync(IContent content)
diff --git a/src/Umbraco.PublishedCache.HybridCache/Services/MediaCacheService.cs b/src/Umbraco.PublishedCache.HybridCache/Services/MediaCacheService.cs
index 65b8f91945a5..46d782bdbecb 100644
--- a/src/Umbraco.PublishedCache.HybridCache/Services/MediaCacheService.cs
+++ b/src/Umbraco.PublishedCache.HybridCache/Services/MediaCacheService.cs
@@ -133,7 +133,7 @@ public async Task<bool> HasContentByIdAsync(int id)
             return false;
         }
 
-        return await _hybridCache.ExistsAsync<ContentCacheNode>($"{keyAttempt.Result}");
+        return await _hybridCache.ExistsAsync<ContentCacheNode?>($"{keyAttempt.Result}", CancellationToken.None);
     }
 
     public async Task RefreshMediaAsync(IMedia media)
@@ -170,7 +170,7 @@ public async Task SeedAsync(CancellationToken cancellationToken)
 
                 var cacheKey = GetCacheKey(key, false);
 
-                var existsInCache = await _hybridCache.ExistsAsync<ContentCacheNode>(cacheKey);
+                var existsInCache = await _hybridCache.ExistsAsync<ContentCacheNode?>(cacheKey, CancellationToken.None);
                 if (existsInCache is false)
                 {
                     uncachedKeys.Add(key);
diff --git a/tests/Umbraco.Tests.Integration/Umbraco.PublishedCache.HybridCache/DocumentHybridCacheTests.cs b/tests/Umbraco.Tests.Integration/Umbraco.PublishedCache.HybridCache/DocumentHybridCacheTests.cs
index 0c4207331a0e..088f14cd319a 100644
--- a/tests/Umbraco.Tests.Integration/Umbraco.PublishedCache.HybridCache/DocumentHybridCacheTests.cs
+++ b/tests/Umbraco.Tests.Integration/Umbraco.PublishedCache.HybridCache/DocumentHybridCacheTests.cs
@@ -7,6 +7,7 @@
 using Umbraco.Cms.Core.PublishedCache;
 using Umbraco.Cms.Core.Services;
 using Umbraco.Cms.Core.Sync;
+using Umbraco.Cms.Tests.Common.Builders;
 using Umbraco.Cms.Tests.Common.Testing;
 using Umbraco.Cms.Tests.Integration.Testing;
 using Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Services;
@@ -25,10 +26,10 @@ protected override void CustomTestSetup(IUmbracoBuilder builder)
 
     private IPublishedContentCache PublishedContentHybridCache => GetRequiredService<IPublishedContentCache>();
 
-    private IContentEditingService ContentEditingService => GetRequiredService<IContentEditingService>();
-
     private IContentPublishingService ContentPublishingService => GetRequiredService<IContentPublishingService>();
 
+    private IDocumentCacheService DocumentCacheService => GetRequiredService<IDocumentCacheService>();
+
     private const string NewName = "New Name";
     private const string NewTitle = "New Title";
 
@@ -460,6 +461,61 @@ public async Task Can_Not_Get_Deleted_Published_Content_By_Key(bool preview)
         Assert.IsNull(textPage);
     }
 
+    [Test]
+    public async Task Can_Get_Published_Content_By_Id_After_Previous_Check_Where_Not_Found()
+    {
+        // Arrange
+        var testPageKey = Guid.NewGuid();
+
+        // Act & Assert
+        // - assert we cannot get the content that doesn't yet exist from the cache
+        var testPage = await PublishedContentHybridCache.GetByIdAsync(testPageKey);
+        Assert.IsNull(testPage);
+
+        testPage = await PublishedContentHybridCache.GetByIdAsync(testPageKey);
+        Assert.IsNull(testPage);
+
+        // - create and publish the content
+        var testPageContent = ContentEditingBuilder.CreateBasicContent(ContentType.Key, testPageKey);
+        var createResult = await ContentEditingService.CreateAsync(testPageContent, Constants.Security.SuperUserKey);
+        Assert.IsTrue(createResult.Success);
+        var publishResult = await ContentPublishingService.PublishAsync(testPageKey, CultureAndSchedule, Constants.Security.SuperUserKey);
+        Assert.IsTrue(publishResult.Success);
+
+        // - assert we can now get the content from the cache
+        testPage = await PublishedContentHybridCache.GetByIdAsync(testPageKey);
+        Assert.IsNotNull(testPage);
+    }
+
+    [Test]
+    public async Task Can_Get_Published_Content_By_Id_After_Previous_Exists_Check()
+    {
+        // Act
+        var hasContentForTextPageCached = await DocumentCacheService.HasContentByIdAsync(PublishedTextPageId);
+        Assert.IsTrue(hasContentForTextPageCached);
+        var textPage = await PublishedContentHybridCache.GetByIdAsync(PublishedTextPageId);
+
+        // Assert
+        AssertPublishedTextPage(textPage);
+    }
+
+    [Test]
+    public async Task Can_Do_Exists_Check_On_Created_Published_Content()
+    {
+        var testPageKey = Guid.NewGuid();
+        var testPageContent = ContentEditingBuilder.CreateBasicContent(ContentType.Key, testPageKey);
+        var createResult = await ContentEditingService.CreateAsync(testPageContent, Constants.Security.SuperUserKey);
+        Assert.IsTrue(createResult.Success);
+        var publishResult = await ContentPublishingService.PublishAsync(testPageKey, CultureAndSchedule, Constants.Security.SuperUserKey);
+        Assert.IsTrue(publishResult.Success);
+
+        var testPage = await PublishedContentHybridCache.GetByIdAsync(testPageKey);
+        Assert.IsNotNull(testPage);
+
+        var hasContentForTextPageCached = await DocumentCacheService.HasContentByIdAsync(testPage.Id);
+        Assert.IsTrue(hasContentForTextPageCached);
+    }
+
     private void AssertTextPage(IPublishedContent textPage)
     {
         Assert.Multiple(() =>
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.PublishedCache.HybridCache/Extensions/HybridCacheExtensionsTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.PublishedCache.HybridCache/Extensions/HybridCacheExtensionsTests.cs
index 152fe28b4ef6..8da30cd11883 100644
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.PublishedCache.HybridCache/Extensions/HybridCacheExtensionsTests.cs
+++ b/tests/Umbraco.Tests.UnitTests/Umbraco.PublishedCache.HybridCache/Extensions/HybridCacheExtensionsTests.cs
@@ -1,3 +1,4 @@
+using System;
 using Microsoft.Extensions.Caching.Hybrid;
 using Moq;
 using NUnit.Framework;
@@ -33,15 +34,15 @@ public async Task ExistsAsync_WhenKeyExists_ShouldReturnTrue()
         _cacheMock
             .Setup(cache => cache.GetOrCreateAsync(
                 key,
-                null!,
-                It.IsAny<Func<object, CancellationToken, ValueTask<ContentCacheNode>>>(),
+                It.IsAny<Func<CancellationToken, ValueTask<ContentCacheNode?>>>(),
+                It.IsAny<Func<Func<CancellationToken, ValueTask<ContentCacheNode?>>, CancellationToken, ValueTask<ContentCacheNode?>>>(),
                 It.IsAny<HybridCacheEntryOptions>(),
                 null,
                 CancellationToken.None))
             .ReturnsAsync(expectedValue);
 
         // Act
-        var exists = await HybridCacheExtensions.ExistsAsync<ContentCacheNode>(_cacheMock.Object, key);
+        var exists = await HybridCacheExtensions.ExistsAsync<ContentCacheNode?>(_cacheMock.Object, key, CancellationToken.None);
 
         // Assert
         Assert.IsTrue(exists);
@@ -56,24 +57,24 @@ public async Task ExistsAsync_WhenKeyDoesNotExist_ShouldReturnFalse()
         _cacheMock
             .Setup(cache => cache.GetOrCreateAsync(
                 key,
-                null!,
-                It.IsAny<Func<object, CancellationToken, ValueTask<ContentCacheNode>>>(),
+                It.IsAny<Func<CancellationToken, ValueTask<ContentCacheNode?>>>(),
+                It.IsAny<Func<Func<CancellationToken, ValueTask<ContentCacheNode?>>, CancellationToken, ValueTask<ContentCacheNode?>>>(),
                 It.IsAny<HybridCacheEntryOptions>(),
                 null,
                 CancellationToken.None))
             .Returns((
                 string key,
-                object? state,
-                Func<object, CancellationToken, ValueTask<ContentCacheNode>> factory,
+                Func<CancellationToken, ValueTask<ContentCacheNode?>> state,
+                Func<Func<CancellationToken, ValueTask<ContentCacheNode?>>, CancellationToken, ValueTask<ContentCacheNode?>> factory,
                 HybridCacheEntryOptions? options,
                 IEnumerable<string>? tags,
                 CancellationToken token) =>
             {
-                return factory(state!, token);
+                return factory(state, token);
             });
 
         // Act
-        var exists = await HybridCacheExtensions.ExistsAsync<ContentCacheNode>(_cacheMock.Object, key);
+        var exists = await HybridCacheExtensions.ExistsAsync<ContentCacheNode?>(_cacheMock.Object, key, CancellationToken.None);
 
         // Assert
         Assert.IsFalse(exists);
@@ -89,15 +90,15 @@ public async Task TryGetValueAsync_WhenKeyExists_ShouldReturnTrueAndValueAsStrin
         _cacheMock
             .Setup(cache => cache.GetOrCreateAsync(
                 key,
-                null!,
-                It.IsAny<Func<object, CancellationToken, ValueTask<string>>>(),
+                It.IsAny<Func<CancellationToken, ValueTask<string>>>(),
+                It.IsAny<Func<Func<CancellationToken, ValueTask<string>>, CancellationToken, ValueTask<string>>>(),
                 It.IsAny<HybridCacheEntryOptions>(),
                 null,
                 CancellationToken.None))
             .ReturnsAsync(expectedValue);
 
         // Act
-        var (exists, value) = await HybridCacheExtensions.TryGetValueAsync<string>(_cacheMock.Object, key);
+        var (exists, value) = await HybridCacheExtensions.TryGetValueAsync<string>(_cacheMock.Object, key, CancellationToken.None);
 
         // Assert
         Assert.IsTrue(exists);
@@ -114,15 +115,15 @@ public async Task TryGetValueAsync_WhenKeyExists_ShouldReturnTrueAndValueAsInteg
         _cacheMock
             .Setup(cache => cache.GetOrCreateAsync(
                 key,
-                null!,
-                It.IsAny<Func<object, CancellationToken, ValueTask<int>>>(),
+                It.IsAny<Func<CancellationToken, ValueTask<int>>>(),
+                It.IsAny<Func<Func<CancellationToken, ValueTask<int>>, CancellationToken, ValueTask<int>>>(),
                 It.IsAny<HybridCacheEntryOptions>(),
                 null,
                 CancellationToken.None))
             .ReturnsAsync(expectedValue);
 
         // Act
-        var (exists, value) = await HybridCacheExtensions.TryGetValueAsync<int>(_cacheMock.Object, key);
+        var (exists, value) = await HybridCacheExtensions.TryGetValueAsync<int>(_cacheMock.Object, key, CancellationToken.None);
 
         // Assert
         Assert.IsTrue(exists);
@@ -138,15 +139,15 @@ public async Task TryGetValueAsync_WhenKeyExistsButValueIsNull_ShouldReturnTrueA
         _cacheMock
             .Setup(cache => cache.GetOrCreateAsync(
                 key,
-                null!,
-                It.IsAny<Func<object, CancellationToken, ValueTask<object>>>(),
+                It.IsAny<Func<CancellationToken, ValueTask<object>>>(),
+                It.IsAny<Func<Func<CancellationToken, ValueTask<object>>, CancellationToken, ValueTask<object>>>(),
                 It.IsAny<HybridCacheEntryOptions>(),
                 null,
                 CancellationToken.None))
             .ReturnsAsync(null!);
 
         // Act
-        var (exists, value) = await HybridCacheExtensions.TryGetValueAsync<int?>(_cacheMock.Object, key);
+        var (exists, value) = await HybridCacheExtensions.TryGetValueAsync<int?>(_cacheMock.Object, key, CancellationToken.None);
 
         // Assert
         Assert.IsTrue(exists);
@@ -160,16 +161,16 @@ public async Task TryGetValueAsync_WhenKeyDoesNotExist_ShouldReturnFalseAndNull(
         string key = "test-key";
 
         _cacheMock.Setup(cache => cache.GetOrCreateAsync(
-            key,
-            null,
-            It.IsAny<Func<object?, CancellationToken, ValueTask<string>>>(),
-            It.IsAny<HybridCacheEntryOptions>(),
-            null,
-            CancellationToken.None))
+                key,
+                It.IsAny<Func<CancellationToken, ValueTask<object>>>(),
+                It.IsAny<Func<Func<CancellationToken, ValueTask<object>>, CancellationToken, ValueTask<object>>>(),
+                It.IsAny<HybridCacheEntryOptions>(),
+                null,
+                CancellationToken.None))
             .Returns((
                 string key,
-                object? state,
-                Func<object?, CancellationToken, ValueTask<string>> factory,
+                Func<CancellationToken, ValueTask<object>> state,
+                Func<Func<CancellationToken, ValueTask<object>>, CancellationToken, ValueTask<object>> factory,
                 HybridCacheEntryOptions? options,
                 IEnumerable<string>? tags,
                 CancellationToken token) =>
@@ -178,7 +179,7 @@ public async Task TryGetValueAsync_WhenKeyDoesNotExist_ShouldReturnFalseAndNull(
             });
 
         // Act
-        var (exists, value) = await HybridCacheExtensions.TryGetValueAsync<string>(_cacheMock.Object, key);
+        var (exists, value) = await HybridCacheExtensions.TryGetValueAsync<object>(_cacheMock.Object, key, CancellationToken.None);
 
         // Assert
         Assert.IsFalse(exists);

From 942ccc82d9aca9aef02198dd75bdf6bf07c253d7 Mon Sep 17 00:00:00 2001
From: Jacob Overgaard <752371+iOvergaard@users.noreply.github.com>
Date: Tue, 21 Oct 2025 16:22:36 +0200
Subject: [PATCH 059/155] docs: Add 'Running Umbraco in Different Modes'
 section to copilot-instructions

---
 .github/copilot-instructions.md | 21 ++++++++++++++++-----
 1 file changed, 16 insertions(+), 5 deletions(-)

diff --git a/.github/copilot-instructions.md b/.github/copilot-instructions.md
index b438a0027b48..ed34279ab99b 100644
--- a/.github/copilot-instructions.md
+++ b/.github/copilot-instructions.md
@@ -94,11 +94,18 @@ The solution contains 30 C# projects organized as follows:
 
 ## Common Tasks
 
-### Frontend Development
-For frontend-only changes:
-1. Configure backend for frontend development:
-   ```json
-   <!-- Add to src/Umbraco.Web.UI/appsettings.json under Umbraco:Cms:Security: -->
+### Running Umbraco in Different Modes
+
+**Production Mode (Standard Development)**
+Use this for backend development, testing full builds, or when you don't need hot reloading:
+1. Build frontend assets: `cd src/Umbraco.Web.UI.Client && npm run build:for:cms`
+2. Run backend: `cd src/Umbraco.Web.UI && dotnet run --no-build`
+3. Access backoffice: `https://localhost:44339/umbraco`
+4. Application uses compiled frontend from `wwwroot/umbraco/backoffice/`
+
+**Vite Dev Server Mode (Frontend Development with Hot Reload)**
+Use this for frontend-only development with hot module reloading:
+1. Configure backend for frontend development - Add to `src/Umbraco.Web.UI/appsettings.json` under `Umbraco:CMS:Security`:
    ```json
    "BackOfficeHost": "http://localhost:5173",
    "AuthorizeCallbackPathName": "/oauth_complete",
@@ -107,6 +114,10 @@ For frontend-only changes:
    ```
 2. Run backend: `cd src/Umbraco.Web.UI && dotnet run --no-build`
 3. Run frontend dev server: `cd src/Umbraco.Web.UI.Client && npm run dev:server`
+4. Access backoffice: `http://localhost:5173/` (no `/umbraco` prefix)
+5. Changes to TypeScript/Lit files hot reload automatically
+
+**Important:** Remove the `BackOfficeHost` configuration before committing or switching back to production mode.
 
 ### Backend-Only Development
 For backend-only changes, disable frontend builds:

From caeb3454e1fe37a45580dc3bf81a2a31fecab18e Mon Sep 17 00:00:00 2001
From: Jacob Overgaard <752371+iOvergaard@users.noreply.github.com>
Date: Tue, 21 Oct 2025 16:22:57 +0200
Subject: [PATCH 060/155] build(dev): adds umbracoapplicationurl to vscode
 launch params

---
 .vscode/launch.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.vscode/launch.json b/.vscode/launch.json
index ef4677989e20..f4d47c3dab86 100644
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -101,6 +101,7 @@
       "env": {
         "ASPNETCORE_ENVIRONMENT": "Development",
         "ASPNETCORE_URLS": "https://localhost:44339",
+        "UMBRACO__CMS__WEBROUTING__UMBRACOAPPLICATIONURL": "https://localhost:44339",
         "UMBRACO__CMS__SECURITY__BACKOFFICEHOST": "http://localhost:5173",
         "UMBRACO__CMS__SECURITY__AUTHORIZECALLBACKPATHNAME": "/oauth_complete",
         "UMBRACO__CMS__SECURITY__AUTHORIZECALLBACKLOGOUTPATHNAME": "/logout",

From 79639c0571ebd932d149ba0a1610281d04c39a49 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= <niels.lyngso@gmail.com>
Date: Wed, 22 Oct 2025 11:52:09 +0200
Subject: [PATCH 061/155] Item Repository: Sort statuses by order of unique
 (#20603)

* utility

* ability to replace

* deprecate removeStatus

* no need to call this any longer

* Sort statuses and ensure not appending statuses, only updating them
# Conflicts:
#	src/Umbraco.Web.UI.Client/src/packages/core/repository/repository-items.manager.ts
---
 .../observable-api/states/array-state.test.ts | 70 ++++++++++++-------
 .../libs/observable-api/states/array-state.ts | 33 +++++++++
 .../src/libs/observable-api/utils/index.ts    |  1 +
 .../utils/replace-in-unique-array.function.ts | 19 +++++
 .../core/picker-input/picker-input.context.ts |  1 -
 .../repository/repository-items.manager.ts    | 34 ++++++---
 6 files changed, 119 insertions(+), 39 deletions(-)
 create mode 100644 src/Umbraco.Web.UI.Client/src/libs/observable-api/utils/replace-in-unique-array.function.ts

diff --git a/src/Umbraco.Web.UI.Client/src/libs/observable-api/states/array-state.test.ts b/src/Umbraco.Web.UI.Client/src/libs/observable-api/states/array-state.test.ts
index d9d5d1ad4f88..74c2e63c5ccc 100644
--- a/src/Umbraco.Web.UI.Client/src/libs/observable-api/states/array-state.test.ts
+++ b/src/Umbraco.Web.UI.Client/src/libs/observable-api/states/array-state.test.ts
@@ -5,7 +5,7 @@ describe('ArrayState', () => {
 	type ObjectType = { key: string; another: string };
 	type ArrayType = ObjectType[];
 
-	let subject: UmbArrayState<ObjectType>;
+	let state: UmbArrayState<ObjectType>;
 	let initialData: ArrayType;
 
 	beforeEach(() => {
@@ -14,12 +14,12 @@ describe('ArrayState', () => {
 			{ key: '2', another: 'myValue2' },
 			{ key: '3', another: 'myValue3' },
 		];
-		subject = new UmbArrayState(initialData, (x) => x.key);
+		state = new UmbArrayState(initialData, (x) => x.key);
 	});
 
 	it('replays latests, no matter the amount of subscriptions.', (done) => {
 		let amountOfCallbacks = 0;
-		const observer = subject.asObservable();
+		const observer = state.asObservable();
 		observer.subscribe((value) => {
 			amountOfCallbacks++;
 			expect(value).to.be.equal(initialData);
@@ -36,8 +36,8 @@ describe('ArrayState', () => {
 	it('remove method, removes the one with the key', (done) => {
 		const expectedData = [initialData[0], initialData[2]];
 
-		subject.remove(['2']);
-		const observer = subject.asObservable();
+		state.remove(['2']);
+		const observer = state.asObservable();
 		observer.subscribe((value) => {
 			expect(JSON.stringify(value)).to.be.equal(JSON.stringify(expectedData));
 			done();
@@ -45,17 +45,17 @@ describe('ArrayState', () => {
 	});
 
 	it('getHasOne method, return true when key exists', () => {
-		expect(subject.getHasOne('2')).to.be.true;
+		expect(state.getHasOne('2')).to.be.true;
 	});
 	it('getHasOne method, return false when key does not exists', () => {
-		expect(subject.getHasOne('1337')).to.be.false;
+		expect(state.getHasOne('1337')).to.be.false;
 	});
 
 	it('filter method, removes anything that is not true of the given predicate method', (done) => {
 		const expectedData = [initialData[0], initialData[2]];
 
-		subject.filter((x) => x.key !== '2');
-		const observer = subject.asObservable();
+		state.filter((x) => x.key !== '2');
+		const observer = state.asObservable();
 		observer.subscribe((value) => {
 			expect(JSON.stringify(value)).to.be.equal(JSON.stringify(expectedData));
 			done();
@@ -64,11 +64,11 @@ describe('ArrayState', () => {
 
 	it('add new item via appendOne method.', (done) => {
 		const newItem = { key: '4', another: 'myValue4' };
-		subject.appendOne(newItem);
+		state.appendOne(newItem);
 
 		const expectedData = [...initialData, newItem];
 
-		const observer = subject.asObservable();
+		const observer = state.asObservable();
 		observer.subscribe((value) => {
 			expect(value.length).to.be.equal(expectedData.length);
 			expect(value[3].another).to.be.equal(expectedData[3].another);
@@ -78,9 +78,25 @@ describe('ArrayState', () => {
 
 	it('partially update an existing item via updateOne method.', (done) => {
 		const newItem = { another: 'myValue2.2' };
-		subject.updateOne('2', newItem);
+		state.updateOne('2', newItem);
 
-		const observer = subject.asObservable();
+		const observer = state.asObservable();
+		observer.subscribe((value) => {
+			expect(value.length).to.be.equal(initialData.length);
+			expect(value[0].another).to.be.equal('myValue1');
+			expect(value[1].another).to.be.equal('myValue2.2');
+			done();
+		});
+	});
+
+	it('replaces only existing items via replace method.', (done) => {
+		const newItems = [
+			{ key: '2', another: 'myValue2.2' },
+			{ key: '4', another: 'myValue4.4' },
+		];
+		state.replace(newItems);
+
+		const observer = state.asObservable();
 		observer.subscribe((value) => {
 			expect(value.length).to.be.equal(initialData.length);
 			expect(value[0].another).to.be.equal('myValue1');
@@ -90,7 +106,7 @@ describe('ArrayState', () => {
 	});
 
 	it('getObservablePart for a specific entry of array', (done) => {
-		const subObserver = subject.asObservablePart((data) => data.find((x) => x.key === '2'));
+		const subObserver = state.asObservablePart((data) => data.find((x) => x.key === '2'));
 		subObserver.subscribe((entry) => {
 			if (entry) {
 				expect(entry.another).to.be.equal(initialData[1].another);
@@ -103,7 +119,7 @@ describe('ArrayState', () => {
 		let amountOfCallbacks = 0;
 		const newItem = { key: '4', another: 'myValue4' };
 
-		const subObserver = subject.asObservablePart((data) => data.find((x) => x.key === newItem.key));
+		const subObserver = state.asObservablePart((data) => data.find((x) => x.key === newItem.key));
 		subObserver.subscribe((entry) => {
 			amountOfCallbacks++;
 			if (amountOfCallbacks === 1) {
@@ -118,16 +134,16 @@ describe('ArrayState', () => {
 			}
 		});
 
-		subject.appendOne(newItem);
+		state.appendOne(newItem);
 	});
 
 	it('asObservable returns the replaced item', (done) => {
 		const newItem = { key: '2', another: 'myValue4' };
-		subject.appendOne(newItem);
+		state.appendOne(newItem);
 
 		const expectedData = [initialData[0], newItem, initialData[2]];
 
-		const observer = subject.asObservable();
+		const observer = state.asObservable();
 		observer.subscribe((value) => {
 			expect(value.length).to.be.equal(expectedData.length);
 			expect(value[1].another).to.be.equal(newItem.another);
@@ -137,9 +153,9 @@ describe('ArrayState', () => {
 
 	it('getObservablePart returns the replaced item', (done) => {
 		const newItem = { key: '2', another: 'myValue4' };
-		subject.appendOne(newItem);
+		state.appendOne(newItem);
 
-		const subObserver = subject.asObservablePart((data) => data.find((x) => x.key === newItem.key));
+		const subObserver = state.asObservablePart((data) => data.find((x) => x.key === newItem.key));
 		subObserver.subscribe((entry) => {
 			expect(entry).to.be.equal(newItem); // Second callback should give us the right data:
 			if (entry) {
@@ -152,7 +168,7 @@ describe('ArrayState', () => {
 	it('getObservablePart replays existing data to any amount of subscribers.', (done) => {
 		let amountOfCallbacks = 0;
 
-		const subObserver = subject.asObservablePart((data) => data.find((x) => x.key === '2'));
+		const subObserver = state.asObservablePart((data) => data.find((x) => x.key === '2'));
 		subObserver.subscribe((entry) => {
 			if (entry) {
 				amountOfCallbacks++;
@@ -173,7 +189,7 @@ describe('ArrayState', () => {
 	it('getObservablePart replays existing data to any amount of subscribers.', (done) => {
 		let amountOfCallbacks = 0;
 
-		const subObserver = subject.asObservablePart((data) => data.find((x) => x.key === '2'));
+		const subObserver = state.asObservablePart((data) => data.find((x) => x.key === '2'));
 		subObserver.subscribe((entry) => {
 			if (entry) {
 				amountOfCallbacks++;
@@ -194,7 +210,7 @@ describe('ArrayState', () => {
 	it('append only updates observable if changes item', (done) => {
 		let count = 0;
 
-		const observer = subject.asObservable();
+		const observer = state.asObservable();
 		observer.subscribe((value) => {
 			count++;
 			if (count === 1) {
@@ -212,12 +228,12 @@ describe('ArrayState', () => {
 
 		Promise.resolve().then(() => {
 			// Despite how many times this happens it should not trigger any change.
-			subject.append(initialData);
-			subject.append(initialData);
-			subject.append(initialData);
+			state.append(initialData);
+			state.append(initialData);
+			state.append(initialData);
 
 			Promise.resolve().then(() => {
-				subject.appendOne({ key: '4', another: 'myValue4' });
+				state.appendOne({ key: '4', another: 'myValue4' });
 			});
 		});
 	});
diff --git a/src/Umbraco.Web.UI.Client/src/libs/observable-api/states/array-state.ts b/src/Umbraco.Web.UI.Client/src/libs/observable-api/states/array-state.ts
index 26cf9261abf2..3dab6a21c062 100644
--- a/src/Umbraco.Web.UI.Client/src/libs/observable-api/states/array-state.ts
+++ b/src/Umbraco.Web.UI.Client/src/libs/observable-api/states/array-state.ts
@@ -1,6 +1,7 @@
 import { partialUpdateFrozenArray } from '../utils/partial-update-frozen-array.function.js';
 import { pushAtToUniqueArray } from '../utils/push-at-to-unique-array.function.js';
 import { pushToUniqueArray } from '../utils/push-to-unique-array.function.js';
+import { replaceInUniqueArray } from '../utils/replace-in-unique-array.function.js';
 import { UmbDeepState } from './deep-state.js';
 
 /**
@@ -262,6 +263,38 @@ export class UmbArrayState<T, U = unknown> extends UmbDeepState<T[]> {
 		return this;
 	}
 
+	/**
+	 * @function replace
+	 * @param {Partial<T>} entires - data of entries to be replaced.
+	 * @returns {UmbArrayState<T>} Reference to it self.
+	 * @description - Replaces one or more entries, requires the ArrayState to be constructed with a getUnique method.
+	 * @example <caption>Example append some data.</caption>
+	 * const data = [
+	 * 	{ key: 1, value: 'foo'},
+	 * 	{ key: 2, value: 'bar'}
+	 * ];
+	 * const myState = new UmbArrayState(data, (x) => x.key);
+	 * const updates = [
+	 * 	{ key: 1, value: 'foo2'},
+	 * 	{ key: 3, value: 'bar2'}
+	 * ];
+	 * myState.replace(updates);
+	 * // Only the existing item gets replaced:
+	 * myState.getValue(); // -> [{ key: 1, value: 'foo2'}, { key: 2, value: 'bar'}]
+	 */
+	replace(entries: Array<T>): UmbArrayState<T> {
+		if (this.getUniqueMethod) {
+			const next = [...this.getValue()];
+			entries.forEach((entry) => {
+				replaceInUniqueArray(next, entry as T, this.getUniqueMethod!);
+			});
+			this.setValue(next);
+		} else {
+			throw new Error("Can't replace entries of an ArrayState without a getUnique method provided when constructed.");
+		}
+		return this;
+	}
+
 	/**
 	 * @function updateOne
 	 * @param {U} unique - Unique value to find entry to update.
diff --git a/src/Umbraco.Web.UI.Client/src/libs/observable-api/utils/index.ts b/src/Umbraco.Web.UI.Client/src/libs/observable-api/utils/index.ts
index 3b3452ab110e..0c90285e6c80 100644
--- a/src/Umbraco.Web.UI.Client/src/libs/observable-api/utils/index.ts
+++ b/src/Umbraco.Web.UI.Client/src/libs/observable-api/utils/index.ts
@@ -12,5 +12,6 @@ export * from './observe-multiple.function.js';
 export * from './partial-update-frozen-array.function.js';
 export * from './push-at-to-unique-array.function.js';
 export * from './push-to-unique-array.function.js';
+export * from './replace-in-unique-array.function.js';
 export * from './simple-hash-code.function.js';
 export * from './strict-equality-memoization.function.js';
diff --git a/src/Umbraco.Web.UI.Client/src/libs/observable-api/utils/replace-in-unique-array.function.ts b/src/Umbraco.Web.UI.Client/src/libs/observable-api/utils/replace-in-unique-array.function.ts
new file mode 100644
index 000000000000..1970c0b2a9e7
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/libs/observable-api/utils/replace-in-unique-array.function.ts
@@ -0,0 +1,19 @@
+/**
+ * @function replaceInUniqueArray
+ * @param {T[]} data - An array of objects.
+ * @param {T} entry - The object to replace with.
+ * @param {getUniqueMethod: (entry: T) => unknown} [getUniqueMethod] - Method to get the unique value of an entry.
+ * @description - Replaces an item of an Array.
+ * @example <caption>Example replace an entry of an Array. Where the key is unique and the item will only be replaced if matched with existing.</caption>
+ * const data = [{key: 'myKey', value:'initialValue'}];
+ * const entry = {key: 'myKey', value: 'replacedValue'};
+ * const newDataSet = replaceInUniqueArray(data, entry, x => x.key === key);
+ */
+export function replaceInUniqueArray<T>(data: T[], entry: T, getUniqueMethod: (entry: T) => unknown): T[] {
+	const unique = getUniqueMethod(entry);
+	const indexToReplace = data.findIndex((x) => getUniqueMethod(x) === unique);
+	if (indexToReplace !== -1) {
+		data[indexToReplace] = entry;
+	}
+	return data;
+}
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/picker-input/picker-input.context.ts b/src/Umbraco.Web.UI.Client/src/packages/core/picker-input/picker-input.context.ts
index de943aa88aa8..c345fd22d4ff 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/picker-input/picker-input.context.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/picker-input/picker-input.context.ts
@@ -133,7 +133,6 @@ export class UmbPickerInputContext<
 	#removeItem(unique: string) {
 		const newSelection = this.getSelection().filter((value) => value !== unique);
 		this.setSelection(newSelection);
-		this.#itemManager.removeStatus(unique);
 		this.getHostElement().dispatchEvent(new UmbChangeEvent());
 	}
 }
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/repository/repository-items.manager.ts b/src/Umbraco.Web.UI.Client/src/packages/core/repository/repository-items.manager.ts
index cf227b3cf28b..c60dc8badf25 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/repository/repository-items.manager.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/repository/repository-items.manager.ts
@@ -75,17 +75,20 @@ export class UmbRepositoryItemsManager<ItemType extends { unique: string }> exte
 			(uniques) => {
 				if (uniques.length === 0) {
 					this.#items.setValue([]);
+					this.#statuses.setValue([]);
 					return;
 				}
 
 				// TODO: This could be optimized so we only load the appended items, but this requires that the response checks that an item is still present in uniques. [NL]
-				// Check if we already have the items, and then just sort them:
-				const items = this.#items.getValue();
+				// Check if we already have the statuses, and then just sort them:
+				const statuses = this.#statuses.getValue();
 				if (
-					uniques.length === items.length &&
-					uniques.every((unique) => items.find((item) => this.#getUnique(item) === unique))
+					uniques.length === statuses.length &&
+					uniques.every((unique) => statuses.find((status) => status.unique === unique))
 				) {
+					const items = this.#items.getValue();
 					this.#items.setValue(this.#sortByUniques(items));
+					this.#statuses.setValue(this.#sortByUniques(statuses));
 				} else {
 					// We need to load new items, so ...
 					this.#requestItems();
@@ -124,9 +127,17 @@ export class UmbRepositoryItemsManager<ItemType extends { unique: string }> exte
 		return this.#items.asObservablePart((items) => items.find((item) => this.#getUnique(item) === unique));
 	}
 
+	/**
+	 * @deprecated - This is resolved by setUniques, no need to update statuses.
+	 * @param unique {string} - The unique identifier of the item to remove the status of.
+	 */
 	removeStatus(unique: string) {
-		const newStatuses = this.#statuses.getValue().filter((status) => status.unique !== unique);
-		this.#statuses.setValue(newStatuses);
+		new UmbDeprecation({
+			removeInVersion: '18.0.0',
+			deprecated: 'removeStatus',
+			solution: 'Statuses are removed automatically when setting uniques',
+		}).warn();
+		this.#statuses.filter((status) => status.unique !== unique);
 	}
 
 	async getItemByUnique(unique: string) {
@@ -144,6 +155,7 @@ export class UmbRepositoryItemsManager<ItemType extends { unique: string }> exte
 		const requestedUniques = this.getUniques();
 
 		this.#statuses.setValue(
+			// No need to do sorting here as we just got the unique in the right order above.
 			requestedUniques.map((unique) => ({
 				state: {
 					type: 'loading',
@@ -164,7 +176,7 @@ export class UmbRepositoryItemsManager<ItemType extends { unique: string }> exte
 		}
 
 		if (error) {
-			this.#statuses.append(
+			this.#statuses.replace(
 				requestedUniques.map((unique) => ({
 					state: {
 						type: 'error',
@@ -185,7 +197,7 @@ export class UmbRepositoryItemsManager<ItemType extends { unique: string }> exte
 			const resolvedUniques = requestedUniques.filter((unique) => !rejectedUniques.includes(unique));
 			this.#items.remove(rejectedUniques);
 
-			this.#statuses.append([
+			this.#statuses.replace([
 				...rejectedUniques.map(
 					(unique) =>
 						({
@@ -226,12 +238,11 @@ export class UmbRepositoryItemsManager<ItemType extends { unique: string }> exte
 		const { data, error } = await this.repository.requestItems([unique]);
 
 		if (error) {
-			this.#statuses.appendOne({
+			this.#statuses.updateOne(unique, {
 				state: {
 					type: 'error',
 					error: '#general_notFound',
 				},
-				unique,
 			} as UmbRepositoryItemsStatus);
 		}
 
@@ -244,11 +255,12 @@ export class UmbRepositoryItemsManager<ItemType extends { unique: string }> exte
 				const newItems = [...items];
 				newItems[index] = data[0];
 				this.#items.setValue(this.#sortByUniques(newItems));
+				// No need to update statuses here, as the item is the same, just updated.
 			}
 		}
 	}
 
-	#sortByUniques(data?: Array<ItemType>): Array<ItemType> {
+	#sortByUniques<T extends Pick<ItemType, 'unique'>>(data?: Array<T>): Array<T> {
 		if (!data) return [];
 		const uniques = this.getUniques();
 		return [...data].sort((a, b) => {

From 48759b9852990f021fb4cc0ffb5609c91ba79061 Mon Sep 17 00:00:00 2001
From: Andy Butland <abutland73@gmail.com>
Date: Wed, 22 Oct 2025 12:21:42 +0200
Subject: [PATCH 062/155] Migrations: Use reliable GUID to check for existence
 of data type when creating (#20604)

* Use reliable GUID to check for existence of data type in migration.

* Retrieve just a single field in existence check.
---
 .../MigrateMediaTypeLabelProperties.cs        | 23 ++++++++++++++-----
 1 file changed, 17 insertions(+), 6 deletions(-)

diff --git a/src/Umbraco.Infrastructure/Migrations/Upgrade/V_16_3_0/MigrateMediaTypeLabelProperties.cs b/src/Umbraco.Infrastructure/Migrations/Upgrade/V_16_3_0/MigrateMediaTypeLabelProperties.cs
index efa48f00f276..71c824f35758 100644
--- a/src/Umbraco.Infrastructure/Migrations/Upgrade/V_16_3_0/MigrateMediaTypeLabelProperties.cs
+++ b/src/Umbraco.Infrastructure/Migrations/Upgrade/V_16_3_0/MigrateMediaTypeLabelProperties.cs
@@ -6,7 +6,9 @@
 using Umbraco.Cms.Core.Models;
 using Umbraco.Cms.Core.Services;
 using Umbraco.Cms.Core.Services.OperationStatus;
+using Umbraco.Cms.Infrastructure.Persistence;
 using Umbraco.Cms.Infrastructure.Persistence.Dtos;
+using Umbraco.Extensions;
 
 namespace Umbraco.Cms.Infrastructure.Migrations.Upgrade.V_16_3_0;
 
@@ -69,7 +71,7 @@ private void ToggleIndentityInsertForNodes(bool toggleOn)
 
     private void IfNotExistsCreateBytesLabel()
     {
-        if (Database.Exists<NodeDto>(Constants.DataTypes.LabelBytes))
+        if (NodeExists(_labelBytesDataTypeKey))
         {
             return;
         }
@@ -89,7 +91,7 @@ private void IfNotExistsCreateBytesLabel()
             CreateDate = DateTime.Now,
         };
 
-        _ = Database.Insert(Constants.DatabaseSchema.Tables.Node, "id", false, nodeDto);
+        Database.Insert(Constants.DatabaseSchema.Tables.Node, "id", false, nodeDto);
 
         var dataTypeDto = new DataTypeDto
         {
@@ -100,12 +102,12 @@ private void IfNotExistsCreateBytesLabel()
             Configuration = "{\"umbracoDataValueType\":\"BIGINT\", \"labelTemplate\":\"{=value | bytes}\"}",
         };
 
-        _ = Database.Insert(Constants.DatabaseSchema.Tables.DataType, "pk", false, dataTypeDto);
+        Database.Insert(Constants.DatabaseSchema.Tables.DataType, "pk", false, dataTypeDto);
     }
 
     private void IfNotExistsCreatePixelsLabel()
     {
-        if (Database.Exists<NodeDto>(Constants.DataTypes.LabelPixels))
+        if (NodeExists(_labelPixelsDataTypeKey))
         {
             return;
         }
@@ -125,7 +127,7 @@ private void IfNotExistsCreatePixelsLabel()
             CreateDate = DateTime.Now,
         };
 
-        _ = Database.Insert(Constants.DatabaseSchema.Tables.Node, "id", false, nodeDto);
+        Database.Insert(Constants.DatabaseSchema.Tables.Node, "id", false, nodeDto);
 
         var dataTypeDto = new DataTypeDto
         {
@@ -136,7 +138,16 @@ private void IfNotExistsCreatePixelsLabel()
             Configuration = "{\"umbracoDataValueType\":\"INT\", \"labelTemplate\":\"{=value}px\"}",
         };
 
-        _ = Database.Insert(Constants.DatabaseSchema.Tables.DataType, "pk", false, dataTypeDto);
+        Database.Insert(Constants.DatabaseSchema.Tables.DataType, "pk", false, dataTypeDto);
+    }
+
+    private bool NodeExists(Guid uniqueId)
+    {
+        Sql<ISqlContext> sql = Database.SqlContext.Sql()
+            .Select<NodeDto>(x => x.NodeId)
+            .From<NodeDto>()
+            .Where<NodeDto>(x => x.UniqueId == uniqueId);
+        return Database.FirstOrDefault<NodeDto>(sql) is not null;
     }
 
     private async Task MigrateMediaTypeLabels()

From 21bf23b67df097cd0d40c8a44e582055185ff973 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= <niels.lyngso@gmail.com>
Date: Wed, 22 Oct 2025 12:37:13 +0200
Subject: [PATCH 063/155] Dictionary: Fix shortcut Ctrl + S not saving
 dictionary items (#20605)

* switched event listener from 'change' to 'input'

* Update workspace-view-dictionary-editor.element.ts
---
 .../workspace-view-dictionary-editor.element.ts     | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/packages/dictionary/workspace/views/workspace-view-dictionary-editor.element.ts b/src/Umbraco.Web.UI.Client/src/packages/dictionary/workspace/views/workspace-view-dictionary-editor.element.ts
index b987fc3a64f6..dff606e5197f 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/dictionary/workspace/views/workspace-view-dictionary-editor.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/dictionary/workspace/views/workspace-view-dictionary-editor.element.ts
@@ -1,7 +1,6 @@
 import { UMB_DICTIONARY_WORKSPACE_CONTEXT } from '../dictionary-workspace.context-token.js';
 import type { UmbDictionaryDetailModel } from '../../types.js';
 import type { UUITextareaElement } from '@umbraco-cms/backoffice/external/uui';
-import { UUITextareaEvent } from '@umbraco-cms/backoffice/external/uui';
 import { css, html, customElement, state, repeat } from '@umbraco-cms/backoffice/external/lit';
 import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element';
 import { UmbLanguageCollectionRepository, type UmbLanguageDetailModel } from '@umbraco-cms/backoffice/language';
@@ -72,13 +71,11 @@ export class UmbWorkspaceViewDictionaryEditorElement extends UmbLitElement {
 	}
 
 	#onTextareaChange(e: Event) {
-		if (e instanceof UUITextareaEvent) {
-			const target = e.composedPath()[0] as UUITextareaElement;
-			const translation = (target.value as string).toString();
-			const isoCode = target.getAttribute('name')!;
+		const target = e.composedPath()[0] as UUITextareaElement;
+		const translation = (target.value as string).toString();
+		const isoCode = target.getAttribute('name')!;
 
-			this.#workspaceContext?.setPropertyValue(isoCode, translation);
-		}
+		this.#workspaceContext?.setPropertyValue(isoCode, translation);
 	}
 
 	override render() {
@@ -104,7 +101,7 @@ export class UmbWorkspaceViewDictionaryEditorElement extends UmbLitElement {
 				slot="editor"
 				name=${language.unique}
 				label="translation"
-				@change=${this.#onTextareaChange}
+				@input=${this.#onTextareaChange}
 				.value=${translation?.translation ?? ''}
 				?readonly=${this.#isReadOnly(language.unique)}></uui-textarea>
 		</umb-property-layout>`;

From c2eea5d6cc95e328d2b55831a5b6683c3bfdc396 Mon Sep 17 00:00:00 2001
From: Andy Butland <abutland73@gmail.com>
Date: Wed, 22 Oct 2025 13:37:19 +0200
Subject: [PATCH 064/155] Populate IncludeDescendants on
 ContentPublishedNotification when publishing branch (forward port of #20578).

---
 src/Umbraco.Core/Notifications/ContentPublishedNotification.cs | 1 +
 src/Umbraco.Core/Services/ContentService.cs                    | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/Umbraco.Core/Notifications/ContentPublishedNotification.cs b/src/Umbraco.Core/Notifications/ContentPublishedNotification.cs
index 07baedc47301..f242ef20a95a 100644
--- a/src/Umbraco.Core/Notifications/ContentPublishedNotification.cs
+++ b/src/Umbraco.Core/Notifications/ContentPublishedNotification.cs
@@ -24,6 +24,7 @@ public ContentPublishedNotification(IEnumerable<IContent> target, EventMessages
 
     public ContentPublishedNotification(IEnumerable<IContent> target, EventMessages messages, bool includeDescendants)
         : base(target, messages) => IncludeDescendants = includeDescendants;
+
     /// <summary>
     /// Gets a enumeration of <see cref="IContent"/> which are being published.
     /// </summary>
diff --git a/src/Umbraco.Core/Services/ContentService.cs b/src/Umbraco.Core/Services/ContentService.cs
index 5d4ed2f98ca8..fd12d4dbb53e 100644
--- a/src/Umbraco.Core/Services/ContentService.cs
+++ b/src/Umbraco.Core/Services/ContentService.cs
@@ -2207,7 +2207,7 @@ internal IEnumerable<PublishResult> PublishBranch(
                     variesByCulture ? culturesPublished.IsCollectionEmpty() ? null : culturesPublished : ["*"],
                     null,
                     eventMessages));
-            scope.Notifications.Publish(new ContentPublishedNotification(publishedDocuments, eventMessages).WithState(notificationState));
+            scope.Notifications.Publish(new ContentPublishedNotification(publishedDocuments, eventMessages, true).WithState(notificationState));
 
             scope.Complete();
         }

From 62c1d44a5d924085d526426d45722e1c61c84387 Mon Sep 17 00:00:00 2001
From: Sven Geusens <sge@umbraco.dk>
Date: Wed, 22 Oct 2025 13:46:56 +0200
Subject: [PATCH 065/155] Webhooks: Register OutputExpansionStrategy for
 webhooks if Delivery API is not enabled (#20559)

* Register slimmed down OutputExpansionStrategy for webhooks if deliveryapi is not enabled

* PR review comment resolution
---
 ...tContextOutputExpansionStrategyAccessor.cs |  12 ++
 .../RequestContextServiceAccessorBase.cs      |  20 +++
 .../ElementOnlyOutputExpansionStrategy.cs     | 148 ++++++++++++++++++
 .../UmbracoBuilderExtensions.cs               |  33 ++--
 ...RequestContextOutputExpansionStrategyV2.cs | 145 +----------------
 .../WebhooksBuilderExtensions.cs              |  10 +-
 6 files changed, 214 insertions(+), 154 deletions(-)
 create mode 100644 src/Umbraco.Cms.Api.Common/Accessors/RequestContextOutputExpansionStrategyAccessor.cs
 create mode 100644 src/Umbraco.Cms.Api.Common/Accessors/RequestContextServiceAccessorBase.cs
 create mode 100644 src/Umbraco.Cms.Api.Common/Rendering/ElementOnlyOutputExpansionStrategy.cs

diff --git a/src/Umbraco.Cms.Api.Common/Accessors/RequestContextOutputExpansionStrategyAccessor.cs b/src/Umbraco.Cms.Api.Common/Accessors/RequestContextOutputExpansionStrategyAccessor.cs
new file mode 100644
index 000000000000..cb375857b792
--- /dev/null
+++ b/src/Umbraco.Cms.Api.Common/Accessors/RequestContextOutputExpansionStrategyAccessor.cs
@@ -0,0 +1,12 @@
+using Microsoft.AspNetCore.Http;
+using Umbraco.Cms.Core.DeliveryApi;
+
+namespace Umbraco.Cms.Api.Common.Accessors;
+
+public sealed class RequestContextOutputExpansionStrategyAccessor : RequestContextServiceAccessorBase<IOutputExpansionStrategy>, IOutputExpansionStrategyAccessor
+{
+    public RequestContextOutputExpansionStrategyAccessor(IHttpContextAccessor httpContextAccessor)
+        : base(httpContextAccessor)
+    {
+    }
+}
diff --git a/src/Umbraco.Cms.Api.Common/Accessors/RequestContextServiceAccessorBase.cs b/src/Umbraco.Cms.Api.Common/Accessors/RequestContextServiceAccessorBase.cs
new file mode 100644
index 000000000000..2748746a964d
--- /dev/null
+++ b/src/Umbraco.Cms.Api.Common/Accessors/RequestContextServiceAccessorBase.cs
@@ -0,0 +1,20 @@
+using System.Diagnostics.CodeAnalysis;
+using Microsoft.AspNetCore.Http;
+using Microsoft.Extensions.DependencyInjection;
+
+namespace Umbraco.Cms.Api.Common.Accessors;
+
+public abstract class RequestContextServiceAccessorBase<T>
+    where T : class
+{
+    private readonly IHttpContextAccessor _httpContextAccessor;
+
+    protected RequestContextServiceAccessorBase(IHttpContextAccessor httpContextAccessor)
+        => _httpContextAccessor = httpContextAccessor;
+
+    public bool TryGetValue([NotNullWhen(true)] out T? requestStartNodeService)
+    {
+        requestStartNodeService = _httpContextAccessor.HttpContext?.RequestServices.GetService<T>();
+        return requestStartNodeService is not null;
+    }
+}
diff --git a/src/Umbraco.Cms.Api.Common/Rendering/ElementOnlyOutputExpansionStrategy.cs b/src/Umbraco.Cms.Api.Common/Rendering/ElementOnlyOutputExpansionStrategy.cs
new file mode 100644
index 000000000000..a5f113c7c760
--- /dev/null
+++ b/src/Umbraco.Cms.Api.Common/Rendering/ElementOnlyOutputExpansionStrategy.cs
@@ -0,0 +1,148 @@
+using Umbraco.Cms.Core.DeliveryApi;
+using Umbraco.Cms.Core.Models.PublishedContent;
+using Umbraco.Extensions;
+
+namespace Umbraco.Cms.Api.Common.Rendering;
+
+public class ElementOnlyOutputExpansionStrategy : IOutputExpansionStrategy
+{
+    protected const string All = "$all";
+    protected const string None = "";
+    protected const string ExpandParameterName = "expand";
+    protected const string FieldsParameterName = "fields";
+
+    private readonly IApiPropertyRenderer _propertyRenderer;
+
+    protected Stack<Node?> ExpandProperties { get; } = new();
+
+    protected Stack<Node?> IncludeProperties { get; } = new();
+
+    public ElementOnlyOutputExpansionStrategy(
+        IApiPropertyRenderer propertyRenderer)
+    {
+        _propertyRenderer = propertyRenderer;
+    }
+
+    public virtual IDictionary<string, object?> MapContentProperties(IPublishedContent content)
+        => content.ItemType == PublishedItemType.Content
+            ? MapProperties(content.Properties)
+            : throw new ArgumentException($"Invalid item type. This method can only be used with item type {nameof(PublishedItemType.Content)}, got: {content.ItemType}");
+
+    public virtual IDictionary<string, object?> MapMediaProperties(IPublishedContent media, bool skipUmbracoProperties = true)
+    {
+        if (media.ItemType != PublishedItemType.Media)
+        {
+            throw new ArgumentException($"Invalid item type. This method can only be used with item type {PublishedItemType.Media}, got: {media.ItemType}");
+        }
+
+        IPublishedProperty[] properties = media
+            .Properties
+            .Where(p => skipUmbracoProperties is false || p.Alias.StartsWith("umbraco") is false)
+            .ToArray();
+
+        return properties.Any()
+            ? MapProperties(properties)
+            : new Dictionary<string, object?>();
+    }
+
+    public virtual IDictionary<string, object?> MapElementProperties(IPublishedElement element)
+        => MapProperties(element.Properties, true);
+
+    private IDictionary<string, object?> MapProperties(IEnumerable<IPublishedProperty> properties, bool forceExpandProperties = false)
+    {
+        Node? currentExpandProperties = ExpandProperties.Count > 0 ? ExpandProperties.Peek() : null;
+        if (ExpandProperties.Count > 1 && currentExpandProperties is null && forceExpandProperties is false)
+        {
+            return new Dictionary<string, object?>();
+        }
+
+        Node? currentIncludeProperties = IncludeProperties.Count > 0 ? IncludeProperties.Peek() : null;
+        var result = new Dictionary<string, object?>();
+        foreach (IPublishedProperty property in properties)
+        {
+            Node? nextIncludeProperties = GetNextProperties(currentIncludeProperties, property.Alias);
+            if (currentIncludeProperties is not null && currentIncludeProperties.Items.Any() && nextIncludeProperties is null)
+            {
+                continue;
+            }
+
+            Node? nextExpandProperties = GetNextProperties(currentExpandProperties, property.Alias);
+
+            IncludeProperties.Push(nextIncludeProperties);
+            ExpandProperties.Push(nextExpandProperties);
+
+            result[property.Alias] = GetPropertyValue(property);
+
+            ExpandProperties.Pop();
+            IncludeProperties.Pop();
+        }
+
+        return result;
+    }
+
+    private Node? GetNextProperties(Node? currentProperties, string propertyAlias)
+        => currentProperties?.Items.FirstOrDefault(i => i.Key == All)
+           ?? currentProperties?.Items.FirstOrDefault(i => i.Key == "properties")?.Items.FirstOrDefault(i => i.Key == All || i.Key == propertyAlias);
+
+    private object? GetPropertyValue(IPublishedProperty property)
+        => _propertyRenderer.GetPropertyValue(property, ExpandProperties.Peek() is not null);
+
+    protected sealed class Node
+    {
+        public string Key { get; private set; } = string.Empty;
+
+        public List<Node> Items { get; } = new();
+
+        public static Node Parse(string value)
+        {
+            // verify that there are as many start brackets as there are end brackets
+            if (value.CountOccurrences("[") != value.CountOccurrences("]"))
+            {
+                throw new ArgumentException("Value did not contain an equal number of start and end brackets");
+            }
+
+            // verify that the value does not start with a start bracket
+            if (value.StartsWith("["))
+            {
+                throw new ArgumentException("Value cannot start with a bracket");
+            }
+
+            // verify that there are no empty brackets
+            if (value.Contains("[]"))
+            {
+                throw new ArgumentException("Value cannot contain empty brackets");
+            }
+
+            var stack = new Stack<Node>();
+            var root = new Node { Key = "root" };
+            stack.Push(root);
+
+            var currentNode = new Node();
+            root.Items.Add(currentNode);
+
+            foreach (char c in value)
+            {
+                switch (c)
+                {
+                    case '[': // Start a new node, child of the current node
+                        stack.Push(currentNode);
+                        currentNode = new Node();
+                        stack.Peek().Items.Add(currentNode);
+                        break;
+                    case ',': // Start a new node, but at the same level of the current node
+                        currentNode = new Node();
+                        stack.Peek().Items.Add(currentNode);
+                        break;
+                    case ']': // Back to parent of the current node
+                        currentNode = stack.Pop();
+                        break;
+                    default: // Add char to current node key
+                        currentNode.Key += c;
+                        break;
+                }
+            }
+
+            return root;
+        }
+    }
+}
diff --git a/src/Umbraco.Cms.Api.Delivery/DependencyInjection/UmbracoBuilderExtensions.cs b/src/Umbraco.Cms.Api.Delivery/DependencyInjection/UmbracoBuilderExtensions.cs
index 7d200398977c..a0860a342234 100644
--- a/src/Umbraco.Cms.Api.Delivery/DependencyInjection/UmbracoBuilderExtensions.cs
+++ b/src/Umbraco.Cms.Api.Delivery/DependencyInjection/UmbracoBuilderExtensions.cs
@@ -35,28 +35,35 @@ public static IUmbracoBuilder AddDeliveryApi(this IUmbracoBuilder builder)
         builder.Services.AddScoped<IRequestStartItemProvider, RequestStartItemProvider>();
         builder.Services.AddScoped<RequestContextOutputExpansionStrategy>();
         builder.Services.AddScoped<RequestContextOutputExpansionStrategyV2>();
-        builder.Services.AddScoped<IOutputExpansionStrategy>(provider =>
-        {
-            HttpContext? httpContext = provider.GetRequiredService<IHttpContextAccessor>().HttpContext;
-            ApiVersion? apiVersion = httpContext?.GetRequestedApiVersion();
-            if (apiVersion is null)
+
+        builder.Services.AddUnique<IOutputExpansionStrategy>(
+            provider =>
             {
-                return provider.GetRequiredService<RequestContextOutputExpansionStrategyV2>();
-            }
+                HttpContext? httpContext = provider.GetRequiredService<IHttpContextAccessor>().HttpContext;
+                ApiVersion? apiVersion = httpContext?.GetRequestedApiVersion();
+                if (apiVersion is null)
+                {
+                    return provider.GetRequiredService<RequestContextOutputExpansionStrategyV2>();
+                }
+
+                // V1 of the Delivery API uses a different expansion strategy than V2+
+                return apiVersion.MajorVersion == 1
+                    ? provider.GetRequiredService<RequestContextOutputExpansionStrategy>()
+                    : provider.GetRequiredService<RequestContextOutputExpansionStrategyV2>();
+            },
+            ServiceLifetime.Scoped);
 
-            // V1 of the Delivery API uses a different expansion strategy than V2+
-            return apiVersion.MajorVersion == 1
-                ? provider.GetRequiredService<RequestContextOutputExpansionStrategy>()
-                : provider.GetRequiredService<RequestContextOutputExpansionStrategyV2>();
-        });
         builder.Services.AddSingleton<IRequestCultureService, RequestCultureService>();
         builder.Services.AddSingleton<IRequestSegmmentService, RequestSegmentService>();
         builder.Services.AddSingleton<IRequestSegmentService, RequestSegmentService>();
         builder.Services.AddSingleton<IRequestRoutingService, RequestRoutingService>();
         builder.Services.AddSingleton<IRequestRedirectService, RequestRedirectService>();
         builder.Services.AddSingleton<IRequestPreviewService, RequestPreviewService>();
-        builder.Services.AddSingleton<IOutputExpansionStrategyAccessor, RequestContextOutputExpansionStrategyAccessor>();
+
+        // Webooks register a more basic implementation, remove it.
+        builder.Services.AddUnique<IOutputExpansionStrategyAccessor, RequestContextOutputExpansionStrategyAccessor>(ServiceLifetime.Singleton);
         builder.Services.AddSingleton<IRequestStartItemProviderAccessor, RequestContextRequestStartItemProviderAccessor>();
+
         builder.Services.AddSingleton<IApiAccessService, ApiAccessService>();
         builder.Services.AddSingleton<IApiContentQueryService, ApiContentQueryService>();
         builder.Services.AddSingleton<IApiContentQueryProvider, ApiContentQueryProvider>();
diff --git a/src/Umbraco.Cms.Api.Delivery/Rendering/RequestContextOutputExpansionStrategyV2.cs b/src/Umbraco.Cms.Api.Delivery/Rendering/RequestContextOutputExpansionStrategyV2.cs
index e1a29b3ec718..779ed31083fe 100644
--- a/src/Umbraco.Cms.Api.Delivery/Rendering/RequestContextOutputExpansionStrategyV2.cs
+++ b/src/Umbraco.Cms.Api.Delivery/Rendering/RequestContextOutputExpansionStrategyV2.cs
@@ -1,62 +1,25 @@
 using Microsoft.AspNetCore.Http;
 using Microsoft.Extensions.Logging;
+using Umbraco.Cms.Api.Common.Rendering;
 using Umbraco.Cms.Core.DeliveryApi;
-using Umbraco.Cms.Core.Models.PublishedContent;
-using Umbraco.Extensions;
 
 namespace Umbraco.Cms.Api.Delivery.Rendering;
 
-internal sealed class RequestContextOutputExpansionStrategyV2 : IOutputExpansionStrategy
+internal sealed class RequestContextOutputExpansionStrategyV2 : ElementOnlyOutputExpansionStrategy, IOutputExpansionStrategy
 {
-    private const string All = "$all";
-    private const string None = "";
-    private const string ExpandParameterName = "expand";
-    private const string FieldsParameterName = "fields";
-
-    private readonly IApiPropertyRenderer _propertyRenderer;
     private readonly ILogger<RequestContextOutputExpansionStrategyV2> _logger;
 
-    private readonly Stack<Node?> _expandProperties;
-    private readonly Stack<Node?> _includeProperties;
-
     public RequestContextOutputExpansionStrategyV2(
         IHttpContextAccessor httpContextAccessor,
         IApiPropertyRenderer propertyRenderer,
         ILogger<RequestContextOutputExpansionStrategyV2> logger)
+        : base(propertyRenderer)
     {
-        _propertyRenderer = propertyRenderer;
         _logger = logger;
-        _expandProperties = new Stack<Node?>();
-        _includeProperties = new Stack<Node?>();
 
         InitializeExpandAndInclude(httpContextAccessor);
     }
 
-    public IDictionary<string, object?> MapContentProperties(IPublishedContent content)
-        => content.ItemType == PublishedItemType.Content
-            ? MapProperties(content.Properties)
-            : throw new ArgumentException($"Invalid item type. This method can only be used with item type {nameof(PublishedItemType.Content)}, got: {content.ItemType}");
-
-    public IDictionary<string, object?> MapMediaProperties(IPublishedContent media, bool skipUmbracoProperties = true)
-    {
-        if (media.ItemType != PublishedItemType.Media)
-        {
-            throw new ArgumentException($"Invalid item type. This method can only be used with item type {PublishedItemType.Media}, got: {media.ItemType}");
-        }
-
-        IPublishedProperty[] properties = media
-            .Properties
-            .Where(p => skipUmbracoProperties is false || p.Alias.StartsWith("umbraco") is false)
-            .ToArray();
-
-        return properties.Any()
-            ? MapProperties(properties)
-            : new Dictionary<string, object?>();
-    }
-
-    public IDictionary<string, object?> MapElementProperties(IPublishedElement element)
-        => MapProperties(element.Properties, true);
-
     private void InitializeExpandAndInclude(IHttpContextAccessor httpContextAccessor)
     {
         string? QueryValue(string key) => httpContextAccessor.HttpContext?.Request.Query[key];
@@ -66,7 +29,7 @@ private void InitializeExpandAndInclude(IHttpContextAccessor httpContextAccessor
 
         try
         {
-            _expandProperties.Push(Node.Parse(toExpand));
+            ExpandProperties.Push(Node.Parse(toExpand));
         }
         catch (ArgumentException ex)
         {
@@ -76,7 +39,7 @@ private void InitializeExpandAndInclude(IHttpContextAccessor httpContextAccessor
 
         try
         {
-            _includeProperties.Push(Node.Parse(toInclude));
+            IncludeProperties.Push(Node.Parse(toInclude));
         }
         catch (ArgumentException ex)
         {
@@ -84,102 +47,4 @@ private void InitializeExpandAndInclude(IHttpContextAccessor httpContextAccessor
             throw new ArgumentException($"Could not parse the '{FieldsParameterName}' parameter: {ex.Message}");
         }
     }
-
-    private IDictionary<string, object?> MapProperties(IEnumerable<IPublishedProperty> properties, bool forceExpandProperties = false)
-    {
-        Node? currentExpandProperties = _expandProperties.Peek();
-        if (_expandProperties.Count > 1 && currentExpandProperties is null && forceExpandProperties is false)
-        {
-            return new Dictionary<string, object?>();
-        }
-
-        Node? currentIncludeProperties = _includeProperties.Peek();
-        var result = new Dictionary<string, object?>();
-        foreach (IPublishedProperty property in properties)
-        {
-            Node? nextIncludeProperties = GetNextProperties(currentIncludeProperties, property.Alias);
-            if (currentIncludeProperties is not null && currentIncludeProperties.Items.Any() && nextIncludeProperties is null)
-            {
-                continue;
-            }
-
-            Node? nextExpandProperties = GetNextProperties(currentExpandProperties, property.Alias);
-
-            _includeProperties.Push(nextIncludeProperties);
-            _expandProperties.Push(nextExpandProperties);
-
-            result[property.Alias] = GetPropertyValue(property);
-
-            _expandProperties.Pop();
-            _includeProperties.Pop();
-        }
-
-        return result;
-    }
-
-    private Node? GetNextProperties(Node? currentProperties, string propertyAlias)
-        => currentProperties?.Items.FirstOrDefault(i => i.Key == All)
-           ?? currentProperties?.Items.FirstOrDefault(i => i.Key == "properties")?.Items.FirstOrDefault(i => i.Key == All || i.Key == propertyAlias);
-
-    private object? GetPropertyValue(IPublishedProperty property)
-        => _propertyRenderer.GetPropertyValue(property, _expandProperties.Peek() is not null);
-
-    private sealed class Node
-    {
-        public string Key { get; private set; } = string.Empty;
-
-        public List<Node> Items { get; } = new();
-
-        public static Node Parse(string value)
-        {
-            // verify that there are as many start brackets as there are end brackets
-            if (value.CountOccurrences("[") != value.CountOccurrences("]"))
-            {
-                throw new ArgumentException("Value did not contain an equal number of start and end brackets");
-            }
-
-            // verify that the value does not start with a start bracket
-            if (value.StartsWith("["))
-            {
-                throw new ArgumentException("Value cannot start with a bracket");
-            }
-
-            // verify that there are no empty brackets
-            if (value.Contains("[]"))
-            {
-                throw new ArgumentException("Value cannot contain empty brackets");
-            }
-
-            var stack = new Stack<Node>();
-            var root = new Node { Key = "root" };
-            stack.Push(root);
-
-            var currentNode = new Node();
-            root.Items.Add(currentNode);
-
-            foreach (char c in value)
-            {
-                switch (c)
-                {
-                    case '[': // Start a new node, child of the current node
-                        stack.Push(currentNode);
-                        currentNode = new Node();
-                        stack.Peek().Items.Add(currentNode);
-                        break;
-                    case ',': // Start a new node, but at the same level of the current node
-                        currentNode = new Node();
-                        stack.Peek().Items.Add(currentNode);
-                        break;
-                    case ']': // Back to parent of the current node
-                        currentNode = stack.Pop();
-                        break;
-                    default: // Add char to current node key
-                        currentNode.Key += c;
-                        break;
-                }
-            }
-
-            return root;
-        }
-    }
 }
diff --git a/src/Umbraco.Cms.Api.Management/DependencyInjection/WebhooksBuilderExtensions.cs b/src/Umbraco.Cms.Api.Management/DependencyInjection/WebhooksBuilderExtensions.cs
index 8d2d20a1d65d..81d764f69793 100644
--- a/src/Umbraco.Cms.Api.Management/DependencyInjection/WebhooksBuilderExtensions.cs
+++ b/src/Umbraco.Cms.Api.Management/DependencyInjection/WebhooksBuilderExtensions.cs
@@ -1,5 +1,9 @@
-using Umbraco.Cms.Api.Management.Factories;
+using Microsoft.Extensions.DependencyInjection;
+using Umbraco.Cms.Api.Common.Accessors;
+using Umbraco.Cms.Api.Common.Rendering;
+using Umbraco.Cms.Api.Management.Factories;
 using Umbraco.Cms.Api.Management.Mapping.Webhook;
+using Umbraco.Cms.Core.DeliveryApi;
 using Umbraco.Cms.Core.DependencyInjection;
 using Umbraco.Extensions;
 
@@ -12,6 +16,10 @@ internal static IUmbracoBuilder AddWebhooks(this IUmbracoBuilder builder)
         builder.Services.AddUnique<IWebhookPresentationFactory, WebhookPresentationFactory>();
         builder.AddMapDefinition<WebhookEventMapDefinition>();
 
+        // deliveryApi will overwrite these more basic ones.
+        builder.Services.AddScoped<IOutputExpansionStrategy, ElementOnlyOutputExpansionStrategy>();
+        builder.Services.AddSingleton<IOutputExpansionStrategyAccessor, RequestContextOutputExpansionStrategyAccessor>();
+
         return builder;
     }
 }

From 4a65f56d9d10d344ed117b209b444e6790403287 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= <nsl@umbraco.dk>
Date: Wed, 22 Oct 2025 13:57:09 +0200
Subject: [PATCH 066/155] =?UTF-8?q?Hotfix:=20Implement=20a=20specific=20so?=
 =?UTF-8?q?rting=20method=20for=20statuses=20as=20the=20existing=20has=20?=
 =?UTF-8?q?=E2=80=A6=20(#20609)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Implement a specific sorting method for statuses as the existing has to support deprecated implementation of custom getUnique method
---
 .../core/repository/repository-items.manager.ts   | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/repository/repository-items.manager.ts b/src/Umbraco.Web.UI.Client/src/packages/core/repository/repository-items.manager.ts
index c60dc8badf25..0b50d72399ca 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/repository/repository-items.manager.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/repository/repository-items.manager.ts
@@ -88,7 +88,7 @@ export class UmbRepositoryItemsManager<ItemType extends { unique: string }> exte
 				) {
 					const items = this.#items.getValue();
 					this.#items.setValue(this.#sortByUniques(items));
-					this.#statuses.setValue(this.#sortByUniques(statuses));
+					this.#statuses.setValue(this.#sortStatusByUniques(statuses));
 				} else {
 					// We need to load new items, so ...
 					this.#requestItems();
@@ -260,7 +260,7 @@ export class UmbRepositoryItemsManager<ItemType extends { unique: string }> exte
 		}
 	}
 
-	#sortByUniques<T extends Pick<ItemType, 'unique'>>(data?: Array<T>): Array<T> {
+	#sortByUniques(data?: Array<ItemType>): Array<ItemType> {
 		if (!data) return [];
 		const uniques = this.getUniques();
 		return [...data].sort((a, b) => {
@@ -270,6 +270,17 @@ export class UmbRepositoryItemsManager<ItemType extends { unique: string }> exte
 		});
 	}
 
+	/** Just needed for the deprecation implementation to work, do not bring this into 17.0 [NL] */
+	#sortStatusByUniques(data?: Array<UmbRepositoryItemsStatus>): Array<UmbRepositoryItemsStatus> {
+		if (!data) return [];
+		const uniques = this.getUniques();
+		return [...data].sort((a, b) => {
+			const aIndex = uniques.indexOf(a.unique ?? '');
+			const bIndex = uniques.indexOf(b.unique ?? '');
+			return aIndex - bIndex;
+		});
+	}
+
 	#onEntityUpdatedEvent = (event: UmbEntityUpdatedEvent) => {
 		const eventUnique = event.getUnique();
 

From 194fee7c916a7632e2c8f0249112ca6cb6089189 Mon Sep 17 00:00:00 2001
From: Mads Rasmussen <madsr@hey.com>
Date: Wed, 22 Oct 2025 12:54:47 +0200
Subject: [PATCH 067/155] Use tryExecute for delete API call

Replaces direct await of #delete with tryExecute to improve error handling in the delete method of UmbManagementApiDetailDataRequestManager.
---
 .../management-api/detail/detail-data.request-manager.ts        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Umbraco.Web.UI.Client/src/packages/management-api/detail/detail-data.request-manager.ts b/src/Umbraco.Web.UI.Client/src/packages/management-api/detail/detail-data.request-manager.ts
index cf33e0c4f5cf..db0507475a84 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/management-api/detail/detail-data.request-manager.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/management-api/detail/detail-data.request-manager.ts
@@ -125,7 +125,7 @@ export class UmbManagementApiDetailDataRequestManager<
 	}
 
 	async delete(id: string): Promise<UmbApiWithErrorResponse> {
-		const { error } = await this.#delete(id);
+		const { error } = await tryExecute(this, this.#delete(id));
 
 		// Only update the cache when we are connected to the server events
 		if (this.#isConnectedToServerEvents && !error) {

From f88e28d642b90fcc78b258be1a1c98ea4a588cc9 Mon Sep 17 00:00:00 2001
From: Nicklas Kramer <kramernicklas@gmail.com>
Date: Wed, 22 Oct 2025 15:12:39 +0200
Subject: [PATCH 068/155] Filesystem: Prevent tree showing other filetypes than
 the supported ones (#20567)

* Added check to only find .css files in FileSystemTreeServiceBase.cs

* Marking GetFiles as virtual and overriding it in StyleSheetTreeService.cs to only find .css files

* Redone tests to fit new format

* Fix tests to use file extensions

* Adding file extensions to all other relevant tests

* Adding file filter to remaining trees

* Adding tests to ensure invalid filetypes wont show

* Encapulation and resolved minor warnings in tests.

---------

Co-authored-by: Andy Butland <abutland73@gmail.com>
---
 .../FileSystem/FileSystemTreeServiceBase.cs   |  3 ++
 .../FileSystem/PartialViewTreeService.cs      |  2 ++
 .../Services/FileSystem/ScriptTreeService.cs  |  2 ++
 .../FileSystem/StyleSheetTreeService.cs       |  4 ++-
 .../Trees/FileSystemTreeServiceTestsBase.cs   | 10 +++---
 .../Trees/PartialViewTreeServiceTests.cs      | 32 +++++++++++++++----
 .../Services/Trees/ScriptTreeServiceTests.cs  | 31 ++++++++++++++----
 .../Trees/StyleSheetTreeServiceTests.cs       | 32 +++++++++++++++----
 8 files changed, 90 insertions(+), 26 deletions(-)

diff --git a/src/Umbraco.Cms.Api.Management/Services/FileSystem/FileSystemTreeServiceBase.cs b/src/Umbraco.Cms.Api.Management/Services/FileSystem/FileSystemTreeServiceBase.cs
index 43816e77b23c..894c837dd8a5 100644
--- a/src/Umbraco.Cms.Api.Management/Services/FileSystem/FileSystemTreeServiceBase.cs
+++ b/src/Umbraco.Cms.Api.Management/Services/FileSystem/FileSystemTreeServiceBase.cs
@@ -75,9 +75,12 @@ public string[] GetDirectories(string path) => FileSystem
 
     public string[] GetFiles(string path) => FileSystem
         .GetFiles(path)
+        .Where(FilterFile)
         .OrderBy(file => file)
         .ToArray();
 
+    protected virtual bool FilterFile(string file) => true;
+
     public bool DirectoryHasChildren(string path)
         => FileSystem.GetFiles(path).Any() || FileSystem.GetDirectories(path).Any();
 
diff --git a/src/Umbraco.Cms.Api.Management/Services/FileSystem/PartialViewTreeService.cs b/src/Umbraco.Cms.Api.Management/Services/FileSystem/PartialViewTreeService.cs
index 3da299008cd9..7a614e69f397 100644
--- a/src/Umbraco.Cms.Api.Management/Services/FileSystem/PartialViewTreeService.cs
+++ b/src/Umbraco.Cms.Api.Management/Services/FileSystem/PartialViewTreeService.cs
@@ -11,4 +11,6 @@ public class PartialViewTreeService : FileSystemTreeServiceBase, IPartialViewTre
     public PartialViewTreeService(FileSystems fileSystems) =>
         _partialViewFileSystem = fileSystems.PartialViewsFileSystem ??
                                  throw new ArgumentException("Missing partial views file system", nameof(fileSystems));
+
+    protected override bool FilterFile(string file) => file.ToLowerInvariant().EndsWith(".cshtml");
 }
diff --git a/src/Umbraco.Cms.Api.Management/Services/FileSystem/ScriptTreeService.cs b/src/Umbraco.Cms.Api.Management/Services/FileSystem/ScriptTreeService.cs
index ef870406f865..27b1eaf8f5e3 100644
--- a/src/Umbraco.Cms.Api.Management/Services/FileSystem/ScriptTreeService.cs
+++ b/src/Umbraco.Cms.Api.Management/Services/FileSystem/ScriptTreeService.cs
@@ -11,4 +11,6 @@ public class ScriptTreeService : FileSystemTreeServiceBase, IScriptTreeService
     public ScriptTreeService(FileSystems fileSystems) =>
         _scriptFileSystem = fileSystems.ScriptsFileSystem ??
                             throw new ArgumentException("Missing partial views file system", nameof(fileSystems));
+
+    protected override bool FilterFile(string file) => file.ToLowerInvariant().EndsWith(".js");
 }
diff --git a/src/Umbraco.Cms.Api.Management/Services/FileSystem/StyleSheetTreeService.cs b/src/Umbraco.Cms.Api.Management/Services/FileSystem/StyleSheetTreeService.cs
index ed14819231db..57cdf616aeae 100644
--- a/src/Umbraco.Cms.Api.Management/Services/FileSystem/StyleSheetTreeService.cs
+++ b/src/Umbraco.Cms.Api.Management/Services/FileSystem/StyleSheetTreeService.cs
@@ -10,5 +10,7 @@ public class StyleSheetTreeService : FileSystemTreeServiceBase, IStyleSheetTreeS
 
     public StyleSheetTreeService(FileSystems fileSystems) =>
         _scriptFileSystem = fileSystems.StylesheetsFileSystem ??
-                            throw new ArgumentException("Missing partial views file system", nameof(fileSystems));
+                            throw new ArgumentException("Missing stylesheets file system", nameof(fileSystems));
+
+    protected override bool FilterFile(string file) => file.ToLowerInvariant().EndsWith(".css");
 }
diff --git a/tests/Umbraco.Tests.Integration/ManagementApi/Services/Trees/FileSystemTreeServiceTestsBase.cs b/tests/Umbraco.Tests.Integration/ManagementApi/Services/Trees/FileSystemTreeServiceTestsBase.cs
index e328b90d416b..0ae45feb110a 100644
--- a/tests/Umbraco.Tests.Integration/ManagementApi/Services/Trees/FileSystemTreeServiceTestsBase.cs
+++ b/tests/Umbraco.Tests.Integration/ManagementApi/Services/Trees/FileSystemTreeServiceTestsBase.cs
@@ -16,12 +16,14 @@ public abstract class FileSystemTreeServiceTestsBase : UmbracoIntegrationTest
 
     protected IFileSystem TestFileSystem { get; private set; }
 
+    protected abstract string FileExtension { get; set; }
+
     protected abstract string FileSystemPath { get; }
 
     protected IHostingEnvironment HostingEnvironment => GetRequiredService<IHostingEnvironment>();
 
     [SetUp]
-    public void SetUpFileSystem()
+    public virtual void SetUpFileSystem()
     {
         TestFileSystem = new PhysicalFileSystem(IOHelper, HostingEnvironment, LoggerFactory.CreateLogger<PhysicalFileSystem>(), HostingEnvironment.MapPathWebRoot(FileSystemPath), HostingEnvironment.ToAbsolute(FileSystemPath));
 
@@ -37,11 +39,11 @@ public void SetUpFileSystem()
         for (int i = 0; i < 10; i++)
         {
             using var stream = CreateStream(Path.Join("tests"));
-            TestFileSystem.AddFile($"file{i}", stream);
+            TestFileSystem.AddFile($"file{i}{FileExtension}", stream);
         }
     }
 
-    private static Stream CreateStream(string contents = null)
+    protected static Stream CreateStream(string contents = null)
     {
         if (string.IsNullOrEmpty(contents))
         {
@@ -59,7 +61,7 @@ private static Stream CreateStream(string contents = null)
     protected virtual IFileSystem? GetScriptsFileSystem() => null;
 
     [TearDown]
-    public void TearDownFileSystem()
+    public virtual void TearDownFileSystem()
     {
         Purge(TestFileSystem, string.Empty);
         FileSystems = null;
diff --git a/tests/Umbraco.Tests.Integration/ManagementApi/Services/Trees/PartialViewTreeServiceTests.cs b/tests/Umbraco.Tests.Integration/ManagementApi/Services/Trees/PartialViewTreeServiceTests.cs
index 0dbe9f39a347..f2068a4b7053 100644
--- a/tests/Umbraco.Tests.Integration/ManagementApi/Services/Trees/PartialViewTreeServiceTests.cs
+++ b/tests/Umbraco.Tests.Integration/ManagementApi/Services/Trees/PartialViewTreeServiceTests.cs
@@ -8,6 +8,8 @@ namespace Umbraco.Cms.Tests.Integration.ManagementApi.Services.Trees;
 
 public class PartialViewTreeServiceTests : FileSystemTreeServiceTestsBase
 {
+    protected override string FileExtension { get; set; } = ".cshtml";
+
     protected override string FileSystemPath => Constants.SystemDirectories.PartialViews;
 
     protected override IFileSystem? GetPartialViewsFileSystem() => TestFileSystem;
@@ -17,12 +19,12 @@ public void Can_Get_Siblings_From_PartialView_Tree_Service()
     {
         var service = new PartialViewTreeService(FileSystems);
 
-        FileSystemTreeItemPresentationModel[] treeModel = service.GetSiblingsViewModels("file5", 1, 1, out long before, out var after);
-        int index = Array.FindIndex(treeModel, item => item.Name == "file5");
+        FileSystemTreeItemPresentationModel[] treeModel = service.GetSiblingsViewModels($"file5{FileExtension}", 1, 1, out long before, out var after);
+        int index = Array.FindIndex(treeModel, item => item.Name == $"file5{FileExtension}");
 
-        Assert.AreEqual(treeModel[index].Name, "file5");
-        Assert.AreEqual(treeModel[index - 1].Name, "file4");
-        Assert.AreEqual(treeModel[index + 1].Name, "file6");
+        Assert.AreEqual(treeModel[index].Name, $"file5{FileExtension}");
+        Assert.AreEqual(treeModel[index - 1].Name, $"file4{FileExtension}");
+        Assert.AreEqual(treeModel[index + 1].Name, $"file6{FileExtension}");
         Assert.That(treeModel.Length == 3);
         Assert.AreEqual(after, 3);
         Assert.AreEqual(before, 4);
@@ -33,7 +35,7 @@ public void Can_Get_Ancestors_From_StyleSheet_Tree_Service()
     {
         var service = new PartialViewTreeService(FileSystems);
 
-        var path = Path.Join("tests", "file5");
+        var path = Path.Join("tests", $"file5{FileExtension}");
         FileSystemTreeItemPresentationModel[] treeModel = service.GetAncestorModels(path, true);
 
         Assert.IsNotEmpty(treeModel);
@@ -46,9 +48,25 @@ public void Can_Get_PathViewModels_From_StyleSheet_Tree_Service()
     {
         var service = new PartialViewTreeService(FileSystems);
 
-        FileSystemTreeItemPresentationModel[] treeModels = service.GetPathViewModels(string.Empty, 0, Int32.MaxValue, out var totalItems);
+        FileSystemTreeItemPresentationModel[] treeModels = service.GetPathViewModels(string.Empty, 0, int.MaxValue, out var totalItems);
 
         Assert.IsNotEmpty(treeModels);
         Assert.AreEqual(treeModels.Length, totalItems);
     }
+
+    [Test]
+    public void Will_Hide_Unsupported_File_Extensions()
+    {
+        var service = new PartialViewTreeService(FileSystems);
+        for (int i = 0; i < 2; i++)
+        {
+            using var stream = CreateStream(Path.Join("tests"));
+            TestFileSystem.AddFile($"file{i}.invalid", stream);
+        }
+
+        FileSystemTreeItemPresentationModel[] treeModels = service.GetPathViewModels(string.Empty, 0, int.MaxValue, out var totalItems);
+
+        Assert.IsEmpty(treeModels.Where(file => file.Name.Contains(".invalid")));
+        Assert.AreEqual(treeModels.Length, totalItems);
+    }
 }
diff --git a/tests/Umbraco.Tests.Integration/ManagementApi/Services/Trees/ScriptTreeServiceTests.cs b/tests/Umbraco.Tests.Integration/ManagementApi/Services/Trees/ScriptTreeServiceTests.cs
index 481fbd609bdf..874d59fd153a 100644
--- a/tests/Umbraco.Tests.Integration/ManagementApi/Services/Trees/ScriptTreeServiceTests.cs
+++ b/tests/Umbraco.Tests.Integration/ManagementApi/Services/Trees/ScriptTreeServiceTests.cs
@@ -7,6 +7,7 @@ namespace Umbraco.Cms.Tests.Integration.ManagementApi.Services.Trees;
 
 public class ScriptTreeServiceTests : FileSystemTreeServiceTestsBase
 {
+    protected override string FileExtension { get; set; } = ".js";
     protected override string FileSystemPath => GlobalSettings.UmbracoScriptsPath;
 
     protected override IFileSystem? GetScriptsFileSystem() => TestFileSystem;
@@ -16,12 +17,12 @@ public void Can_Get_Siblings_From_Script_Tree_Service()
     {
         var service = new ScriptTreeService(FileSystems);
 
-        FileSystemTreeItemPresentationModel[] treeModel = service.GetSiblingsViewModels("file5", 1, 1, out long before, out var after);
-        int index = Array.FindIndex(treeModel, item => item.Name == "file5");
+        FileSystemTreeItemPresentationModel[] treeModel = service.GetSiblingsViewModels($"file5{FileExtension}", 1, 1, out long before, out var after);
+        int index = Array.FindIndex(treeModel, item => item.Name == $"file5{FileExtension}");
 
-        Assert.AreEqual(treeModel[index].Name, "file5");
-        Assert.AreEqual(treeModel[index - 1].Name, "file4");
-        Assert.AreEqual(treeModel[index + 1].Name, "file6");
+        Assert.AreEqual(treeModel[index].Name, $"file5{FileExtension}");
+        Assert.AreEqual(treeModel[index - 1].Name, $"file4{FileExtension}");
+        Assert.AreEqual(treeModel[index + 1].Name, $"file6{FileExtension}");
         Assert.That(treeModel.Length == 3);
         Assert.AreEqual(after, 3);
         Assert.AreEqual(before, 4);
@@ -32,7 +33,7 @@ public void Can_Get_Ancestors_From_StyleSheet_Tree_Service()
     {
         var service = new ScriptTreeService(FileSystems);
 
-        var path = Path.Join("tests", "file5");
+        var path = Path.Join("tests", $"file5{FileExtension}");
         FileSystemTreeItemPresentationModel[] treeModel = service.GetAncestorModels(path, true);
 
         Assert.IsNotEmpty(treeModel);
@@ -45,9 +46,25 @@ public void Can_Get_PathViewModels_From_StyleSheet_Tree_Service()
     {
         var service = new ScriptTreeService(FileSystems);
 
-        FileSystemTreeItemPresentationModel[] treeModels = service.GetPathViewModels(string.Empty, 0, Int32.MaxValue, out var totalItems);
+        FileSystemTreeItemPresentationModel[] treeModels = service.GetPathViewModels(string.Empty, 0, int.MaxValue, out var totalItems);
 
         Assert.IsNotEmpty(treeModels);
         Assert.AreEqual(treeModels.Length, totalItems);
     }
+
+    [Test]
+    public void Will_Hide_Unsupported_File_Extensions()
+    {
+        var service = new ScriptTreeService(FileSystems);
+        for (int i = 0; i < 2; i++)
+        {
+            using var stream = CreateStream(Path.Join("tests"));
+            TestFileSystem.AddFile($"file{i}.invalid", stream);
+        }
+
+        FileSystemTreeItemPresentationModel[] treeModels = service.GetPathViewModels(string.Empty, 0, int.MaxValue, out var totalItems);
+
+        Assert.IsEmpty(treeModels.Where(file => file.Name.Contains(".invalid")));
+        Assert.AreEqual(treeModels.Length, totalItems);
+    }
 }
diff --git a/tests/Umbraco.Tests.Integration/ManagementApi/Services/Trees/StyleSheetTreeServiceTests.cs b/tests/Umbraco.Tests.Integration/ManagementApi/Services/Trees/StyleSheetTreeServiceTests.cs
index 2fe15f27ea42..c3300bcbb8aa 100644
--- a/tests/Umbraco.Tests.Integration/ManagementApi/Services/Trees/StyleSheetTreeServiceTests.cs
+++ b/tests/Umbraco.Tests.Integration/ManagementApi/Services/Trees/StyleSheetTreeServiceTests.cs
@@ -7,6 +7,8 @@ namespace Umbraco.Cms.Tests.Integration.ManagementApi.Services.Trees;
 
 public class StyleSheetTreeServiceTests : FileSystemTreeServiceTestsBase
 {
+    protected override string FileExtension { get; set; } = ".css";
+
     protected override string FileSystemPath => GlobalSettings.UmbracoCssPath;
 
     protected override IFileSystem? GetStylesheetsFileSystem() => TestFileSystem;
@@ -16,12 +18,12 @@ public void Can_Get_Siblings_From_StyleSheet_Tree_Service()
     {
         var service = new StyleSheetTreeService(FileSystems);
 
-        FileSystemTreeItemPresentationModel[] treeModel = service.GetSiblingsViewModels("file5", 1, 1, out long before, out var after);
-        int index = Array.FindIndex(treeModel, item => item.Name == "file5");
+        FileSystemTreeItemPresentationModel[] treeModel = service.GetSiblingsViewModels($"file5{FileExtension}", 1, 1, out long before, out var after);
+        int index = Array.FindIndex(treeModel, item => item.Name == $"file5{FileExtension}");
 
-        Assert.AreEqual(treeModel[index].Name, "file5");
-        Assert.AreEqual(treeModel[index - 1].Name, "file4");
-        Assert.AreEqual(treeModel[index + 1].Name, "file6");
+        Assert.AreEqual(treeModel[index].Name, $"file5{FileExtension}");
+        Assert.AreEqual(treeModel[index - 1].Name, $"file4{FileExtension}");
+        Assert.AreEqual(treeModel[index + 1].Name, $"file6{FileExtension}");
         Assert.That(treeModel.Length == 3);
         Assert.AreEqual(after, 3);
         Assert.AreEqual(before, 4);
@@ -32,7 +34,7 @@ public void Can_Get_Ancestors_From_StyleSheet_Tree_Service()
     {
         var service = new StyleSheetTreeService(FileSystems);
 
-        var path = Path.Join("tests", "file5");
+        var path = Path.Join("tests", $"file5{FileExtension}");
         FileSystemTreeItemPresentationModel[] treeModel = service.GetAncestorModels(path, true);
 
         Assert.IsNotEmpty(treeModel);
@@ -45,9 +47,25 @@ public void Can_Get_PathViewModels_From_StyleSheet_Tree_Service()
     {
         var service = new StyleSheetTreeService(FileSystems);
 
-        FileSystemTreeItemPresentationModel[] treeModels = service.GetPathViewModels(string.Empty, 0, Int32.MaxValue, out var totalItems);
+        FileSystemTreeItemPresentationModel[] treeModels = service.GetPathViewModels(string.Empty, 0, int.MaxValue, out var totalItems);
 
         Assert.IsNotEmpty(treeModels);
         Assert.AreEqual(treeModels.Length, totalItems);
     }
+
+    [Test]
+    public void Will_Hide_Unsupported_File_Extensions()
+    {
+        var service = new StyleSheetTreeService(FileSystems);
+        for (int i = 0; i < 2; i++)
+        {
+            using var stream = CreateStream(Path.Join("tests"));
+            TestFileSystem.AddFile($"file{i}.invalid", stream);
+        }
+
+        FileSystemTreeItemPresentationModel[] treeModels = service.GetPathViewModels(string.Empty, 0, int.MaxValue, out var totalItems);
+
+        Assert.IsEmpty(treeModels.Where(file => file.Name.Contains(".invalid")));
+        Assert.AreEqual(treeModels.Length, totalItems);
+    }
 }

From 6bc498ad41acb4cfcaecb52d05432e185cf1f894 Mon Sep 17 00:00:00 2001
From: Andy Butland <abutland73@gmail.com>
Date: Wed, 22 Oct 2025 16:20:20 +0200
Subject: [PATCH 069/155] Trees: Restore backward compatibility for file system
 based tree controllers (closes #20602) (#20608)

* Restore backward compatibility for file system based tree controllers.

* Aligned obsoletion messages.
---
 .../AncestorsPartialViewTreeController.cs     | 24 +++---
 .../Tree/ChildrenPartialViewTreeController.cs | 25 +++---
 .../Tree/PartialViewTreeControllerBase.cs     | 22 +++--
 .../Tree/RootPartialViewTreeController.cs     | 25 +++---
 .../Tree/SiblingsPartialViewTreeController.cs | 23 +++---
 .../Tree/AncestorsScriptTreeController.cs     | 23 +++---
 .../Tree/ChildrenScriptTreeController.cs      | 25 +++---
 .../Script/Tree/RootScriptTreeController.cs   | 25 +++---
 .../Script/Tree/ScriptTreeControllerBase.cs   | 22 +++--
 .../Tree/SiblingsScriptTreeController.cs      | 23 +++---
 .../Tree/AncestorsStylesheetTreeController.cs | 23 +++---
 .../Tree/ChildrenStylesheetTreeController.cs  | 26 +++---
 .../Tree/RootStylesheetTreeController.cs      | 25 +++---
 .../Tree/SiblingsStylesheetTreeController.cs  | 23 +++---
 .../Tree/StylesheetTreeControllerBase.cs      | 20 ++---
 .../Tree/FileSystemTreeControllerBase.cs      | 81 ++++++++++++++-----
 16 files changed, 225 insertions(+), 210 deletions(-)

diff --git a/src/Umbraco.Cms.Api.Management/Controllers/PartialView/Tree/AncestorsPartialViewTreeController.cs b/src/Umbraco.Cms.Api.Management/Controllers/PartialView/Tree/AncestorsPartialViewTreeController.cs
index 3f79545e3950..6f30a7268482 100644
--- a/src/Umbraco.Cms.Api.Management/Controllers/PartialView/Tree/AncestorsPartialViewTreeController.cs
+++ b/src/Umbraco.Cms.Api.Management/Controllers/PartialView/Tree/AncestorsPartialViewTreeController.cs
@@ -1,34 +1,32 @@
-using Asp.Versioning;
+using Asp.Versioning;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.DependencyInjection;
 using Umbraco.Cms.Api.Management.Services.FileSystem;
 using Umbraco.Cms.Api.Management.ViewModels.Tree;
-using Umbraco.Cms.Core.DependencyInjection;
 using Umbraco.Cms.Core.IO;
-using Umbraco.Cms.Core.Services;
 
 namespace Umbraco.Cms.Api.Management.Controllers.PartialView.Tree;
 
 [ApiVersion("1.0")]
 public class AncestorsPartialViewTreeController : PartialViewTreeControllerBase
 {
-    private readonly IPartialViewTreeService _partialViewTreeService;
-
     // TODO Remove the static service provider, and replace with base when the other constructors are obsoleted.
+    [ActivatorUtilitiesConstructor]
     public AncestorsPartialViewTreeController(IPartialViewTreeService partialViewTreeService)
-    : this(partialViewTreeService, StaticServiceProvider.Instance.GetRequiredService<FileSystems>())
-        => _partialViewTreeService = partialViewTreeService;
+        : base(partialViewTreeService)
+    {
+    }
 
-    [ActivatorUtilitiesConstructor]
-    [Obsolete("Please use the other constructor. Scheduled to be removed in Umbraco 19")]
+    [Obsolete("Please use the constructor taking all parameters. Scheduled to be removed in Umbraco 19.")]
     public AncestorsPartialViewTreeController(IPartialViewTreeService partialViewTreeService, FileSystems fileSystems)
-    : base(partialViewTreeService, fileSystems) =>
-        _partialViewTreeService = partialViewTreeService;
+        : base(partialViewTreeService, fileSystems)
+    {
+    }
 
-    [Obsolete("Please use the other constructor. Scheduled to be removed in Umbraco 19")]
+    [Obsolete("Please use the constructor taking all parameters. Scheduled to be removed in Umbraco 19.")]
     public AncestorsPartialViewTreeController(FileSystems fileSystems)
-        : this(StaticServiceProvider.Instance.GetRequiredService<IPartialViewTreeService>(), fileSystems)
+        : base(fileSystems)
     {
     }
 
diff --git a/src/Umbraco.Cms.Api.Management/Controllers/PartialView/Tree/ChildrenPartialViewTreeController.cs b/src/Umbraco.Cms.Api.Management/Controllers/PartialView/Tree/ChildrenPartialViewTreeController.cs
index 099f01f3422d..9c70e7acbed4 100644
--- a/src/Umbraco.Cms.Api.Management/Controllers/PartialView/Tree/ChildrenPartialViewTreeController.cs
+++ b/src/Umbraco.Cms.Api.Management/Controllers/PartialView/Tree/ChildrenPartialViewTreeController.cs
@@ -1,34 +1,33 @@
-using Asp.Versioning;
+using Asp.Versioning;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.DependencyInjection;
-using Umbraco.Cms.Core.IO;
 using Umbraco.Cms.Api.Common.ViewModels.Pagination;
 using Umbraco.Cms.Api.Management.Services.FileSystem;
 using Umbraco.Cms.Api.Management.ViewModels.Tree;
-using Umbraco.Cms.Core.DependencyInjection;
+using Umbraco.Cms.Core.IO;
 
 namespace Umbraco.Cms.Api.Management.Controllers.PartialView.Tree;
 
 [ApiVersion("1.0")]
 public class ChildrenPartialViewTreeController : PartialViewTreeControllerBase
 {
-    private readonly IPartialViewTreeService _partialViewTreeService;
-
     // TODO Remove the static service provider, and replace with base when the other constructors are obsoleted.
+    [ActivatorUtilitiesConstructor]
     public ChildrenPartialViewTreeController(IPartialViewTreeService partialViewTreeService)
-        : this(partialViewTreeService, StaticServiceProvider.Instance.GetRequiredService<FileSystems>())
-        => _partialViewTreeService = partialViewTreeService;
+        : base(partialViewTreeService)
+    {
+    }
 
-    [ActivatorUtilitiesConstructor]
-    [Obsolete("Please use the other constructor. Scheduled to be removed in Umbraco 19")]
+    [Obsolete("Please use the constructor taking all parameters. Scheduled to be removed in Umbraco 19.")]
     public ChildrenPartialViewTreeController(IPartialViewTreeService partialViewTreeService, FileSystems fileSystems)
-        : base(partialViewTreeService, fileSystems) =>
-        _partialViewTreeService = partialViewTreeService;
+        : base(partialViewTreeService, fileSystems)
+    {
+    }
 
-    [Obsolete("Please use the other constructor. Scheduled to be removed in Umbraco 19")]
+    [Obsolete("Please use the constructor taking all parameters. Scheduled to be removed in Umbraco 19.")]
     public ChildrenPartialViewTreeController(FileSystems fileSystems)
-        : this(StaticServiceProvider.Instance.GetRequiredService<IPartialViewTreeService>(), fileSystems)
+        : base(fileSystems)
     {
     }
 
diff --git a/src/Umbraco.Cms.Api.Management/Controllers/PartialView/Tree/PartialViewTreeControllerBase.cs b/src/Umbraco.Cms.Api.Management/Controllers/PartialView/Tree/PartialViewTreeControllerBase.cs
index 6875e395f640..5f50a098983b 100644
--- a/src/Umbraco.Cms.Api.Management/Controllers/PartialView/Tree/PartialViewTreeControllerBase.cs
+++ b/src/Umbraco.Cms.Api.Management/Controllers/PartialView/Tree/PartialViewTreeControllerBase.cs
@@ -1,11 +1,9 @@
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
-using Microsoft.Extensions.DependencyInjection;
 using Umbraco.Cms.Api.Management.Controllers.Tree;
 using Umbraco.Cms.Api.Management.Routing;
 using Umbraco.Cms.Api.Management.Services.FileSystem;
 using Umbraco.Cms.Core;
-using Umbraco.Cms.Core.DependencyInjection;
 using Umbraco.Cms.Core.IO;
 using Umbraco.Cms.Web.Common.Authorization;
 
@@ -16,30 +14,28 @@ namespace Umbraco.Cms.Api.Management.Controllers.PartialView.Tree;
 [Authorize(Policy = AuthorizationPolicies.TreeAccessPartialViews)]
 public class PartialViewTreeControllerBase : FileSystemTreeControllerBase
 {
-    private readonly IPartialViewTreeService _partialViewTreeService;
-
     // TODO Remove the static service provider, and replace with base when the other constructors are obsoleted.
     public PartialViewTreeControllerBase(IPartialViewTreeService partialViewTreeService)
-        : this(partialViewTreeService, StaticServiceProvider.Instance.GetRequiredService<FileSystems>()) =>
-        _partialViewTreeService = partialViewTreeService;
+        : base(partialViewTreeService)
+    {
+        FileSystem = null!;
+    }
 
-    // FileSystem is required therefore, we can't remove it without some wizadry. When obsoletion is due, remove this.
-    [ActivatorUtilitiesConstructor]
-    [Obsolete("Scheduled for removal in Umbraco 18.")]
+    // FileSystem is required therefore, we can't remove it without some wizardry. When obsoletion is due, remove this.
+    [Obsolete("Please use the constructor taking all parameters. Scheduled to be removed in Umbraco 19.")]
     public PartialViewTreeControllerBase(IPartialViewTreeService partialViewTreeService, FileSystems fileSystems)
         : base(partialViewTreeService)
     {
-        _partialViewTreeService = partialViewTreeService;
         FileSystem = fileSystems.PartialViewsFileSystem ??
                      throw new ArgumentException("Missing scripts file system", nameof(fileSystems));
     }
 
-    [Obsolete("Please use the other constructor. Scheduled to be removed in Umbraco 18.")]
+    [Obsolete("Please use the constructor taking all parameters. Scheduled to be removed in Umbraco 19.")]
     public PartialViewTreeControllerBase(FileSystems fileSystems)
-        : this(StaticServiceProvider.Instance.GetRequiredService<IPartialViewTreeService>())
+        : base()
         => FileSystem = fileSystems.PartialViewsFileSystem ??
                         throw new ArgumentException("Missing scripts file system", nameof(fileSystems));
 
-    [Obsolete("Included in the service class. Scheduled to be removed in Umbraco 18.")]
+    [Obsolete("Included in the service class. Scheduled to be removed in Umbraco 19.")]
     protected override IFileSystem FileSystem { get; }
 }
diff --git a/src/Umbraco.Cms.Api.Management/Controllers/PartialView/Tree/RootPartialViewTreeController.cs b/src/Umbraco.Cms.Api.Management/Controllers/PartialView/Tree/RootPartialViewTreeController.cs
index 4e42266389f7..0a7d95627f87 100644
--- a/src/Umbraco.Cms.Api.Management/Controllers/PartialView/Tree/RootPartialViewTreeController.cs
+++ b/src/Umbraco.Cms.Api.Management/Controllers/PartialView/Tree/RootPartialViewTreeController.cs
@@ -1,34 +1,33 @@
-using Asp.Versioning;
+using Asp.Versioning;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.DependencyInjection;
-using Umbraco.Cms.Core.IO;
 using Umbraco.Cms.Api.Common.ViewModels.Pagination;
 using Umbraco.Cms.Api.Management.Services.FileSystem;
 using Umbraco.Cms.Api.Management.ViewModels.Tree;
-using Umbraco.Cms.Core.DependencyInjection;
+using Umbraco.Cms.Core.IO;
 
 namespace Umbraco.Cms.Api.Management.Controllers.PartialView.Tree;
 
 [ApiVersion("1.0")]
 public class RootPartialViewTreeController : PartialViewTreeControllerBase
 {
-    private readonly IPartialViewTreeService _partialViewTreeService;
-
     // TODO Remove the static service provider, and replace with base when the other constructors are obsoleted.
+    [ActivatorUtilitiesConstructor]
     public RootPartialViewTreeController(IPartialViewTreeService partialViewTreeService)
-        : this(partialViewTreeService, StaticServiceProvider.Instance.GetRequiredService<FileSystems>())
-        => _partialViewTreeService = partialViewTreeService;
+        : base(partialViewTreeService)
+    {
+    }
 
-    [ActivatorUtilitiesConstructor]
-    [Obsolete("Please use the other constructor. Scheduled to be removed in Umbraco 19")]
+    [Obsolete("Please use the constructor taking all parameters. Scheduled to be removed in Umbraco 19.")]
     public RootPartialViewTreeController(IPartialViewTreeService partialViewTreeService, FileSystems fileSystems)
-        : base(partialViewTreeService, fileSystems) =>
-        _partialViewTreeService = partialViewTreeService;
+        : base(partialViewTreeService, fileSystems)
+    {
+    }
 
-    [Obsolete("Please use the other constructor. Scheduled to be removed in Umbraco 19")]
+    [Obsolete("Please use the constructor taking all parameters. Scheduled to be removed in Umbraco 19.")]
     public RootPartialViewTreeController(FileSystems fileSystems)
-        : this(StaticServiceProvider.Instance.GetRequiredService<IPartialViewTreeService>(), fileSystems)
+        : base(fileSystems)
     {
     }
 
diff --git a/src/Umbraco.Cms.Api.Management/Controllers/PartialView/Tree/SiblingsPartialViewTreeController.cs b/src/Umbraco.Cms.Api.Management/Controllers/PartialView/Tree/SiblingsPartialViewTreeController.cs
index af1e3171a643..8b3354d0f663 100644
--- a/src/Umbraco.Cms.Api.Management/Controllers/PartialView/Tree/SiblingsPartialViewTreeController.cs
+++ b/src/Umbraco.Cms.Api.Management/Controllers/PartialView/Tree/SiblingsPartialViewTreeController.cs
@@ -1,32 +1,31 @@
-using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.DependencyInjection;
 using Umbraco.Cms.Api.Common.ViewModels.Pagination;
 using Umbraco.Cms.Api.Management.Services.FileSystem;
 using Umbraco.Cms.Api.Management.ViewModels.Tree;
-using Umbraco.Cms.Core.DependencyInjection;
 using Umbraco.Cms.Core.IO;
 
 namespace Umbraco.Cms.Api.Management.Controllers.PartialView.Tree;
 
 public class SiblingsPartialViewTreeController : PartialViewTreeControllerBase
 {
-    private readonly IPartialViewTreeService _partialViewTreeService;
-
     // TODO Remove the static service provider, and replace with base when the other constructors are obsoleted.
+    [ActivatorUtilitiesConstructor]
     public SiblingsPartialViewTreeController(IPartialViewTreeService partialViewTreeService)
-        : this(partialViewTreeService, StaticServiceProvider.Instance.GetRequiredService<FileSystems>())
-        => _partialViewTreeService = partialViewTreeService;
+        : base(partialViewTreeService)
+    {
+    }
 
-    [ActivatorUtilitiesConstructor]
-    [Obsolete("Please use the other constructor. Scheduled to be removed in Umbraco 19")]
+    [Obsolete("Please use the constructor taking all parameters. Scheduled to be removed in Umbraco 19.")]
     public SiblingsPartialViewTreeController(IPartialViewTreeService partialViewTreeService, FileSystems fileSystems)
-        : base(partialViewTreeService, fileSystems) =>
-        _partialViewTreeService = partialViewTreeService;
+        : base(partialViewTreeService, fileSystems)
+    {
+    }
 
-    [Obsolete("Please use the other constructor. Scheduled to be removed in Umbraco 19")]
+    [Obsolete("Please use the constructor taking all parameters. Scheduled to be removed in Umbraco 19.")]
     public SiblingsPartialViewTreeController(FileSystems fileSystems)
-        : this(StaticServiceProvider.Instance.GetRequiredService<IPartialViewTreeService>(), fileSystems)
+        : base(fileSystems)
     {
     }
 
diff --git a/src/Umbraco.Cms.Api.Management/Controllers/Script/Tree/AncestorsScriptTreeController.cs b/src/Umbraco.Cms.Api.Management/Controllers/Script/Tree/AncestorsScriptTreeController.cs
index ed5acbc0c356..0aef76c5b782 100644
--- a/src/Umbraco.Cms.Api.Management/Controllers/Script/Tree/AncestorsScriptTreeController.cs
+++ b/src/Umbraco.Cms.Api.Management/Controllers/Script/Tree/AncestorsScriptTreeController.cs
@@ -1,10 +1,9 @@
-using Asp.Versioning;
+using Asp.Versioning;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.DependencyInjection;
 using Umbraco.Cms.Api.Management.Services.FileSystem;
 using Umbraco.Cms.Api.Management.ViewModels.Tree;
-using Umbraco.Cms.Core.DependencyInjection;
 using Umbraco.Cms.Core.IO;
 
 namespace Umbraco.Cms.Api.Management.Controllers.Script.Tree;
@@ -12,22 +11,22 @@ namespace Umbraco.Cms.Api.Management.Controllers.Script.Tree;
 [ApiVersion("1.0")]
 public class AncestorsScriptTreeController : ScriptTreeControllerBase
 {
-    private readonly IScriptTreeService _scriptTreeService;
-
     // TODO Remove the static service provider, and replace with base when the other constructors are obsoleted.
+    [ActivatorUtilitiesConstructor]
     public AncestorsScriptTreeController(IScriptTreeService scriptTreeService)
-        : this(scriptTreeService, StaticServiceProvider.Instance.GetRequiredService<FileSystems>())
-        => _scriptTreeService = scriptTreeService;
+        : base(scriptTreeService)
+    {
+    }
 
-    [ActivatorUtilitiesConstructor]
-    [Obsolete("Please use the other constructor. Scheduled to be removed in Umbraco 19")]
+    [Obsolete("Please use the constructor taking all parameters. Scheduled to be removed in Umbraco 19.")]
     public AncestorsScriptTreeController(IScriptTreeService scriptTreeService, FileSystems fileSystems)
-        : base(scriptTreeService, fileSystems) =>
-        _scriptTreeService = scriptTreeService;
+        : base(scriptTreeService, fileSystems)
+    {
+    }
 
-    [Obsolete("Please use the other constructor. Scheduled to be removed in Umbraco 19")]
+    [Obsolete("Please use the constructor taking all parameters. Scheduled to be removed in Umbraco 19.")]
     public AncestorsScriptTreeController(FileSystems fileSystems)
-        : this(StaticServiceProvider.Instance.GetRequiredService<IScriptTreeService>(), fileSystems)
+        : base(fileSystems)
     {
     }
 
diff --git a/src/Umbraco.Cms.Api.Management/Controllers/Script/Tree/ChildrenScriptTreeController.cs b/src/Umbraco.Cms.Api.Management/Controllers/Script/Tree/ChildrenScriptTreeController.cs
index ba4003784142..8313b6294139 100644
--- a/src/Umbraco.Cms.Api.Management/Controllers/Script/Tree/ChildrenScriptTreeController.cs
+++ b/src/Umbraco.Cms.Api.Management/Controllers/Script/Tree/ChildrenScriptTreeController.cs
@@ -1,34 +1,33 @@
-using Asp.Versioning;
+using Asp.Versioning;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.DependencyInjection;
-using Umbraco.Cms.Core.IO;
 using Umbraco.Cms.Api.Common.ViewModels.Pagination;
 using Umbraco.Cms.Api.Management.Services.FileSystem;
 using Umbraco.Cms.Api.Management.ViewModels.Tree;
-using Umbraco.Cms.Core.DependencyInjection;
+using Umbraco.Cms.Core.IO;
 
 namespace Umbraco.Cms.Api.Management.Controllers.Script.Tree;
 
 [ApiVersion("1.0")]
 public class ChildrenScriptTreeController : ScriptTreeControllerBase
 {
-    private readonly IScriptTreeService _scriptTreeService;
-
     // TODO Remove the static service provider, and replace with base when the other constructors are obsoleted.
+    [ActivatorUtilitiesConstructor]
     public ChildrenScriptTreeController(IScriptTreeService scriptTreeService)
-        : this(scriptTreeService, StaticServiceProvider.Instance.GetRequiredService<FileSystems>())
-        => _scriptTreeService = scriptTreeService;
+        : base(scriptTreeService)
+    {
+    }
 
-    [ActivatorUtilitiesConstructor]
-    [Obsolete("Please use the other constructor. Scheduled to be removed in Umbraco 19")]
+    [Obsolete("Please use the constructor taking all parameters. Scheduled to be removed in Umbraco 19.")]
     public ChildrenScriptTreeController(IScriptTreeService scriptTreeService, FileSystems fileSystems)
-        : base(scriptTreeService, fileSystems) =>
-        _scriptTreeService = scriptTreeService;
+        : base(scriptTreeService, fileSystems)
+    {
+    }
 
-    [Obsolete("Please use the other constructor. Scheduled to be removed in Umbraco 19")]
+    [Obsolete("Please use the constructor taking all parameters. Scheduled to be removed in Umbraco 19.")]
     public ChildrenScriptTreeController(FileSystems fileSystems)
-        : this(StaticServiceProvider.Instance.GetRequiredService<IScriptTreeService>(), fileSystems)
+        : base(fileSystems)
     {
     }
 
diff --git a/src/Umbraco.Cms.Api.Management/Controllers/Script/Tree/RootScriptTreeController.cs b/src/Umbraco.Cms.Api.Management/Controllers/Script/Tree/RootScriptTreeController.cs
index f29d3bdb4401..dcb5e2479ced 100644
--- a/src/Umbraco.Cms.Api.Management/Controllers/Script/Tree/RootScriptTreeController.cs
+++ b/src/Umbraco.Cms.Api.Management/Controllers/Script/Tree/RootScriptTreeController.cs
@@ -1,34 +1,33 @@
-using Asp.Versioning;
+using Asp.Versioning;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.DependencyInjection;
-using Umbraco.Cms.Core.IO;
 using Umbraco.Cms.Api.Common.ViewModels.Pagination;
 using Umbraco.Cms.Api.Management.Services.FileSystem;
 using Umbraco.Cms.Api.Management.ViewModels.Tree;
-using Umbraco.Cms.Core.DependencyInjection;
+using Umbraco.Cms.Core.IO;
 
 namespace Umbraco.Cms.Api.Management.Controllers.Script.Tree;
 
 [ApiVersion("1.0")]
 public class RootScriptTreeController : ScriptTreeControllerBase
 {
-    private readonly IScriptTreeService _scriptTreeService;
-
     // TODO Remove the static service provider, and replace with base when the other constructors are obsoleted.
+    [ActivatorUtilitiesConstructor]
     public RootScriptTreeController(IScriptTreeService scriptTreeService)
-        : this(scriptTreeService, StaticServiceProvider.Instance.GetRequiredService<FileSystems>())
-        => _scriptTreeService = scriptTreeService;
+        : base(scriptTreeService)
+    {
+    }
 
-    [ActivatorUtilitiesConstructor]
-    [Obsolete("Please use the other constructor. Scheduled to be removed in Umbraco 19")]
+    [Obsolete("Please use the constructor taking all parameters. Scheduled to be removed in Umbraco 19.")]
     public RootScriptTreeController(IScriptTreeService scriptTreeService, FileSystems fileSystems)
-        : base(scriptTreeService, fileSystems) =>
-        _scriptTreeService = scriptTreeService;
+        : base(scriptTreeService, fileSystems)
+    {
+    }
 
-    [Obsolete("Please use the other constructor. Scheduled to be removed in Umbraco 19")]
+    [Obsolete("Please use the constructor taking all parameters. Scheduled to be removed in Umbraco 19.")]
     public RootScriptTreeController(FileSystems fileSystems)
-        : this(StaticServiceProvider.Instance.GetRequiredService<IScriptTreeService>(), fileSystems)
+        : base(fileSystems)
     {
     }
 
diff --git a/src/Umbraco.Cms.Api.Management/Controllers/Script/Tree/ScriptTreeControllerBase.cs b/src/Umbraco.Cms.Api.Management/Controllers/Script/Tree/ScriptTreeControllerBase.cs
index d79740d845e3..f803db096fd4 100644
--- a/src/Umbraco.Cms.Api.Management/Controllers/Script/Tree/ScriptTreeControllerBase.cs
+++ b/src/Umbraco.Cms.Api.Management/Controllers/Script/Tree/ScriptTreeControllerBase.cs
@@ -1,11 +1,9 @@
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
-using Microsoft.Extensions.DependencyInjection;
 using Umbraco.Cms.Api.Management.Controllers.Tree;
 using Umbraco.Cms.Api.Management.Routing;
 using Umbraco.Cms.Api.Management.Services.FileSystem;
 using Umbraco.Cms.Core;
-using Umbraco.Cms.Core.DependencyInjection;
 using Umbraco.Cms.Core.IO;
 using Umbraco.Cms.Web.Common.Authorization;
 
@@ -16,30 +14,28 @@ namespace Umbraco.Cms.Api.Management.Controllers.Script.Tree;
 [Authorize(Policy = AuthorizationPolicies.TreeAccessScripts)]
 public class ScriptTreeControllerBase : FileSystemTreeControllerBase
 {
-    private readonly IScriptTreeService _scriptTreeService;
-
     // TODO Remove the static service provider, and replace with base when the other constructors are obsoleted.
     public ScriptTreeControllerBase(IScriptTreeService scriptTreeService)
-        : this(scriptTreeService, StaticServiceProvider.Instance.GetRequiredService<FileSystems>()) =>
-        _scriptTreeService = scriptTreeService;
+        : base(scriptTreeService)
+    {
+        FileSystem = null!;
+    }
 
-    // FileSystem is required therefore, we can't remove it without some wizadry. When obsoletion is due, remove this.
-    [ActivatorUtilitiesConstructor]
-    [Obsolete("Scheduled for removal in Umbraco 18.")]
+    // FileSystem is required therefore, we can't remove it without some wizardry. When obsoletion is due, remove this.
+    [Obsolete("Please use the constructor taking all parameters. Scheduled to be removed in Umbraco 19.")]
     public ScriptTreeControllerBase(IScriptTreeService scriptTreeService, FileSystems fileSystems)
         : base(scriptTreeService)
     {
-        _scriptTreeService = scriptTreeService;
         FileSystem = fileSystems.ScriptsFileSystem ??
                      throw new ArgumentException("Missing scripts file system", nameof(fileSystems));
     }
 
-    [Obsolete("Please use the other constructor. Scheduled to be removed in Umbraco 18.")]
+    [Obsolete("Please use the constructor taking all parameters. Scheduled to be removed in Umbraco 19.")]
     public ScriptTreeControllerBase(FileSystems fileSystems)
-        : this(StaticServiceProvider.Instance.GetRequiredService<IScriptTreeService>())
+        : base()
         => FileSystem = fileSystems.ScriptsFileSystem ??
                         throw new ArgumentException("Missing scripts file system", nameof(fileSystems));
 
-    [Obsolete("Included in the service class. Scheduled to be removed in Umbraco 18.")]
+    [Obsolete("Included in the service class. Scheduled to be removed in Umbraco 19.")]
     protected override IFileSystem FileSystem { get; }
 }
diff --git a/src/Umbraco.Cms.Api.Management/Controllers/Script/Tree/SiblingsScriptTreeController.cs b/src/Umbraco.Cms.Api.Management/Controllers/Script/Tree/SiblingsScriptTreeController.cs
index deec60cacb8e..fa53cfa77473 100644
--- a/src/Umbraco.Cms.Api.Management/Controllers/Script/Tree/SiblingsScriptTreeController.cs
+++ b/src/Umbraco.Cms.Api.Management/Controllers/Script/Tree/SiblingsScriptTreeController.cs
@@ -1,32 +1,31 @@
-using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.DependencyInjection;
 using Umbraco.Cms.Api.Common.ViewModels.Pagination;
 using Umbraco.Cms.Api.Management.Services.FileSystem;
 using Umbraco.Cms.Api.Management.ViewModels.Tree;
-using Umbraco.Cms.Core.DependencyInjection;
 using Umbraco.Cms.Core.IO;
 
 namespace Umbraco.Cms.Api.Management.Controllers.Script.Tree;
 
 public class SiblingsScriptTreeController : ScriptTreeControllerBase
 {
-    private readonly IScriptTreeService _scriptTreeService;
-
     // TODO Remove the static service provider, and replace with base when the other constructors are obsoleted.
+    [ActivatorUtilitiesConstructor]
     public SiblingsScriptTreeController(IScriptTreeService scriptTreeService)
-        : this(scriptTreeService, StaticServiceProvider.Instance.GetRequiredService<FileSystems>())
-        => _scriptTreeService = scriptTreeService;
+        : base(scriptTreeService)
+    {
+    }
 
-    [ActivatorUtilitiesConstructor]
-    [Obsolete("Please use the other constructor. Scheduled to be removed in Umbraco 19")]
+    [Obsolete("Please use the constructor taking all parameters. Scheduled to be removed in Umbraco 19.")]
     public SiblingsScriptTreeController(IScriptTreeService scriptTreeService, FileSystems fileSystems)
-        : base(scriptTreeService, fileSystems) =>
-        _scriptTreeService = scriptTreeService;
+        : base(scriptTreeService, fileSystems)
+    {
+    }
 
-    [Obsolete("Please use the other constructor. Scheduled to be removed in Umbraco 19")]
+    [Obsolete("Please use the constructor taking all parameters. Scheduled to be removed in Umbraco 19.")]
     public SiblingsScriptTreeController(FileSystems fileSystems)
-        : this(StaticServiceProvider.Instance.GetRequiredService<IScriptTreeService>(), fileSystems)
+        : base(fileSystems)
     {
     }
 
diff --git a/src/Umbraco.Cms.Api.Management/Controllers/Stylesheet/Tree/AncestorsStylesheetTreeController.cs b/src/Umbraco.Cms.Api.Management/Controllers/Stylesheet/Tree/AncestorsStylesheetTreeController.cs
index 3760808263bf..2663152f4c6a 100644
--- a/src/Umbraco.Cms.Api.Management/Controllers/Stylesheet/Tree/AncestorsStylesheetTreeController.cs
+++ b/src/Umbraco.Cms.Api.Management/Controllers/Stylesheet/Tree/AncestorsStylesheetTreeController.cs
@@ -1,10 +1,9 @@
-using Asp.Versioning;
+using Asp.Versioning;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.DependencyInjection;
 using Umbraco.Cms.Api.Management.Services.FileSystem;
 using Umbraco.Cms.Api.Management.ViewModels.Tree;
-using Umbraco.Cms.Core.DependencyInjection;
 using Umbraco.Cms.Core.IO;
 
 namespace Umbraco.Cms.Api.Management.Controllers.Stylesheet.Tree;
@@ -12,22 +11,22 @@ namespace Umbraco.Cms.Api.Management.Controllers.Stylesheet.Tree;
 [ApiVersion("1.0")]
 public class AncestorsStylesheetTreeController : StylesheetTreeControllerBase
 {
-    private readonly IStyleSheetTreeService _styleSheetTreeService;
-
     // TODO Remove the static service provider, and replace with base when the other constructors are obsoleted.
+    [ActivatorUtilitiesConstructor]
     public AncestorsStylesheetTreeController(IStyleSheetTreeService styleSheetTreeService)
-        : this(styleSheetTreeService, StaticServiceProvider.Instance.GetRequiredService<FileSystems>())
-        => _styleSheetTreeService = styleSheetTreeService;
+        : base(styleSheetTreeService)
+    {
+    }
 
-    [ActivatorUtilitiesConstructor]
-    [Obsolete("Please use the other constructor. Scheduled to be removed in Umbraco 19")]
+    [Obsolete("Please use the constructor taking all parameters. Scheduled to be removed in Umbraco 19.")]
     public AncestorsStylesheetTreeController(IStyleSheetTreeService styleSheetTreeService, FileSystems fileSystems)
-        : base(styleSheetTreeService, fileSystems) =>
-        _styleSheetTreeService = styleSheetTreeService;
+        : base(styleSheetTreeService, fileSystems)
+    {
+    }
 
-    [Obsolete("Please use the other constructor. Scheduled to be removed in Umbraco 19")]
+    [Obsolete("Please use the constructor taking all parameters. Scheduled to be removed in Umbraco 19.")]
     public AncestorsStylesheetTreeController(FileSystems fileSystems)
-        : this(StaticServiceProvider.Instance.GetRequiredService<IStyleSheetTreeService>(), fileSystems)
+        : base(fileSystems)
     {
     }
 
diff --git a/src/Umbraco.Cms.Api.Management/Controllers/Stylesheet/Tree/ChildrenStylesheetTreeController.cs b/src/Umbraco.Cms.Api.Management/Controllers/Stylesheet/Tree/ChildrenStylesheetTreeController.cs
index 41484bce50ec..bf016b54e39f 100644
--- a/src/Umbraco.Cms.Api.Management/Controllers/Stylesheet/Tree/ChildrenStylesheetTreeController.cs
+++ b/src/Umbraco.Cms.Api.Management/Controllers/Stylesheet/Tree/ChildrenStylesheetTreeController.cs
@@ -1,36 +1,36 @@
-using Asp.Versioning;
+using Asp.Versioning;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.DependencyInjection;
-using Umbraco.Cms.Core.IO;
 using Umbraco.Cms.Api.Common.ViewModels.Pagination;
 using Umbraco.Cms.Api.Management.Services.FileSystem;
 using Umbraco.Cms.Api.Management.ViewModels.Tree;
-using Umbraco.Cms.Core.DependencyInjection;
+using Umbraco.Cms.Core.IO;
 
 namespace Umbraco.Cms.Api.Management.Controllers.Stylesheet.Tree;
 
 [ApiVersion("1.0")]
 public class ChildrenStylesheetTreeController : StylesheetTreeControllerBase
 {
-    private readonly IStyleSheetTreeService _styleSheetTreeService;
-
     // TODO Remove the static service provider, and replace with base when the other constructors are obsoleted.
+    [ActivatorUtilitiesConstructor]
     public ChildrenStylesheetTreeController(IStyleSheetTreeService styleSheetTreeService)
-        : this(styleSheetTreeService, StaticServiceProvider.Instance.GetRequiredService<FileSystems>())
-        => _styleSheetTreeService = styleSheetTreeService;
+        : base(styleSheetTreeService)
+    {
+    }
 
-    [ActivatorUtilitiesConstructor]
-    [Obsolete("Please use the other constructor. Scheduled to be removed in Umbraco 19")]
+    [Obsolete("Please use the constructor taking all parameters. Scheduled to be removed in Umbraco 19.")]
     public ChildrenStylesheetTreeController(IStyleSheetTreeService styleSheetTreeService, FileSystems fileSystems)
-        : base(styleSheetTreeService, fileSystems) =>
-        _styleSheetTreeService = styleSheetTreeService;
+        : base(styleSheetTreeService, fileSystems)
+    {
+    }
 
-    [Obsolete("Please use the other constructor. Scheduled to be removed in Umbraco 19")]
+    [Obsolete("Please use the constructor taking all parameters. Scheduled to be removed in Umbraco 19.")]
     public ChildrenStylesheetTreeController(FileSystems fileSystems)
-        : this(StaticServiceProvider.Instance.GetRequiredService<IStyleSheetTreeService>(), fileSystems)
+        : base(fileSystems)
     {
     }
+
     [HttpGet("children")]
     [MapToApiVersion("1.0")]
     [ProducesResponseType(typeof(PagedViewModel<FileSystemTreeItemPresentationModel>), StatusCodes.Status200OK)]
diff --git a/src/Umbraco.Cms.Api.Management/Controllers/Stylesheet/Tree/RootStylesheetTreeController.cs b/src/Umbraco.Cms.Api.Management/Controllers/Stylesheet/Tree/RootStylesheetTreeController.cs
index 417c636a375d..c47828d09228 100644
--- a/src/Umbraco.Cms.Api.Management/Controllers/Stylesheet/Tree/RootStylesheetTreeController.cs
+++ b/src/Umbraco.Cms.Api.Management/Controllers/Stylesheet/Tree/RootStylesheetTreeController.cs
@@ -1,34 +1,33 @@
-using Asp.Versioning;
+using Asp.Versioning;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.DependencyInjection;
-using Umbraco.Cms.Core.IO;
 using Umbraco.Cms.Api.Common.ViewModels.Pagination;
 using Umbraco.Cms.Api.Management.Services.FileSystem;
 using Umbraco.Cms.Api.Management.ViewModels.Tree;
-using Umbraco.Cms.Core.DependencyInjection;
+using Umbraco.Cms.Core.IO;
 
 namespace Umbraco.Cms.Api.Management.Controllers.Stylesheet.Tree;
 
 [ApiVersion("1.0")]
 public class RootStylesheetTreeController : StylesheetTreeControllerBase
 {
-    private readonly IStyleSheetTreeService _styleSheetTreeService;
-
     // TODO Remove the static service provider, and replace with base when the other constructors are obsoleted.
+    [ActivatorUtilitiesConstructor]
     public RootStylesheetTreeController(IStyleSheetTreeService styleSheetTreeService)
-        : this(styleSheetTreeService, StaticServiceProvider.Instance.GetRequiredService<FileSystems>())
-        => _styleSheetTreeService = styleSheetTreeService;
+        : base(styleSheetTreeService)
+    {
+    }
 
-    [ActivatorUtilitiesConstructor]
-    [Obsolete("Please use the other constructor. Scheduled to be removed in Umbraco 19")]
+    [Obsolete("Please use the constructor taking all parameters. Scheduled to be removed in Umbraco 19.")]
     public RootStylesheetTreeController(IStyleSheetTreeService styleSheetTreeService, FileSystems fileSystems)
-        : base(styleSheetTreeService, fileSystems) =>
-        _styleSheetTreeService = styleSheetTreeService;
+        : base(styleSheetTreeService, fileSystems)
+    {
+    }
 
-    [Obsolete("Please use the other constructor. Scheduled to be removed in Umbraco 19")]
+    [Obsolete("Please use the constructor taking all parameters. Scheduled to be removed in Umbraco 19.")]
     public RootStylesheetTreeController(FileSystems fileSystems)
-        : this(StaticServiceProvider.Instance.GetRequiredService<IStyleSheetTreeService>(), fileSystems)
+        : base(fileSystems)
     {
     }
 
diff --git a/src/Umbraco.Cms.Api.Management/Controllers/Stylesheet/Tree/SiblingsStylesheetTreeController.cs b/src/Umbraco.Cms.Api.Management/Controllers/Stylesheet/Tree/SiblingsStylesheetTreeController.cs
index 0f2b03b704d9..b56afe70b775 100644
--- a/src/Umbraco.Cms.Api.Management/Controllers/Stylesheet/Tree/SiblingsStylesheetTreeController.cs
+++ b/src/Umbraco.Cms.Api.Management/Controllers/Stylesheet/Tree/SiblingsStylesheetTreeController.cs
@@ -1,32 +1,31 @@
-using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.DependencyInjection;
 using Umbraco.Cms.Api.Common.ViewModels.Pagination;
 using Umbraco.Cms.Api.Management.Services.FileSystem;
 using Umbraco.Cms.Api.Management.ViewModels.Tree;
-using Umbraco.Cms.Core.DependencyInjection;
 using Umbraco.Cms.Core.IO;
 
 namespace Umbraco.Cms.Api.Management.Controllers.Stylesheet.Tree;
 
 public class SiblingsStylesheetTreeController : StylesheetTreeControllerBase
 {
-    private readonly IStyleSheetTreeService _styleSheetTreeService;
-
     // TODO Remove the static service provider, and replace with base when the other constructors are obsoleted.
+    [ActivatorUtilitiesConstructor]
     public SiblingsStylesheetTreeController(IStyleSheetTreeService styleSheetTreeService)
-        : this(styleSheetTreeService, StaticServiceProvider.Instance.GetRequiredService<FileSystems>())
-        => _styleSheetTreeService = styleSheetTreeService;
+        : base(styleSheetTreeService)
+    {
+    }
 
-    [ActivatorUtilitiesConstructor]
-    [Obsolete("Please use the other constructor. Scheduled to be removed in Umbraco 19")]
+    [Obsolete("Please use the constructor taking all parameters. Scheduled to be removed in Umbraco 19.")]
     public SiblingsStylesheetTreeController(IStyleSheetTreeService styleSheetTreeService, FileSystems fileSystems)
-        : base(styleSheetTreeService, fileSystems) =>
-        _styleSheetTreeService = styleSheetTreeService;
+        : base(styleSheetTreeService, fileSystems)
+    {
+    }
 
-    [Obsolete("Please use the other constructor. Scheduled to be removed in Umbraco 19")]
+    [Obsolete("Please use the constructor taking all parameters. Scheduled to be removed in Umbraco 19.")]
     public SiblingsStylesheetTreeController(FileSystems fileSystems)
-        : this(StaticServiceProvider.Instance.GetRequiredService<IStyleSheetTreeService>(), fileSystems)
+        : base(fileSystems)
     {
     }
 
diff --git a/src/Umbraco.Cms.Api.Management/Controllers/Stylesheet/Tree/StylesheetTreeControllerBase.cs b/src/Umbraco.Cms.Api.Management/Controllers/Stylesheet/Tree/StylesheetTreeControllerBase.cs
index 501293f11fa4..07382a145399 100644
--- a/src/Umbraco.Cms.Api.Management/Controllers/Stylesheet/Tree/StylesheetTreeControllerBase.cs
+++ b/src/Umbraco.Cms.Api.Management/Controllers/Stylesheet/Tree/StylesheetTreeControllerBase.cs
@@ -1,11 +1,9 @@
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
-using Microsoft.Extensions.DependencyInjection;
 using Umbraco.Cms.Api.Management.Controllers.Tree;
 using Umbraco.Cms.Api.Management.Routing;
 using Umbraco.Cms.Api.Management.Services.FileSystem;
 using Umbraco.Cms.Core;
-using Umbraco.Cms.Core.DependencyInjection;
 using Umbraco.Cms.Core.IO;
 using Umbraco.Cms.Web.Common.Authorization;
 
@@ -16,30 +14,28 @@ namespace Umbraco.Cms.Api.Management.Controllers.Stylesheet.Tree;
 [Authorize(Policy = AuthorizationPolicies.TreeAccessStylesheets)]
 public class StylesheetTreeControllerBase : FileSystemTreeControllerBase
 {
-    private readonly IStyleSheetTreeService _styleSheetTreeService;
-
     // TODO Remove the static service provider, and replace with base when the other constructors are obsoleted.
     public StylesheetTreeControllerBase(IStyleSheetTreeService styleSheetTreeService)
-        : this(styleSheetTreeService, StaticServiceProvider.Instance.GetRequiredService<FileSystems>()) =>
-        _styleSheetTreeService = styleSheetTreeService;
+        : base(styleSheetTreeService)
+    {
+        FileSystem = null!;
+    }
 
     // FileSystem is required therefore, we can't remove it without some wizadry. When obsoletion is due, remove this.
-    [ActivatorUtilitiesConstructor]
-    [Obsolete("Scheduled for removal in Umbraco 18.")]
+    [Obsolete("Please use the constructor taking all parameters. Scheduled to be removed in Umbraco 19.")]
     public StylesheetTreeControllerBase(IStyleSheetTreeService styleSheetTreeService, FileSystems fileSystems)
         : base(styleSheetTreeService)
     {
-        _styleSheetTreeService = styleSheetTreeService;
         FileSystem = fileSystems.ScriptsFileSystem ??
                      throw new ArgumentException("Missing scripts file system", nameof(fileSystems));
     }
 
-    [Obsolete("Please use the other constructor. Scheduled to be removed in Umbraco 18.")]
+    [Obsolete("Please use the constructor taking all parameters. Scheduled to be removed in Umbraco 19.")]
     public StylesheetTreeControllerBase(FileSystems fileSystems)
-        : this(StaticServiceProvider.Instance.GetRequiredService<IStyleSheetTreeService>())
+        : base()
         => FileSystem = fileSystems.ScriptsFileSystem ??
                         throw new ArgumentException("Missing scripts file system", nameof(fileSystems));
 
-    [Obsolete("Included in the service class. Scheduled to be removed in Umbraco 18.")]
+    [Obsolete("Included in the service class. Scheduled to be removed in Umbraco 19.")]
     protected override IFileSystem FileSystem { get; }
 }
diff --git a/src/Umbraco.Cms.Api.Management/Controllers/Tree/FileSystemTreeControllerBase.cs b/src/Umbraco.Cms.Api.Management/Controllers/Tree/FileSystemTreeControllerBase.cs
index 68d1414788fb..fa3b2027b35d 100644
--- a/src/Umbraco.Cms.Api.Management/Controllers/Tree/FileSystemTreeControllerBase.cs
+++ b/src/Umbraco.Cms.Api.Management/Controllers/Tree/FileSystemTreeControllerBase.cs
@@ -5,7 +5,6 @@
 using Umbraco.Cms.Api.Management.Services.FileSystem;
 using Umbraco.Cms.Api.Management.ViewModels.FileSystem;
 using Umbraco.Cms.Api.Management.ViewModels.Tree;
-using Umbraco.Cms.Core.DependencyInjection;
 using Umbraco.Cms.Core.IO;
 using Umbraco.Extensions;
 
@@ -13,23 +12,30 @@ namespace Umbraco.Cms.Api.Management.Controllers.Tree;
 
 public abstract class FileSystemTreeControllerBase : ManagementApiControllerBase
 {
-    private readonly IFileSystemTreeService _fileSystemTreeService;
+    private readonly IFileSystemTreeService _fileSystemTreeService = null!;
 
-    [Obsolete("Has been moved to the individual services. Scheduled to be removed in Umbraco 18.")]
+    /// <summary>
+    /// Indicates whether to use the IFileSystemTreeService or the legacy implementation.
+    /// </summary>
+    /// <remarks>
+    /// This is retained to ensure that any controllers outside of the CMS that use this base class with the obsolete constructor
+    /// continue to function until they can be updated to use the new service.
+    /// To be removed along with the constructor taking no parameters in Umbraco 19.
+    /// </remarks>
+    private readonly bool _useFileSystemTreeService = true;
+
+    [Obsolete("Has been moved to the individual services. Scheduled to be removed in Umbraco 19.")]
     protected abstract IFileSystem FileSystem { get; }
 
     [ActivatorUtilitiesConstructor]
     protected FileSystemTreeControllerBase(IFileSystemTreeService fileSystemTreeService) => _fileSystemTreeService = fileSystemTreeService;
 
-    [Obsolete("Use the other constructor. Scheduled for removal in Umbraco 18.")]
-    protected FileSystemTreeControllerBase()
-        : this(StaticServiceProvider.Instance.GetRequiredService<IScriptTreeService>())
-    {
-    }
+    [Obsolete("Please use the constructor taking all parameters. Scheduled for removal in Umbraco 19.")]
+    protected FileSystemTreeControllerBase() => _useFileSystemTreeService = false;
 
     protected Task<ActionResult<PagedViewModel<FileSystemTreeItemPresentationModel>>> GetRoot(int skip, int take)
     {
-        FileSystemTreeItemPresentationModel[] viewModels = _fileSystemTreeService.GetPathViewModels(string.Empty, skip, take, out var totalItems);
+        FileSystemTreeItemPresentationModel[] viewModels = GetPathViewModels(string.Empty, skip, take, out var totalItems);
 
         PagedViewModel<FileSystemTreeItemPresentationModel> result = PagedViewModel(viewModels, totalItems);
         return Task.FromResult<ActionResult<PagedViewModel<FileSystemTreeItemPresentationModel>>>(Ok(result));
@@ -37,14 +43,14 @@ protected Task<ActionResult<PagedViewModel<FileSystemTreeItemPresentationModel>>
 
     protected Task<ActionResult<PagedViewModel<FileSystemTreeItemPresentationModel>>> GetChildren(string path, int skip, int take)
     {
-        FileSystemTreeItemPresentationModel[] viewModels = _fileSystemTreeService.GetPathViewModels(path, skip, take, out var totalItems);
+        FileSystemTreeItemPresentationModel[] viewModels = GetPathViewModels(path, skip, take, out var totalItems);
 
         PagedViewModel<FileSystemTreeItemPresentationModel> result = PagedViewModel(viewModels, totalItems);
         return Task.FromResult<ActionResult<PagedViewModel<FileSystemTreeItemPresentationModel>>>(Ok(result));
     }
 
     /// <summary>
-    /// Gets the sibling of the targeted item based on its path.
+    /// Gets the siblings of the targeted item based on its path.
     /// </summary>
     /// <param name="path">The path to the item.</param>
     /// <param name="before">The amount of siblings you want to fetch from before the items position in the array.</param>
@@ -61,17 +67,19 @@ protected Task<ActionResult<SubsetViewModel<FileSystemTreeItemPresentationModel>
     protected virtual Task<ActionResult<IEnumerable<FileSystemTreeItemPresentationModel>>> GetAncestors(string path, bool includeSelf = true)
     {
         path = path.VirtualPathToSystemPath();
-        FileSystemTreeItemPresentationModel[] models = _fileSystemTreeService.GetAncestorModels(path, includeSelf);
+        FileSystemTreeItemPresentationModel[] models = GetAncestorModels(path, includeSelf);
 
         return Task.FromResult<ActionResult<IEnumerable<FileSystemTreeItemPresentationModel>>>(Ok(models));
     }
 
-    private PagedViewModel<FileSystemTreeItemPresentationModel> PagedViewModel(IEnumerable<FileSystemTreeItemPresentationModel> viewModels, long totalItems)
-        => new() { Total = totalItems, Items = viewModels };
-
-    [Obsolete("Has been moved to FileSystemTreeServiceBase. Scheduled for removal in Umbraco 18.")]
+    [Obsolete("Has been moved to FileSystemTreeServiceBase. Scheduled for removal in Umbraco 19.")]
     protected virtual FileSystemTreeItemPresentationModel[] GetAncestorModels(string path, bool includeSelf)
     {
+        if (_useFileSystemTreeService)
+        {
+            return _fileSystemTreeService.GetAncestorModels(path, includeSelf);
+        }
+
         var directories = path.Split(Path.DirectorySeparatorChar).Take(Range.EndAt(Index.FromEnd(1))).ToArray();
         var result = directories
             .Select((directory, index) => MapViewModel(string.Join(Path.DirectorySeparatorChar, directories.Take(index + 1)), directory, true))
@@ -86,28 +94,59 @@ protected virtual FileSystemTreeItemPresentationModel[] GetAncestorModels(string
         return result.ToArray();
     }
 
-    [Obsolete("Has been moved to FileSystemTreeServiceBase. Scheduled for removal in Umbraco 18.")]
+    [Obsolete("Has been moved to FileSystemTreeServiceBase. Scheduled for removal in Umbraco 19.")]
     protected virtual string[] GetDirectories(string path) => FileSystem
         .GetDirectories(path)
         .OrderBy(directory => directory)
         .ToArray();
 
-    [Obsolete("Has been moved to FileSystemTreeServiceBase. Scheduled for removal in Umbraco 18.")]
+    [Obsolete("Has been moved to FileSystemTreeServiceBase. Scheduled for removal in Umbraco 19.")]
     protected virtual string[] GetFiles(string path) => FileSystem
         .GetFiles(path)
         .OrderBy(file => file)
         .ToArray();
 
-    [Obsolete("Has been moved to FileSystemTreeServiceBase. Scheduled for removal in Umbraco 18.")]
+    [Obsolete("Has been moved to FileSystemTreeServiceBase. Scheduled for removal in Umbraco 19.")]
     protected virtual bool DirectoryHasChildren(string path)
         => FileSystem.GetFiles(path).Any() || FileSystem.GetDirectories(path).Any();
 
-    [Obsolete("Has been moved to FileSystemTreeServiceBase. Scheduled for removal in Umbraco 18.")]
+    [Obsolete("Has been moved to FileSystemTreeServiceBase. Scheduled for removal in Umbraco 19.")]
     private string GetFileSystemItemName(bool isFolder, string itemPath) => isFolder
         ? Path.GetFileName(itemPath)
         : FileSystem.GetFileName(itemPath);
 
-    [Obsolete("Has been moved to FileSystemTreeServiceBase. Scheduled for removal in Umbraco 18.")]
+    private FileSystemTreeItemPresentationModel[] GetPathViewModels(string path, int skip, int take, out long totalItems)
+    {
+        if (_useFileSystemTreeService)
+        {
+            return _fileSystemTreeService.GetPathViewModels(path, skip, take, out totalItems);
+        }
+
+        path = path.VirtualPathToSystemPath();
+        var allItems = GetDirectories(path)
+            .Select(directory => new { Path = directory, IsFolder = true })
+            .Union(GetFiles(path).Select(file => new { Path = file, IsFolder = false }))
+            .ToArray();
+
+        totalItems = allItems.Length;
+
+        FileSystemTreeItemPresentationModel ViewModel(string itemPath, bool isFolder)
+            => MapViewModel(
+                itemPath,
+                GetFileSystemItemName(isFolder, itemPath),
+                isFolder);
+
+        return allItems
+            .Skip(skip)
+            .Take(take)
+            .Select(item => ViewModel(item.Path, item.IsFolder))
+            .ToArray();
+    }
+
+    private PagedViewModel<FileSystemTreeItemPresentationModel> PagedViewModel(IEnumerable<FileSystemTreeItemPresentationModel> viewModels, long totalItems)
+        => new() { Total = totalItems, Items = viewModels };
+
+    [Obsolete("Has been moved to FileSystemTreeServiceBase. Scheduled for removal in Umbraco 19.")]
     private FileSystemTreeItemPresentationModel MapViewModel(string path, string name, bool isFolder)
     {
         var parentPath = Path.GetDirectoryName(path);

From 9cb59fe1b4c73c931148f24b35917ca711cf3b7b Mon Sep 17 00:00:00 2001
From: Andy Butland <abutland73@gmail.com>
Date: Wed, 22 Oct 2025 16:42:12 +0200
Subject: [PATCH 070/155] Bumped version to 16.3.3.

---
 src/Umbraco.Web.UI.Client/package.json | 2 +-
 version.json                           | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/package.json b/src/Umbraco.Web.UI.Client/package.json
index 74bf09f5a9cf..bbdb09451381 100644
--- a/src/Umbraco.Web.UI.Client/package.json
+++ b/src/Umbraco.Web.UI.Client/package.json
@@ -1,7 +1,7 @@
 {
 	"name": "@umbraco-cms/backoffice",
 	"license": "MIT",
-	"version": "16.3.2",
+	"version": "16.3.3",
 	"type": "module",
 	"exports": {
 		".": null,
diff --git a/version.json b/version.json
index 7167818c6d67..eb6387dfd627 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": "16.3.2",
+  "version": "16.3.3",
   "assemblyVersion": {
     "precision": "build"
   },

From a09e1777c4604d2b6b7a6c9616764c7a6522cedd Mon Sep 17 00:00:00 2001
From: Andy Butland <abutland73@gmail.com>
Date: Wed, 22 Oct 2025 12:21:42 +0200
Subject: [PATCH 071/155] Migrations: Use reliable GUID to check for existence
 of data type when creating (#20604)

* Use reliable GUID to check for existence of data type in migration.

* Retrieve just a single field in existence check.
---
 .../MigrateMediaTypeLabelProperties.cs        | 23 ++++++++++++++-----
 1 file changed, 17 insertions(+), 6 deletions(-)

diff --git a/src/Umbraco.Infrastructure/Migrations/Upgrade/V_16_3_0/MigrateMediaTypeLabelProperties.cs b/src/Umbraco.Infrastructure/Migrations/Upgrade/V_16_3_0/MigrateMediaTypeLabelProperties.cs
index efa48f00f276..71c824f35758 100644
--- a/src/Umbraco.Infrastructure/Migrations/Upgrade/V_16_3_0/MigrateMediaTypeLabelProperties.cs
+++ b/src/Umbraco.Infrastructure/Migrations/Upgrade/V_16_3_0/MigrateMediaTypeLabelProperties.cs
@@ -6,7 +6,9 @@
 using Umbraco.Cms.Core.Models;
 using Umbraco.Cms.Core.Services;
 using Umbraco.Cms.Core.Services.OperationStatus;
+using Umbraco.Cms.Infrastructure.Persistence;
 using Umbraco.Cms.Infrastructure.Persistence.Dtos;
+using Umbraco.Extensions;
 
 namespace Umbraco.Cms.Infrastructure.Migrations.Upgrade.V_16_3_0;
 
@@ -69,7 +71,7 @@ private void ToggleIndentityInsertForNodes(bool toggleOn)
 
     private void IfNotExistsCreateBytesLabel()
     {
-        if (Database.Exists<NodeDto>(Constants.DataTypes.LabelBytes))
+        if (NodeExists(_labelBytesDataTypeKey))
         {
             return;
         }
@@ -89,7 +91,7 @@ private void IfNotExistsCreateBytesLabel()
             CreateDate = DateTime.Now,
         };
 
-        _ = Database.Insert(Constants.DatabaseSchema.Tables.Node, "id", false, nodeDto);
+        Database.Insert(Constants.DatabaseSchema.Tables.Node, "id", false, nodeDto);
 
         var dataTypeDto = new DataTypeDto
         {
@@ -100,12 +102,12 @@ private void IfNotExistsCreateBytesLabel()
             Configuration = "{\"umbracoDataValueType\":\"BIGINT\", \"labelTemplate\":\"{=value | bytes}\"}",
         };
 
-        _ = Database.Insert(Constants.DatabaseSchema.Tables.DataType, "pk", false, dataTypeDto);
+        Database.Insert(Constants.DatabaseSchema.Tables.DataType, "pk", false, dataTypeDto);
     }
 
     private void IfNotExistsCreatePixelsLabel()
     {
-        if (Database.Exists<NodeDto>(Constants.DataTypes.LabelPixels))
+        if (NodeExists(_labelPixelsDataTypeKey))
         {
             return;
         }
@@ -125,7 +127,7 @@ private void IfNotExistsCreatePixelsLabel()
             CreateDate = DateTime.Now,
         };
 
-        _ = Database.Insert(Constants.DatabaseSchema.Tables.Node, "id", false, nodeDto);
+        Database.Insert(Constants.DatabaseSchema.Tables.Node, "id", false, nodeDto);
 
         var dataTypeDto = new DataTypeDto
         {
@@ -136,7 +138,16 @@ private void IfNotExistsCreatePixelsLabel()
             Configuration = "{\"umbracoDataValueType\":\"INT\", \"labelTemplate\":\"{=value}px\"}",
         };
 
-        _ = Database.Insert(Constants.DatabaseSchema.Tables.DataType, "pk", false, dataTypeDto);
+        Database.Insert(Constants.DatabaseSchema.Tables.DataType, "pk", false, dataTypeDto);
+    }
+
+    private bool NodeExists(Guid uniqueId)
+    {
+        Sql<ISqlContext> sql = Database.SqlContext.Sql()
+            .Select<NodeDto>(x => x.NodeId)
+            .From<NodeDto>()
+            .Where<NodeDto>(x => x.UniqueId == uniqueId);
+        return Database.FirstOrDefault<NodeDto>(sql) is not null;
     }
 
     private async Task MigrateMediaTypeLabels()

From 644334c63b79802b641fc2d63534e0ef337617f4 Mon Sep 17 00:00:00 2001
From: Andy Butland <abutland73@gmail.com>
Date: Wed, 22 Oct 2025 16:20:20 +0200
Subject: [PATCH 072/155] Trees: Restore backward compatibility for file system
 based tree controllers (closes #20602) (#20608)

* Restore backward compatibility for file system based tree controllers.

* Aligned obsoletion messages.
---
 .../AncestorsPartialViewTreeController.cs     | 24 +++---
 .../Tree/ChildrenPartialViewTreeController.cs | 25 +++---
 .../Tree/PartialViewTreeControllerBase.cs     | 22 +++--
 .../Tree/RootPartialViewTreeController.cs     | 25 +++---
 .../Tree/SiblingsPartialViewTreeController.cs | 23 +++---
 .../Tree/AncestorsScriptTreeController.cs     | 23 +++---
 .../Tree/ChildrenScriptTreeController.cs      | 25 +++---
 .../Script/Tree/RootScriptTreeController.cs   | 25 +++---
 .../Script/Tree/ScriptTreeControllerBase.cs   | 22 +++--
 .../Tree/SiblingsScriptTreeController.cs      | 23 +++---
 .../Tree/AncestorsStylesheetTreeController.cs | 23 +++---
 .../Tree/ChildrenStylesheetTreeController.cs  | 26 +++---
 .../Tree/RootStylesheetTreeController.cs      | 25 +++---
 .../Tree/SiblingsStylesheetTreeController.cs  | 23 +++---
 .../Tree/StylesheetTreeControllerBase.cs      | 20 ++---
 .../Tree/FileSystemTreeControllerBase.cs      | 81 ++++++++++++++-----
 16 files changed, 225 insertions(+), 210 deletions(-)

diff --git a/src/Umbraco.Cms.Api.Management/Controllers/PartialView/Tree/AncestorsPartialViewTreeController.cs b/src/Umbraco.Cms.Api.Management/Controllers/PartialView/Tree/AncestorsPartialViewTreeController.cs
index 3f79545e3950..6f30a7268482 100644
--- a/src/Umbraco.Cms.Api.Management/Controllers/PartialView/Tree/AncestorsPartialViewTreeController.cs
+++ b/src/Umbraco.Cms.Api.Management/Controllers/PartialView/Tree/AncestorsPartialViewTreeController.cs
@@ -1,34 +1,32 @@
-using Asp.Versioning;
+using Asp.Versioning;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.DependencyInjection;
 using Umbraco.Cms.Api.Management.Services.FileSystem;
 using Umbraco.Cms.Api.Management.ViewModels.Tree;
-using Umbraco.Cms.Core.DependencyInjection;
 using Umbraco.Cms.Core.IO;
-using Umbraco.Cms.Core.Services;
 
 namespace Umbraco.Cms.Api.Management.Controllers.PartialView.Tree;
 
 [ApiVersion("1.0")]
 public class AncestorsPartialViewTreeController : PartialViewTreeControllerBase
 {
-    private readonly IPartialViewTreeService _partialViewTreeService;
-
     // TODO Remove the static service provider, and replace with base when the other constructors are obsoleted.
+    [ActivatorUtilitiesConstructor]
     public AncestorsPartialViewTreeController(IPartialViewTreeService partialViewTreeService)
-    : this(partialViewTreeService, StaticServiceProvider.Instance.GetRequiredService<FileSystems>())
-        => _partialViewTreeService = partialViewTreeService;
+        : base(partialViewTreeService)
+    {
+    }
 
-    [ActivatorUtilitiesConstructor]
-    [Obsolete("Please use the other constructor. Scheduled to be removed in Umbraco 19")]
+    [Obsolete("Please use the constructor taking all parameters. Scheduled to be removed in Umbraco 19.")]
     public AncestorsPartialViewTreeController(IPartialViewTreeService partialViewTreeService, FileSystems fileSystems)
-    : base(partialViewTreeService, fileSystems) =>
-        _partialViewTreeService = partialViewTreeService;
+        : base(partialViewTreeService, fileSystems)
+    {
+    }
 
-    [Obsolete("Please use the other constructor. Scheduled to be removed in Umbraco 19")]
+    [Obsolete("Please use the constructor taking all parameters. Scheduled to be removed in Umbraco 19.")]
     public AncestorsPartialViewTreeController(FileSystems fileSystems)
-        : this(StaticServiceProvider.Instance.GetRequiredService<IPartialViewTreeService>(), fileSystems)
+        : base(fileSystems)
     {
     }
 
diff --git a/src/Umbraco.Cms.Api.Management/Controllers/PartialView/Tree/ChildrenPartialViewTreeController.cs b/src/Umbraco.Cms.Api.Management/Controllers/PartialView/Tree/ChildrenPartialViewTreeController.cs
index 099f01f3422d..9c70e7acbed4 100644
--- a/src/Umbraco.Cms.Api.Management/Controllers/PartialView/Tree/ChildrenPartialViewTreeController.cs
+++ b/src/Umbraco.Cms.Api.Management/Controllers/PartialView/Tree/ChildrenPartialViewTreeController.cs
@@ -1,34 +1,33 @@
-using Asp.Versioning;
+using Asp.Versioning;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.DependencyInjection;
-using Umbraco.Cms.Core.IO;
 using Umbraco.Cms.Api.Common.ViewModels.Pagination;
 using Umbraco.Cms.Api.Management.Services.FileSystem;
 using Umbraco.Cms.Api.Management.ViewModels.Tree;
-using Umbraco.Cms.Core.DependencyInjection;
+using Umbraco.Cms.Core.IO;
 
 namespace Umbraco.Cms.Api.Management.Controllers.PartialView.Tree;
 
 [ApiVersion("1.0")]
 public class ChildrenPartialViewTreeController : PartialViewTreeControllerBase
 {
-    private readonly IPartialViewTreeService _partialViewTreeService;
-
     // TODO Remove the static service provider, and replace with base when the other constructors are obsoleted.
+    [ActivatorUtilitiesConstructor]
     public ChildrenPartialViewTreeController(IPartialViewTreeService partialViewTreeService)
-        : this(partialViewTreeService, StaticServiceProvider.Instance.GetRequiredService<FileSystems>())
-        => _partialViewTreeService = partialViewTreeService;
+        : base(partialViewTreeService)
+    {
+    }
 
-    [ActivatorUtilitiesConstructor]
-    [Obsolete("Please use the other constructor. Scheduled to be removed in Umbraco 19")]
+    [Obsolete("Please use the constructor taking all parameters. Scheduled to be removed in Umbraco 19.")]
     public ChildrenPartialViewTreeController(IPartialViewTreeService partialViewTreeService, FileSystems fileSystems)
-        : base(partialViewTreeService, fileSystems) =>
-        _partialViewTreeService = partialViewTreeService;
+        : base(partialViewTreeService, fileSystems)
+    {
+    }
 
-    [Obsolete("Please use the other constructor. Scheduled to be removed in Umbraco 19")]
+    [Obsolete("Please use the constructor taking all parameters. Scheduled to be removed in Umbraco 19.")]
     public ChildrenPartialViewTreeController(FileSystems fileSystems)
-        : this(StaticServiceProvider.Instance.GetRequiredService<IPartialViewTreeService>(), fileSystems)
+        : base(fileSystems)
     {
     }
 
diff --git a/src/Umbraco.Cms.Api.Management/Controllers/PartialView/Tree/PartialViewTreeControllerBase.cs b/src/Umbraco.Cms.Api.Management/Controllers/PartialView/Tree/PartialViewTreeControllerBase.cs
index 6875e395f640..5f50a098983b 100644
--- a/src/Umbraco.Cms.Api.Management/Controllers/PartialView/Tree/PartialViewTreeControllerBase.cs
+++ b/src/Umbraco.Cms.Api.Management/Controllers/PartialView/Tree/PartialViewTreeControllerBase.cs
@@ -1,11 +1,9 @@
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
-using Microsoft.Extensions.DependencyInjection;
 using Umbraco.Cms.Api.Management.Controllers.Tree;
 using Umbraco.Cms.Api.Management.Routing;
 using Umbraco.Cms.Api.Management.Services.FileSystem;
 using Umbraco.Cms.Core;
-using Umbraco.Cms.Core.DependencyInjection;
 using Umbraco.Cms.Core.IO;
 using Umbraco.Cms.Web.Common.Authorization;
 
@@ -16,30 +14,28 @@ namespace Umbraco.Cms.Api.Management.Controllers.PartialView.Tree;
 [Authorize(Policy = AuthorizationPolicies.TreeAccessPartialViews)]
 public class PartialViewTreeControllerBase : FileSystemTreeControllerBase
 {
-    private readonly IPartialViewTreeService _partialViewTreeService;
-
     // TODO Remove the static service provider, and replace with base when the other constructors are obsoleted.
     public PartialViewTreeControllerBase(IPartialViewTreeService partialViewTreeService)
-        : this(partialViewTreeService, StaticServiceProvider.Instance.GetRequiredService<FileSystems>()) =>
-        _partialViewTreeService = partialViewTreeService;
+        : base(partialViewTreeService)
+    {
+        FileSystem = null!;
+    }
 
-    // FileSystem is required therefore, we can't remove it without some wizadry. When obsoletion is due, remove this.
-    [ActivatorUtilitiesConstructor]
-    [Obsolete("Scheduled for removal in Umbraco 18.")]
+    // FileSystem is required therefore, we can't remove it without some wizardry. When obsoletion is due, remove this.
+    [Obsolete("Please use the constructor taking all parameters. Scheduled to be removed in Umbraco 19.")]
     public PartialViewTreeControllerBase(IPartialViewTreeService partialViewTreeService, FileSystems fileSystems)
         : base(partialViewTreeService)
     {
-        _partialViewTreeService = partialViewTreeService;
         FileSystem = fileSystems.PartialViewsFileSystem ??
                      throw new ArgumentException("Missing scripts file system", nameof(fileSystems));
     }
 
-    [Obsolete("Please use the other constructor. Scheduled to be removed in Umbraco 18.")]
+    [Obsolete("Please use the constructor taking all parameters. Scheduled to be removed in Umbraco 19.")]
     public PartialViewTreeControllerBase(FileSystems fileSystems)
-        : this(StaticServiceProvider.Instance.GetRequiredService<IPartialViewTreeService>())
+        : base()
         => FileSystem = fileSystems.PartialViewsFileSystem ??
                         throw new ArgumentException("Missing scripts file system", nameof(fileSystems));
 
-    [Obsolete("Included in the service class. Scheduled to be removed in Umbraco 18.")]
+    [Obsolete("Included in the service class. Scheduled to be removed in Umbraco 19.")]
     protected override IFileSystem FileSystem { get; }
 }
diff --git a/src/Umbraco.Cms.Api.Management/Controllers/PartialView/Tree/RootPartialViewTreeController.cs b/src/Umbraco.Cms.Api.Management/Controllers/PartialView/Tree/RootPartialViewTreeController.cs
index 4e42266389f7..0a7d95627f87 100644
--- a/src/Umbraco.Cms.Api.Management/Controllers/PartialView/Tree/RootPartialViewTreeController.cs
+++ b/src/Umbraco.Cms.Api.Management/Controllers/PartialView/Tree/RootPartialViewTreeController.cs
@@ -1,34 +1,33 @@
-using Asp.Versioning;
+using Asp.Versioning;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.DependencyInjection;
-using Umbraco.Cms.Core.IO;
 using Umbraco.Cms.Api.Common.ViewModels.Pagination;
 using Umbraco.Cms.Api.Management.Services.FileSystem;
 using Umbraco.Cms.Api.Management.ViewModels.Tree;
-using Umbraco.Cms.Core.DependencyInjection;
+using Umbraco.Cms.Core.IO;
 
 namespace Umbraco.Cms.Api.Management.Controllers.PartialView.Tree;
 
 [ApiVersion("1.0")]
 public class RootPartialViewTreeController : PartialViewTreeControllerBase
 {
-    private readonly IPartialViewTreeService _partialViewTreeService;
-
     // TODO Remove the static service provider, and replace with base when the other constructors are obsoleted.
+    [ActivatorUtilitiesConstructor]
     public RootPartialViewTreeController(IPartialViewTreeService partialViewTreeService)
-        : this(partialViewTreeService, StaticServiceProvider.Instance.GetRequiredService<FileSystems>())
-        => _partialViewTreeService = partialViewTreeService;
+        : base(partialViewTreeService)
+    {
+    }
 
-    [ActivatorUtilitiesConstructor]
-    [Obsolete("Please use the other constructor. Scheduled to be removed in Umbraco 19")]
+    [Obsolete("Please use the constructor taking all parameters. Scheduled to be removed in Umbraco 19.")]
     public RootPartialViewTreeController(IPartialViewTreeService partialViewTreeService, FileSystems fileSystems)
-        : base(partialViewTreeService, fileSystems) =>
-        _partialViewTreeService = partialViewTreeService;
+        : base(partialViewTreeService, fileSystems)
+    {
+    }
 
-    [Obsolete("Please use the other constructor. Scheduled to be removed in Umbraco 19")]
+    [Obsolete("Please use the constructor taking all parameters. Scheduled to be removed in Umbraco 19.")]
     public RootPartialViewTreeController(FileSystems fileSystems)
-        : this(StaticServiceProvider.Instance.GetRequiredService<IPartialViewTreeService>(), fileSystems)
+        : base(fileSystems)
     {
     }
 
diff --git a/src/Umbraco.Cms.Api.Management/Controllers/PartialView/Tree/SiblingsPartialViewTreeController.cs b/src/Umbraco.Cms.Api.Management/Controllers/PartialView/Tree/SiblingsPartialViewTreeController.cs
index af1e3171a643..8b3354d0f663 100644
--- a/src/Umbraco.Cms.Api.Management/Controllers/PartialView/Tree/SiblingsPartialViewTreeController.cs
+++ b/src/Umbraco.Cms.Api.Management/Controllers/PartialView/Tree/SiblingsPartialViewTreeController.cs
@@ -1,32 +1,31 @@
-using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.DependencyInjection;
 using Umbraco.Cms.Api.Common.ViewModels.Pagination;
 using Umbraco.Cms.Api.Management.Services.FileSystem;
 using Umbraco.Cms.Api.Management.ViewModels.Tree;
-using Umbraco.Cms.Core.DependencyInjection;
 using Umbraco.Cms.Core.IO;
 
 namespace Umbraco.Cms.Api.Management.Controllers.PartialView.Tree;
 
 public class SiblingsPartialViewTreeController : PartialViewTreeControllerBase
 {
-    private readonly IPartialViewTreeService _partialViewTreeService;
-
     // TODO Remove the static service provider, and replace with base when the other constructors are obsoleted.
+    [ActivatorUtilitiesConstructor]
     public SiblingsPartialViewTreeController(IPartialViewTreeService partialViewTreeService)
-        : this(partialViewTreeService, StaticServiceProvider.Instance.GetRequiredService<FileSystems>())
-        => _partialViewTreeService = partialViewTreeService;
+        : base(partialViewTreeService)
+    {
+    }
 
-    [ActivatorUtilitiesConstructor]
-    [Obsolete("Please use the other constructor. Scheduled to be removed in Umbraco 19")]
+    [Obsolete("Please use the constructor taking all parameters. Scheduled to be removed in Umbraco 19.")]
     public SiblingsPartialViewTreeController(IPartialViewTreeService partialViewTreeService, FileSystems fileSystems)
-        : base(partialViewTreeService, fileSystems) =>
-        _partialViewTreeService = partialViewTreeService;
+        : base(partialViewTreeService, fileSystems)
+    {
+    }
 
-    [Obsolete("Please use the other constructor. Scheduled to be removed in Umbraco 19")]
+    [Obsolete("Please use the constructor taking all parameters. Scheduled to be removed in Umbraco 19.")]
     public SiblingsPartialViewTreeController(FileSystems fileSystems)
-        : this(StaticServiceProvider.Instance.GetRequiredService<IPartialViewTreeService>(), fileSystems)
+        : base(fileSystems)
     {
     }
 
diff --git a/src/Umbraco.Cms.Api.Management/Controllers/Script/Tree/AncestorsScriptTreeController.cs b/src/Umbraco.Cms.Api.Management/Controllers/Script/Tree/AncestorsScriptTreeController.cs
index ed5acbc0c356..0aef76c5b782 100644
--- a/src/Umbraco.Cms.Api.Management/Controllers/Script/Tree/AncestorsScriptTreeController.cs
+++ b/src/Umbraco.Cms.Api.Management/Controllers/Script/Tree/AncestorsScriptTreeController.cs
@@ -1,10 +1,9 @@
-using Asp.Versioning;
+using Asp.Versioning;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.DependencyInjection;
 using Umbraco.Cms.Api.Management.Services.FileSystem;
 using Umbraco.Cms.Api.Management.ViewModels.Tree;
-using Umbraco.Cms.Core.DependencyInjection;
 using Umbraco.Cms.Core.IO;
 
 namespace Umbraco.Cms.Api.Management.Controllers.Script.Tree;
@@ -12,22 +11,22 @@ namespace Umbraco.Cms.Api.Management.Controllers.Script.Tree;
 [ApiVersion("1.0")]
 public class AncestorsScriptTreeController : ScriptTreeControllerBase
 {
-    private readonly IScriptTreeService _scriptTreeService;
-
     // TODO Remove the static service provider, and replace with base when the other constructors are obsoleted.
+    [ActivatorUtilitiesConstructor]
     public AncestorsScriptTreeController(IScriptTreeService scriptTreeService)
-        : this(scriptTreeService, StaticServiceProvider.Instance.GetRequiredService<FileSystems>())
-        => _scriptTreeService = scriptTreeService;
+        : base(scriptTreeService)
+    {
+    }
 
-    [ActivatorUtilitiesConstructor]
-    [Obsolete("Please use the other constructor. Scheduled to be removed in Umbraco 19")]
+    [Obsolete("Please use the constructor taking all parameters. Scheduled to be removed in Umbraco 19.")]
     public AncestorsScriptTreeController(IScriptTreeService scriptTreeService, FileSystems fileSystems)
-        : base(scriptTreeService, fileSystems) =>
-        _scriptTreeService = scriptTreeService;
+        : base(scriptTreeService, fileSystems)
+    {
+    }
 
-    [Obsolete("Please use the other constructor. Scheduled to be removed in Umbraco 19")]
+    [Obsolete("Please use the constructor taking all parameters. Scheduled to be removed in Umbraco 19.")]
     public AncestorsScriptTreeController(FileSystems fileSystems)
-        : this(StaticServiceProvider.Instance.GetRequiredService<IScriptTreeService>(), fileSystems)
+        : base(fileSystems)
     {
     }
 
diff --git a/src/Umbraco.Cms.Api.Management/Controllers/Script/Tree/ChildrenScriptTreeController.cs b/src/Umbraco.Cms.Api.Management/Controllers/Script/Tree/ChildrenScriptTreeController.cs
index ba4003784142..8313b6294139 100644
--- a/src/Umbraco.Cms.Api.Management/Controllers/Script/Tree/ChildrenScriptTreeController.cs
+++ b/src/Umbraco.Cms.Api.Management/Controllers/Script/Tree/ChildrenScriptTreeController.cs
@@ -1,34 +1,33 @@
-using Asp.Versioning;
+using Asp.Versioning;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.DependencyInjection;
-using Umbraco.Cms.Core.IO;
 using Umbraco.Cms.Api.Common.ViewModels.Pagination;
 using Umbraco.Cms.Api.Management.Services.FileSystem;
 using Umbraco.Cms.Api.Management.ViewModels.Tree;
-using Umbraco.Cms.Core.DependencyInjection;
+using Umbraco.Cms.Core.IO;
 
 namespace Umbraco.Cms.Api.Management.Controllers.Script.Tree;
 
 [ApiVersion("1.0")]
 public class ChildrenScriptTreeController : ScriptTreeControllerBase
 {
-    private readonly IScriptTreeService _scriptTreeService;
-
     // TODO Remove the static service provider, and replace with base when the other constructors are obsoleted.
+    [ActivatorUtilitiesConstructor]
     public ChildrenScriptTreeController(IScriptTreeService scriptTreeService)
-        : this(scriptTreeService, StaticServiceProvider.Instance.GetRequiredService<FileSystems>())
-        => _scriptTreeService = scriptTreeService;
+        : base(scriptTreeService)
+    {
+    }
 
-    [ActivatorUtilitiesConstructor]
-    [Obsolete("Please use the other constructor. Scheduled to be removed in Umbraco 19")]
+    [Obsolete("Please use the constructor taking all parameters. Scheduled to be removed in Umbraco 19.")]
     public ChildrenScriptTreeController(IScriptTreeService scriptTreeService, FileSystems fileSystems)
-        : base(scriptTreeService, fileSystems) =>
-        _scriptTreeService = scriptTreeService;
+        : base(scriptTreeService, fileSystems)
+    {
+    }
 
-    [Obsolete("Please use the other constructor. Scheduled to be removed in Umbraco 19")]
+    [Obsolete("Please use the constructor taking all parameters. Scheduled to be removed in Umbraco 19.")]
     public ChildrenScriptTreeController(FileSystems fileSystems)
-        : this(StaticServiceProvider.Instance.GetRequiredService<IScriptTreeService>(), fileSystems)
+        : base(fileSystems)
     {
     }
 
diff --git a/src/Umbraco.Cms.Api.Management/Controllers/Script/Tree/RootScriptTreeController.cs b/src/Umbraco.Cms.Api.Management/Controllers/Script/Tree/RootScriptTreeController.cs
index f29d3bdb4401..dcb5e2479ced 100644
--- a/src/Umbraco.Cms.Api.Management/Controllers/Script/Tree/RootScriptTreeController.cs
+++ b/src/Umbraco.Cms.Api.Management/Controllers/Script/Tree/RootScriptTreeController.cs
@@ -1,34 +1,33 @@
-using Asp.Versioning;
+using Asp.Versioning;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.DependencyInjection;
-using Umbraco.Cms.Core.IO;
 using Umbraco.Cms.Api.Common.ViewModels.Pagination;
 using Umbraco.Cms.Api.Management.Services.FileSystem;
 using Umbraco.Cms.Api.Management.ViewModels.Tree;
-using Umbraco.Cms.Core.DependencyInjection;
+using Umbraco.Cms.Core.IO;
 
 namespace Umbraco.Cms.Api.Management.Controllers.Script.Tree;
 
 [ApiVersion("1.0")]
 public class RootScriptTreeController : ScriptTreeControllerBase
 {
-    private readonly IScriptTreeService _scriptTreeService;
-
     // TODO Remove the static service provider, and replace with base when the other constructors are obsoleted.
+    [ActivatorUtilitiesConstructor]
     public RootScriptTreeController(IScriptTreeService scriptTreeService)
-        : this(scriptTreeService, StaticServiceProvider.Instance.GetRequiredService<FileSystems>())
-        => _scriptTreeService = scriptTreeService;
+        : base(scriptTreeService)
+    {
+    }
 
-    [ActivatorUtilitiesConstructor]
-    [Obsolete("Please use the other constructor. Scheduled to be removed in Umbraco 19")]
+    [Obsolete("Please use the constructor taking all parameters. Scheduled to be removed in Umbraco 19.")]
     public RootScriptTreeController(IScriptTreeService scriptTreeService, FileSystems fileSystems)
-        : base(scriptTreeService, fileSystems) =>
-        _scriptTreeService = scriptTreeService;
+        : base(scriptTreeService, fileSystems)
+    {
+    }
 
-    [Obsolete("Please use the other constructor. Scheduled to be removed in Umbraco 19")]
+    [Obsolete("Please use the constructor taking all parameters. Scheduled to be removed in Umbraco 19.")]
     public RootScriptTreeController(FileSystems fileSystems)
-        : this(StaticServiceProvider.Instance.GetRequiredService<IScriptTreeService>(), fileSystems)
+        : base(fileSystems)
     {
     }
 
diff --git a/src/Umbraco.Cms.Api.Management/Controllers/Script/Tree/ScriptTreeControllerBase.cs b/src/Umbraco.Cms.Api.Management/Controllers/Script/Tree/ScriptTreeControllerBase.cs
index d79740d845e3..f803db096fd4 100644
--- a/src/Umbraco.Cms.Api.Management/Controllers/Script/Tree/ScriptTreeControllerBase.cs
+++ b/src/Umbraco.Cms.Api.Management/Controllers/Script/Tree/ScriptTreeControllerBase.cs
@@ -1,11 +1,9 @@
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
-using Microsoft.Extensions.DependencyInjection;
 using Umbraco.Cms.Api.Management.Controllers.Tree;
 using Umbraco.Cms.Api.Management.Routing;
 using Umbraco.Cms.Api.Management.Services.FileSystem;
 using Umbraco.Cms.Core;
-using Umbraco.Cms.Core.DependencyInjection;
 using Umbraco.Cms.Core.IO;
 using Umbraco.Cms.Web.Common.Authorization;
 
@@ -16,30 +14,28 @@ namespace Umbraco.Cms.Api.Management.Controllers.Script.Tree;
 [Authorize(Policy = AuthorizationPolicies.TreeAccessScripts)]
 public class ScriptTreeControllerBase : FileSystemTreeControllerBase
 {
-    private readonly IScriptTreeService _scriptTreeService;
-
     // TODO Remove the static service provider, and replace with base when the other constructors are obsoleted.
     public ScriptTreeControllerBase(IScriptTreeService scriptTreeService)
-        : this(scriptTreeService, StaticServiceProvider.Instance.GetRequiredService<FileSystems>()) =>
-        _scriptTreeService = scriptTreeService;
+        : base(scriptTreeService)
+    {
+        FileSystem = null!;
+    }
 
-    // FileSystem is required therefore, we can't remove it without some wizadry. When obsoletion is due, remove this.
-    [ActivatorUtilitiesConstructor]
-    [Obsolete("Scheduled for removal in Umbraco 18.")]
+    // FileSystem is required therefore, we can't remove it without some wizardry. When obsoletion is due, remove this.
+    [Obsolete("Please use the constructor taking all parameters. Scheduled to be removed in Umbraco 19.")]
     public ScriptTreeControllerBase(IScriptTreeService scriptTreeService, FileSystems fileSystems)
         : base(scriptTreeService)
     {
-        _scriptTreeService = scriptTreeService;
         FileSystem = fileSystems.ScriptsFileSystem ??
                      throw new ArgumentException("Missing scripts file system", nameof(fileSystems));
     }
 
-    [Obsolete("Please use the other constructor. Scheduled to be removed in Umbraco 18.")]
+    [Obsolete("Please use the constructor taking all parameters. Scheduled to be removed in Umbraco 19.")]
     public ScriptTreeControllerBase(FileSystems fileSystems)
-        : this(StaticServiceProvider.Instance.GetRequiredService<IScriptTreeService>())
+        : base()
         => FileSystem = fileSystems.ScriptsFileSystem ??
                         throw new ArgumentException("Missing scripts file system", nameof(fileSystems));
 
-    [Obsolete("Included in the service class. Scheduled to be removed in Umbraco 18.")]
+    [Obsolete("Included in the service class. Scheduled to be removed in Umbraco 19.")]
     protected override IFileSystem FileSystem { get; }
 }
diff --git a/src/Umbraco.Cms.Api.Management/Controllers/Script/Tree/SiblingsScriptTreeController.cs b/src/Umbraco.Cms.Api.Management/Controllers/Script/Tree/SiblingsScriptTreeController.cs
index deec60cacb8e..fa53cfa77473 100644
--- a/src/Umbraco.Cms.Api.Management/Controllers/Script/Tree/SiblingsScriptTreeController.cs
+++ b/src/Umbraco.Cms.Api.Management/Controllers/Script/Tree/SiblingsScriptTreeController.cs
@@ -1,32 +1,31 @@
-using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.DependencyInjection;
 using Umbraco.Cms.Api.Common.ViewModels.Pagination;
 using Umbraco.Cms.Api.Management.Services.FileSystem;
 using Umbraco.Cms.Api.Management.ViewModels.Tree;
-using Umbraco.Cms.Core.DependencyInjection;
 using Umbraco.Cms.Core.IO;
 
 namespace Umbraco.Cms.Api.Management.Controllers.Script.Tree;
 
 public class SiblingsScriptTreeController : ScriptTreeControllerBase
 {
-    private readonly IScriptTreeService _scriptTreeService;
-
     // TODO Remove the static service provider, and replace with base when the other constructors are obsoleted.
+    [ActivatorUtilitiesConstructor]
     public SiblingsScriptTreeController(IScriptTreeService scriptTreeService)
-        : this(scriptTreeService, StaticServiceProvider.Instance.GetRequiredService<FileSystems>())
-        => _scriptTreeService = scriptTreeService;
+        : base(scriptTreeService)
+    {
+    }
 
-    [ActivatorUtilitiesConstructor]
-    [Obsolete("Please use the other constructor. Scheduled to be removed in Umbraco 19")]
+    [Obsolete("Please use the constructor taking all parameters. Scheduled to be removed in Umbraco 19.")]
     public SiblingsScriptTreeController(IScriptTreeService scriptTreeService, FileSystems fileSystems)
-        : base(scriptTreeService, fileSystems) =>
-        _scriptTreeService = scriptTreeService;
+        : base(scriptTreeService, fileSystems)
+    {
+    }
 
-    [Obsolete("Please use the other constructor. Scheduled to be removed in Umbraco 19")]
+    [Obsolete("Please use the constructor taking all parameters. Scheduled to be removed in Umbraco 19.")]
     public SiblingsScriptTreeController(FileSystems fileSystems)
-        : this(StaticServiceProvider.Instance.GetRequiredService<IScriptTreeService>(), fileSystems)
+        : base(fileSystems)
     {
     }
 
diff --git a/src/Umbraco.Cms.Api.Management/Controllers/Stylesheet/Tree/AncestorsStylesheetTreeController.cs b/src/Umbraco.Cms.Api.Management/Controllers/Stylesheet/Tree/AncestorsStylesheetTreeController.cs
index 3760808263bf..2663152f4c6a 100644
--- a/src/Umbraco.Cms.Api.Management/Controllers/Stylesheet/Tree/AncestorsStylesheetTreeController.cs
+++ b/src/Umbraco.Cms.Api.Management/Controllers/Stylesheet/Tree/AncestorsStylesheetTreeController.cs
@@ -1,10 +1,9 @@
-using Asp.Versioning;
+using Asp.Versioning;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.DependencyInjection;
 using Umbraco.Cms.Api.Management.Services.FileSystem;
 using Umbraco.Cms.Api.Management.ViewModels.Tree;
-using Umbraco.Cms.Core.DependencyInjection;
 using Umbraco.Cms.Core.IO;
 
 namespace Umbraco.Cms.Api.Management.Controllers.Stylesheet.Tree;
@@ -12,22 +11,22 @@ namespace Umbraco.Cms.Api.Management.Controllers.Stylesheet.Tree;
 [ApiVersion("1.0")]
 public class AncestorsStylesheetTreeController : StylesheetTreeControllerBase
 {
-    private readonly IStyleSheetTreeService _styleSheetTreeService;
-
     // TODO Remove the static service provider, and replace with base when the other constructors are obsoleted.
+    [ActivatorUtilitiesConstructor]
     public AncestorsStylesheetTreeController(IStyleSheetTreeService styleSheetTreeService)
-        : this(styleSheetTreeService, StaticServiceProvider.Instance.GetRequiredService<FileSystems>())
-        => _styleSheetTreeService = styleSheetTreeService;
+        : base(styleSheetTreeService)
+    {
+    }
 
-    [ActivatorUtilitiesConstructor]
-    [Obsolete("Please use the other constructor. Scheduled to be removed in Umbraco 19")]
+    [Obsolete("Please use the constructor taking all parameters. Scheduled to be removed in Umbraco 19.")]
     public AncestorsStylesheetTreeController(IStyleSheetTreeService styleSheetTreeService, FileSystems fileSystems)
-        : base(styleSheetTreeService, fileSystems) =>
-        _styleSheetTreeService = styleSheetTreeService;
+        : base(styleSheetTreeService, fileSystems)
+    {
+    }
 
-    [Obsolete("Please use the other constructor. Scheduled to be removed in Umbraco 19")]
+    [Obsolete("Please use the constructor taking all parameters. Scheduled to be removed in Umbraco 19.")]
     public AncestorsStylesheetTreeController(FileSystems fileSystems)
-        : this(StaticServiceProvider.Instance.GetRequiredService<IStyleSheetTreeService>(), fileSystems)
+        : base(fileSystems)
     {
     }
 
diff --git a/src/Umbraco.Cms.Api.Management/Controllers/Stylesheet/Tree/ChildrenStylesheetTreeController.cs b/src/Umbraco.Cms.Api.Management/Controllers/Stylesheet/Tree/ChildrenStylesheetTreeController.cs
index 41484bce50ec..bf016b54e39f 100644
--- a/src/Umbraco.Cms.Api.Management/Controllers/Stylesheet/Tree/ChildrenStylesheetTreeController.cs
+++ b/src/Umbraco.Cms.Api.Management/Controllers/Stylesheet/Tree/ChildrenStylesheetTreeController.cs
@@ -1,36 +1,36 @@
-using Asp.Versioning;
+using Asp.Versioning;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.DependencyInjection;
-using Umbraco.Cms.Core.IO;
 using Umbraco.Cms.Api.Common.ViewModels.Pagination;
 using Umbraco.Cms.Api.Management.Services.FileSystem;
 using Umbraco.Cms.Api.Management.ViewModels.Tree;
-using Umbraco.Cms.Core.DependencyInjection;
+using Umbraco.Cms.Core.IO;
 
 namespace Umbraco.Cms.Api.Management.Controllers.Stylesheet.Tree;
 
 [ApiVersion("1.0")]
 public class ChildrenStylesheetTreeController : StylesheetTreeControllerBase
 {
-    private readonly IStyleSheetTreeService _styleSheetTreeService;
-
     // TODO Remove the static service provider, and replace with base when the other constructors are obsoleted.
+    [ActivatorUtilitiesConstructor]
     public ChildrenStylesheetTreeController(IStyleSheetTreeService styleSheetTreeService)
-        : this(styleSheetTreeService, StaticServiceProvider.Instance.GetRequiredService<FileSystems>())
-        => _styleSheetTreeService = styleSheetTreeService;
+        : base(styleSheetTreeService)
+    {
+    }
 
-    [ActivatorUtilitiesConstructor]
-    [Obsolete("Please use the other constructor. Scheduled to be removed in Umbraco 19")]
+    [Obsolete("Please use the constructor taking all parameters. Scheduled to be removed in Umbraco 19.")]
     public ChildrenStylesheetTreeController(IStyleSheetTreeService styleSheetTreeService, FileSystems fileSystems)
-        : base(styleSheetTreeService, fileSystems) =>
-        _styleSheetTreeService = styleSheetTreeService;
+        : base(styleSheetTreeService, fileSystems)
+    {
+    }
 
-    [Obsolete("Please use the other constructor. Scheduled to be removed in Umbraco 19")]
+    [Obsolete("Please use the constructor taking all parameters. Scheduled to be removed in Umbraco 19.")]
     public ChildrenStylesheetTreeController(FileSystems fileSystems)
-        : this(StaticServiceProvider.Instance.GetRequiredService<IStyleSheetTreeService>(), fileSystems)
+        : base(fileSystems)
     {
     }
+
     [HttpGet("children")]
     [MapToApiVersion("1.0")]
     [ProducesResponseType(typeof(PagedViewModel<FileSystemTreeItemPresentationModel>), StatusCodes.Status200OK)]
diff --git a/src/Umbraco.Cms.Api.Management/Controllers/Stylesheet/Tree/RootStylesheetTreeController.cs b/src/Umbraco.Cms.Api.Management/Controllers/Stylesheet/Tree/RootStylesheetTreeController.cs
index 417c636a375d..c47828d09228 100644
--- a/src/Umbraco.Cms.Api.Management/Controllers/Stylesheet/Tree/RootStylesheetTreeController.cs
+++ b/src/Umbraco.Cms.Api.Management/Controllers/Stylesheet/Tree/RootStylesheetTreeController.cs
@@ -1,34 +1,33 @@
-using Asp.Versioning;
+using Asp.Versioning;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.DependencyInjection;
-using Umbraco.Cms.Core.IO;
 using Umbraco.Cms.Api.Common.ViewModels.Pagination;
 using Umbraco.Cms.Api.Management.Services.FileSystem;
 using Umbraco.Cms.Api.Management.ViewModels.Tree;
-using Umbraco.Cms.Core.DependencyInjection;
+using Umbraco.Cms.Core.IO;
 
 namespace Umbraco.Cms.Api.Management.Controllers.Stylesheet.Tree;
 
 [ApiVersion("1.0")]
 public class RootStylesheetTreeController : StylesheetTreeControllerBase
 {
-    private readonly IStyleSheetTreeService _styleSheetTreeService;
-
     // TODO Remove the static service provider, and replace with base when the other constructors are obsoleted.
+    [ActivatorUtilitiesConstructor]
     public RootStylesheetTreeController(IStyleSheetTreeService styleSheetTreeService)
-        : this(styleSheetTreeService, StaticServiceProvider.Instance.GetRequiredService<FileSystems>())
-        => _styleSheetTreeService = styleSheetTreeService;
+        : base(styleSheetTreeService)
+    {
+    }
 
-    [ActivatorUtilitiesConstructor]
-    [Obsolete("Please use the other constructor. Scheduled to be removed in Umbraco 19")]
+    [Obsolete("Please use the constructor taking all parameters. Scheduled to be removed in Umbraco 19.")]
     public RootStylesheetTreeController(IStyleSheetTreeService styleSheetTreeService, FileSystems fileSystems)
-        : base(styleSheetTreeService, fileSystems) =>
-        _styleSheetTreeService = styleSheetTreeService;
+        : base(styleSheetTreeService, fileSystems)
+    {
+    }
 
-    [Obsolete("Please use the other constructor. Scheduled to be removed in Umbraco 19")]
+    [Obsolete("Please use the constructor taking all parameters. Scheduled to be removed in Umbraco 19.")]
     public RootStylesheetTreeController(FileSystems fileSystems)
-        : this(StaticServiceProvider.Instance.GetRequiredService<IStyleSheetTreeService>(), fileSystems)
+        : base(fileSystems)
     {
     }
 
diff --git a/src/Umbraco.Cms.Api.Management/Controllers/Stylesheet/Tree/SiblingsStylesheetTreeController.cs b/src/Umbraco.Cms.Api.Management/Controllers/Stylesheet/Tree/SiblingsStylesheetTreeController.cs
index 0f2b03b704d9..b56afe70b775 100644
--- a/src/Umbraco.Cms.Api.Management/Controllers/Stylesheet/Tree/SiblingsStylesheetTreeController.cs
+++ b/src/Umbraco.Cms.Api.Management/Controllers/Stylesheet/Tree/SiblingsStylesheetTreeController.cs
@@ -1,32 +1,31 @@
-using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.DependencyInjection;
 using Umbraco.Cms.Api.Common.ViewModels.Pagination;
 using Umbraco.Cms.Api.Management.Services.FileSystem;
 using Umbraco.Cms.Api.Management.ViewModels.Tree;
-using Umbraco.Cms.Core.DependencyInjection;
 using Umbraco.Cms.Core.IO;
 
 namespace Umbraco.Cms.Api.Management.Controllers.Stylesheet.Tree;
 
 public class SiblingsStylesheetTreeController : StylesheetTreeControllerBase
 {
-    private readonly IStyleSheetTreeService _styleSheetTreeService;
-
     // TODO Remove the static service provider, and replace with base when the other constructors are obsoleted.
+    [ActivatorUtilitiesConstructor]
     public SiblingsStylesheetTreeController(IStyleSheetTreeService styleSheetTreeService)
-        : this(styleSheetTreeService, StaticServiceProvider.Instance.GetRequiredService<FileSystems>())
-        => _styleSheetTreeService = styleSheetTreeService;
+        : base(styleSheetTreeService)
+    {
+    }
 
-    [ActivatorUtilitiesConstructor]
-    [Obsolete("Please use the other constructor. Scheduled to be removed in Umbraco 19")]
+    [Obsolete("Please use the constructor taking all parameters. Scheduled to be removed in Umbraco 19.")]
     public SiblingsStylesheetTreeController(IStyleSheetTreeService styleSheetTreeService, FileSystems fileSystems)
-        : base(styleSheetTreeService, fileSystems) =>
-        _styleSheetTreeService = styleSheetTreeService;
+        : base(styleSheetTreeService, fileSystems)
+    {
+    }
 
-    [Obsolete("Please use the other constructor. Scheduled to be removed in Umbraco 19")]
+    [Obsolete("Please use the constructor taking all parameters. Scheduled to be removed in Umbraco 19.")]
     public SiblingsStylesheetTreeController(FileSystems fileSystems)
-        : this(StaticServiceProvider.Instance.GetRequiredService<IStyleSheetTreeService>(), fileSystems)
+        : base(fileSystems)
     {
     }
 
diff --git a/src/Umbraco.Cms.Api.Management/Controllers/Stylesheet/Tree/StylesheetTreeControllerBase.cs b/src/Umbraco.Cms.Api.Management/Controllers/Stylesheet/Tree/StylesheetTreeControllerBase.cs
index 501293f11fa4..07382a145399 100644
--- a/src/Umbraco.Cms.Api.Management/Controllers/Stylesheet/Tree/StylesheetTreeControllerBase.cs
+++ b/src/Umbraco.Cms.Api.Management/Controllers/Stylesheet/Tree/StylesheetTreeControllerBase.cs
@@ -1,11 +1,9 @@
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
-using Microsoft.Extensions.DependencyInjection;
 using Umbraco.Cms.Api.Management.Controllers.Tree;
 using Umbraco.Cms.Api.Management.Routing;
 using Umbraco.Cms.Api.Management.Services.FileSystem;
 using Umbraco.Cms.Core;
-using Umbraco.Cms.Core.DependencyInjection;
 using Umbraco.Cms.Core.IO;
 using Umbraco.Cms.Web.Common.Authorization;
 
@@ -16,30 +14,28 @@ namespace Umbraco.Cms.Api.Management.Controllers.Stylesheet.Tree;
 [Authorize(Policy = AuthorizationPolicies.TreeAccessStylesheets)]
 public class StylesheetTreeControllerBase : FileSystemTreeControllerBase
 {
-    private readonly IStyleSheetTreeService _styleSheetTreeService;
-
     // TODO Remove the static service provider, and replace with base when the other constructors are obsoleted.
     public StylesheetTreeControllerBase(IStyleSheetTreeService styleSheetTreeService)
-        : this(styleSheetTreeService, StaticServiceProvider.Instance.GetRequiredService<FileSystems>()) =>
-        _styleSheetTreeService = styleSheetTreeService;
+        : base(styleSheetTreeService)
+    {
+        FileSystem = null!;
+    }
 
     // FileSystem is required therefore, we can't remove it without some wizadry. When obsoletion is due, remove this.
-    [ActivatorUtilitiesConstructor]
-    [Obsolete("Scheduled for removal in Umbraco 18.")]
+    [Obsolete("Please use the constructor taking all parameters. Scheduled to be removed in Umbraco 19.")]
     public StylesheetTreeControllerBase(IStyleSheetTreeService styleSheetTreeService, FileSystems fileSystems)
         : base(styleSheetTreeService)
     {
-        _styleSheetTreeService = styleSheetTreeService;
         FileSystem = fileSystems.ScriptsFileSystem ??
                      throw new ArgumentException("Missing scripts file system", nameof(fileSystems));
     }
 
-    [Obsolete("Please use the other constructor. Scheduled to be removed in Umbraco 18.")]
+    [Obsolete("Please use the constructor taking all parameters. Scheduled to be removed in Umbraco 19.")]
     public StylesheetTreeControllerBase(FileSystems fileSystems)
-        : this(StaticServiceProvider.Instance.GetRequiredService<IStyleSheetTreeService>())
+        : base()
         => FileSystem = fileSystems.ScriptsFileSystem ??
                         throw new ArgumentException("Missing scripts file system", nameof(fileSystems));
 
-    [Obsolete("Included in the service class. Scheduled to be removed in Umbraco 18.")]
+    [Obsolete("Included in the service class. Scheduled to be removed in Umbraco 19.")]
     protected override IFileSystem FileSystem { get; }
 }
diff --git a/src/Umbraco.Cms.Api.Management/Controllers/Tree/FileSystemTreeControllerBase.cs b/src/Umbraco.Cms.Api.Management/Controllers/Tree/FileSystemTreeControllerBase.cs
index 68d1414788fb..fa3b2027b35d 100644
--- a/src/Umbraco.Cms.Api.Management/Controllers/Tree/FileSystemTreeControllerBase.cs
+++ b/src/Umbraco.Cms.Api.Management/Controllers/Tree/FileSystemTreeControllerBase.cs
@@ -5,7 +5,6 @@
 using Umbraco.Cms.Api.Management.Services.FileSystem;
 using Umbraco.Cms.Api.Management.ViewModels.FileSystem;
 using Umbraco.Cms.Api.Management.ViewModels.Tree;
-using Umbraco.Cms.Core.DependencyInjection;
 using Umbraco.Cms.Core.IO;
 using Umbraco.Extensions;
 
@@ -13,23 +12,30 @@ namespace Umbraco.Cms.Api.Management.Controllers.Tree;
 
 public abstract class FileSystemTreeControllerBase : ManagementApiControllerBase
 {
-    private readonly IFileSystemTreeService _fileSystemTreeService;
+    private readonly IFileSystemTreeService _fileSystemTreeService = null!;
 
-    [Obsolete("Has been moved to the individual services. Scheduled to be removed in Umbraco 18.")]
+    /// <summary>
+    /// Indicates whether to use the IFileSystemTreeService or the legacy implementation.
+    /// </summary>
+    /// <remarks>
+    /// This is retained to ensure that any controllers outside of the CMS that use this base class with the obsolete constructor
+    /// continue to function until they can be updated to use the new service.
+    /// To be removed along with the constructor taking no parameters in Umbraco 19.
+    /// </remarks>
+    private readonly bool _useFileSystemTreeService = true;
+
+    [Obsolete("Has been moved to the individual services. Scheduled to be removed in Umbraco 19.")]
     protected abstract IFileSystem FileSystem { get; }
 
     [ActivatorUtilitiesConstructor]
     protected FileSystemTreeControllerBase(IFileSystemTreeService fileSystemTreeService) => _fileSystemTreeService = fileSystemTreeService;
 
-    [Obsolete("Use the other constructor. Scheduled for removal in Umbraco 18.")]
-    protected FileSystemTreeControllerBase()
-        : this(StaticServiceProvider.Instance.GetRequiredService<IScriptTreeService>())
-    {
-    }
+    [Obsolete("Please use the constructor taking all parameters. Scheduled for removal in Umbraco 19.")]
+    protected FileSystemTreeControllerBase() => _useFileSystemTreeService = false;
 
     protected Task<ActionResult<PagedViewModel<FileSystemTreeItemPresentationModel>>> GetRoot(int skip, int take)
     {
-        FileSystemTreeItemPresentationModel[] viewModels = _fileSystemTreeService.GetPathViewModels(string.Empty, skip, take, out var totalItems);
+        FileSystemTreeItemPresentationModel[] viewModels = GetPathViewModels(string.Empty, skip, take, out var totalItems);
 
         PagedViewModel<FileSystemTreeItemPresentationModel> result = PagedViewModel(viewModels, totalItems);
         return Task.FromResult<ActionResult<PagedViewModel<FileSystemTreeItemPresentationModel>>>(Ok(result));
@@ -37,14 +43,14 @@ protected Task<ActionResult<PagedViewModel<FileSystemTreeItemPresentationModel>>
 
     protected Task<ActionResult<PagedViewModel<FileSystemTreeItemPresentationModel>>> GetChildren(string path, int skip, int take)
     {
-        FileSystemTreeItemPresentationModel[] viewModels = _fileSystemTreeService.GetPathViewModels(path, skip, take, out var totalItems);
+        FileSystemTreeItemPresentationModel[] viewModels = GetPathViewModels(path, skip, take, out var totalItems);
 
         PagedViewModel<FileSystemTreeItemPresentationModel> result = PagedViewModel(viewModels, totalItems);
         return Task.FromResult<ActionResult<PagedViewModel<FileSystemTreeItemPresentationModel>>>(Ok(result));
     }
 
     /// <summary>
-    /// Gets the sibling of the targeted item based on its path.
+    /// Gets the siblings of the targeted item based on its path.
     /// </summary>
     /// <param name="path">The path to the item.</param>
     /// <param name="before">The amount of siblings you want to fetch from before the items position in the array.</param>
@@ -61,17 +67,19 @@ protected Task<ActionResult<SubsetViewModel<FileSystemTreeItemPresentationModel>
     protected virtual Task<ActionResult<IEnumerable<FileSystemTreeItemPresentationModel>>> GetAncestors(string path, bool includeSelf = true)
     {
         path = path.VirtualPathToSystemPath();
-        FileSystemTreeItemPresentationModel[] models = _fileSystemTreeService.GetAncestorModels(path, includeSelf);
+        FileSystemTreeItemPresentationModel[] models = GetAncestorModels(path, includeSelf);
 
         return Task.FromResult<ActionResult<IEnumerable<FileSystemTreeItemPresentationModel>>>(Ok(models));
     }
 
-    private PagedViewModel<FileSystemTreeItemPresentationModel> PagedViewModel(IEnumerable<FileSystemTreeItemPresentationModel> viewModels, long totalItems)
-        => new() { Total = totalItems, Items = viewModels };
-
-    [Obsolete("Has been moved to FileSystemTreeServiceBase. Scheduled for removal in Umbraco 18.")]
+    [Obsolete("Has been moved to FileSystemTreeServiceBase. Scheduled for removal in Umbraco 19.")]
     protected virtual FileSystemTreeItemPresentationModel[] GetAncestorModels(string path, bool includeSelf)
     {
+        if (_useFileSystemTreeService)
+        {
+            return _fileSystemTreeService.GetAncestorModels(path, includeSelf);
+        }
+
         var directories = path.Split(Path.DirectorySeparatorChar).Take(Range.EndAt(Index.FromEnd(1))).ToArray();
         var result = directories
             .Select((directory, index) => MapViewModel(string.Join(Path.DirectorySeparatorChar, directories.Take(index + 1)), directory, true))
@@ -86,28 +94,59 @@ protected virtual FileSystemTreeItemPresentationModel[] GetAncestorModels(string
         return result.ToArray();
     }
 
-    [Obsolete("Has been moved to FileSystemTreeServiceBase. Scheduled for removal in Umbraco 18.")]
+    [Obsolete("Has been moved to FileSystemTreeServiceBase. Scheduled for removal in Umbraco 19.")]
     protected virtual string[] GetDirectories(string path) => FileSystem
         .GetDirectories(path)
         .OrderBy(directory => directory)
         .ToArray();
 
-    [Obsolete("Has been moved to FileSystemTreeServiceBase. Scheduled for removal in Umbraco 18.")]
+    [Obsolete("Has been moved to FileSystemTreeServiceBase. Scheduled for removal in Umbraco 19.")]
     protected virtual string[] GetFiles(string path) => FileSystem
         .GetFiles(path)
         .OrderBy(file => file)
         .ToArray();
 
-    [Obsolete("Has been moved to FileSystemTreeServiceBase. Scheduled for removal in Umbraco 18.")]
+    [Obsolete("Has been moved to FileSystemTreeServiceBase. Scheduled for removal in Umbraco 19.")]
     protected virtual bool DirectoryHasChildren(string path)
         => FileSystem.GetFiles(path).Any() || FileSystem.GetDirectories(path).Any();
 
-    [Obsolete("Has been moved to FileSystemTreeServiceBase. Scheduled for removal in Umbraco 18.")]
+    [Obsolete("Has been moved to FileSystemTreeServiceBase. Scheduled for removal in Umbraco 19.")]
     private string GetFileSystemItemName(bool isFolder, string itemPath) => isFolder
         ? Path.GetFileName(itemPath)
         : FileSystem.GetFileName(itemPath);
 
-    [Obsolete("Has been moved to FileSystemTreeServiceBase. Scheduled for removal in Umbraco 18.")]
+    private FileSystemTreeItemPresentationModel[] GetPathViewModels(string path, int skip, int take, out long totalItems)
+    {
+        if (_useFileSystemTreeService)
+        {
+            return _fileSystemTreeService.GetPathViewModels(path, skip, take, out totalItems);
+        }
+
+        path = path.VirtualPathToSystemPath();
+        var allItems = GetDirectories(path)
+            .Select(directory => new { Path = directory, IsFolder = true })
+            .Union(GetFiles(path).Select(file => new { Path = file, IsFolder = false }))
+            .ToArray();
+
+        totalItems = allItems.Length;
+
+        FileSystemTreeItemPresentationModel ViewModel(string itemPath, bool isFolder)
+            => MapViewModel(
+                itemPath,
+                GetFileSystemItemName(isFolder, itemPath),
+                isFolder);
+
+        return allItems
+            .Skip(skip)
+            .Take(take)
+            .Select(item => ViewModel(item.Path, item.IsFolder))
+            .ToArray();
+    }
+
+    private PagedViewModel<FileSystemTreeItemPresentationModel> PagedViewModel(IEnumerable<FileSystemTreeItemPresentationModel> viewModels, long totalItems)
+        => new() { Total = totalItems, Items = viewModels };
+
+    [Obsolete("Has been moved to FileSystemTreeServiceBase. Scheduled for removal in Umbraco 19.")]
     private FileSystemTreeItemPresentationModel MapViewModel(string path, string name, bool isFolder)
     {
         var parentPath = Path.GetDirectoryName(path);

From b7621355541a34aea9730cfb4dbc67846bbdf7fa Mon Sep 17 00:00:00 2001
From: Sebastiaan Janssen <sebastiaan@umbraco.com>
Date: Thu, 23 Oct 2025 11:21:25 +0200
Subject: [PATCH 073/155] Exclude 'release/no-notes' from release labels

---
 .github/workflows/label-to-release-announcement.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/label-to-release-announcement.yml b/.github/workflows/label-to-release-announcement.yml
index 013b36d60c50..b8cd447b6e61 100644
--- a/.github/workflows/label-to-release-announcement.yml
+++ b/.github/workflows/label-to-release-announcement.yml
@@ -52,7 +52,7 @@ jobs:
               for (const item of items) {
                 const releaseLabels = (item.labels || [])
                   .map(l => (typeof l === "string" ? l : l.name)) // always get the name
-                  .filter(n => typeof n === "string" && n.startsWith("release/"));
+                  .filter(n => typeof n === "string" && n.startsWith("release/") && n !== "release/no-notes");
                 if (releaseLabels.length === 0) continue;
 
                 core.info(`#${item.number}: ${releaseLabels.join(", ")}`);

From 9cc2df7acd65e381cfa20ad6eefe886b1a42df21 Mon Sep 17 00:00:00 2001
From: Lee Kelleher <leekelleher@users.noreply.github.com>
Date: Thu, 23 Oct 2025 10:47:50 +0100
Subject: [PATCH 074/155] Preview: Removes sessions (#20561)

Removes preview sessions concept

Fixes #19443 and #19471.

The implementation of exiting sessions was a design flawed.
The v13 feature worked due to an implementation bug.

Exiting preview mode should be a deliberate action by the user.
---
 .../apps/preview/apps/preview-exit.element.ts |  2 +-
 .../src/apps/preview/preview.context.ts       | 62 ++-----------------
 .../src/apps/preview/preview.element.ts       | 21 -------
 3 files changed, 7 insertions(+), 78 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/apps/preview/apps/preview-exit.element.ts b/src/Umbraco.Web.UI.Client/src/apps/preview/apps/preview-exit.element.ts
index 26af65490ba7..c1a45b753de2 100644
--- a/src/Umbraco.Web.UI.Client/src/apps/preview/apps/preview-exit.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/apps/preview/apps/preview-exit.element.ts
@@ -6,7 +6,7 @@ import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element';
 export class UmbPreviewExitElement extends UmbLitElement {
 	async #onClick() {
 		const previewContext = await this.getContext(UMB_PREVIEW_CONTEXT);
-		await previewContext?.exitPreview(0);
+		await previewContext?.exitPreview();
 	}
 
 	override render() {
diff --git a/src/Umbraco.Web.UI.Client/src/apps/preview/preview.context.ts b/src/Umbraco.Web.UI.Client/src/apps/preview/preview.context.ts
index 2acbd754dedf..f3f13c9fdeef 100644
--- a/src/Umbraco.Web.UI.Client/src/apps/preview/preview.context.ts
+++ b/src/Umbraco.Web.UI.Client/src/apps/preview/preview.context.ts
@@ -1,17 +1,15 @@
 import { tryExecute } from '@umbraco-cms/backoffice/resources';
-import { umbConfirmModal } from '@umbraco-cms/backoffice/modal';
 import { DocumentService } from '@umbraco-cms/backoffice/external/backend-api';
+import { HubConnectionBuilder } from '@umbraco-cms/backoffice/external/signalr';
 import { UmbBooleanState, UmbStringState } from '@umbraco-cms/backoffice/observable-api';
 import { UmbContextBase } from '@umbraco-cms/backoffice/class-api';
 import { UmbContextToken } from '@umbraco-cms/backoffice/context-api';
 import { UmbDocumentPreviewRepository } from '@umbraco-cms/backoffice/document';
+import { UmbLocalizationController } from '@umbraco-cms/backoffice/localization-api';
+import { UMB_NOTIFICATION_CONTEXT } from '@umbraco-cms/backoffice/notification';
 import { UMB_SERVER_CONTEXT } from '@umbraco-cms/backoffice/server';
+import type { HubConnection } from '@umbraco-cms/backoffice/external/signalr';
 import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api';
-import { HubConnectionBuilder, type HubConnection } from '@umbraco-cms/backoffice/external/signalr';
-import { UMB_NOTIFICATION_CONTEXT } from '@umbraco-cms/backoffice/notification';
-import { UmbLocalizationController } from '@umbraco-cms/backoffice/localization-api';
-
-const UMB_LOCALSTORAGE_SESSION_KEY = 'umb:previewSessions';
 
 interface UmbPreviewIframeArgs {
 	className?: string;
@@ -133,10 +131,6 @@ export class UmbPreviewContext extends UmbContextBase {
 		return urlInfo.url.startsWith('/') ? `${this.#serverUrl}${urlInfo.url}` : urlInfo.url;
 	}
 
-	#getSessionCount(): number {
-		return Math.max(Number(localStorage.getItem(UMB_LOCALSTORAGE_SESSION_KEY)), 0) || 0;
-	}
-
 	#setPreviewUrl(args?: UmbPreviewUrlArgs) {
 		const host = args?.serverUrl || this.#serverUrl;
 		const unique = args?.unique || this.#unique;
@@ -179,35 +173,8 @@ export class UmbPreviewContext extends UmbContextBase {
 		this.#previewUrl.setValue(previewUrlString);
 	}
 
-	#setSessionCount(sessions: number) {
-		localStorage.setItem(UMB_LOCALSTORAGE_SESSION_KEY, sessions.toString());
-	}
-
-	checkSession() {
-		const sessions = this.#getSessionCount();
-		if (sessions > 0) return;
-
-		umbConfirmModal(this._host, {
-			headline: `Preview website?`,
-			content: `You have ended preview mode, do you want to enable it again to view the latest saved version of your website?`,
-			cancelLabel: 'View published version',
-			confirmLabel: 'Preview latest version',
-		})
-			.then(() => {
-				this.restartSession();
-			})
-			.catch(() => {
-				this.exitSession();
-			});
-	}
-
-	async exitPreview(sessions: number = 0) {
-		this.#setSessionCount(sessions);
-
-		// We are good to end preview mode.
-		if (sessions <= 0) {
-			await this.#documentPreviewRepository.exit();
-		}
+	async exitPreview() {
+		await this.#documentPreviewRepository.exit();
 
 		if (this.#connection) {
 			await this.#connection.stop();
@@ -223,12 +190,6 @@ export class UmbPreviewContext extends UmbContextBase {
 		window.location.replace(url);
 	}
 
-	async exitSession() {
-		let sessions = this.#getSessionCount();
-		sessions--;
-		this.exitPreview(sessions);
-	}
-
 	iframeLoaded(iframe: HTMLIFrameElement) {
 		if (!iframe) return;
 		this.#iframeReady.setValue(true);
@@ -255,17 +216,6 @@ export class UmbPreviewContext extends UmbContextBase {
 		document.location.reload();
 	}
 
-	async restartSession() {
-		await this.#documentPreviewRepository.enter();
-		this.startSession();
-	}
-
-	startSession() {
-		let sessions = this.#getSessionCount();
-		sessions++;
-		this.#setSessionCount(sessions);
-	}
-
 	#currentArgs: UmbPreviewIframeArgs = {};
 	async updateIFrame(args?: UmbPreviewIframeArgs) {
 		const mergedArgs = { ...this.#currentArgs, ...args };
diff --git a/src/Umbraco.Web.UI.Client/src/apps/preview/preview.element.ts b/src/Umbraco.Web.UI.Client/src/apps/preview/preview.element.ts
index 4897f21190dc..b2d0db0da7aa 100644
--- a/src/Umbraco.Web.UI.Client/src/apps/preview/preview.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/apps/preview/preview.element.ts
@@ -22,23 +22,6 @@ export class UmbPreviewElement extends UmbLitElement {
 		this.observe(this.#context.previewUrl, (previewUrl) => (this._previewUrl = previewUrl));
 	}
 
-	override connectedCallback() {
-		super.connectedCallback();
-		this.addEventListener('visibilitychange', this.#onVisibilityChange);
-		window.addEventListener('beforeunload', () => this.#context.exitSession());
-		this.#context.startSession();
-	}
-
-	override disconnectedCallback() {
-		super.disconnectedCallback();
-		this.removeEventListener('visibilitychange', this.#onVisibilityChange);
-		// NOTE: Unsure how we remove an anonymous function from 'beforeunload' event listener.
-		// The reason for the anonymous function is that if we used a named function,
-		// `this` would be the `window` and would not have context to the class instance. [LK]
-		//window.removeEventListener('beforeunload', () => this.#context.exitSession());
-		this.#context.exitSession();
-	}
-
 	@state()
 	private _iframeReady?: boolean;
 
@@ -49,10 +32,6 @@ export class UmbPreviewElement extends UmbLitElement {
 		this.#context.iframeLoaded(event.target);
 	}
 
-	#onVisibilityChange() {
-		this.#context.checkSession();
-	}
-
 	override render() {
 		if (!this._previewUrl) return nothing;
 		return html`

From 08d217360e1bee8952d210f70734099b83a5fe49 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 23 Oct 2025 09:22:47 +0000
Subject: [PATCH 075/155] Bump vite from 7.1.9 to 7.1.11 in
 /src/Umbraco.Web.UI.Login

Bumps [vite](https://github.com/vitejs/vite/tree/HEAD/packages/vite) from 7.1.9 to 7.1.11.
- [Release notes](https://github.com/vitejs/vite/releases)
- [Changelog](https://github.com/vitejs/vite/blob/main/packages/vite/CHANGELOG.md)
- [Commits](https://github.com/vitejs/vite/commits/v7.1.11/packages/vite)

---
updated-dependencies:
- dependency-name: vite
  dependency-version: 7.1.11
  dependency-type: direct:development
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 src/Umbraco.Web.UI.Login/package-lock.json | 8 ++++----
 src/Umbraco.Web.UI.Login/package.json      | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/Umbraco.Web.UI.Login/package-lock.json b/src/Umbraco.Web.UI.Login/package-lock.json
index 51ea289023aa..7a81a473af42 100644
--- a/src/Umbraco.Web.UI.Login/package-lock.json
+++ b/src/Umbraco.Web.UI.Login/package-lock.json
@@ -10,7 +10,7 @@
         "@umbraco-cms/backoffice": "16.2.0",
         "msw": "^2.11.3",
         "typescript": "^5.9.3",
-        "vite": "^7.1.9"
+        "vite": "^7.1.11"
       },
       "engines": {
         "node": ">=22",
@@ -4328,9 +4328,9 @@
       }
     },
     "node_modules/vite": {
-      "version": "7.1.9",
-      "resolved": "https://registry.npmjs.org/vite/-/vite-7.1.9.tgz",
-      "integrity": "sha512-4nVGliEpxmhCL8DslSAUdxlB6+SMrhB0a1v5ijlh1xB1nEPuy1mxaHxysVucLHuWryAxLWg6a5ei+U4TLn/rFg==",
+      "version": "7.1.11",
+      "resolved": "https://registry.npmjs.org/vite/-/vite-7.1.11.tgz",
+      "integrity": "sha512-uzcxnSDVjAopEUjljkWh8EIrg6tlzrjFUfMcR1EVsRDGwf/ccef0qQPRyOrROwhrTDaApueq+ja+KLPlzR/zdg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
diff --git a/src/Umbraco.Web.UI.Login/package.json b/src/Umbraco.Web.UI.Login/package.json
index 8857826c05ec..e53f3f3c5fbe 100644
--- a/src/Umbraco.Web.UI.Login/package.json
+++ b/src/Umbraco.Web.UI.Login/package.json
@@ -18,7 +18,7 @@
     "@umbraco-cms/backoffice": "16.2.0",
     "msw": "^2.11.3",
     "typescript": "^5.9.3",
-    "vite": "^7.1.9"
+    "vite": "^7.1.11"
   },
   "msw": {
     "workerDirectory": [

From 3854b2bd53c76d639e3343691c04f812bcce7466 Mon Sep 17 00:00:00 2001
From: Bjarne Fyrstenborg <bf@mcb.dk>
Date: Thu, 23 Oct 2025 14:32:37 +0200
Subject: [PATCH 076/155] Block List: Remove bold label from inline editing
 (#20437)

Remove bold label from block list inline editing
---
 .../components/inline-list-block/inline-list-block.element.ts | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/packages/block/block-list/components/inline-list-block/inline-list-block.element.ts b/src/Umbraco.Web.UI.Client/src/packages/block/block-list/components/inline-list-block/inline-list-block.element.ts
index fd379b6f28ba..b67c2e60eaea 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/block/block-list/components/inline-list-block/inline-list-block.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/block/block-list/components/inline-list-block/inline-list-block.element.ts
@@ -292,10 +292,6 @@ export class UmbInlineListBlockElement extends UmbLitElement {
 				padding-left: var(--uui-size-2, 6px);
 			}
 
-			#name {
-				font-weight: 700;
-			}
-
 			uui-tag {
 				margin-left: 0.5em;
 				margin-bottom: -0.3em;

From e482976a9d218b49a7f7712ddb5498fc841ff680 Mon Sep 17 00:00:00 2001
From: Mads Rasmussen <madsr@hey.com>
Date: Thu, 23 Oct 2025 14:43:49 +0200
Subject: [PATCH 077/155] User And User Group Workspace: Make views extendable
 (#20548) (#20617)

* implement user details as a workspace view

* register user group details as a workspace view
---
 .../workspace/user-group/manifests.ts         |   2 +
 .../user-group-workspace-editor.element.ts    | 269 ++---------------
 .../workspace/user-group/views/manifests.ts   |  23 ++
 ...er-group-details-workspace-view.element.ts | 275 ++++++++++++++++++
 .../user/user/workspace/user/manifests.ts     |   2 +
 .../user/user-workspace-editor.element.ts     |  73 +----
 .../user/workspace/user/views/manifests.ts    |  23 ++
 .../user-details-workspace-view.element.ts    |  98 +++++++
 8 files changed, 444 insertions(+), 321 deletions(-)
 create mode 100644 src/Umbraco.Web.UI.Client/src/packages/user/user-group/workspace/user-group/views/manifests.ts
 create mode 100644 src/Umbraco.Web.UI.Client/src/packages/user/user-group/workspace/user-group/views/user-group-details-workspace-view.element.ts
 create mode 100644 src/Umbraco.Web.UI.Client/src/packages/user/user/workspace/user/views/manifests.ts
 create mode 100644 src/Umbraco.Web.UI.Client/src/packages/user/user/workspace/user/views/user-details-workspace-view.element.ts

diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/user-group/workspace/user-group/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user-group/workspace/user-group/manifests.ts
index 13c3dfb21346..ea9c5b869f43 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/user/user-group/workspace/user-group/manifests.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/user/user-group/workspace/user-group/manifests.ts
@@ -1,4 +1,5 @@
 import { UMB_USER_GROUP_WORKSPACE_ALIAS } from './constants.js';
+import { manifests as viewManifests } from './views/manifests.js';
 import { UmbSubmitWorkspaceAction, UMB_WORKSPACE_CONDITION_ALIAS } from '@umbraco-cms/backoffice/workspace';
 
 export const manifests: Array<UmbExtensionManifest> = [
@@ -30,4 +31,5 @@ export const manifests: Array<UmbExtensionManifest> = [
 			},
 		],
 	},
+	...viewManifests,
 ];
diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/user-group/workspace/user-group/user-group-workspace-editor.element.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user-group/workspace/user-group/user-group-workspace-editor.element.ts
index cbbad3824f57..08aeea40244f 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/user/user-group/workspace/user-group/user-group-workspace-editor.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/user/user-group/workspace/user-group/user-group-workspace-editor.element.ts
@@ -1,27 +1,18 @@
-import type { UmbUserGroupDetailModel } from '../../types.js';
 import { UMB_USER_GROUP_ROOT_WORKSPACE_PATH } from '../../paths.js';
+import type { UmbUserGroupDetailModel } from '../../types.js';
 import { UMB_USER_GROUP_WORKSPACE_CONTEXT } from './user-group-workspace.context-token.js';
-import type { UUIBooleanInputEvent } from '@umbraco-cms/backoffice/external/uui';
-import { css, html, nothing, customElement, state, ifDefined } from '@umbraco-cms/backoffice/external/lit';
-import { UmbLitElement, umbFocus } from '@umbraco-cms/backoffice/lit-element';
-import { UmbTextStyles } from '@umbraco-cms/backoffice/style';
-import type { UmbInputSectionElement } from '@umbraco-cms/backoffice/section';
-import type { UmbChangeEvent } from '@umbraco-cms/backoffice/event';
-import { umbOpenModal } from '@umbraco-cms/backoffice/modal';
-import type { UmbInputLanguageElement } from '@umbraco-cms/backoffice/language';
-import { UMB_ICON_PICKER_MODAL } from '@umbraco-cms/backoffice/icon';
 import type { UmbInputWithAliasElement } from '@umbraco-cms/backoffice/components';
-
-import './components/user-group-entity-type-permission-groups.element.js';
+import { css, html, customElement, state, ifDefined } from '@umbraco-cms/backoffice/external/lit';
+import { UMB_ICON_PICKER_MODAL } from '@umbraco-cms/backoffice/icon';
+import { umbFocus, UmbLitElement } from '@umbraco-cms/backoffice/lit-element';
+import { umbOpenModal } from '@umbraco-cms/backoffice/modal';
+import { UmbTextStyles } from '@umbraco-cms/backoffice/style';
 
 @customElement('umb-user-group-workspace-editor')
 export class UmbUserGroupWorkspaceEditorElement extends UmbLitElement {
 	@state()
 	private _isNew?: boolean = false;
 
-	@state()
-	private _unique?: UmbUserGroupDetailModel['unique'];
-
 	@state()
 	private _name?: UmbUserGroupDetailModel['name'];
 
@@ -34,41 +25,19 @@ export class UmbUserGroupWorkspaceEditorElement extends UmbLitElement {
 	@state()
 	private _icon?: UmbUserGroupDetailModel['icon'];
 
-	@state()
-	private _sections: UmbUserGroupDetailModel['sections'] = [];
-
-	@state()
-	private _languages: UmbUserGroupDetailModel['languages'] = [];
-
-	@state()
-	private _hasAccessToAllLanguages: UmbUserGroupDetailModel['hasAccessToAllLanguages'] = false;
-
-	@state()
-	private _documentStartNode?: UmbUserGroupDetailModel['documentStartNode'];
-
-	@state()
-	private _documentRootAccess: UmbUserGroupDetailModel['documentRootAccess'] = false;
-
-	@state()
-	private _mediaStartNode?: UmbUserGroupDetailModel['mediaStartNode'];
-
-	@state()
-	private _mediaRootAccess: UmbUserGroupDetailModel['mediaRootAccess'] = false;
-
 	#workspaceContext?: typeof UMB_USER_GROUP_WORKSPACE_CONTEXT.TYPE;
 
 	constructor() {
 		super();
 
-		this.consumeContext(UMB_USER_GROUP_WORKSPACE_CONTEXT, (instance) => {
-			this.#workspaceContext = instance;
+		this.consumeContext(UMB_USER_GROUP_WORKSPACE_CONTEXT, (context) => {
+			this.#workspaceContext = context;
 			this.#observeUserGroup();
 		});
 	}
 
 	#observeUserGroup() {
 		this.observe(this.#workspaceContext?.isNew, (value) => (this._isNew = value), '_observeIsNew');
-		this.observe(this.#workspaceContext?.unique, (value) => (this._unique = value ?? undefined), '_observeUnique');
 		this.observe(this.#workspaceContext?.name, (value) => (this._name = value), '_observeName');
 		this.observe(this.#workspaceContext?.alias, (value) => (this._alias = value), '_observeAlias');
 		this.observe(
@@ -77,102 +46,11 @@ export class UmbUserGroupWorkspaceEditorElement extends UmbLitElement {
 			'_observeAliasCanBeChanged',
 		);
 		this.observe(this.#workspaceContext?.icon, (value) => (this._icon = value), '_observeIcon');
-		this.observe(this.#workspaceContext?.sections, (value) => (this._sections = value ?? []), '_observeSections');
-		this.observe(this.#workspaceContext?.languages, (value) => (this._languages = value ?? []), '_observeLanguages');
-		this.observe(
-			this.#workspaceContext?.hasAccessToAllLanguages,
-			(value) => (this._hasAccessToAllLanguages = value ?? false),
-			'_observeHasAccessToAllLanguages',
-		);
-
-		this.observe(
-			this.#workspaceContext?.documentRootAccess,
-			(value) => (this._documentRootAccess = value ?? false),
-			'_observeDocumentRootAccess',
-		);
-
-		this.observe(
-			this.#workspaceContext?.documentStartNode,
-			(value) => (this._documentStartNode = value),
-			'_observeDocumentStartNode',
-		);
-
-		this.observe(
-			this.#workspaceContext?.mediaRootAccess,
-			(value) => (this._mediaRootAccess = value ?? false),
-			'_observeMediaRootAccess',
-		);
-
-		this.observe(
-			this.#workspaceContext?.mediaStartNode,
-			(value) => (this._mediaStartNode = value),
-			'_observeMediaStartNode',
-		);
-	}
-
-	#onSectionsChange(event: UmbChangeEvent) {
-		event.stopPropagation();
-		const target = event.target as UmbInputSectionElement;
-		// TODO make contexts method
-		this.#workspaceContext?.updateProperty('sections', target.selection);
-	}
-
-	#onAllowAllLanguagesChange(event: UUIBooleanInputEvent) {
-		event.stopPropagation();
-		const target = event.target;
-		// TODO make contexts method
-		this.#workspaceContext?.updateProperty('hasAccessToAllLanguages', target.checked);
-	}
-
-	#onLanguagePermissionChange(event: UmbChangeEvent) {
-		event.stopPropagation();
-		const target = event.target as UmbInputLanguageElement;
-		// TODO make contexts method
-		this.#workspaceContext?.updateProperty('languages', target.selection);
-	}
-
-	#onAllowAllDocumentsChange(event: UUIBooleanInputEvent) {
-		event.stopPropagation();
-		const target = event.target;
-		// TODO make contexts method
-		this.#workspaceContext?.updateProperty('documentRootAccess', target.checked);
-		this.#workspaceContext?.updateProperty('documentStartNode', null);
 	}
 
-	#onDocumentStartNodeChange(event: CustomEvent) {
-		event.stopPropagation();
-		// TODO: get back to this when documents have been decoupled from users.
-		// The event target is deliberately set to any to avoid an import cycle with documents.
-		const target = event.target as any;
-		const selected = target.selection?.[0];
-		// TODO make contexts method
-		this.#workspaceContext?.updateProperty('documentStartNode', selected ? { unique: selected } : null);
-	}
-
-	#onAllowAllMediaChange(event: UUIBooleanInputEvent) {
-		event.stopPropagation();
-		const target = event.target;
-		// TODO make contexts method
-		this.#workspaceContext?.updateProperty('mediaRootAccess', target.checked);
-		this.#workspaceContext?.updateProperty('mediaStartNode', null);
-	}
-
-	#onMediaStartNodeChange(event: CustomEvent) {
-		event.stopPropagation();
-		// TODO: get back to this when media have been decoupled from users.
-		// The event target is deliberately set to any to avoid an import cycle with media.
-		const target = event.target as any;
-		const selected = target.selection?.[0];
-		// TODO make contexts method
-		this.#workspaceContext?.updateProperty('mediaStartNode', selected ? { unique: selected } : null);
-	}
-
-	override render() {
-		return html`
-			<umb-entity-detail-workspace-editor class="uui-text" back-path=${UMB_USER_GROUP_ROOT_WORKSPACE_PATH}>
-				${this.#renderHeader()} ${this.#renderMain()}
-			</umb-entity-detail-workspace-editor>
-		`;
+	#onNameAndAliasChange(event: InputEvent & { target: UmbInputWithAliasElement }) {
+		this.#workspaceContext?.updateProperty('name', event.target.value ?? '');
+		this.#workspaceContext?.updateProperty('alias', event.target.alias ?? '');
 	}
 
 	async #onIconClick() {
@@ -193,9 +71,12 @@ export class UmbUserGroupWorkspaceEditorElement extends UmbLitElement {
 		}
 	}
 
-	#onNameAndAliasChange(event: InputEvent & { target: UmbInputWithAliasElement }) {
-		this.#workspaceContext?.updateProperty('name', event.target.value ?? '');
-		this.#workspaceContext?.updateProperty('alias', event.target.alias ?? '');
+	override render() {
+		return html`
+			<umb-entity-detail-workspace-editor .backPath=${UMB_USER_GROUP_ROOT_WORKSPACE_PATH}>
+				${this.#renderHeader()}
+			</umb-entity-detail-workspace-editor>
+		`;
 	}
 
 	#renderHeader() {
@@ -219,118 +100,12 @@ export class UmbUserGroupWorkspaceEditorElement extends UmbLitElement {
 		`;
 	}
 
-	#renderMain() {
-		if (!this._unique) return nothing;
-
-		return html`
-			<div id="main">
-				<umb-stack>
-					<uui-box>
-						<div slot="headline"><umb-localize key="user_assignAccess"></umb-localize></div>
-
-						<umb-property-layout
-							label=${this.localize.term('main_sections')}
-							description=${this.localize.term('user_sectionsHelp')}>
-							<umb-input-section
-								slot="editor"
-								.selection=${this._sections}
-								@change=${this.#onSectionsChange}></umb-input-section>
-						</umb-property-layout>
-
-						${this.#renderLanguageAccess()} ${this.#renderDocumentAccess()} ${this.#renderMediaAccess()}
-					</uui-box>
-
-					${this.#renderPermissionGroups()}
-				</umb-stack>
-			</div>
-		`;
-	}
-
-	#renderLanguageAccess() {
-		return html`
-			<umb-property-layout
-				label=${this.localize.term('treeHeaders_languages')}
-				description=${this.localize.term('user_languagesHelp')}>
-				<div slot="editor">
-					<uui-toggle
-						style="margin-bottom: var(--uui-size-space-3);"
-						label="${this.localize.term('user_allowAccessToAllLanguages')}"
-						.checked=${this._hasAccessToAllLanguages}
-						@change=${this.#onAllowAllLanguagesChange}></uui-toggle>
-
-					${this._hasAccessToAllLanguages === false
-						? html`
-								<umb-input-language
-									.selection=${this._languages}
-									@change=${this.#onLanguagePermissionChange}></umb-input-language>
-							`
-						: nothing}
-				</div>
-			</umb-property-layout>
-		`;
-	}
-
-	#renderDocumentAccess() {
-		return html`
-			<umb-property-layout
-				label=${this.localize.term('defaultdialogs_selectContentStartNode')}
-				description=${this.localize.term('user_startnodehelp')}>
-				<div slot="editor">
-					<uui-toggle
-						style="margin-bottom: var(--uui-size-space-3);"
-						label="${this.localize.term('user_allowAccessToAllDocuments')}"
-						.checked=${this._documentRootAccess}
-						@change=${this.#onAllowAllDocumentsChange}></uui-toggle>
-				</div>
-
-				${this._documentRootAccess === false
-					? html`
-							<umb-input-document
-								slot="editor"
-								max="1"
-								.selection=${this._documentStartNode?.unique ? [this._documentStartNode.unique] : []}
-								@change=${this.#onDocumentStartNodeChange}></umb-input-document>
-						`
-					: nothing}
-			</umb-property-layout>
-		`;
-	}
-
-	#renderMediaAccess() {
-		return html`
-			<umb-property-layout
-				label=${this.localize.term('defaultdialogs_selectMediaStartNode')}
-				description=${this.localize.term('user_mediastartnodehelp')}>
-				<div slot="editor">
-					<uui-toggle
-						style="margin-bottom: var(--uui-size-space-3);"
-						label="${this.localize.term('user_allowAccessToAllMedia')}"
-						.checked=${this._mediaRootAccess}
-						@change=${this.#onAllowAllMediaChange}></uui-toggle>
-				</div>
-
-				${this._mediaRootAccess === false
-					? html`
-							<umb-input-media
-								slot="editor"
-								max="1"
-								.selection=${this._mediaStartNode?.unique ? [this._mediaStartNode.unique] : []}
-								@change=${this.#onMediaStartNodeChange}></umb-input-media>
-						`
-					: nothing}
-			</umb-property-layout>
-		`;
-	}
-
-	#renderPermissionGroups() {
-		return html`<umb-user-group-entity-type-permission-groups></umb-user-group-entity-type-permission-groups> `;
-	}
-
 	static override styles = [
 		UmbTextStyles,
 		css`
 			:host {
 				display: block;
+				width: 100%;
 				height: 100%;
 			}
 
@@ -352,14 +127,6 @@ export class UmbUserGroupWorkspaceEditorElement extends UmbLitElement {
 				flex: 1 1 auto;
 				align-items: center;
 			}
-
-			#main {
-				padding: var(--uui-size-layout-1);
-			}
-
-			uui-input {
-				width: 100%;
-			}
 		`,
 	];
 }
diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/user-group/workspace/user-group/views/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user-group/workspace/user-group/views/manifests.ts
new file mode 100644
index 000000000000..91bacd1501cf
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/packages/user/user-group/workspace/user-group/views/manifests.ts
@@ -0,0 +1,23 @@
+import { UMB_USER_GROUP_WORKSPACE_ALIAS } from '../constants.js';
+import { UMB_WORKSPACE_CONDITION_ALIAS } from '@umbraco-cms/backoffice/workspace';
+
+export const manifests: Array<UmbExtensionManifest> = [
+	{
+		type: 'workspaceView',
+		alias: 'Umb.WorkspaceView.UserGroup.Details',
+		name: 'User Group Details Workspace View',
+		element: () => import('./user-group-details-workspace-view.element.js'),
+		weight: 90,
+		meta: {
+			label: '#general_details',
+			pathname: 'details',
+			icon: 'edit',
+		},
+		conditions: [
+			{
+				alias: UMB_WORKSPACE_CONDITION_ALIAS,
+				match: UMB_USER_GROUP_WORKSPACE_ALIAS,
+			},
+		],
+	},
+];
diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/user-group/workspace/user-group/views/user-group-details-workspace-view.element.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user-group/workspace/user-group/views/user-group-details-workspace-view.element.ts
new file mode 100644
index 000000000000..1aaa43beb671
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/packages/user/user-group/workspace/user-group/views/user-group-details-workspace-view.element.ts
@@ -0,0 +1,275 @@
+import type { UmbUserGroupDetailModel } from '../../../types.js';
+import { UMB_USER_GROUP_WORKSPACE_CONTEXT } from '../user-group-workspace.context-token.js';
+import type { UmbInputSectionElement } from '@umbraco-cms/backoffice/section';
+import type { UmbChangeEvent } from '@umbraco-cms/backoffice/event';
+import type { UmbInputLanguageElement } from '@umbraco-cms/backoffice/language';
+import { css, html, nothing, customElement, state } from '@umbraco-cms/backoffice/external/lit';
+import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element';
+import type { UmbWorkspaceViewElement } from '@umbraco-cms/backoffice/workspace';
+import { UmbTextStyles } from '@umbraco-cms/backoffice/style';
+import type { UUIBooleanInputEvent } from '@umbraco-cms/backoffice/external/uui';
+
+import '../components/user-group-entity-type-permission-groups.element.js';
+
+@customElement('umb-user-group-details-workspace-view')
+export class UmbUserGroupDetailsWorkspaceViewElement extends UmbLitElement implements UmbWorkspaceViewElement {
+	@state()
+	private _unique?: UmbUserGroupDetailModel['unique'];
+
+	@state()
+	private _sections: UmbUserGroupDetailModel['sections'] = [];
+
+	@state()
+	private _languages: UmbUserGroupDetailModel['languages'] = [];
+
+	@state()
+	private _hasAccessToAllLanguages: UmbUserGroupDetailModel['hasAccessToAllLanguages'] = false;
+
+	@state()
+	private _documentStartNode?: UmbUserGroupDetailModel['documentStartNode'];
+
+	@state()
+	private _documentRootAccess: UmbUserGroupDetailModel['documentRootAccess'] = false;
+
+	@state()
+	private _mediaStartNode?: UmbUserGroupDetailModel['mediaStartNode'];
+
+	@state()
+	private _mediaRootAccess: UmbUserGroupDetailModel['mediaRootAccess'] = false;
+
+	#workspaceContext?: typeof UMB_USER_GROUP_WORKSPACE_CONTEXT.TYPE;
+
+	constructor() {
+		super();
+
+		this.consumeContext(UMB_USER_GROUP_WORKSPACE_CONTEXT, (instance) => {
+			this.#workspaceContext = instance;
+			this.#observeUserGroup();
+		});
+	}
+
+	#observeUserGroup() {
+		this.observe(this.#workspaceContext?.unique, (value) => (this._unique = value ?? undefined), '_observeUnique');
+		this.observe(this.#workspaceContext?.sections, (value) => (this._sections = value ?? []), '_observeSections');
+		this.observe(this.#workspaceContext?.languages, (value) => (this._languages = value ?? []), '_observeLanguages');
+		this.observe(
+			this.#workspaceContext?.hasAccessToAllLanguages,
+			(value) => (this._hasAccessToAllLanguages = value ?? false),
+			'_observeHasAccessToAllLanguages',
+		);
+
+		this.observe(
+			this.#workspaceContext?.documentRootAccess,
+			(value) => (this._documentRootAccess = value ?? false),
+			'_observeDocumentRootAccess',
+		);
+
+		this.observe(
+			this.#workspaceContext?.documentStartNode,
+			(value) => (this._documentStartNode = value),
+			'_observeDocumentStartNode',
+		);
+
+		this.observe(
+			this.#workspaceContext?.mediaRootAccess,
+			(value) => (this._mediaRootAccess = value ?? false),
+			'_observeMediaRootAccess',
+		);
+
+		this.observe(
+			this.#workspaceContext?.mediaStartNode,
+			(value) => (this._mediaStartNode = value),
+			'_observeMediaStartNode',
+		);
+	}
+
+	#onSectionsChange(event: UmbChangeEvent) {
+		event.stopPropagation();
+		const target = event.target as UmbInputSectionElement;
+		// TODO make contexts method
+		this.#workspaceContext?.updateProperty('sections', target.selection);
+	}
+
+	#onAllowAllLanguagesChange(event: UUIBooleanInputEvent) {
+		event.stopPropagation();
+		const target = event.target;
+		// TODO make contexts method
+		this.#workspaceContext?.updateProperty('hasAccessToAllLanguages', target.checked);
+	}
+
+	#onLanguagePermissionChange(event: UmbChangeEvent) {
+		event.stopPropagation();
+		const target = event.target as UmbInputLanguageElement;
+		// TODO make contexts method
+		this.#workspaceContext?.updateProperty('languages', target.selection);
+	}
+
+	#onAllowAllDocumentsChange(event: UUIBooleanInputEvent) {
+		event.stopPropagation();
+		const target = event.target;
+		// TODO make contexts method
+		this.#workspaceContext?.updateProperty('documentRootAccess', target.checked);
+		this.#workspaceContext?.updateProperty('documentStartNode', null);
+	}
+
+	#onDocumentStartNodeChange(event: CustomEvent) {
+		event.stopPropagation();
+		// TODO: get back to this when documents have been decoupled from users.
+		// The event target is deliberately set to any to avoid an import cycle with documents.
+		const target = event.target as any;
+		const selected = target.selection?.[0];
+		// TODO make contexts method
+		this.#workspaceContext?.updateProperty('documentStartNode', selected ? { unique: selected } : null);
+	}
+
+	#onAllowAllMediaChange(event: UUIBooleanInputEvent) {
+		event.stopPropagation();
+		const target = event.target;
+		// TODO make contexts method
+		this.#workspaceContext?.updateProperty('mediaRootAccess', target.checked);
+		this.#workspaceContext?.updateProperty('mediaStartNode', null);
+	}
+
+	#onMediaStartNodeChange(event: CustomEvent) {
+		event.stopPropagation();
+		// TODO: get back to this when media have been decoupled from users.
+		// The event target is deliberately set to any to avoid an import cycle with media.
+		const target = event.target as any;
+		const selected = target.selection?.[0];
+		// TODO make contexts method
+		this.#workspaceContext?.updateProperty('mediaStartNode', selected ? { unique: selected } : null);
+	}
+
+	override render() {
+		if (!this._unique) return nothing;
+
+		return html`
+			<div id="main">
+				<umb-stack>
+					<uui-box>
+						<div slot="headline"><umb-localize key="user_assignAccess"></umb-localize></div>
+
+						<umb-property-layout
+							label=${this.localize.term('main_sections')}
+							description=${this.localize.term('user_sectionsHelp')}>
+							<umb-input-section
+								slot="editor"
+								.selection=${this._sections}
+								@change=${this.#onSectionsChange}></umb-input-section>
+						</umb-property-layout>
+
+						${this.#renderLanguageAccess()} ${this.#renderDocumentAccess()} ${this.#renderMediaAccess()}
+					</uui-box>
+
+					${this.#renderPermissionGroups()}
+				</umb-stack>
+			</div>
+		`;
+	}
+
+	#renderLanguageAccess() {
+		return html`
+			<umb-property-layout
+				label=${this.localize.term('treeHeaders_languages')}
+				description=${this.localize.term('user_languagesHelp')}>
+				<div slot="editor">
+					<uui-toggle
+						style="margin-bottom: var(--uui-size-space-3);"
+						label="${this.localize.term('user_allowAccessToAllLanguages')}"
+						.checked=${this._hasAccessToAllLanguages}
+						@change=${this.#onAllowAllLanguagesChange}></uui-toggle>
+
+					${this._hasAccessToAllLanguages === false
+						? html`
+								<umb-input-language
+									.selection=${this._languages}
+									@change=${this.#onLanguagePermissionChange}></umb-input-language>
+							`
+						: nothing}
+				</div>
+			</umb-property-layout>
+		`;
+	}
+
+	#renderDocumentAccess() {
+		return html`
+			<umb-property-layout
+				label=${this.localize.term('defaultdialogs_selectContentStartNode')}
+				description=${this.localize.term('user_startnodehelp')}>
+				<div slot="editor">
+					<uui-toggle
+						style="margin-bottom: var(--uui-size-space-3);"
+						label="${this.localize.term('user_allowAccessToAllDocuments')}"
+						.checked=${this._documentRootAccess}
+						@change=${this.#onAllowAllDocumentsChange}></uui-toggle>
+				</div>
+
+				${this._documentRootAccess === false
+					? html`
+							<umb-input-document
+								slot="editor"
+								max="1"
+								.selection=${this._documentStartNode?.unique ? [this._documentStartNode.unique] : []}
+								@change=${this.#onDocumentStartNodeChange}></umb-input-document>
+						`
+					: nothing}
+			</umb-property-layout>
+		`;
+	}
+
+	#renderMediaAccess() {
+		return html`
+			<umb-property-layout
+				label=${this.localize.term('defaultdialogs_selectMediaStartNode')}
+				description=${this.localize.term('user_mediastartnodehelp')}>
+				<div slot="editor">
+					<uui-toggle
+						style="margin-bottom: var(--uui-size-space-3);"
+						label="${this.localize.term('user_allowAccessToAllMedia')}"
+						.checked=${this._mediaRootAccess}
+						@change=${this.#onAllowAllMediaChange}></uui-toggle>
+				</div>
+
+				${this._mediaRootAccess === false
+					? html`
+							<umb-input-media
+								slot="editor"
+								max="1"
+								.selection=${this._mediaStartNode?.unique ? [this._mediaStartNode.unique] : []}
+								@change=${this.#onMediaStartNodeChange}></umb-input-media>
+						`
+					: nothing}
+			</umb-property-layout>
+		`;
+	}
+
+	#renderPermissionGroups() {
+		return html`<umb-user-group-entity-type-permission-groups></umb-user-group-entity-type-permission-groups> `;
+	}
+
+	static override styles = [
+		UmbTextStyles,
+		css`
+			:host {
+				display: block;
+				height: 100%;
+			}
+
+			#main {
+				padding: var(--uui-size-layout-1);
+			}
+
+			uui-input {
+				width: 100%;
+			}
+		`,
+	];
+}
+
+export { UmbUserGroupDetailsWorkspaceViewElement as element };
+
+declare global {
+	interface HTMLElementTagNameMap {
+		'umb-user-group-details-workspace-view': UmbUserGroupDetailsWorkspaceViewElement;
+	}
+}
diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/user/workspace/user/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user/workspace/user/manifests.ts
index 850cee09f912..0dc237d29329 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/user/user/workspace/user/manifests.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/user/user/workspace/user/manifests.ts
@@ -1,6 +1,7 @@
 import { UMB_USER_ENTITY_TYPE } from '../../entity.js';
 import { UMB_USER_WORKSPACE_ALIAS } from './constants.js';
 import { UMB_WORKSPACE_CONDITION_ALIAS, UmbSubmitWorkspaceAction } from '@umbraco-cms/backoffice/workspace';
+import { manifests as viewManifests } from './views/manifests.js';
 
 export const manifests: Array<UmbExtensionManifest> = [
 	{
@@ -31,4 +32,5 @@ export const manifests: Array<UmbExtensionManifest> = [
 			},
 		],
 	},
+	...viewManifests,
 ];
diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/user/workspace/user/user-workspace-editor.element.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user/workspace/user/user-workspace-editor.element.ts
index d0bf6b4cef35..ffc11e434da2 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/user/user/workspace/user/user-workspace-editor.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/user/user/workspace/user/user-workspace-editor.element.ts
@@ -1,93 +1,26 @@
-import type { UmbUserDetailModel } from '../../index.js';
 import { UMB_USER_ROOT_WORKSPACE_PATH } from '../../paths.js';
-import type { UmbUserWorkspaceContext } from './user-workspace.context.js';
-import { UMB_USER_WORKSPACE_CONTEXT } from './user-workspace.context-token.js';
-import { css, html, nothing, customElement, state } from '@umbraco-cms/backoffice/external/lit';
+import { css, html, customElement } from '@umbraco-cms/backoffice/external/lit';
 import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element';
 import { UmbTextStyles } from '@umbraco-cms/backoffice/style';
 
-// import local components. Theses are not meant to be used outside of this component.
-import './components/user-workspace-profile-settings/user-workspace-profile-settings.element.js';
-import './components/user-workspace-access/user-workspace-access.element.js';
-import './components/user-workspace-info/user-workspace-info.element.js';
-import './components/user-workspace-avatar/user-workspace-avatar.element.js';
-import './components/user-workspace-client-credentials/user-workspace-client-credentials.element.js';
-
 @customElement('umb-user-workspace-editor')
 export class UmbUserWorkspaceEditorElement extends UmbLitElement {
-	@state()
-	private _user?: UmbUserDetailModel;
-
-	#workspaceContext?: UmbUserWorkspaceContext;
-
-	constructor() {
-		super();
-
-		this.consumeContext(UMB_USER_WORKSPACE_CONTEXT, (context) => {
-			this.#workspaceContext = context;
-			this.#observeUser();
-		});
-	}
-
-	#observeUser() {
-		if (!this.#workspaceContext) return;
-		this.observe(this.#workspaceContext.data, (user) => (this._user = user), 'umbUserObserver');
-	}
-
 	override render() {
 		return html`
-			<umb-entity-detail-workspace-editor class="uui-text" .backPath=${UMB_USER_ROOT_WORKSPACE_PATH}>
+			<umb-entity-detail-workspace-editor .backPath=${UMB_USER_ROOT_WORKSPACE_PATH}>
 				<umb-workspace-header-name-editable slot="header"></umb-workspace-header-name-editable>
-				${this._user
-					? html`<div id="main">
-							<div id="left-column">${this.#renderLeftColumn()}</div>
-							<div id="right-column">${this.#renderRightColumn()}</div>
-						</div>`
-					: nothing}
 			</umb-entity-detail-workspace-editor>
 		`;
 	}
 
-	#renderLeftColumn() {
-		return html`
-			<umb-stack>
-				<umb-user-workspace-profile-settings></umb-user-workspace-profile-settings>
-				<umb-user-workspace-assign-access></umb-user-workspace-assign-access>
-				<umb-user-workspace-access></umb-user-workspace-access>
-			</umb-stack>
-		`;
-	}
-
-	#renderRightColumn() {
-		return html`
-			<umb-stack look="compact">
-				<umb-user-workspace-avatar></umb-user-workspace-avatar>
-				<umb-user-workspace-info></umb-user-workspace-info>
-				<umb-user-workspace-client-credentials></umb-user-workspace-client-credentials>
-			</umb-stack>
-		`;
-	}
-
 	static override styles = [
 		UmbTextStyles,
 		css`
 			:host {
 				display: block;
+				width: 100%;
 				height: 100%;
 			}
-
-			#main {
-				display: grid;
-				grid-template-columns: 1fr 350px;
-				gap: var(--uui-size-layout-1);
-				padding: var(--uui-size-layout-1);
-			}
-
-			#left-column {
-				display: flex;
-				flex-direction: column;
-				gap: var(--uui-size-space-4);
-			}
 		`,
 	];
 }
diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/user/workspace/user/views/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user/workspace/user/views/manifests.ts
new file mode 100644
index 000000000000..3e414288d594
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/packages/user/user/workspace/user/views/manifests.ts
@@ -0,0 +1,23 @@
+import { UMB_USER_WORKSPACE_ALIAS } from '../constants.js';
+import { UMB_WORKSPACE_CONDITION_ALIAS } from '@umbraco-cms/backoffice/workspace';
+
+export const manifests: Array<UmbExtensionManifest> = [
+	{
+		type: 'workspaceView',
+		alias: 'Umb.WorkspaceView.User.Details',
+		name: 'User Details Workspace View',
+		element: () => import('./user-details-workspace-view.element.js'),
+		weight: 90,
+		meta: {
+			label: '#general_details',
+			pathname: 'details',
+			icon: 'edit',
+		},
+		conditions: [
+			{
+				alias: UMB_WORKSPACE_CONDITION_ALIAS,
+				match: UMB_USER_WORKSPACE_ALIAS,
+			},
+		],
+	},
+];
diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/user/workspace/user/views/user-details-workspace-view.element.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user/workspace/user/views/user-details-workspace-view.element.ts
new file mode 100644
index 000000000000..292639178b33
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/packages/user/user/workspace/user/views/user-details-workspace-view.element.ts
@@ -0,0 +1,98 @@
+import { UMB_USER_WORKSPACE_CONTEXT } from '../user-workspace.context-token.js';
+import type { UmbUserWorkspaceContext } from '../user-workspace.context.js';
+import type { UmbUserDetailModel } from '../../../types.js';
+import { customElement, html, nothing, state, css } from '@umbraco-cms/backoffice/external/lit';
+import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element';
+import type { UmbWorkspaceViewElement } from '@umbraco-cms/backoffice/workspace';
+import { UmbTextStyles } from '@umbraco-cms/backoffice/style';
+
+// import local components. Theses are not meant to be used outside of this component.
+import '../components/user-workspace-profile-settings/user-workspace-profile-settings.element.js';
+import '../components/user-workspace-access/user-workspace-access.element.js';
+import '../components/user-workspace-info/user-workspace-info.element.js';
+import '../components/user-workspace-avatar/user-workspace-avatar.element.js';
+import '../components/user-workspace-client-credentials/user-workspace-client-credentials.element.js';
+
+@customElement('umb-user-details-workspace-view')
+export class UmbUserDetailsWorkspaceViewElement extends UmbLitElement implements UmbWorkspaceViewElement {
+	@state()
+	private _user?: UmbUserDetailModel;
+
+	#workspaceContext?: UmbUserWorkspaceContext;
+
+	constructor() {
+		super();
+
+		this.consumeContext(UMB_USER_WORKSPACE_CONTEXT, (context) => {
+			this.#workspaceContext = context;
+			this.#observeUser();
+		});
+	}
+
+	#observeUser() {
+		if (!this.#workspaceContext) return;
+		this.observe(this.#workspaceContext.data, (user) => (this._user = user), 'umbUserObserver');
+	}
+
+	override render() {
+		return html`
+			${this._user
+				? html`<div id="main">
+						<div id="left-column">${this.#renderLeftColumn()}</div>
+						<div id="right-column">${this.#renderRightColumn()}</div>
+					</div>`
+				: nothing}
+		`;
+	}
+
+	#renderLeftColumn() {
+		return html`
+			<umb-stack>
+				<umb-user-workspace-profile-settings></umb-user-workspace-profile-settings>
+				<umb-user-workspace-assign-access></umb-user-workspace-assign-access>
+				<umb-user-workspace-access></umb-user-workspace-access>
+			</umb-stack>
+		`;
+	}
+
+	#renderRightColumn() {
+		return html`
+			<umb-stack look="compact">
+				<umb-user-workspace-avatar></umb-user-workspace-avatar>
+				<umb-user-workspace-info></umb-user-workspace-info>
+				<umb-user-workspace-client-credentials></umb-user-workspace-client-credentials>
+			</umb-stack>
+		`;
+	}
+
+	static override styles = [
+		UmbTextStyles,
+		css`
+			:host {
+				display: block;
+				height: 100%;
+			}
+
+			#main {
+				display: grid;
+				grid-template-columns: 1fr 350px;
+				gap: var(--uui-size-layout-1);
+				padding: var(--uui-size-layout-1);
+			}
+
+			#left-column {
+				display: flex;
+				flex-direction: column;
+				gap: var(--uui-size-space-4);
+			}
+		`,
+	];
+}
+
+export { UmbUserDetailsWorkspaceViewElement as element };
+
+declare global {
+	interface HTMLElementTagNameMap {
+		'umb-user-details-workspace-view': UmbUserDetailsWorkspaceViewElement;
+	}
+}

From 8434c7d0cbf919532be72e0c86bfed5a3af66877 Mon Sep 17 00:00:00 2001
From: Engiber Lozada <89547469+engijlr@users.noreply.github.com>
Date: Thu, 23 Oct 2025 15:49:14 +0200
Subject: [PATCH 078/155] Icon Picker: Fix empty selection allowed on mandatory
 fields and add validation. (#20536)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Not show the empty tile when filtering is active.

* Added mandatory property to the icon picker.

* Avoid deselecting the icon on second click when not showing the empty option.

* Extends the form control mixin to the icon picker.

* Used super.value.

* Support mandatory from settings config.

* Removed mandatoryConf.

* remove requestUpdate

---------

Co-authored-by: Niels Lyngsø <niels.lyngso@gmail.com>
---
 .../icon-picker-modal.element.ts              | 38 +++++++++++++------
 .../icon-picker-modal.token.ts                |  1 +
 .../property-editor-ui-icon-picker.element.ts | 37 +++++++++++++-----
 3 files changed, 54 insertions(+), 22 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/icon-registry/icon-picker-modal/icon-picker-modal.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/icon-registry/icon-picker-modal/icon-picker-modal.element.ts
index 0311318845ae..7227be73a0d3 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/icon-registry/icon-picker-modal/icon-picker-modal.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/icon-registry/icon-picker-modal/icon-picker-modal.element.ts
@@ -30,6 +30,9 @@ export class UmbIconPickerModalElement extends UmbModalBaseElement<UmbIconPicker
 	@state()
 	private _colorList = umbracoColors.filter((color) => !color.legacy);
 
+	@state()
+	private _isSearching = false;
+
 	constructor() {
 		super();
 		this.consumeContext(UMB_ICON_REGISTRY_CONTEXT, (context) => {
@@ -44,8 +47,10 @@ export class UmbIconPickerModalElement extends UmbModalBaseElement<UmbIconPicker
 		if (!this.#icons) return;
 		const value = this._searchInput?.value;
 		if (value) {
+			this._isSearching = value.length > 0;
 			this._iconsFiltered = this.#icons.filter((icon) => icon.name.toLowerCase().includes(value.toLowerCase()));
 		} else {
+			this._isSearching = false;
 			this._iconsFiltered = this.#icons;
 		}
 	}
@@ -54,8 +59,12 @@ export class UmbIconPickerModalElement extends UmbModalBaseElement<UmbIconPicker
 		const isActivate = e.type === 'click' || (e.type === 'keyup' && (e as KeyboardEvent).key === 'Enter');
 		if (!isActivate) return;
 
-		const nextIcon = this.value.icon === iconName ? '' : iconName;
-		this.modalContext?.updateValue({ icon: nextIcon });
+		if (this.data?.showEmptyOption) {
+			const nextIcon = this.value.icon === iconName ? '' : iconName;
+			this.modalContext?.updateValue({ icon: nextIcon });
+		} else {
+			this.modalContext?.updateValue({ icon: iconName });
+		}
 	}
 
 	#onColorChange(e: UUIColorSwatchesEvent) {
@@ -93,16 +102,21 @@ export class UmbIconPickerModalElement extends UmbModalBaseElement<UmbIconPicker
 					</uui-color-swatches>
 					<hr />
 					<uui-scroll-container id="icons">
-						<uui-button
-							class=${!this.value.icon ? 'selected' : ''}
-							label=${this.localize.term('defaultdialogs_noIcon')}
-							title=${this.localize.term('defaultdialogs_noIcon')}
-							@click=${this.#clearIcon}
-							@keyup=${(e: KeyboardEvent) => {
-								if (e.key === 'Enter' || e.key === ' ') this.#clearIcon();
-							}}>
-							<uui-icon style="opacity:.35" name=${ifDefined(this.data?.placeholder)}></uui-icon> </uui-button
-						>${this.renderIcons()}</uui-scroll-container
+						${this.data?.showEmptyOption && !this._isSearching
+							? html`
+									<uui-button
+										class=${!this.value.icon ? 'selected' : ''}
+										label=${this.localize.term('defaultdialogs_noIcon')}
+										title=${this.localize.term('defaultdialogs_noIcon')}
+										@click=${this.#clearIcon}
+										@keyup=${(e: KeyboardEvent) => {
+											if (e.key === 'Enter' || e.key === ' ') this.#clearIcon();
+										}}>
+										<uui-icon style="opacity:.35" name=${ifDefined(this.data?.placeholder)}></uui-icon>
+									</uui-button>
+								`
+							: nothing}
+						${this.renderIcons()}</uui-scroll-container
 					>
 				</div>
 				<uui-button
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/icon-registry/icon-picker-modal/icon-picker-modal.token.ts b/src/Umbraco.Web.UI.Client/src/packages/core/icon-registry/icon-picker-modal/icon-picker-modal.token.ts
index d531214325d2..bf1aafec4735 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/icon-registry/icon-picker-modal/icon-picker-modal.token.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/icon-registry/icon-picker-modal/icon-picker-modal.token.ts
@@ -2,6 +2,7 @@ import { UmbModalToken } from '@umbraco-cms/backoffice/modal';
 
 export interface UmbIconPickerModalData {
 	placeholder?: string;
+	showEmptyOption?: boolean;
 }
 
 export interface UmbIconPickerModalValue {
diff --git a/src/Umbraco.Web.UI.Client/src/packages/property-editors/icon-picker/property-editor-ui-icon-picker.element.ts b/src/Umbraco.Web.UI.Client/src/packages/property-editors/icon-picker/property-editor-ui-icon-picker.element.ts
index fffedbbaec1e..8c9814bf5168 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/property-editors/icon-picker/property-editor-ui-icon-picker.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/property-editors/icon-picker/property-editor-ui-icon-picker.element.ts
@@ -9,28 +9,45 @@ import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element';
 import { extractUmbColorVariable } from '@umbraco-cms/backoffice/resources';
 import { UmbChangeEvent } from '@umbraco-cms/backoffice/event';
 
+import { UmbFormControlMixin } from '@umbraco-cms/backoffice/validation';
+
 /**
  * @element umb-property-editor-ui-icon-picker
  */
 @customElement('umb-property-editor-ui-icon-picker')
-export class UmbPropertyEditorUIIconPickerElement extends UmbLitElement implements UmbPropertyEditorUiElement {
-	//
+export class UmbPropertyEditorUIIconPickerElement
+	extends UmbFormControlMixin<string, typeof UmbLitElement, undefined>(UmbLitElement, undefined)
+	implements UmbPropertyEditorUiElement
+{
+	@property({ type: Boolean })
+	mandatory = false;
+
+	protected override firstUpdated(): void {
+		this.addValidator(
+			'valueMissing',
+			() => 'Icon is required',
+			() => this.mandatory && !this._icon,
+		);
+	}
+
 	@property()
-	public set value(v: string) {
-		this._value = v ?? '';
-		const parts = this._value.split(' ');
+	public override set value(v: string) {
+		const val = v ?? '';
+		super.value = val;
+
+		const parts = val.split(' ');
 		if (parts.length === 2) {
 			this._icon = parts[0];
 			this._color = parts[1].replace('color-', '');
 		} else {
-			this._icon = this._value;
+			this._icon = val;
 			this._color = '';
 		}
 	}
-	public get value() {
-		return this._value;
+
+	public override get value() {
+		return (super.value as string) ?? '';
 	}
-	private _value = '';
 
 	@state()
 	private _icon = '';
@@ -53,7 +70,7 @@ export class UmbPropertyEditorUIIconPickerElement extends UmbLitElement implemen
 				icon: this._icon,
 				color: this._color,
 			},
-			data: { placeholder: this._placeholderIcon },
+			data: { placeholder: this._placeholderIcon, showEmptyOption: !this.mandatory },
 		}).catch(() => undefined);
 
 		if (!data) return;

From d9c201e3d17265591681814b7782d13630ce37b1 Mon Sep 17 00:00:00 2001
From: Jacob Overgaard <752371+iOvergaard@users.noreply.github.com>
Date: Fri, 24 Oct 2025 08:36:34 +0200
Subject: [PATCH 079/155] docs: Add backoffice preview URL to README files
 (#20623)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* docs: Add backoffice preview URL to README files

Added links to https://backofficepreview.umbraco.com/ in both the main repository README and the Umbraco.Web.UI.Client package README to make the live backoffice preview easily discoverable.

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude <noreply@anthropic.com>

* docs: fix link

* Update .github/README.md

Co-authored-by: Andy Butland <abutland73@gmail.com>

---------

Co-authored-by: Claude <noreply@anthropic.com>
Co-authored-by: Andy Butland <abutland73@gmail.com>
---
 .github/README.md                   | 8 ++++++++
 src/Umbraco.Web.UI.Client/README.md | 8 ++++++++
 2 files changed, 16 insertions(+)

diff --git a/.github/README.md b/.github/README.md
index 195d4f9a36c7..33cb2d41d6e2 100644
--- a/.github/README.md
+++ b/.github/README.md
@@ -38,6 +38,14 @@ Some important documentation links to get you started:
 - [Getting to know Umbraco](https://docs.umbraco.com/umbraco-cms/fundamentals/get-to-know-umbraco)
 - [Tutorials for creating a basic website and customizing the editing experience](https://docs.umbraco.com/umbraco-cms/tutorials/overview)
 
+## Backoffice Preview
+
+Want to see the latest backoffice UI in action? Check out our live preview:
+
+**[backofficepreview.umbraco.com](https://backofficepreview.umbraco.com/)**
+
+This preview is automatically deployed from the main branch and showcases the latest backoffice features and improvements.  It runs from mock data and persistent edits are not supported.
+
 ## Get help
 
 If you need a bit of feedback while building your Umbraco projects, we are [chatty on Discord](https://discord.umbraco.com). Our Discord server serves as a social space for all Umbracians. If you have any questions or need some help with a problem, head over to our [dedicated forum](https://forum.umbraco.com/) where the Umbraco Community will be happy to help. 
diff --git a/src/Umbraco.Web.UI.Client/README.md b/src/Umbraco.Web.UI.Client/README.md
index 1404fba49ca8..0bc565c8edab 100644
--- a/src/Umbraco.Web.UI.Client/README.md
+++ b/src/Umbraco.Web.UI.Client/README.md
@@ -2,6 +2,14 @@
 
 This package contains the types for the Umbraco Backoffice.
 
+## Preview
+
+A live preview of the latest backoffice build from the main branch is available at:
+
+**[backofficepreview.umbraco.com](https://backofficepreview.umbraco.com/)**
+
+This preview is automatically deployed via GitHub Actions whenever changes are pushed to main or version branches.
+
 ## Installation
 
 ```bash

From d9cdf03442fb41b5f71683ae140ba88ce37d69bc Mon Sep 17 00:00:00 2001
From: Lee Kelleher <leekelleher@users.noreply.github.com>
Date: Fri, 24 Oct 2025 09:29:22 +0100
Subject: [PATCH 080/155] Preview: Allows changing the preview environment
 inside the preview app, and other UX changes that enhance the experience
 (#20598)

* Preview Device: refactored config

Fixed "flip" icon style.

Removed "shadow" as unnecessary.

Renamed "className" to "wrapperClass" to be descriptive.

* Preview element CSS refinement

* Preview element: load in private extensions

* Added "Preview Environments" preview-app

Made `unique`, `culture` and `segment` observable in the context.

* Aligned preview-app design

with `hidden` attribute and design consistency.

* Created "Preview" package

* Relocated "Preview Apps" and Context to the new package

* Deprecated `UmbDocumentPreviewRepository` (for v19)

as the methods have moved to `UmbPreviewRepository`.

* Removed Preview Sessions event listeners

* Changed localization from "End" to "Exit"

* chore: consumes context only when needed

* feat: uses the UmbPreviewRepository instead

* feat: adds localization to errors and ensures the function does not randomly throw

* feat: prevents creating a new repository for every click

* feat: prevents potential memory leak by adding a signal to the events added to each iframe update

* feat: adds a custom interface to prevent typescript errors

* feat: ensures new string states are checked properly

* docs: adds comment to avoid confusion

* feat: sets up scaling once per iframe load rather than on each update

* fix: ensures that you can go back to the default segment again

* feat: closes popovers when clicking on the iframe (losing blur) and if selecting an item (expect for devices)

---------

Co-authored-by: Jacob Overgaard <752371+iOvergaard@users.noreply.github.com>
---
 src/Umbraco.Web.UI.Client/package-lock.json   |   7 +
 src/Umbraco.Web.UI.Client/package.json        |   1 +
 .../src/apps/preview/index.ts                 |   1 +
 .../src/apps/preview/preview.element.ts       |  68 ++++---
 .../src/assets/lang/en.ts                     |   4 +-
 .../preview/document-preview.repository.ts    |  13 ++
 .../workspace/document-workspace.context.ts   |   4 +-
 .../src/packages/preview/context/index.ts     |   2 +
 .../preview/context/preview.context-token.ts  |   4 +
 .../preview/context}/preview.context.ts       | 150 ++++++++++------
 .../src/packages/preview/index.ts             |   2 +
 .../src/packages/preview/manifests.ts         |   4 +
 .../src/packages/preview/package.json         |   8 +
 .../preview/preview-apps}/manifests.ts        |  15 +-
 .../preview-apps}/preview-culture.element.ts  |  55 +++++-
 .../preview-apps}/preview-device.element.ts   |  87 ++++++---
 .../preview-environments.element.ts           | 170 ++++++++++++++++++
 .../preview-apps}/preview-exit.element.ts     |   4 +-
 .../preview-open-website.element.ts           |   4 +-
 .../preview-apps}/preview-segment.element.ts  |  66 +++++--
 .../packages/preview/preview-apps/types.ts    |   6 +
 .../src/packages/preview/repository/index.ts  |   1 +
 .../preview/repository/preview.repository.ts  |  74 ++++++++
 .../src/packages/preview/umbraco-package.ts   |   9 +
 .../src/packages/preview/vite.config.ts       |  12 ++
 src/Umbraco.Web.UI.Client/tsconfig.json       |   1 +
 26 files changed, 641 insertions(+), 131 deletions(-)
 create mode 100644 src/Umbraco.Web.UI.Client/src/apps/preview/index.ts
 create mode 100644 src/Umbraco.Web.UI.Client/src/packages/preview/context/index.ts
 create mode 100644 src/Umbraco.Web.UI.Client/src/packages/preview/context/preview.context-token.ts
 rename src/Umbraco.Web.UI.Client/src/{apps/preview => packages/preview/context}/preview.context.ts (65%)
 create mode 100644 src/Umbraco.Web.UI.Client/src/packages/preview/index.ts
 create mode 100644 src/Umbraco.Web.UI.Client/src/packages/preview/manifests.ts
 create mode 100644 src/Umbraco.Web.UI.Client/src/packages/preview/package.json
 rename src/Umbraco.Web.UI.Client/src/{apps/preview/apps => packages/preview/preview-apps}/manifests.ts (76%)
 rename src/Umbraco.Web.UI.Client/src/{apps/preview/apps => packages/preview/preview-apps}/preview-culture.element.ts (66%)
 rename src/Umbraco.Web.UI.Client/src/{apps/preview/apps => packages/preview/preview-apps}/preview-device.element.ts (57%)
 create mode 100644 src/Umbraco.Web.UI.Client/src/packages/preview/preview-apps/preview-environments.element.ts
 rename src/Umbraco.Web.UI.Client/src/{apps/preview/apps => packages/preview/preview-apps}/preview-exit.element.ts (91%)
 rename src/Umbraco.Web.UI.Client/src/{apps/preview/apps => packages/preview/preview-apps}/preview-open-website.element.ts (91%)
 rename src/Umbraco.Web.UI.Client/src/{apps/preview/apps => packages/preview/preview-apps}/preview-segment.element.ts (62%)
 create mode 100644 src/Umbraco.Web.UI.Client/src/packages/preview/preview-apps/types.ts
 create mode 100644 src/Umbraco.Web.UI.Client/src/packages/preview/repository/index.ts
 create mode 100644 src/Umbraco.Web.UI.Client/src/packages/preview/repository/preview.repository.ts
 create mode 100644 src/Umbraco.Web.UI.Client/src/packages/preview/umbraco-package.ts
 create mode 100644 src/Umbraco.Web.UI.Client/src/packages/preview/vite.config.ts

diff --git a/src/Umbraco.Web.UI.Client/package-lock.json b/src/Umbraco.Web.UI.Client/package-lock.json
index 9c08dfb59fe6..74589de99c53 100644
--- a/src/Umbraco.Web.UI.Client/package-lock.json
+++ b/src/Umbraco.Web.UI.Client/package-lock.json
@@ -3638,6 +3638,10 @@
 			"resolved": "src/packages/performance-profiling",
 			"link": true
 		},
+		"node_modules/@umbraco-backoffice/preview": {
+			"resolved": "src/packages/preview",
+			"link": true
+		},
 		"node_modules/@umbraco-backoffice/property-editors": {
 			"resolved": "src/packages/property-editors",
 			"link": true
@@ -17084,6 +17088,9 @@
 		"src/packages/performance-profiling": {
 			"name": "@umbraco-backoffice/performance-profiling"
 		},
+		"src/packages/preview": {
+			"name": "@umbraco-backoffice/preview"
+		},
 		"src/packages/property-editors": {
 			"name": "@umbraco-backoffice/property-editors"
 		},
diff --git a/src/Umbraco.Web.UI.Client/package.json b/src/Umbraco.Web.UI.Client/package.json
index b22f6f4e7456..f91e42d9ba7d 100644
--- a/src/Umbraco.Web.UI.Client/package.json
+++ b/src/Umbraco.Web.UI.Client/package.json
@@ -85,6 +85,7 @@
 		"./picker-input": "./dist-cms/packages/core/picker-input/index.js",
 		"./picker-data-source": "./dist-cms/packages/core/picker-data-source/index.js",
 		"./picker": "./dist-cms/packages/core/picker/index.js",
+		"./preview": "./dist-cms/packages/preview/index.js",
 		"./property-action": "./dist-cms/packages/core/property-action/index.js",
 		"./property-editor-data-source": "./dist-cms/packages/core/property-editor-data-source/index.js",
 		"./property-editor": "./dist-cms/packages/core/property-editor/index.js",
diff --git a/src/Umbraco.Web.UI.Client/src/apps/preview/index.ts b/src/Umbraco.Web.UI.Client/src/apps/preview/index.ts
new file mode 100644
index 000000000000..d90c7995f9bb
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/apps/preview/index.ts
@@ -0,0 +1 @@
+export * from './preview.element.js';
diff --git a/src/Umbraco.Web.UI.Client/src/apps/preview/preview.element.ts b/src/Umbraco.Web.UI.Client/src/apps/preview/preview.element.ts
index b2d0db0da7aa..e9bce3c441a0 100644
--- a/src/Umbraco.Web.UI.Client/src/apps/preview/preview.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/apps/preview/preview.element.ts
@@ -1,8 +1,14 @@
-import { manifests as previewApps } from './apps/manifests.js';
-import { UmbPreviewContext } from './preview.context.js';
 import { css, customElement, html, nothing, state, when } from '@umbraco-cms/backoffice/external/lit';
-import { umbExtensionsRegistry } from '@umbraco-cms/backoffice/extension-registry';
+import {
+	umbExtensionsRegistry,
+	UmbBackofficeEntryPointExtensionInitializer,
+} from '@umbraco-cms/backoffice/extension-registry';
 import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element';
+import { UmbPreviewContext } from '@umbraco-cms/backoffice/preview';
+import { UmbServerExtensionRegistrator } from '@umbraco-cms/backoffice/extension-api';
+import { UMB_AUTH_CONTEXT } from '@umbraco-cms/backoffice/auth';
+
+const CORE_PACKAGES = [import('../../packages/preview/umbraco-package.js')];
 
 /**
  * @element umb-preview
@@ -11,22 +17,39 @@ import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element';
 export class UmbPreviewElement extends UmbLitElement {
 	#context = new UmbPreviewContext(this);
 
+	@state()
+	private _iframeReady?: boolean;
+
+	@state()
+	private _previewUrl?: string;
+
 	constructor() {
 		super();
 
-		if (previewApps?.length) {
-			umbExtensionsRegistry.registerMany(previewApps);
-		}
+		new UmbBackofficeEntryPointExtensionInitializer(this, umbExtensionsRegistry);
 
 		this.observe(this.#context.iframeReady, (iframeReady) => (this._iframeReady = iframeReady));
 		this.observe(this.#context.previewUrl, (previewUrl) => (this._previewUrl = previewUrl));
 	}
 
-	@state()
-	private _iframeReady?: boolean;
+	override async firstUpdated() {
+		await this.#extensionsAfterAuth();
 
-	@state()
-	private _previewUrl?: string;
+		// Extensions are loaded in parallel and don't need to block the preview frame
+		CORE_PACKAGES.forEach(async (packageImport) => {
+			const { extensions } = await packageImport;
+			umbExtensionsRegistry.registerMany(extensions);
+		});
+	}
+
+	async #extensionsAfterAuth() {
+		const authContext = await this.getContext(UMB_AUTH_CONTEXT, { preventTimeout: true });
+		if (!authContext) {
+			throw new Error('UmbPreviewElement requires the UMB_AUTH_CONTEXT to be set.');
+		}
+		await this.observe(authContext.isAuthorized).asPromise();
+		await new UmbServerExtensionRegistrator(this, umbExtensionsRegistry).registerPrivateExtensions();
+	}
 
 	#onIFrameLoad(event: Event & { target: HTMLIFrameElement }) {
 		this.#context.iframeLoaded(event.target);
@@ -36,7 +59,7 @@ export class UmbPreviewElement extends UmbLitElement {
 		if (!this._previewUrl) return nothing;
 		return html`
 			${when(!this._iframeReady, () => html`<div id="loading"><uui-loader-circle></uui-loader-circle></div>`)}
-			<div id="wrapper">
+			<div id="wrapper" class="fullsize">
 				<div id="container">
 					<iframe
 						src=${this._previewUrl}
@@ -47,9 +70,9 @@ export class UmbPreviewElement extends UmbLitElement {
 			</div>
 			<div id="menu">
 				<h4>Preview Mode</h4>
-				<uui-button-group>
-					<umb-extension-slot id="apps" type="previewApp"></umb-extension-slot>
-				</uui-button-group>
+				<div id="apps">
+					<umb-extension-slot type="previewApp"></umb-extension-slot>
+				</div>
 			</div>
 		`;
 	}
@@ -62,10 +85,7 @@ export class UmbPreviewElement extends UmbLitElement {
 				align-items: center;
 
 				position: absolute;
-				top: 0;
-				left: 0;
-				right: 0;
-				bottom: 0;
+				inset: 0;
 
 				padding-bottom: 40px;
 			}
@@ -82,7 +102,9 @@ export class UmbPreviewElement extends UmbLitElement {
 				bottom: 0;
 
 				font-size: 6rem;
-				backdrop-filter: blur(5px);
+				backdrop-filter: blur(var(--uui-size-1, 3px));
+
+				z-index: 1;
 			}
 
 			#wrapper {
@@ -97,7 +119,7 @@ export class UmbPreviewElement extends UmbLitElement {
 				overflow: hidden;
 			}
 
-			#wrapper.shadow {
+			#wrapper:not(.fullsize) {
 				margin: 10px auto;
 				background-color: white;
 				border-radius: 3px;
@@ -123,6 +145,8 @@ export class UmbPreviewElement extends UmbLitElement {
 				left: 0;
 				right: 0;
 
+				z-index: 1;
+
 				background-color: var(--uui-color-header-surface);
 				height: 40px;
 
@@ -136,7 +160,9 @@ export class UmbPreviewElement extends UmbLitElement {
 				padding: 0 15px;
 			}
 
-			#menu > uui-button-group {
+			#apps {
+				display: inline-flex;
+				align-items: stretch;
 				height: 100%;
 			}
 
diff --git a/src/Umbraco.Web.UI.Client/src/assets/lang/en.ts b/src/Umbraco.Web.UI.Client/src/assets/lang/en.ts
index 810d9dbb4d8a..1d70a6ab6dff 100644
--- a/src/Umbraco.Web.UI.Client/src/assets/lang/en.ts
+++ b/src/Umbraco.Web.UI.Client/src/assets/lang/en.ts
@@ -2737,8 +2737,8 @@ export default {
 			'You can edit and delete Document Blueprints from the "Document Blueprints" tree in the Settings section. Expand the Document Type which the Document Blueprint is based on and click it to edit or delete it.',
 	},
 	preview: {
-		endLabel: 'End',
-		endTitle: 'End preview mode',
+		endLabel: 'Exit',
+		endTitle: 'Exit preview mode',
 		openWebsiteLabel: 'Preview website',
 		openWebsiteTitle: 'Open website in preview mode',
 		returnToPreviewHeadline: 'Preview website?',
diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/repository/preview/document-preview.repository.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/repository/preview/document-preview.repository.ts
index d216290d3997..abf31e686754 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/repository/preview/document-preview.repository.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/repository/preview/document-preview.repository.ts
@@ -5,6 +5,7 @@ import { UmbRepositoryBase } from '@umbraco-cms/backoffice/repository';
 import type { DocumentUrlInfoModel } from '@umbraco-cms/backoffice/external/backend-api';
 import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api';
 
+/** @deprecated This has been deprecated, please use `UmbPreviewRepository` instead. To be removed in Umbraco 19. [LK] */
 export class UmbDocumentPreviewRepository extends UmbRepositoryBase {
 	constructor(host: UmbControllerHost) {
 		super(host);
@@ -24,6 +25,12 @@ export class UmbDocumentPreviewRepository extends UmbRepositoryBase {
 		culture?: string,
 		segment?: string,
 	): Promise<DocumentUrlInfoModel> {
+		new UmbDeprecation({
+			removeInVersion: '19.0.0',
+			deprecated: '`UmbDocumentPreviewRepository.getPreviewUrl()`',
+			solution: 'Use `UmbPreviewRepository.getPreviewUrl()` instead',
+		}).warn();
+
 		const { data, error } = await tryExecute(
 			this,
 			DocumentService.getDocumentByIdPreviewUrl({
@@ -62,6 +69,12 @@ export class UmbDocumentPreviewRepository extends UmbRepositoryBase {
 	 * @memberof UmbDocumentPreviewRepository
 	 */
 	async exit(): Promise<void> {
+		new UmbDeprecation({
+			removeInVersion: '19.0.0',
+			deprecated: '`UmbDocumentPreviewRepository.exit()`',
+			solution: 'Use `UmbPreviewRepository.exit()` instead',
+		}).warn();
+
 		await tryExecute(this, PreviewService.deletePreview(), { disableNotifications: true });
 		return;
 	}
diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/workspace/document-workspace.context.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/workspace/document-workspace.context.ts
index 0d199d874c3a..50d45001ff16 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/workspace/document-workspace.context.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/workspace/document-workspace.context.ts
@@ -14,7 +14,6 @@ import {
 	UMB_USER_PERMISSION_DOCUMENT_CREATE,
 	UMB_USER_PERMISSION_DOCUMENT_UPDATE,
 } from '../constants.js';
-import { UmbDocumentPreviewRepository } from '../repository/preview/index.js';
 import { UmbDocumentValidationRepository } from '../repository/validation/index.js';
 import { UMB_DOCUMENT_CONFIGURATION_CONTEXT } from '../index.js';
 import { UMB_DOCUMENT_DETAIL_MODEL_VARIANT_SCAFFOLD, UMB_DOCUMENT_WORKSPACE_ALIAS } from './constants.js';
@@ -41,6 +40,7 @@ import type { UmbEntityModel } from '@umbraco-cms/backoffice/entity';
 import type { UmbVariantPropertyGuardRule } from '@umbraco-cms/backoffice/property';
 import { UMB_ACTION_EVENT_CONTEXT } from '@umbraco-cms/backoffice/action';
 import { UmbLocalizationController } from '@umbraco-cms/backoffice/localization-api';
+import { UmbPreviewRepository } from '@umbraco-cms/backoffice/preview';
 
 type ContentModel = UmbDocumentDetailModel;
 type ContentTypeModel = UmbDocumentTypeDetailModel;
@@ -337,7 +337,7 @@ export class UmbDocumentWorkspaceContext
 		}
 
 		// Get the preview URL from the server.
-		const previewRepository = new UmbDocumentPreviewRepository(this);
+		const previewRepository = new UmbPreviewRepository(this);
 		const previewUrlData = await previewRepository.getPreviewUrl(
 			unique,
 			urlProviderAlias,
diff --git a/src/Umbraco.Web.UI.Client/src/packages/preview/context/index.ts b/src/Umbraco.Web.UI.Client/src/packages/preview/context/index.ts
new file mode 100644
index 000000000000..6e256cf2a741
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/packages/preview/context/index.ts
@@ -0,0 +1,2 @@
+export * from './preview.context.js';
+export * from './preview.context-token.js';
diff --git a/src/Umbraco.Web.UI.Client/src/packages/preview/context/preview.context-token.ts b/src/Umbraco.Web.UI.Client/src/packages/preview/context/preview.context-token.ts
new file mode 100644
index 000000000000..1010ffeefc84
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/packages/preview/context/preview.context-token.ts
@@ -0,0 +1,4 @@
+import type { UmbPreviewContext } from './preview.context.js';
+import { UmbContextToken } from '@umbraco-cms/backoffice/context-api';
+
+export const UMB_PREVIEW_CONTEXT = new UmbContextToken<UmbPreviewContext>('UmbPreviewContext');
diff --git a/src/Umbraco.Web.UI.Client/src/apps/preview/preview.context.ts b/src/Umbraco.Web.UI.Client/src/packages/preview/context/preview.context.ts
similarity index 65%
rename from src/Umbraco.Web.UI.Client/src/apps/preview/preview.context.ts
rename to src/Umbraco.Web.UI.Client/src/packages/preview/context/preview.context.ts
index f3f13c9fdeef..de4b0267c76d 100644
--- a/src/Umbraco.Web.UI.Client/src/apps/preview/preview.context.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/preview/context/preview.context.ts
@@ -1,10 +1,8 @@
-import { tryExecute } from '@umbraco-cms/backoffice/resources';
-import { DocumentService } from '@umbraco-cms/backoffice/external/backend-api';
+import { UmbPreviewRepository } from '../repository/index.js';
+import { UMB_PREVIEW_CONTEXT } from './preview.context-token.js';
 import { HubConnectionBuilder } from '@umbraco-cms/backoffice/external/signalr';
 import { UmbBooleanState, UmbStringState } from '@umbraco-cms/backoffice/observable-api';
 import { UmbContextBase } from '@umbraco-cms/backoffice/class-api';
-import { UmbContextToken } from '@umbraco-cms/backoffice/context-api';
-import { UmbDocumentPreviewRepository } from '@umbraco-cms/backoffice/document';
 import { UmbLocalizationController } from '@umbraco-cms/backoffice/localization-api';
 import { UMB_NOTIFICATION_CONTEXT } from '@umbraco-cms/backoffice/notification';
 import { UMB_SERVER_CONTEXT } from '@umbraco-cms/backoffice/server';
@@ -12,11 +10,11 @@ import type { HubConnection } from '@umbraco-cms/backoffice/external/signalr';
 import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api';
 
 interface UmbPreviewIframeArgs {
-	className?: string;
 	culture?: string;
 	height?: string;
 	segment?: string;
 	width?: string;
+	wrapperClass?: string;
 }
 
 interface UmbPreviewUrlArgs {
@@ -28,11 +26,18 @@ interface UmbPreviewUrlArgs {
 }
 
 export class UmbPreviewContext extends UmbContextBase {
-	#unique?: string | null;
-	#culture?: string | null;
-	#segment?: string | null;
-	#serverUrl: string = '';
 	#connection?: HubConnection;
+	#currentArgs: UmbPreviewIframeArgs = {};
+	#notificationContext?: typeof UMB_NOTIFICATION_CONTEXT.TYPE;
+	#resizeController?: AbortController;
+	#serverUrl: string = '';
+
+	#previewRepository = new UmbPreviewRepository(this);
+
+	#localize = new UmbLocalizationController(this);
+
+	#culture = new UmbStringState(undefined);
+	public readonly culture = this.#culture.asObservable();
 
 	#iframeReady = new UmbBooleanState(false);
 	public readonly iframeReady = this.#iframeReady.asObservable();
@@ -40,27 +45,31 @@ export class UmbPreviewContext extends UmbContextBase {
 	#previewUrl = new UmbStringState(undefined);
 	public readonly previewUrl = this.#previewUrl.asObservable();
 
-	#documentPreviewRepository = new UmbDocumentPreviewRepository(this);
+	#segment = new UmbStringState(undefined);
+	public readonly segment = this.#segment.asObservable();
 
-	#notificationContext?: typeof UMB_NOTIFICATION_CONTEXT.TYPE;
-	#localize = new UmbLocalizationController(this);
+	#unique = new UmbStringState(undefined);
+	public readonly unique = this.#unique.asObservable();
 
 	constructor(host: UmbControllerHost) {
 		super(host, UMB_PREVIEW_CONTEXT);
 
-		this.consumeContext(UMB_SERVER_CONTEXT, (instance) => {
+		this.consumeContext(UMB_SERVER_CONTEXT, (serverContext) => {
 			const params = new URLSearchParams(window.location.search);
 
-			this.#unique = params.get('id');
-			this.#culture = params.get('culture');
-			this.#segment = params.get('segment');
-
-			if (!this.#unique) {
+			if (!params.has('id')) {
 				console.error('No unique ID found in query string.');
 				return;
 			}
 
-			const serverUrl = instance?.getServerUrl();
+			this.#unique.setValue(params.get('id') ?? undefined);
+			this.#culture.setValue(params.get('culture') ?? undefined);
+			this.#segment.setValue(params.get('segment') ?? undefined);
+
+			this.#currentArgs.culture = this.#culture.getValue();
+			this.#currentArgs.segment = this.#segment.getValue();
+
+			const serverUrl = serverContext?.getServerUrl();
 
 			if (!serverUrl) {
 				console.error('No server URL found in context');
@@ -74,11 +83,24 @@ export class UmbPreviewContext extends UmbContextBase {
 			this.#initHubConnection(serverUrl);
 		});
 
-		this.consumeContext(UMB_NOTIFICATION_CONTEXT, (instance) => {
-			this.#notificationContext = instance;
+		this.consumeContext(UMB_NOTIFICATION_CONTEXT, (notificationContext) => {
+			this.#notificationContext = notificationContext;
 		});
 	}
 
+	override hostDisconnected() {
+		super.hostDisconnected();
+
+		// Clean up event listeners
+		this.#resizeController?.abort();
+
+		// Clean up SignalR connection
+		if (this.#connection) {
+			this.#connection.stop();
+			this.#connection = undefined;
+		}
+	}
+
 	async #initHubConnection(serverUrl: string) {
 		const previewHubUrl = `${serverUrl}/umbraco/PreviewHub`;
 
@@ -91,7 +113,7 @@ export class UmbPreviewContext extends UmbContextBase {
 		this.#connection = new HubConnectionBuilder().withUrl(previewHubUrl).build();
 
 		this.#connection.on('refreshed', (payload) => {
-			if (payload === this.#unique) {
+			if (payload === this.#unique.getValue()) {
 				this.#setPreviewUrl({ rnd: Math.random() });
 			}
 		});
@@ -119,13 +141,11 @@ export class UmbPreviewContext extends UmbContextBase {
 	}
 
 	async #getPublishedUrl(): Promise<string | null> {
-		if (!this.#unique) return null;
-
-		// NOTE: We should be reusing `UmbDocumentUrlRepository` here, but the preview app doesn't register the `itemStore` extensions, so can't resolve/consume `UMB_DOCUMENT_URL_STORE_CONTEXT`. [LK]
-		const { data } = await tryExecute(this, DocumentService.getDocumentUrls({ query: { id: [this.#unique] } }));
+		const unique = this.#unique.getValue();
+		if (!unique) return null;
 
-		if (!data?.length) return null;
-		const urlInfo = this.#culture ? data[0].urlInfos.find((x) => x.culture === this.#culture) : data[0].urlInfos[0];
+		const culture = this.#culture.getValue();
+		const urlInfo = await this.#previewRepository.getPublishedUrl(unique, culture);
 
 		if (!urlInfo?.url) return null;
 		return urlInfo.url.startsWith('/') ? `${this.#serverUrl}${urlInfo.url}` : urlInfo.url;
@@ -133,7 +153,7 @@ export class UmbPreviewContext extends UmbContextBase {
 
 	#setPreviewUrl(args?: UmbPreviewUrlArgs) {
 		const host = args?.serverUrl || this.#serverUrl;
-		const unique = args?.unique || this.#unique;
+		const unique = args?.unique || this.#unique.getValue();
 
 		if (!unique) {
 			throw new Error('No unique ID found in query string.');
@@ -142,8 +162,8 @@ export class UmbPreviewContext extends UmbContextBase {
 		const url = new URL(unique, host);
 		const params = new URLSearchParams(url.search);
 
-		const culture = args?.culture || this.#culture;
-		const segment = args?.segment || this.#segment;
+		const culture = args && 'culture' in args ? args.culture : this.#culture.getValue();
+		const segment = args && 'segment' in args ? args.segment : this.#segment.getValue();
 
 		const cultureParam = 'culture';
 		const rndParam = 'rnd';
@@ -151,8 +171,10 @@ export class UmbPreviewContext extends UmbContextBase {
 
 		if (culture) {
 			params.set(cultureParam, culture);
+			this.#culture.setValue(culture);
 		} else {
 			params.delete(cultureParam);
+			this.#culture.setValue(undefined);
 		}
 
 		if (args?.rnd) {
@@ -163,8 +185,10 @@ export class UmbPreviewContext extends UmbContextBase {
 
 		if (segment) {
 			params.set(segmentParam, segment);
+			this.#segment.setValue(segment);
 		} else {
 			params.delete(segmentParam);
+			this.#segment.setValue(undefined);
 		}
 
 		const previewUrl = new URL(`${url.pathname}?${params.toString()}`, host);
@@ -174,7 +198,7 @@ export class UmbPreviewContext extends UmbContextBase {
 	}
 
 	async exitPreview() {
-		await this.#documentPreviewRepository.exit();
+		await this.#previewRepository.exit();
 
 		if (this.#connection) {
 			await this.#connection.stop();
@@ -193,6 +217,35 @@ export class UmbPreviewContext extends UmbContextBase {
 	iframeLoaded(iframe: HTMLIFrameElement) {
 		if (!iframe) return;
 		this.#iframeReady.setValue(true);
+		this.#setupScaling();
+	}
+
+	#setupScaling() {
+		// Clean up old event listeners before adding new ones
+		this.#resizeController?.abort();
+		this.#resizeController = new AbortController();
+		const signal = this.#resizeController.signal;
+
+		const wrapper = this.getIFrameWrapper();
+		if (!wrapper) return;
+
+		const scaleIFrame = () => {
+			if (wrapper.className === 'fullsize') {
+				wrapper.style.transform = '';
+			} else {
+				const wScale = document.body.offsetWidth / (wrapper.offsetWidth + 30);
+				const hScale = document.body.offsetHeight / (wrapper.offsetHeight + 30);
+				const scale = Math.min(wScale, hScale, 1);
+				wrapper.style.transform = `scale(${scale})`;
+			}
+		};
+
+		// Set up listeners once per iframe load
+		window.addEventListener('resize', scaleIFrame, { signal });
+		wrapper.addEventListener('transitionend', scaleIFrame, { signal });
+
+		// Initial scale
+		scaleIFrame();
 	}
 
 	getIFrameWrapper(): HTMLElement | undefined {
@@ -216,41 +269,32 @@ export class UmbPreviewContext extends UmbContextBase {
 		document.location.reload();
 	}
 
-	#currentArgs: UmbPreviewIframeArgs = {};
 	async updateIFrame(args?: UmbPreviewIframeArgs) {
 		const mergedArgs = { ...this.#currentArgs, ...args };
 
 		const wrapper = this.getIFrameWrapper();
 		if (!wrapper) return;
 
-		const scaleIFrame = () => {
-			if (wrapper.className === 'fullsize') {
-				wrapper.style.transform = '';
-			} else {
-				const wScale = document.body.offsetWidth / (wrapper.offsetWidth + 30);
-				const hScale = document.body.offsetHeight / (wrapper.offsetHeight + 30);
-				const scale = Math.min(wScale, hScale, 1); // get the lowest ratio, but not higher than 1
-				wrapper.style.transform = `scale(${scale})`;
-			}
-		};
-
-		window.addEventListener('resize', scaleIFrame);
-		wrapper.addEventListener('transitionend', scaleIFrame);
+		// Check if URL will change (culture or segment changed)
+		const urlWillChange =
+			(args?.culture !== undefined && mergedArgs.culture !== this.#currentArgs.culture) ||
+			(args?.segment !== undefined && mergedArgs.segment !== this.#currentArgs.segment);
 
-		this.#iframeReady.setValue(false);
+		// Only show loading spinner if iframe will reload
+		if (urlWillChange) {
+			this.#iframeReady.setValue(false);
+		}
 
 		const params = new URLSearchParams(window.location.search);
 
+		params.delete('culture');
 		if (mergedArgs.culture) {
 			params.set('culture', mergedArgs.culture);
-		} else {
-			params.delete('culture');
 		}
 
+		params.delete('segment');
 		if (mergedArgs.segment) {
 			params.set('segment', mergedArgs.segment);
-		} else {
-			params.delete('segment');
 		}
 
 		const newRelativePathQuery = window.location.pathname + '?' + params.toString();
@@ -260,10 +304,8 @@ export class UmbPreviewContext extends UmbContextBase {
 
 		this.#setPreviewUrl({ culture: mergedArgs.culture, segment: mergedArgs.segment });
 
-		if (mergedArgs.className) wrapper.className = mergedArgs.className;
+		if (mergedArgs.wrapperClass) wrapper.className = mergedArgs.wrapperClass;
 		if (mergedArgs.height) wrapper.style.height = mergedArgs.height;
 		if (mergedArgs.width) wrapper.style.width = mergedArgs.width;
 	}
 }
-
-export const UMB_PREVIEW_CONTEXT = new UmbContextToken<UmbPreviewContext>('UmbPreviewContext');
diff --git a/src/Umbraco.Web.UI.Client/src/packages/preview/index.ts b/src/Umbraco.Web.UI.Client/src/packages/preview/index.ts
new file mode 100644
index 000000000000..b8e135f9822d
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/packages/preview/index.ts
@@ -0,0 +1,2 @@
+export * from './context/index.js';
+export * from './repository/index.js';
diff --git a/src/Umbraco.Web.UI.Client/src/packages/preview/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/preview/manifests.ts
new file mode 100644
index 000000000000..5a50cd3e0c67
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/packages/preview/manifests.ts
@@ -0,0 +1,4 @@
+import { manifests as previewApps } from './preview-apps/manifests.js';
+import type { UmbExtensionManifestKind } from '@umbraco-cms/backoffice/extension-registry';
+
+export const manifests: Array<UmbExtensionManifest | UmbExtensionManifestKind> = [...previewApps];
diff --git a/src/Umbraco.Web.UI.Client/src/packages/preview/package.json b/src/Umbraco.Web.UI.Client/src/packages/preview/package.json
new file mode 100644
index 000000000000..1949079ee408
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/packages/preview/package.json
@@ -0,0 +1,8 @@
+{
+	"name": "@umbraco-backoffice/preview",
+	"private": true,
+	"type": "module",
+	"scripts": {
+		"build": "vite build"
+	}
+}
diff --git a/src/Umbraco.Web.UI.Client/src/apps/preview/apps/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/preview/preview-apps/manifests.ts
similarity index 76%
rename from src/Umbraco.Web.UI.Client/src/apps/preview/apps/manifests.ts
rename to src/Umbraco.Web.UI.Client/src/packages/preview/preview-apps/manifests.ts
index b9c2126a96bf..9f84f0659bf8 100644
--- a/src/Umbraco.Web.UI.Client/src/apps/preview/apps/manifests.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/preview/preview-apps/manifests.ts
@@ -1,6 +1,4 @@
-import type { ManifestPreviewAppProvider } from '@umbraco-cms/backoffice/extension-registry';
-
-export const manifests: Array<ManifestPreviewAppProvider> = [
+export const manifests: Array<UmbExtensionManifest> = [
 	{
 		type: 'previewApp',
 		alias: 'Umb.PreviewApps.Device',
@@ -13,14 +11,21 @@ export const manifests: Array<ManifestPreviewAppProvider> = [
 		alias: 'Umb.PreviewApps.Culture',
 		name: 'Preview: Culture Switcher',
 		element: () => import('./preview-culture.element.js'),
-		weight: 300,
+		weight: 310,
 	},
 	{
 		type: 'previewApp',
 		alias: 'Umb.PreviewApps.Segment',
 		name: 'Preview: Segment Switcher',
 		element: () => import('./preview-segment.element.js'),
-		weight: 290,
+		weight: 300,
+	},
+	{
+		type: 'previewApp',
+		alias: 'Umb.PreviewApps.Environments',
+		name: 'Preview: Environments Menu',
+		element: () => import('./preview-environments.element.js'),
+		weight: 210,
 	},
 	{
 		type: 'previewApp',
diff --git a/src/Umbraco.Web.UI.Client/src/apps/preview/apps/preview-culture.element.ts b/src/Umbraco.Web.UI.Client/src/packages/preview/preview-apps/preview-culture.element.ts
similarity index 66%
rename from src/Umbraco.Web.UI.Client/src/apps/preview/apps/preview-culture.element.ts
rename to src/Umbraco.Web.UI.Client/src/packages/preview/preview-apps/preview-culture.element.ts
index 3fd66910edd9..fd7f9fa75632 100644
--- a/src/Umbraco.Web.UI.Client/src/apps/preview/apps/preview-culture.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/preview/preview-apps/preview-culture.element.ts
@@ -1,25 +1,39 @@
-import { UMB_PREVIEW_CONTEXT } from '../preview.context.js';
-import { css, customElement, html, nothing, repeat, state } from '@umbraco-cms/backoffice/external/lit';
+import { UMB_PREVIEW_CONTEXT } from '../context/preview.context-token.js';
+import type { UmbPopoverToggleEvent } from './types.js';
+import { css, customElement, html, nothing, query, repeat, state } from '@umbraco-cms/backoffice/external/lit';
 import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element';
 import { UmbLanguageCollectionRepository } from '@umbraco-cms/backoffice/language';
 import type { UmbLanguageDetailModel } from '@umbraco-cms/backoffice/language';
+import type { UUIPopoverContainerElement } from '@umbraco-cms/backoffice/external/uui';
 
 @customElement('umb-preview-culture')
 export class UmbPreviewCultureElement extends UmbLitElement {
 	#languageRepository = new UmbLanguageCollectionRepository(this);
 
+	@query('#cultures-popover')
+	private _popoverElement?: UUIPopoverContainerElement;
+
 	@state()
 	private _culture?: UmbLanguageDetailModel;
 
 	@state()
 	private _cultures: Array<UmbLanguageDetailModel> = [];
 
+	@state()
+	private _popoverOpen = false;
+
+	constructor() {
+		super();
+		this.addEventListener('blur', this.#onBlur, true); // Use capture phase to catch blur events
+	}
+
 	override connectedCallback() {
 		super.connectedCallback();
-		this.#getCultures();
+		this.hidden = true;
+		this.#loadCultures();
 	}
 
-	async #getCultures() {
+	async #loadCultures() {
 		const { data: langauges } = await this.#languageRepository.requestCollection({ skip: 0, take: 100 });
 		this._cultures = langauges?.items ?? [];
 
@@ -29,6 +43,8 @@ export class UmbPreviewCultureElement extends UmbLitElement {
 		if (culture && culture !== this._culture?.unique) {
 			this._culture = this._cultures.find((c) => c.unique === culture);
 		}
+
+		this.hidden = !this._cultures.length;
 	}
 
 	async #onClick(culture: UmbLanguageDetailModel) {
@@ -37,8 +53,20 @@ export class UmbPreviewCultureElement extends UmbLitElement {
 
 		const previewContext = await this.getContext(UMB_PREVIEW_CONTEXT);
 		previewContext?.updateIFrame({ culture: culture.unique });
+
+		this._popoverElement?.hidePopover();
+	}
+
+	#onPopoverToggle(event: UmbPopoverToggleEvent) {
+		this._popoverOpen = event.newState === 'open';
 	}
 
+	#onBlur = () => {
+		if (this._popoverOpen) {
+			this._popoverElement?.hidePopover();
+		}
+	};
+
 	override render() {
 		if (this._cultures.length <= 1) return nothing;
 		return html`
@@ -47,8 +75,9 @@ export class UmbPreviewCultureElement extends UmbLitElement {
 					<uui-icon name="icon-globe"></uui-icon>
 					<span>${this._culture?.name ?? this.localize.term('treeHeaders_languages')}</span>
 				</div>
+				<uui-symbol-expand slot="extra" id="expand-symbol" .open=${this._popoverOpen}></uui-symbol-expand>
 			</uui-button>
-			<uui-popover-container id="cultures-popover" placement="top-end">
+			<uui-popover-container id="cultures-popover" placement="top-end" @toggle=${this.#onPopoverToggle}>
 				<umb-popover-layout>
 					${repeat(
 						this._cultures,
@@ -75,12 +104,26 @@ export class UmbPreviewCultureElement extends UmbLitElement {
 				--uui-button-font-weight: 400;
 				--uui-button-padding-left-factor: 3;
 				--uui-button-padding-right-factor: 3;
+				--uui-menu-item-flat-structure: 1;
+			}
+
+			:host([hidden]) {
+				display: none;
+			}
+
+			#expand-symbol {
+				transform: rotate(-90deg);
+				margin-left: var(--uui-size-space-3, 9px);
+
+				&[open] {
+					transform: rotate(0deg);
+				}
 			}
 
 			uui-button > div {
 				display: flex;
 				align-items: center;
-				gap: 5px;
+				gap: var(--uui-size-2, 6px);
 			}
 
 			umb-popover-layout {
diff --git a/src/Umbraco.Web.UI.Client/src/apps/preview/apps/preview-device.element.ts b/src/Umbraco.Web.UI.Client/src/packages/preview/preview-apps/preview-device.element.ts
similarity index 57%
rename from src/Umbraco.Web.UI.Client/src/apps/preview/apps/preview-device.element.ts
rename to src/Umbraco.Web.UI.Client/src/packages/preview/preview-apps/preview-device.element.ts
index 92cb0412b198..bb0a24baf180 100644
--- a/src/Umbraco.Web.UI.Client/src/apps/preview/apps/preview-device.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/preview/preview-apps/preview-device.element.ts
@@ -1,65 +1,66 @@
-import { UMB_PREVIEW_CONTEXT } from '../preview.context.js';
-import { css, customElement, html, property, repeat } from '@umbraco-cms/backoffice/external/lit';
+import { UMB_PREVIEW_CONTEXT } from '../context/preview.context-token.js';
+import type { UmbPopoverToggleEvent } from './types.js';
+import { css, customElement, html, ifDefined, property, query, repeat, state } from '@umbraco-cms/backoffice/external/lit';
 import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element';
+import type { UUIPopoverContainerElement } from '@umbraco-cms/backoffice/external/uui';
 
 export interface UmbPreviewDevice {
 	alias: string;
 	label: string;
-	css: string;
 	icon: string;
+	iconClass?: string;
 	dimensions: { height: string; width: string };
 }
 
 @customElement('umb-preview-device')
 export class UmbPreviewDeviceElement extends UmbLitElement {
+	@query('#devices-popover')
+	private _popoverElement?: UUIPopoverContainerElement;
+
+	// TODO: [LK] Eventually, convert these devices to be an  extension point.
 	#devices: Array<UmbPreviewDevice> = [
 		{
 			alias: 'fullsize',
 			label: 'Fit browser',
-			css: 'fullsize',
 			icon: 'icon-application-window-alt',
 			dimensions: { height: '100%', width: '100%' },
 		},
 		{
 			alias: 'desktop',
 			label: 'Desktop',
-			css: 'desktop shadow',
 			icon: 'icon-display',
 			dimensions: { height: '1080px', width: '1920px' },
 		},
 		{
 			alias: 'laptop',
 			label: 'Laptop',
-			css: 'laptop shadow',
 			icon: 'icon-laptop',
 			dimensions: { height: '768px', width: '1366px' },
 		},
 		{
 			alias: 'ipad-portrait',
 			label: 'Tablet portrait',
-			css: 'ipad-portrait shadow',
 			icon: 'icon-ipad',
 			dimensions: { height: '929px', width: '769px' },
 		},
 		{
 			alias: 'ipad-landscape',
 			label: 'Tablet landscape',
-			css: 'ipad-landscape shadow flip',
 			icon: 'icon-ipad',
+			iconClass: 'flip',
 			dimensions: { height: '675px', width: '1024px' },
 		},
 		{
 			alias: 'smartphone-portrait',
 			label: 'Smartphone portrait',
-			css: 'smartphone-portrait shadow',
 			icon: 'icon-iphone',
 			dimensions: { height: '640px', width: '360px' },
 		},
 		{
 			alias: 'smartphone-landscape',
 			label: 'Smartphone landscape',
-			css: 'smartphone-landscape shadow flip',
 			icon: 'icon-iphone',
+			iconClass: 'flip',
 			dimensions: { height: '360px', width: '640px' },
 		},
 	];
@@ -67,44 +68,68 @@ export class UmbPreviewDeviceElement extends UmbLitElement {
 	@property({ attribute: false, type: Object })
 	device = this.#devices[0];
 
+	@state()
+	private _popoverOpen = false;
+
+	constructor() {
+		super();
+		this.addEventListener('blur', this.#onBlur, true); // Use capture phase to catch blur events
+	}
+
 	override connectedCallback() {
 		super.connectedCallback();
-		this.#changeDevice(this.device);
+		this.hidden = true;
+		this.#loadDevices();
 	}
 
-	async #changeDevice(device: UmbPreviewDevice) {
+	async #loadDevices() {
+		// TODO: [LK] Eventually, load devices from extension points.
+		this.hidden = false;
+	}
+
+	async #onClick(device: UmbPreviewDevice) {
 		if (device === this.device) return;
 
 		this.device = device;
 
 		const previewContext = await this.getContext(UMB_PREVIEW_CONTEXT);
 
-		previewContext?.updateIFrame({
-			className: device.css,
+		await previewContext?.updateIFrame({
+			wrapperClass: device.alias,
 			height: device.dimensions.height,
 			width: device.dimensions.width,
 		});
+
+		// Don't close popover for device selector - users often want to quickly test multiple devices
+	}
+
+	#onPopoverToggle(event: UmbPopoverToggleEvent) {
+		this._popoverOpen = event.newState === 'open';
 	}
 
+	#onBlur = () => {
+		if (this._popoverOpen) {
+			this._popoverElement?.hidePopover();
+		}
+	};
+
 	override render() {
 		return html`
 			<uui-button look="primary" popovertarget="devices-popover">
 				<div>
-					<uui-icon name=${this.device.icon} class=${this.device.css.includes('flip') ? 'flip' : ''}></uui-icon>
+					<uui-icon name=${this.device.icon} class=${ifDefined(this.device.iconClass)}></uui-icon>
 					<span>${this.device.label}</span>
 				</div>
+				<uui-symbol-expand slot="extra" id="expand-symbol" .open=${this._popoverOpen}></uui-symbol-expand>
 			</uui-button>
-			<uui-popover-container id="devices-popover" placement="top-end">
+			<uui-popover-container id="devices-popover" placement="top-end" @toggle=${this.#onPopoverToggle}>
 				<umb-popover-layout>
 					${repeat(
 						this.#devices,
 						(item) => item.alias,
 						(item) => html`
-							<uui-menu-item
-								label=${item.label}
-								?active=${item === this.device}
-								@click=${() => this.#changeDevice(item)}>
-								<uui-icon slot="icon" name=${item.icon} class=${item.css.includes('flip') ? 'flip' : ''}></uui-icon>
+							<uui-menu-item label=${item.label} ?active=${item === this.device} @click=${() => this.#onClick(item)}>
+								<uui-icon slot="icon" name=${item.icon} class=${ifDefined(item.iconClass)}></uui-icon>
 							</uui-menu-item>
 						`,
 					)}
@@ -121,12 +146,30 @@ export class UmbPreviewDeviceElement extends UmbLitElement {
 				--uui-button-font-weight: 400;
 				--uui-button-padding-left-factor: 3;
 				--uui-button-padding-right-factor: 3;
+				--uui-menu-item-flat-structure: 1;
+			}
+
+			:host([hidden]) {
+				display: none;
+			}
+
+			#expand-symbol {
+				transform: rotate(-90deg);
+				margin-left: var(--uui-size-space-3, 9px);
+
+				&[open] {
+					transform: rotate(0deg);
+				}
 			}
 
 			uui-button > div {
 				display: flex;
 				align-items: center;
-				gap: 5px;
+				gap: var(--uui-size-2, 6px);
+			}
+
+			uui-icon.flip {
+				transform: rotate(90deg);
 			}
 
 			umb-popover-layout {
diff --git a/src/Umbraco.Web.UI.Client/src/packages/preview/preview-apps/preview-environments.element.ts b/src/Umbraco.Web.UI.Client/src/packages/preview/preview-apps/preview-environments.element.ts
new file mode 100644
index 000000000000..8b0bf0452adc
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/packages/preview/preview-apps/preview-environments.element.ts
@@ -0,0 +1,170 @@
+import { UmbPreviewRepository } from '../repository/preview.repository.js';
+import { UMB_PREVIEW_CONTEXT } from '../context/preview.context-token.js';
+import { css, customElement, html, nothing, repeat, state } from '@umbraco-cms/backoffice/external/lit';
+import { umbExtensionsRegistry } from '@umbraco-cms/backoffice/extension-registry';
+import { umbPeekError } from '@umbraco-cms/backoffice/notification';
+import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element';
+import type { UmbPopoverToggleEvent } from './types.js';
+
+type UmbPreviewEnvironmentItem = {
+	alias: string;
+	label: string;
+	icon: string;
+	urlProviderAlias?: string;
+};
+
+@customElement('umb-preview-environments')
+export class UmbPreviewEnvironmentsElement extends UmbLitElement {
+	#fallbackIcon = 'icon-multiple-windows';
+
+	@state()
+	private _culture?: string;
+
+	@state()
+	private _items: Array<UmbPreviewEnvironmentItem> = [];
+
+	@state()
+	private _popoverOpen = false;
+
+	@state()
+	private _segment?: string;
+
+	@state()
+	private _unique?: string;
+
+	#previewRepository = new UmbPreviewRepository(this);
+
+	constructor() {
+		super();
+
+		this.consumeContext(UMB_PREVIEW_CONTEXT, (context) => {
+			this.observe(context?.unique, (unique) => (this._unique = unique), '_observeUnique');
+			this.observe(context?.culture, (culture) => (this._culture = culture), '_observeCulture');
+			this.observe(context?.segment, (segment) => (this._segment = segment), '_observeSegment');
+		});
+	}
+
+	override connectedCallback() {
+		super.connectedCallback();
+		this.hidden = true;
+		this.#getPreviewOptions();
+	}
+
+	async #getPreviewOptions() {
+		this.observe(
+			umbExtensionsRegistry.byTypeAndFilter('workspaceActionMenuItem', (ext) => ext.kind === 'previewOption'),
+			(manifests) => {
+				this._items = manifests.map((manifest) => ({
+					alias: manifest.alias,
+					label: (manifest.meta as any).label || manifest.name,
+					icon: (manifest.meta as any).icon || this.#fallbackIcon,
+					urlProviderAlias: (manifest.meta as any).urlProviderAlias,
+				}));
+
+				this.hidden = !this._items.length;
+			},
+		);
+	}
+
+	async #onClick(item: UmbPreviewEnvironmentItem) {
+		if (!this._unique) return;
+		if (!item.urlProviderAlias) return;
+
+		const previewUrlData = await this.#previewRepository.getPreviewUrl(
+			this._unique,
+			item.urlProviderAlias,
+			this._culture,
+			this._segment,
+		);
+
+		if (previewUrlData.url) {
+			const previewWindow = window.open(previewUrlData.url, `umbpreview-${this._unique}`);
+			previewWindow?.focus();
+			return;
+		}
+
+		if (previewUrlData.message) {
+			umbPeekError(this, {
+				color: 'danger',
+				headline: this.localize.term('general_preview'),
+				message: previewUrlData.message,
+			});
+		}
+	}
+
+	#onPopoverToggle(event: UmbPopoverToggleEvent) {
+		this._popoverOpen = event.newState === 'open';
+	}
+
+	override render() {
+		if (!this._items.length) return nothing;
+		return html`
+			<uui-button look="primary" popovertarget="options-popover">
+				<div>
+					<uui-icon name=${this.#fallbackIcon}></uui-icon>
+					<span>Preview environments</span>
+				</div>
+				<uui-symbol-expand slot="extra" id="expand-symbol" .open=${this._popoverOpen}></uui-symbol-expand>
+			</uui-button>
+			<uui-popover-container id="options-popover" placement="top-end" @toggle=${this.#onPopoverToggle}>
+				<umb-popover-layout>
+					${repeat(
+						this._items,
+						(item) => item.alias,
+						(item) => html`
+							<uui-menu-item label=${this.localize.string(item.label)} @click=${() => this.#onClick(item)}>
+								<uui-icon slot="icon" name=${item.icon}></uui-icon>
+							</uui-menu-item>
+						`,
+					)}
+				</umb-popover-layout>
+			</uui-popover-container>
+		`;
+	}
+
+	static override styles = [
+		css`
+			:host {
+				display: flex;
+				border-left: 1px solid var(--uui-color-header-contrast);
+				--uui-button-font-weight: 400;
+				--uui-button-padding-left-factor: 3;
+				--uui-button-padding-right-factor: 3;
+				--uui-menu-item-flat-structure: 1;
+			}
+
+			:host([hidden]) {
+				display: none;
+			}
+
+			#expand-symbol {
+				transform: rotate(-90deg);
+				margin-left: var(--uui-size-space-3, 9px);
+
+				&[open] {
+					transform: rotate(0deg);
+				}
+			}
+
+			uui-button > div {
+				display: flex;
+				align-items: center;
+				gap: var(--uui-size-2, 6px);
+			}
+
+			umb-popover-layout {
+				--uui-color-surface: var(--uui-color-header-surface);
+				--uui-color-border: var(--uui-color-header-surface);
+				color: var(--uui-color-header-contrast);
+			}
+		`,
+	];
+}
+
+export { UmbPreviewEnvironmentsElement as element };
+
+declare global {
+	interface HTMLElementTagNameMap {
+		'umb-preview-environments': UmbPreviewEnvironmentsElement;
+	}
+}
diff --git a/src/Umbraco.Web.UI.Client/src/apps/preview/apps/preview-exit.element.ts b/src/Umbraco.Web.UI.Client/src/packages/preview/preview-apps/preview-exit.element.ts
similarity index 91%
rename from src/Umbraco.Web.UI.Client/src/apps/preview/apps/preview-exit.element.ts
rename to src/Umbraco.Web.UI.Client/src/packages/preview/preview-apps/preview-exit.element.ts
index c1a45b753de2..80ccec9c7b49 100644
--- a/src/Umbraco.Web.UI.Client/src/apps/preview/apps/preview-exit.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/preview/preview-apps/preview-exit.element.ts
@@ -1,4 +1,4 @@
-import { UMB_PREVIEW_CONTEXT } from '../preview.context.js';
+import { UMB_PREVIEW_CONTEXT } from '../context/preview.context-token.js';
 import { css, customElement, html } from '@umbraco-cms/backoffice/external/lit';
 import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element';
 
@@ -33,7 +33,7 @@ export class UmbPreviewExitElement extends UmbLitElement {
 			uui-button > div {
 				display: flex;
 				align-items: center;
-				gap: 5px;
+				gap: var(--uui-size-2, 6px);
 			}
 		`,
 	];
diff --git a/src/Umbraco.Web.UI.Client/src/apps/preview/apps/preview-open-website.element.ts b/src/Umbraco.Web.UI.Client/src/packages/preview/preview-apps/preview-open-website.element.ts
similarity index 91%
rename from src/Umbraco.Web.UI.Client/src/apps/preview/apps/preview-open-website.element.ts
rename to src/Umbraco.Web.UI.Client/src/packages/preview/preview-apps/preview-open-website.element.ts
index 4a77454df8f5..7021ad942638 100644
--- a/src/Umbraco.Web.UI.Client/src/apps/preview/apps/preview-open-website.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/preview/preview-apps/preview-open-website.element.ts
@@ -1,4 +1,4 @@
-import { UMB_PREVIEW_CONTEXT } from '../preview.context.js';
+import { UMB_PREVIEW_CONTEXT } from '../context/preview.context-token.js';
 import { css, customElement, html } from '@umbraco-cms/backoffice/external/lit';
 import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element';
 
@@ -33,7 +33,7 @@ export class UmbPreviewOpenWebsiteElement extends UmbLitElement {
 			uui-button > div {
 				display: flex;
 				align-items: center;
-				gap: 5px;
+				gap: var(--uui-size-2, 6px);
 			}
 		`,
 	];
diff --git a/src/Umbraco.Web.UI.Client/src/apps/preview/apps/preview-segment.element.ts b/src/Umbraco.Web.UI.Client/src/packages/preview/preview-apps/preview-segment.element.ts
similarity index 62%
rename from src/Umbraco.Web.UI.Client/src/apps/preview/apps/preview-segment.element.ts
rename to src/Umbraco.Web.UI.Client/src/packages/preview/preview-apps/preview-segment.element.ts
index dc49628d49ff..c3817d1d9525 100644
--- a/src/Umbraco.Web.UI.Client/src/apps/preview/apps/preview-segment.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/preview/preview-apps/preview-segment.element.ts
@@ -1,28 +1,35 @@
-import { UMB_PREVIEW_CONTEXT } from '../preview.context.js';
-import {
-	css,
-	customElement,
-	html,
-	nothing,
-	repeat,
-	state,
-	type PropertyValues,
-} from '@umbraco-cms/backoffice/external/lit';
+import { UMB_PREVIEW_CONTEXT } from '../context/preview.context-token.js';
+import type { UmbPopoverToggleEvent } from './types.js';
+import { css, customElement, html, nothing, query, repeat, state } from '@umbraco-cms/backoffice/external/lit';
 import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element';
-import { UmbSegmentCollectionRepository, type UmbSegmentCollectionItemModel } from '@umbraco-cms/backoffice/segment';
+import { UmbSegmentCollectionRepository } from '@umbraco-cms/backoffice/segment';
+import type { UmbSegmentCollectionItemModel } from '@umbraco-cms/backoffice/segment';
+import type { UUIPopoverContainerElement } from '@umbraco-cms/backoffice/external/uui';
 
 @customElement('umb-preview-segment')
 export class UmbPreviewSegmentElement extends UmbLitElement {
 	#segmentRepository = new UmbSegmentCollectionRepository(this);
 
+	@query('#segments-popover')
+	private _popoverElement?: UUIPopoverContainerElement;
+
 	@state()
 	private _segment?: UmbSegmentCollectionItemModel;
 
 	@state()
 	private _segments: Array<UmbSegmentCollectionItemModel> = [];
 
-	protected override firstUpdated(_changedProperties: PropertyValues): void {
-		super.firstUpdated(_changedProperties);
+	@state()
+	private _popoverOpen = false;
+
+	constructor() {
+		super();
+		this.addEventListener('blur', this.#onBlur, true); // Use capture phase to catch blur events
+	}
+
+	override connectedCallback() {
+		super.connectedCallback();
+		this.hidden = true;
 		this.#loadSegments();
 	}
 
@@ -36,6 +43,8 @@ export class UmbPreviewSegmentElement extends UmbLitElement {
 		if (segment && segment !== this._segment?.unique) {
 			this._segment = this._segments.find((c) => c.unique === segment);
 		}
+
+		this.hidden = !this._segments.length;
 	}
 
 	async #onClick(segment?: UmbSegmentCollectionItemModel) {
@@ -44,8 +53,20 @@ export class UmbPreviewSegmentElement extends UmbLitElement {
 
 		const previewContext = await this.getContext(UMB_PREVIEW_CONTEXT);
 		previewContext?.updateIFrame({ segment: segment?.unique });
+
+		this._popoverElement?.hidePopover();
+	}
+
+	#onPopoverToggle(event: UmbPopoverToggleEvent) {
+		this._popoverOpen = event.newState === 'open';
 	}
 
+	#onBlur = () => {
+		if (this._popoverOpen) {
+			this._popoverElement?.hidePopover();
+		}
+	};
+
 	override render() {
 		if (!this._segments.length) return nothing;
 		return html`
@@ -54,8 +75,9 @@ export class UmbPreviewSegmentElement extends UmbLitElement {
 					<uui-icon name="icon-filter"></uui-icon>
 					<span>${this._segment?.name ?? 'Segments'}</span>
 				</div>
+				<uui-symbol-expand slot="extra" id="expand-symbol" .open=${this._popoverOpen}></uui-symbol-expand>
 			</uui-button>
-			<uui-popover-container id="segments-popover" placement="top-end">
+			<uui-popover-container id="segments-popover" placement="top-end" @toggle=${this.#onPopoverToggle}>
 				<umb-popover-layout>
 					<uui-menu-item label="Default" ?active=${!this._segment} @click=${() => this.#onClick()}></uui-menu-item>
 					${repeat(
@@ -82,12 +104,26 @@ export class UmbPreviewSegmentElement extends UmbLitElement {
 				--uui-button-font-weight: 400;
 				--uui-button-padding-left-factor: 3;
 				--uui-button-padding-right-factor: 3;
+				--uui-menu-item-flat-structure: 1;
+			}
+
+			:host([hidden]) {
+				display: none;
+			}
+
+			#expand-symbol {
+				transform: rotate(-90deg);
+				margin-left: var(--uui-size-space-3, 9px);
+
+				&[open] {
+					transform: rotate(0deg);
+				}
 			}
 
 			uui-button > div {
 				display: flex;
 				align-items: center;
-				gap: 5px;
+				gap: var(--uui-size-2, 6px);
 			}
 
 			umb-popover-layout {
diff --git a/src/Umbraco.Web.UI.Client/src/packages/preview/preview-apps/types.ts b/src/Umbraco.Web.UI.Client/src/packages/preview/preview-apps/types.ts
new file mode 100644
index 000000000000..8284655869c7
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/packages/preview/preview-apps/types.ts
@@ -0,0 +1,6 @@
+/**
+ * Custom event type for popover toggle events
+ */
+export interface UmbPopoverToggleEvent extends Event {
+	newState: string;
+}
diff --git a/src/Umbraco.Web.UI.Client/src/packages/preview/repository/index.ts b/src/Umbraco.Web.UI.Client/src/packages/preview/repository/index.ts
new file mode 100644
index 000000000000..7f9694a5bc4f
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/packages/preview/repository/index.ts
@@ -0,0 +1 @@
+export { UmbPreviewRepository } from './preview.repository.js';
diff --git a/src/Umbraco.Web.UI.Client/src/packages/preview/repository/preview.repository.ts b/src/Umbraco.Web.UI.Client/src/packages/preview/repository/preview.repository.ts
new file mode 100644
index 000000000000..c3172c6e308c
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/packages/preview/repository/preview.repository.ts
@@ -0,0 +1,74 @@
+import { tryExecute } from '@umbraco-cms/backoffice/resources';
+import { DocumentService, PreviewService } from '@umbraco-cms/backoffice/external/backend-api';
+import { UmbRepositoryBase } from '@umbraco-cms/backoffice/repository';
+import type { DocumentUrlInfoModel } from '@umbraco-cms/backoffice/external/backend-api';
+import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api';
+
+export class UmbPreviewRepository extends UmbRepositoryBase {
+	constructor(host: UmbControllerHost) {
+		super(host);
+	}
+
+	/**
+	 * Gets the preview URL for a document.
+	 * @param {string} unique The unique identifier of the document.
+	 * @param {string} providerAlias The alias of the URL provider registered on the server.
+	 * @param {string | undefined} culture The culture to preview (undefined means invariant).
+	 * @param {string | undefined} segment The segment to preview (undefined means no specific segment).
+	 * @returns {DocumentUrlInfoModel} The preview URLs of the document.
+	 * @memberof UmbPreviewRepository
+	 */
+	async getPreviewUrl(
+		unique: string,
+		providerAlias: string,
+		culture?: string,
+		segment?: string,
+	): Promise<DocumentUrlInfoModel> {
+		const { data, error } = await tryExecute(
+			this,
+			DocumentService.getDocumentByIdPreviewUrl({
+				path: { id: unique },
+				query: { providerAlias, culture, segment },
+			}),
+		);
+
+		if (error) {
+			throw new Error(error.message);
+		}
+
+		return data;
+	}
+
+	/**
+	 * Gets the published URL info for a document.
+	 * @param {string} unique The unique identifier of the document.
+	 * @param {string | undefined} culture The culture to preview (undefined means invariant).
+	 * @returns {DocumentUrlInfoModel} The published URL info of the document.
+	 * @memberof UmbPreviewRepository
+	 */
+	async getPublishedUrl(unique: string, culture?: string): Promise<DocumentUrlInfoModel | null | undefined> {
+		if (!unique) return null;
+
+		const { data, error } = await tryExecute(this, DocumentService.getDocumentUrls({ query: { id: [unique] } }));
+
+		if (error) {
+			throw new Error(error.message);
+		}
+
+		if (!data?.length) return null;
+
+		// TODO: [LK] Review the logic here, unsure whether this is correct. When will the array have more than one item?
+		const urlInfo = culture ? data[0].urlInfos.find((x) => x.culture === culture) : data[0].urlInfos[0];
+		return urlInfo;
+	}
+
+	/**
+	 * Exits preview mode.
+	 * @returns {Promise<void>}
+	 * @memberof UmbPreviewRepository
+	 */
+	async exit(): Promise<void> {
+		await tryExecute(this, PreviewService.deletePreview(), { disableNotifications: true });
+		return;
+	}
+}
diff --git a/src/Umbraco.Web.UI.Client/src/packages/preview/umbraco-package.ts b/src/Umbraco.Web.UI.Client/src/packages/preview/umbraco-package.ts
new file mode 100644
index 000000000000..b86e47d21b8a
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/packages/preview/umbraco-package.ts
@@ -0,0 +1,9 @@
+export const name = 'Umbraco.Core.Preview';
+export const extensions = [
+	{
+		name: 'Preview Bundle',
+		alias: 'Umb.Bundle.Preview',
+		type: 'bundle',
+		js: () => import('./manifests.js'),
+	},
+];
diff --git a/src/Umbraco.Web.UI.Client/src/packages/preview/vite.config.ts b/src/Umbraco.Web.UI.Client/src/packages/preview/vite.config.ts
new file mode 100644
index 000000000000..c667d802cafd
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/packages/preview/vite.config.ts
@@ -0,0 +1,12 @@
+import { defineConfig } from 'vite';
+import { rmSync } from 'fs';
+import { getDefaultConfig } from '../../vite-config-base';
+
+const dist = '../../../dist-cms/packages/preview';
+
+// delete the unbundled dist folder
+rmSync(dist, { recursive: true, force: true });
+
+export default defineConfig({
+	...getDefaultConfig({ dist }),
+});
diff --git a/src/Umbraco.Web.UI.Client/tsconfig.json b/src/Umbraco.Web.UI.Client/tsconfig.json
index e1928fbeec34..16c2d20becbd 100644
--- a/src/Umbraco.Web.UI.Client/tsconfig.json
+++ b/src/Umbraco.Web.UI.Client/tsconfig.json
@@ -114,6 +114,7 @@ DON'T EDIT THIS FILE DIRECTLY. It is generated by /devops/tsconfig/index.js
 			"@umbraco-cms/backoffice/picker-input": ["./src/packages/core/picker-input/index.ts"],
 			"@umbraco-cms/backoffice/picker-data-source": ["./src/packages/core/picker-data-source/index.ts"],
 			"@umbraco-cms/backoffice/picker": ["./src/packages/core/picker/index.ts"],
+			"@umbraco-cms/backoffice/preview": ["./src/packages/preview/index.ts"],
 			"@umbraco-cms/backoffice/property-action": ["./src/packages/core/property-action/index.ts"],
 			"@umbraco-cms/backoffice/property-editor-data-source": [
 				"./src/packages/core/property-editor-data-source/index.ts"

From e8936827231000cc23466f0b8839d27190d4fda0 Mon Sep 17 00:00:00 2001
From: Jan Skovgaard <1932158+BatJan@users.noreply.github.com>
Date: Thu, 23 Oct 2025 13:02:05 +0200
Subject: [PATCH 081/155] Don't call generateAlias on #onAliasChange()
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Currently it's not possible to use characters like "_" and "-" in aliases due to this check - At least that is was @nul800sebastiaan told me 😇

Suggested fix for #20622
---
 .../views/settings/property-workspace-view-settings.element.ts  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Umbraco.Web.UI.Client/src/packages/content/property-type/workspace/views/settings/property-workspace-view-settings.element.ts b/src/Umbraco.Web.UI.Client/src/packages/content/property-type/workspace/views/settings/property-workspace-view-settings.element.ts
index b12707f699a3..7bef08e813cb 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/content/property-type/workspace/views/settings/property-workspace-view-settings.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/content/property-type/workspace/views/settings/property-workspace-view-settings.element.ts
@@ -108,7 +108,7 @@ export class UmbPropertyTypeWorkspaceViewSettingsElement extends UmbLitElement i
 
 	#onAliasChange() {
 		// TODO: Why can I not get the correct value via event? Is it an issue in uui library too?
-		const alias = generateAlias(this._aliasInput.value.toString());
+		const alias = this._aliasInput.value.toString();
 		this.updateValue({ alias });
 	}
 

From f33eb3f678c24c0b0b34ea27bcf6b14923c721af Mon Sep 17 00:00:00 2001
From: Andy Butland <abutland73@gmail.com>
Date: Mon, 27 Oct 2025 13:42:48 +0100
Subject: [PATCH 082/155] Media types: Handle null configured file extensions
 when populating allowed media types (closes #20620) (#20635)

* Handle null configured file extensions when populating allowed media types.

* Added clarifying comment.
---
 .../Services/ContentTypeEditing/MediaTypeEditingService.cs      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Umbraco.Core/Services/ContentTypeEditing/MediaTypeEditingService.cs b/src/Umbraco.Core/Services/ContentTypeEditing/MediaTypeEditingService.cs
index 8a626215b4ea..4955eeec9cd1 100644
--- a/src/Umbraco.Core/Services/ContentTypeEditing/MediaTypeEditingService.cs
+++ b/src/Umbraco.Core/Services/ContentTypeEditing/MediaTypeEditingService.cs
@@ -175,7 +175,7 @@ private async Task<IDictionary<IMediaType, IEnumerable<string>>> FetchAllowedFil
                 continue;
             }
 
-            allowedFileExtensionsByMediaType[mediaType] = fileUploadConfiguration.FileExtensions;
+            allowedFileExtensionsByMediaType[mediaType] = fileUploadConfiguration.FileExtensions ?? []; // Although we never expect null here, legacy data type configuration did allow it.
         }
 
         return allowedFileExtensionsByMediaType;

From 13c164d81f82a5c15b0198bb2aae8d92f490fc97 Mon Sep 17 00:00:00 2001
From: Andy Butland <abutland73@gmail.com>
Date: Tue, 28 Oct 2025 08:58:03 +0100
Subject: [PATCH 083/155] Bump version to 16.3.4.

---
 src/Umbraco.Web.UI.Client/package.json | 2 +-
 version.json                           | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/package.json b/src/Umbraco.Web.UI.Client/package.json
index bbdb09451381..0576bd6ec080 100644
--- a/src/Umbraco.Web.UI.Client/package.json
+++ b/src/Umbraco.Web.UI.Client/package.json
@@ -1,7 +1,7 @@
 {
 	"name": "@umbraco-cms/backoffice",
 	"license": "MIT",
-	"version": "16.3.3",
+	"version": "16.3.4",
 	"type": "module",
 	"exports": {
 		".": null,
diff --git a/version.json b/version.json
index eb6387dfd627..58f299c4c9d6 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": "16.3.3",
+  "version": "16.3.4",
   "assemblyVersion": {
     "precision": "build"
   },

From fd91f88a7e8f5e8c276667e2e33ada906e584e85 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= <niels.lyngso@gmail.com>
Date: Wed, 22 Oct 2025 11:52:09 +0200
Subject: [PATCH 084/155] Item Repository: Sort statuses by order of unique
 (#20603)

* utility

* ability to replace

* deprecate removeStatus

* no need to call this any longer

* Sort statuses and ensure not appending statuses, only updating them
# Conflicts:
#	src/Umbraco.Web.UI.Client/src/packages/core/repository/repository-items.manager.ts
---
 .../observable-api/states/array-state.test.ts | 70 ++++++++++++-------
 .../libs/observable-api/states/array-state.ts | 33 +++++++++
 .../src/libs/observable-api/utils/index.ts    |  1 +
 .../utils/replace-in-unique-array.function.ts | 19 +++++
 .../core/picker-input/picker-input.context.ts |  1 -
 .../repository/repository-items.manager.ts    | 34 ++++++---
 6 files changed, 119 insertions(+), 39 deletions(-)
 create mode 100644 src/Umbraco.Web.UI.Client/src/libs/observable-api/utils/replace-in-unique-array.function.ts

diff --git a/src/Umbraco.Web.UI.Client/src/libs/observable-api/states/array-state.test.ts b/src/Umbraco.Web.UI.Client/src/libs/observable-api/states/array-state.test.ts
index d9d5d1ad4f88..74c2e63c5ccc 100644
--- a/src/Umbraco.Web.UI.Client/src/libs/observable-api/states/array-state.test.ts
+++ b/src/Umbraco.Web.UI.Client/src/libs/observable-api/states/array-state.test.ts
@@ -5,7 +5,7 @@ describe('ArrayState', () => {
 	type ObjectType = { key: string; another: string };
 	type ArrayType = ObjectType[];
 
-	let subject: UmbArrayState<ObjectType>;
+	let state: UmbArrayState<ObjectType>;
 	let initialData: ArrayType;
 
 	beforeEach(() => {
@@ -14,12 +14,12 @@ describe('ArrayState', () => {
 			{ key: '2', another: 'myValue2' },
 			{ key: '3', another: 'myValue3' },
 		];
-		subject = new UmbArrayState(initialData, (x) => x.key);
+		state = new UmbArrayState(initialData, (x) => x.key);
 	});
 
 	it('replays latests, no matter the amount of subscriptions.', (done) => {
 		let amountOfCallbacks = 0;
-		const observer = subject.asObservable();
+		const observer = state.asObservable();
 		observer.subscribe((value) => {
 			amountOfCallbacks++;
 			expect(value).to.be.equal(initialData);
@@ -36,8 +36,8 @@ describe('ArrayState', () => {
 	it('remove method, removes the one with the key', (done) => {
 		const expectedData = [initialData[0], initialData[2]];
 
-		subject.remove(['2']);
-		const observer = subject.asObservable();
+		state.remove(['2']);
+		const observer = state.asObservable();
 		observer.subscribe((value) => {
 			expect(JSON.stringify(value)).to.be.equal(JSON.stringify(expectedData));
 			done();
@@ -45,17 +45,17 @@ describe('ArrayState', () => {
 	});
 
 	it('getHasOne method, return true when key exists', () => {
-		expect(subject.getHasOne('2')).to.be.true;
+		expect(state.getHasOne('2')).to.be.true;
 	});
 	it('getHasOne method, return false when key does not exists', () => {
-		expect(subject.getHasOne('1337')).to.be.false;
+		expect(state.getHasOne('1337')).to.be.false;
 	});
 
 	it('filter method, removes anything that is not true of the given predicate method', (done) => {
 		const expectedData = [initialData[0], initialData[2]];
 
-		subject.filter((x) => x.key !== '2');
-		const observer = subject.asObservable();
+		state.filter((x) => x.key !== '2');
+		const observer = state.asObservable();
 		observer.subscribe((value) => {
 			expect(JSON.stringify(value)).to.be.equal(JSON.stringify(expectedData));
 			done();
@@ -64,11 +64,11 @@ describe('ArrayState', () => {
 
 	it('add new item via appendOne method.', (done) => {
 		const newItem = { key: '4', another: 'myValue4' };
-		subject.appendOne(newItem);
+		state.appendOne(newItem);
 
 		const expectedData = [...initialData, newItem];
 
-		const observer = subject.asObservable();
+		const observer = state.asObservable();
 		observer.subscribe((value) => {
 			expect(value.length).to.be.equal(expectedData.length);
 			expect(value[3].another).to.be.equal(expectedData[3].another);
@@ -78,9 +78,25 @@ describe('ArrayState', () => {
 
 	it('partially update an existing item via updateOne method.', (done) => {
 		const newItem = { another: 'myValue2.2' };
-		subject.updateOne('2', newItem);
+		state.updateOne('2', newItem);
 
-		const observer = subject.asObservable();
+		const observer = state.asObservable();
+		observer.subscribe((value) => {
+			expect(value.length).to.be.equal(initialData.length);
+			expect(value[0].another).to.be.equal('myValue1');
+			expect(value[1].another).to.be.equal('myValue2.2');
+			done();
+		});
+	});
+
+	it('replaces only existing items via replace method.', (done) => {
+		const newItems = [
+			{ key: '2', another: 'myValue2.2' },
+			{ key: '4', another: 'myValue4.4' },
+		];
+		state.replace(newItems);
+
+		const observer = state.asObservable();
 		observer.subscribe((value) => {
 			expect(value.length).to.be.equal(initialData.length);
 			expect(value[0].another).to.be.equal('myValue1');
@@ -90,7 +106,7 @@ describe('ArrayState', () => {
 	});
 
 	it('getObservablePart for a specific entry of array', (done) => {
-		const subObserver = subject.asObservablePart((data) => data.find((x) => x.key === '2'));
+		const subObserver = state.asObservablePart((data) => data.find((x) => x.key === '2'));
 		subObserver.subscribe((entry) => {
 			if (entry) {
 				expect(entry.another).to.be.equal(initialData[1].another);
@@ -103,7 +119,7 @@ describe('ArrayState', () => {
 		let amountOfCallbacks = 0;
 		const newItem = { key: '4', another: 'myValue4' };
 
-		const subObserver = subject.asObservablePart((data) => data.find((x) => x.key === newItem.key));
+		const subObserver = state.asObservablePart((data) => data.find((x) => x.key === newItem.key));
 		subObserver.subscribe((entry) => {
 			amountOfCallbacks++;
 			if (amountOfCallbacks === 1) {
@@ -118,16 +134,16 @@ describe('ArrayState', () => {
 			}
 		});
 
-		subject.appendOne(newItem);
+		state.appendOne(newItem);
 	});
 
 	it('asObservable returns the replaced item', (done) => {
 		const newItem = { key: '2', another: 'myValue4' };
-		subject.appendOne(newItem);
+		state.appendOne(newItem);
 
 		const expectedData = [initialData[0], newItem, initialData[2]];
 
-		const observer = subject.asObservable();
+		const observer = state.asObservable();
 		observer.subscribe((value) => {
 			expect(value.length).to.be.equal(expectedData.length);
 			expect(value[1].another).to.be.equal(newItem.another);
@@ -137,9 +153,9 @@ describe('ArrayState', () => {
 
 	it('getObservablePart returns the replaced item', (done) => {
 		const newItem = { key: '2', another: 'myValue4' };
-		subject.appendOne(newItem);
+		state.appendOne(newItem);
 
-		const subObserver = subject.asObservablePart((data) => data.find((x) => x.key === newItem.key));
+		const subObserver = state.asObservablePart((data) => data.find((x) => x.key === newItem.key));
 		subObserver.subscribe((entry) => {
 			expect(entry).to.be.equal(newItem); // Second callback should give us the right data:
 			if (entry) {
@@ -152,7 +168,7 @@ describe('ArrayState', () => {
 	it('getObservablePart replays existing data to any amount of subscribers.', (done) => {
 		let amountOfCallbacks = 0;
 
-		const subObserver = subject.asObservablePart((data) => data.find((x) => x.key === '2'));
+		const subObserver = state.asObservablePart((data) => data.find((x) => x.key === '2'));
 		subObserver.subscribe((entry) => {
 			if (entry) {
 				amountOfCallbacks++;
@@ -173,7 +189,7 @@ describe('ArrayState', () => {
 	it('getObservablePart replays existing data to any amount of subscribers.', (done) => {
 		let amountOfCallbacks = 0;
 
-		const subObserver = subject.asObservablePart((data) => data.find((x) => x.key === '2'));
+		const subObserver = state.asObservablePart((data) => data.find((x) => x.key === '2'));
 		subObserver.subscribe((entry) => {
 			if (entry) {
 				amountOfCallbacks++;
@@ -194,7 +210,7 @@ describe('ArrayState', () => {
 	it('append only updates observable if changes item', (done) => {
 		let count = 0;
 
-		const observer = subject.asObservable();
+		const observer = state.asObservable();
 		observer.subscribe((value) => {
 			count++;
 			if (count === 1) {
@@ -212,12 +228,12 @@ describe('ArrayState', () => {
 
 		Promise.resolve().then(() => {
 			// Despite how many times this happens it should not trigger any change.
-			subject.append(initialData);
-			subject.append(initialData);
-			subject.append(initialData);
+			state.append(initialData);
+			state.append(initialData);
+			state.append(initialData);
 
 			Promise.resolve().then(() => {
-				subject.appendOne({ key: '4', another: 'myValue4' });
+				state.appendOne({ key: '4', another: 'myValue4' });
 			});
 		});
 	});
diff --git a/src/Umbraco.Web.UI.Client/src/libs/observable-api/states/array-state.ts b/src/Umbraco.Web.UI.Client/src/libs/observable-api/states/array-state.ts
index 26cf9261abf2..3dab6a21c062 100644
--- a/src/Umbraco.Web.UI.Client/src/libs/observable-api/states/array-state.ts
+++ b/src/Umbraco.Web.UI.Client/src/libs/observable-api/states/array-state.ts
@@ -1,6 +1,7 @@
 import { partialUpdateFrozenArray } from '../utils/partial-update-frozen-array.function.js';
 import { pushAtToUniqueArray } from '../utils/push-at-to-unique-array.function.js';
 import { pushToUniqueArray } from '../utils/push-to-unique-array.function.js';
+import { replaceInUniqueArray } from '../utils/replace-in-unique-array.function.js';
 import { UmbDeepState } from './deep-state.js';
 
 /**
@@ -262,6 +263,38 @@ export class UmbArrayState<T, U = unknown> extends UmbDeepState<T[]> {
 		return this;
 	}
 
+	/**
+	 * @function replace
+	 * @param {Partial<T>} entires - data of entries to be replaced.
+	 * @returns {UmbArrayState<T>} Reference to it self.
+	 * @description - Replaces one or more entries, requires the ArrayState to be constructed with a getUnique method.
+	 * @example <caption>Example append some data.</caption>
+	 * const data = [
+	 * 	{ key: 1, value: 'foo'},
+	 * 	{ key: 2, value: 'bar'}
+	 * ];
+	 * const myState = new UmbArrayState(data, (x) => x.key);
+	 * const updates = [
+	 * 	{ key: 1, value: 'foo2'},
+	 * 	{ key: 3, value: 'bar2'}
+	 * ];
+	 * myState.replace(updates);
+	 * // Only the existing item gets replaced:
+	 * myState.getValue(); // -> [{ key: 1, value: 'foo2'}, { key: 2, value: 'bar'}]
+	 */
+	replace(entries: Array<T>): UmbArrayState<T> {
+		if (this.getUniqueMethod) {
+			const next = [...this.getValue()];
+			entries.forEach((entry) => {
+				replaceInUniqueArray(next, entry as T, this.getUniqueMethod!);
+			});
+			this.setValue(next);
+		} else {
+			throw new Error("Can't replace entries of an ArrayState without a getUnique method provided when constructed.");
+		}
+		return this;
+	}
+
 	/**
 	 * @function updateOne
 	 * @param {U} unique - Unique value to find entry to update.
diff --git a/src/Umbraco.Web.UI.Client/src/libs/observable-api/utils/index.ts b/src/Umbraco.Web.UI.Client/src/libs/observable-api/utils/index.ts
index 3b3452ab110e..0c90285e6c80 100644
--- a/src/Umbraco.Web.UI.Client/src/libs/observable-api/utils/index.ts
+++ b/src/Umbraco.Web.UI.Client/src/libs/observable-api/utils/index.ts
@@ -12,5 +12,6 @@ export * from './observe-multiple.function.js';
 export * from './partial-update-frozen-array.function.js';
 export * from './push-at-to-unique-array.function.js';
 export * from './push-to-unique-array.function.js';
+export * from './replace-in-unique-array.function.js';
 export * from './simple-hash-code.function.js';
 export * from './strict-equality-memoization.function.js';
diff --git a/src/Umbraco.Web.UI.Client/src/libs/observable-api/utils/replace-in-unique-array.function.ts b/src/Umbraco.Web.UI.Client/src/libs/observable-api/utils/replace-in-unique-array.function.ts
new file mode 100644
index 000000000000..1970c0b2a9e7
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/libs/observable-api/utils/replace-in-unique-array.function.ts
@@ -0,0 +1,19 @@
+/**
+ * @function replaceInUniqueArray
+ * @param {T[]} data - An array of objects.
+ * @param {T} entry - The object to replace with.
+ * @param {getUniqueMethod: (entry: T) => unknown} [getUniqueMethod] - Method to get the unique value of an entry.
+ * @description - Replaces an item of an Array.
+ * @example <caption>Example replace an entry of an Array. Where the key is unique and the item will only be replaced if matched with existing.</caption>
+ * const data = [{key: 'myKey', value:'initialValue'}];
+ * const entry = {key: 'myKey', value: 'replacedValue'};
+ * const newDataSet = replaceInUniqueArray(data, entry, x => x.key === key);
+ */
+export function replaceInUniqueArray<T>(data: T[], entry: T, getUniqueMethod: (entry: T) => unknown): T[] {
+	const unique = getUniqueMethod(entry);
+	const indexToReplace = data.findIndex((x) => getUniqueMethod(x) === unique);
+	if (indexToReplace !== -1) {
+		data[indexToReplace] = entry;
+	}
+	return data;
+}
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/picker-input/picker-input.context.ts b/src/Umbraco.Web.UI.Client/src/packages/core/picker-input/picker-input.context.ts
index de943aa88aa8..c345fd22d4ff 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/picker-input/picker-input.context.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/picker-input/picker-input.context.ts
@@ -133,7 +133,6 @@ export class UmbPickerInputContext<
 	#removeItem(unique: string) {
 		const newSelection = this.getSelection().filter((value) => value !== unique);
 		this.setSelection(newSelection);
-		this.#itemManager.removeStatus(unique);
 		this.getHostElement().dispatchEvent(new UmbChangeEvent());
 	}
 }
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/repository/repository-items.manager.ts b/src/Umbraco.Web.UI.Client/src/packages/core/repository/repository-items.manager.ts
index cf227b3cf28b..c60dc8badf25 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/repository/repository-items.manager.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/repository/repository-items.manager.ts
@@ -75,17 +75,20 @@ export class UmbRepositoryItemsManager<ItemType extends { unique: string }> exte
 			(uniques) => {
 				if (uniques.length === 0) {
 					this.#items.setValue([]);
+					this.#statuses.setValue([]);
 					return;
 				}
 
 				// TODO: This could be optimized so we only load the appended items, but this requires that the response checks that an item is still present in uniques. [NL]
-				// Check if we already have the items, and then just sort them:
-				const items = this.#items.getValue();
+				// Check if we already have the statuses, and then just sort them:
+				const statuses = this.#statuses.getValue();
 				if (
-					uniques.length === items.length &&
-					uniques.every((unique) => items.find((item) => this.#getUnique(item) === unique))
+					uniques.length === statuses.length &&
+					uniques.every((unique) => statuses.find((status) => status.unique === unique))
 				) {
+					const items = this.#items.getValue();
 					this.#items.setValue(this.#sortByUniques(items));
+					this.#statuses.setValue(this.#sortByUniques(statuses));
 				} else {
 					// We need to load new items, so ...
 					this.#requestItems();
@@ -124,9 +127,17 @@ export class UmbRepositoryItemsManager<ItemType extends { unique: string }> exte
 		return this.#items.asObservablePart((items) => items.find((item) => this.#getUnique(item) === unique));
 	}
 
+	/**
+	 * @deprecated - This is resolved by setUniques, no need to update statuses.
+	 * @param unique {string} - The unique identifier of the item to remove the status of.
+	 */
 	removeStatus(unique: string) {
-		const newStatuses = this.#statuses.getValue().filter((status) => status.unique !== unique);
-		this.#statuses.setValue(newStatuses);
+		new UmbDeprecation({
+			removeInVersion: '18.0.0',
+			deprecated: 'removeStatus',
+			solution: 'Statuses are removed automatically when setting uniques',
+		}).warn();
+		this.#statuses.filter((status) => status.unique !== unique);
 	}
 
 	async getItemByUnique(unique: string) {
@@ -144,6 +155,7 @@ export class UmbRepositoryItemsManager<ItemType extends { unique: string }> exte
 		const requestedUniques = this.getUniques();
 
 		this.#statuses.setValue(
+			// No need to do sorting here as we just got the unique in the right order above.
 			requestedUniques.map((unique) => ({
 				state: {
 					type: 'loading',
@@ -164,7 +176,7 @@ export class UmbRepositoryItemsManager<ItemType extends { unique: string }> exte
 		}
 
 		if (error) {
-			this.#statuses.append(
+			this.#statuses.replace(
 				requestedUniques.map((unique) => ({
 					state: {
 						type: 'error',
@@ -185,7 +197,7 @@ export class UmbRepositoryItemsManager<ItemType extends { unique: string }> exte
 			const resolvedUniques = requestedUniques.filter((unique) => !rejectedUniques.includes(unique));
 			this.#items.remove(rejectedUniques);
 
-			this.#statuses.append([
+			this.#statuses.replace([
 				...rejectedUniques.map(
 					(unique) =>
 						({
@@ -226,12 +238,11 @@ export class UmbRepositoryItemsManager<ItemType extends { unique: string }> exte
 		const { data, error } = await this.repository.requestItems([unique]);
 
 		if (error) {
-			this.#statuses.appendOne({
+			this.#statuses.updateOne(unique, {
 				state: {
 					type: 'error',
 					error: '#general_notFound',
 				},
-				unique,
 			} as UmbRepositoryItemsStatus);
 		}
 
@@ -244,11 +255,12 @@ export class UmbRepositoryItemsManager<ItemType extends { unique: string }> exte
 				const newItems = [...items];
 				newItems[index] = data[0];
 				this.#items.setValue(this.#sortByUniques(newItems));
+				// No need to update statuses here, as the item is the same, just updated.
 			}
 		}
 	}
 
-	#sortByUniques(data?: Array<ItemType>): Array<ItemType> {
+	#sortByUniques<T extends Pick<ItemType, 'unique'>>(data?: Array<T>): Array<T> {
 		if (!data) return [];
 		const uniques = this.getUniques();
 		return [...data].sort((a, b) => {

From 18ab333afc22278240ac7b51d42691e23ff1710e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= <nsl@umbraco.dk>
Date: Wed, 22 Oct 2025 13:57:09 +0200
Subject: [PATCH 085/155] =?UTF-8?q?Hotfix:=20Implement=20a=20specific=20so?=
 =?UTF-8?q?rting=20method=20for=20statuses=20as=20the=20existing=20has=20?=
 =?UTF-8?q?=E2=80=A6=20(#20609)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Implement a specific sorting method for statuses as the existing has to support deprecated implementation of custom getUnique method
---
 .../core/repository/repository-items.manager.ts   | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/repository/repository-items.manager.ts b/src/Umbraco.Web.UI.Client/src/packages/core/repository/repository-items.manager.ts
index c60dc8badf25..0b50d72399ca 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/repository/repository-items.manager.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/repository/repository-items.manager.ts
@@ -88,7 +88,7 @@ export class UmbRepositoryItemsManager<ItemType extends { unique: string }> exte
 				) {
 					const items = this.#items.getValue();
 					this.#items.setValue(this.#sortByUniques(items));
-					this.#statuses.setValue(this.#sortByUniques(statuses));
+					this.#statuses.setValue(this.#sortStatusByUniques(statuses));
 				} else {
 					// We need to load new items, so ...
 					this.#requestItems();
@@ -260,7 +260,7 @@ export class UmbRepositoryItemsManager<ItemType extends { unique: string }> exte
 		}
 	}
 
-	#sortByUniques<T extends Pick<ItemType, 'unique'>>(data?: Array<T>): Array<T> {
+	#sortByUniques(data?: Array<ItemType>): Array<ItemType> {
 		if (!data) return [];
 		const uniques = this.getUniques();
 		return [...data].sort((a, b) => {
@@ -270,6 +270,17 @@ export class UmbRepositoryItemsManager<ItemType extends { unique: string }> exte
 		});
 	}
 
+	/** Just needed for the deprecation implementation to work, do not bring this into 17.0 [NL] */
+	#sortStatusByUniques(data?: Array<UmbRepositoryItemsStatus>): Array<UmbRepositoryItemsStatus> {
+		if (!data) return [];
+		const uniques = this.getUniques();
+		return [...data].sort((a, b) => {
+			const aIndex = uniques.indexOf(a.unique ?? '');
+			const bIndex = uniques.indexOf(b.unique ?? '');
+			return aIndex - bIndex;
+		});
+	}
+
 	#onEntityUpdatedEvent = (event: UmbEntityUpdatedEvent) => {
 		const eventUnique = event.getUnique();
 

From 3dc65c48b39e81dfe866f441a49efb31d2953934 Mon Sep 17 00:00:00 2001
From: Andy Butland <abutland73@gmail.com>
Date: Tue, 28 Oct 2025 09:58:31 +0100
Subject: [PATCH 086/155] Bump package-lock.json to 16.3.4.

---
 src/Umbraco.Web.UI.Client/package-lock.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/package-lock.json b/src/Umbraco.Web.UI.Client/package-lock.json
index 71e0a69db2a6..7467bc8d4b7a 100644
--- a/src/Umbraco.Web.UI.Client/package-lock.json
+++ b/src/Umbraco.Web.UI.Client/package-lock.json
@@ -1,12 +1,12 @@
 {
 	"name": "@umbraco-cms/backoffice",
-	"version": "16.3.0",
+	"version": "16.3.4",
 	"lockfileVersion": 3,
 	"requires": true,
 	"packages": {
 		"": {
 			"name": "@umbraco-cms/backoffice",
-			"version": "16.3.0",
+			"version": "16.3.4",
 			"license": "MIT",
 			"workspaces": [
 				"./src/packages/*",

From bea21d7b99a574a5d53a93eb4a712c3304e7f645 Mon Sep 17 00:00:00 2001
From: Andy Butland <abutland73@gmail.com>
Date: Tue, 28 Oct 2025 13:25:13 +0100
Subject: [PATCH 087/155] Caching: Resolves publish and install issues related
 to stale cached data retrieval (closes #20539 and #20630) (#20640)

* Request cache published content creation with version.

* Reload memory cache after install with package migrations.

* Improve message on install for database cache rebuild.

* Update src/Umbraco.Infrastructure/Install/MigrationPlansExecutedNotificationHandler.cs

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

* Relocated memory cache refresh after package install from notification handler to unattended upgrader.

* Fix construtor breaking change

---------

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
Co-authored-by: mole <nikolajlauridsen@protonmail.ch>
---
 .../UmbracoBuilder.Installer.cs               |  1 +
 .../Install/UnattendedUpgrader.cs             | 45 ++++++++++++++++---
 .../DatabaseCacheRebuilder.cs                 |  2 +-
 .../Factories/PublishedContentFactory.cs      |  2 +-
 4 files changed, 42 insertions(+), 8 deletions(-)

diff --git a/src/Umbraco.Infrastructure/DependencyInjection/UmbracoBuilder.Installer.cs b/src/Umbraco.Infrastructure/DependencyInjection/UmbracoBuilder.Installer.cs
index a5cf808b2e26..885b8b65b0a9 100644
--- a/src/Umbraco.Infrastructure/DependencyInjection/UmbracoBuilder.Installer.cs
+++ b/src/Umbraco.Infrastructure/DependencyInjection/UmbracoBuilder.Installer.cs
@@ -20,6 +20,7 @@ internal static IUmbracoBuilder AddInstaller(this IUmbracoBuilder builder)
 
         // Add post migration notification handlers
         builder.AddNotificationHandler<UmbracoPlanExecutedNotification, ClearCsrfCookieHandler>();
+
         return builder;
     }
 }
diff --git a/src/Umbraco.Infrastructure/Install/UnattendedUpgrader.cs b/src/Umbraco.Infrastructure/Install/UnattendedUpgrader.cs
index 54f550f23258..11e7836e9e26 100644
--- a/src/Umbraco.Infrastructure/Install/UnattendedUpgrader.cs
+++ b/src/Umbraco.Infrastructure/Install/UnattendedUpgrader.cs
@@ -1,6 +1,8 @@
 using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
 using Umbraco.Cms.Core;
+using Umbraco.Cms.Core.Cache;
 using Umbraco.Cms.Core.Configuration;
 using Umbraco.Cms.Core.Configuration.Models;
 using Umbraco.Cms.Core.DependencyInjection;
@@ -28,7 +30,10 @@ public class UnattendedUpgrader : INotificationAsyncHandler<RuntimeUnattendedUpg
     private readonly IRuntimeState _runtimeState;
     private readonly IUmbracoVersion _umbracoVersion;
     private readonly UnattendedSettings _unattendedSettings;
+    private readonly DistributedCache _distributedCache;
+    private readonly ILogger<UnattendedUpgrader> _logger;
 
+    [Obsolete("Please use the constructor taking all parameters. Scheduled for removal in Umbraco 19.")]
     public UnattendedUpgrader(
         IProfilingLogger profilingLogger,
         IUmbracoVersion umbracoVersion,
@@ -36,13 +41,36 @@ public UnattendedUpgrader(
         IRuntimeState runtimeState,
         PackageMigrationRunner packageMigrationRunner,
         IOptions<UnattendedSettings> unattendedSettings)
+        : this(
+            profilingLogger,
+            umbracoVersion,
+            databaseBuilder,
+            runtimeState,
+            packageMigrationRunner,
+            unattendedSettings,
+            StaticServiceProvider.Instance.GetRequiredService<DistributedCache>(),
+            StaticServiceProvider.Instance.GetRequiredService<ILogger<UnattendedUpgrader>>())
     {
-        _profilingLogger = profilingLogger ?? throw new ArgumentNullException(nameof(profilingLogger));
-        _umbracoVersion = umbracoVersion ?? throw new ArgumentNullException(nameof(umbracoVersion));
-        _databaseBuilder = databaseBuilder ?? throw new ArgumentNullException(nameof(databaseBuilder));
-        _runtimeState = runtimeState ?? throw new ArgumentNullException(nameof(runtimeState));
+    }
+
+    public UnattendedUpgrader(
+        IProfilingLogger profilingLogger,
+        IUmbracoVersion umbracoVersion,
+        DatabaseBuilder databaseBuilder,
+        IRuntimeState runtimeState,
+        PackageMigrationRunner packageMigrationRunner,
+        IOptions<UnattendedSettings> unattendedSettings,
+        DistributedCache distributedCache,
+        ILogger<UnattendedUpgrader> logger)
+    {
+        _profilingLogger = profilingLogger;
+        _umbracoVersion = umbracoVersion;
+        _databaseBuilder = databaseBuilder;
+        _runtimeState = runtimeState;
         _packageMigrationRunner = packageMigrationRunner;
         _unattendedSettings = unattendedSettings.Value;
+        _distributedCache = distributedCache;
+        _logger = logger;
     }
 
     public async Task HandleAsync(RuntimeUnattendedUpgradeNotification notification, CancellationToken cancellationToken)
@@ -109,8 +137,13 @@ private async Task RunPackageMigrationsAsync(RuntimeUnattendedUpgradeNotificatio
         try
         {
             await _packageMigrationRunner.RunPackagePlansAsync(pendingMigrations);
-            notification.UnattendedUpgradeResult = RuntimeUnattendedUpgradeNotification.UpgradeResult
-                .PackageMigrationComplete;
+            notification.UnattendedUpgradeResult = RuntimeUnattendedUpgradeNotification.UpgradeResult.PackageMigrationComplete;
+
+            // Migration plans may have changed published content, so refresh the distributed cache to ensure consistency on first request.
+            _distributedCache.RefreshAllPublishedSnapshot();
+            _logger.LogInformation(
+                "Migration plans run: {Plans}. Triggered refresh of distributed published content cache.",
+                string.Join(", ", pendingMigrations));
         }
         catch (Exception ex)
         {
diff --git a/src/Umbraco.PublishedCache.HybridCache/DatabaseCacheRebuilder.cs b/src/Umbraco.PublishedCache.HybridCache/DatabaseCacheRebuilder.cs
index 5b1512ef5049..670a004d896d 100644
--- a/src/Umbraco.PublishedCache.HybridCache/DatabaseCacheRebuilder.cs
+++ b/src/Umbraco.PublishedCache.HybridCache/DatabaseCacheRebuilder.cs
@@ -108,7 +108,7 @@ public async Task RebuildDatabaseCacheIfSerializerChangedAsync()
 
         _logger.LogWarning(
             "Database cache was serialized using {CurrentSerializer}. Currently configured cache serializer {Serializer}. Rebuilding database cache.",
-            currentSerializer,
+            currentSerializer == 0 ? "None" : currentSerializer,
             serializer);
 
         using (_profilingLogger.TraceDuration<DatabaseCacheRebuilder>($"Rebuilding database cache with {serializer} serializer"))
diff --git a/src/Umbraco.PublishedCache.HybridCache/Factories/PublishedContentFactory.cs b/src/Umbraco.PublishedCache.HybridCache/Factories/PublishedContentFactory.cs
index 68f4d8d80fcb..a22ce1d07d3f 100644
--- a/src/Umbraco.PublishedCache.HybridCache/Factories/PublishedContentFactory.cs
+++ b/src/Umbraco.PublishedCache.HybridCache/Factories/PublishedContentFactory.cs
@@ -38,7 +38,7 @@ public PublishedContentFactory(
     /// <inheritdoc/>
     public IPublishedContent? ToIPublishedContent(ContentCacheNode contentCacheNode, bool preview)
     {
-        var cacheKey = $"{nameof(PublishedContentFactory)}DocumentCache_{contentCacheNode.Id}_{preview}";
+        var cacheKey = $"{nameof(PublishedContentFactory)}DocumentCache_{contentCacheNode.Id}_{preview}_{contentCacheNode.Data?.VersionDate.Ticks ?? 0}";
         IPublishedContent? publishedContent = null;
         if (_appCaches.RequestCache.IsAvailable)
         {

From 0d2393d866da60fa0a253a81510bad3bc2b89c76 Mon Sep 17 00:00:00 2001
From: Andy Butland <abutland73@gmail.com>
Date: Tue, 28 Oct 2025 13:25:13 +0100
Subject: [PATCH 088/155] Caching: Resolves publish and install issues related
 to stale cached data retrieval (closes #20539 and #20630) (#20640)

* Request cache published content creation with version.

* Reload memory cache after install with package migrations.

* Improve message on install for database cache rebuild.

* Update src/Umbraco.Infrastructure/Install/MigrationPlansExecutedNotificationHandler.cs

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

* Relocated memory cache refresh after package install from notification handler to unattended upgrader.

* Fix construtor breaking change

---------

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
Co-authored-by: mole <nikolajlauridsen@protonmail.ch>
---
 .../UmbracoBuilder.Installer.cs               |  1 +
 .../Install/UnattendedUpgrader.cs             | 45 ++++++++++++++++---
 .../DatabaseCacheRebuilder.cs                 |  2 +-
 .../Factories/PublishedContentFactory.cs      |  2 +-
 4 files changed, 42 insertions(+), 8 deletions(-)

diff --git a/src/Umbraco.Infrastructure/DependencyInjection/UmbracoBuilder.Installer.cs b/src/Umbraco.Infrastructure/DependencyInjection/UmbracoBuilder.Installer.cs
index a5cf808b2e26..885b8b65b0a9 100644
--- a/src/Umbraco.Infrastructure/DependencyInjection/UmbracoBuilder.Installer.cs
+++ b/src/Umbraco.Infrastructure/DependencyInjection/UmbracoBuilder.Installer.cs
@@ -20,6 +20,7 @@ internal static IUmbracoBuilder AddInstaller(this IUmbracoBuilder builder)
 
         // Add post migration notification handlers
         builder.AddNotificationHandler<UmbracoPlanExecutedNotification, ClearCsrfCookieHandler>();
+
         return builder;
     }
 }
diff --git a/src/Umbraco.Infrastructure/Install/UnattendedUpgrader.cs b/src/Umbraco.Infrastructure/Install/UnattendedUpgrader.cs
index 54f550f23258..11e7836e9e26 100644
--- a/src/Umbraco.Infrastructure/Install/UnattendedUpgrader.cs
+++ b/src/Umbraco.Infrastructure/Install/UnattendedUpgrader.cs
@@ -1,6 +1,8 @@
 using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
 using Umbraco.Cms.Core;
+using Umbraco.Cms.Core.Cache;
 using Umbraco.Cms.Core.Configuration;
 using Umbraco.Cms.Core.Configuration.Models;
 using Umbraco.Cms.Core.DependencyInjection;
@@ -28,7 +30,10 @@ public class UnattendedUpgrader : INotificationAsyncHandler<RuntimeUnattendedUpg
     private readonly IRuntimeState _runtimeState;
     private readonly IUmbracoVersion _umbracoVersion;
     private readonly UnattendedSettings _unattendedSettings;
+    private readonly DistributedCache _distributedCache;
+    private readonly ILogger<UnattendedUpgrader> _logger;
 
+    [Obsolete("Please use the constructor taking all parameters. Scheduled for removal in Umbraco 19.")]
     public UnattendedUpgrader(
         IProfilingLogger profilingLogger,
         IUmbracoVersion umbracoVersion,
@@ -36,13 +41,36 @@ public UnattendedUpgrader(
         IRuntimeState runtimeState,
         PackageMigrationRunner packageMigrationRunner,
         IOptions<UnattendedSettings> unattendedSettings)
+        : this(
+            profilingLogger,
+            umbracoVersion,
+            databaseBuilder,
+            runtimeState,
+            packageMigrationRunner,
+            unattendedSettings,
+            StaticServiceProvider.Instance.GetRequiredService<DistributedCache>(),
+            StaticServiceProvider.Instance.GetRequiredService<ILogger<UnattendedUpgrader>>())
     {
-        _profilingLogger = profilingLogger ?? throw new ArgumentNullException(nameof(profilingLogger));
-        _umbracoVersion = umbracoVersion ?? throw new ArgumentNullException(nameof(umbracoVersion));
-        _databaseBuilder = databaseBuilder ?? throw new ArgumentNullException(nameof(databaseBuilder));
-        _runtimeState = runtimeState ?? throw new ArgumentNullException(nameof(runtimeState));
+    }
+
+    public UnattendedUpgrader(
+        IProfilingLogger profilingLogger,
+        IUmbracoVersion umbracoVersion,
+        DatabaseBuilder databaseBuilder,
+        IRuntimeState runtimeState,
+        PackageMigrationRunner packageMigrationRunner,
+        IOptions<UnattendedSettings> unattendedSettings,
+        DistributedCache distributedCache,
+        ILogger<UnattendedUpgrader> logger)
+    {
+        _profilingLogger = profilingLogger;
+        _umbracoVersion = umbracoVersion;
+        _databaseBuilder = databaseBuilder;
+        _runtimeState = runtimeState;
         _packageMigrationRunner = packageMigrationRunner;
         _unattendedSettings = unattendedSettings.Value;
+        _distributedCache = distributedCache;
+        _logger = logger;
     }
 
     public async Task HandleAsync(RuntimeUnattendedUpgradeNotification notification, CancellationToken cancellationToken)
@@ -109,8 +137,13 @@ private async Task RunPackageMigrationsAsync(RuntimeUnattendedUpgradeNotificatio
         try
         {
             await _packageMigrationRunner.RunPackagePlansAsync(pendingMigrations);
-            notification.UnattendedUpgradeResult = RuntimeUnattendedUpgradeNotification.UpgradeResult
-                .PackageMigrationComplete;
+            notification.UnattendedUpgradeResult = RuntimeUnattendedUpgradeNotification.UpgradeResult.PackageMigrationComplete;
+
+            // Migration plans may have changed published content, so refresh the distributed cache to ensure consistency on first request.
+            _distributedCache.RefreshAllPublishedSnapshot();
+            _logger.LogInformation(
+                "Migration plans run: {Plans}. Triggered refresh of distributed published content cache.",
+                string.Join(", ", pendingMigrations));
         }
         catch (Exception ex)
         {
diff --git a/src/Umbraco.PublishedCache.HybridCache/DatabaseCacheRebuilder.cs b/src/Umbraco.PublishedCache.HybridCache/DatabaseCacheRebuilder.cs
index 5b1512ef5049..670a004d896d 100644
--- a/src/Umbraco.PublishedCache.HybridCache/DatabaseCacheRebuilder.cs
+++ b/src/Umbraco.PublishedCache.HybridCache/DatabaseCacheRebuilder.cs
@@ -108,7 +108,7 @@ public async Task RebuildDatabaseCacheIfSerializerChangedAsync()
 
         _logger.LogWarning(
             "Database cache was serialized using {CurrentSerializer}. Currently configured cache serializer {Serializer}. Rebuilding database cache.",
-            currentSerializer,
+            currentSerializer == 0 ? "None" : currentSerializer,
             serializer);
 
         using (_profilingLogger.TraceDuration<DatabaseCacheRebuilder>($"Rebuilding database cache with {serializer} serializer"))
diff --git a/src/Umbraco.PublishedCache.HybridCache/Factories/PublishedContentFactory.cs b/src/Umbraco.PublishedCache.HybridCache/Factories/PublishedContentFactory.cs
index 68f4d8d80fcb..a22ce1d07d3f 100644
--- a/src/Umbraco.PublishedCache.HybridCache/Factories/PublishedContentFactory.cs
+++ b/src/Umbraco.PublishedCache.HybridCache/Factories/PublishedContentFactory.cs
@@ -38,7 +38,7 @@ public PublishedContentFactory(
     /// <inheritdoc/>
     public IPublishedContent? ToIPublishedContent(ContentCacheNode contentCacheNode, bool preview)
     {
-        var cacheKey = $"{nameof(PublishedContentFactory)}DocumentCache_{contentCacheNode.Id}_{preview}";
+        var cacheKey = $"{nameof(PublishedContentFactory)}DocumentCache_{contentCacheNode.Id}_{preview}_{contentCacheNode.Data?.VersionDate.Ticks ?? 0}";
         IPublishedContent? publishedContent = null;
         if (_appCaches.RequestCache.IsAvailable)
         {

From 87332307627fbe999eef062c5f70abe1f452b390 Mon Sep 17 00:00:00 2001
From: Engiber Lozada <89547469+engijlr@users.noreply.github.com>
Date: Tue, 28 Oct 2025 13:33:29 +0100
Subject: [PATCH 089/155] Property Editors: Added form control and mandatory
 support to editors in common group(Number, Tags, Slider). (#20659)

* Added mandatory support to property-editor-ui-number.

* Added form control to property-editor-ui-tags

* Added validator to the slider when value is missing and support for mandatory and mandatory message.

* Removed unnecessary ternary.

* Removed white space lit error.

* Fix tags input to handle undefined items array

---------

Co-authored-by: Mads Rasmussen <madsr@hey.com>
---
 .../input-slider/input-slider.element.ts      | 30 +++++++++++++++++++
 .../property-editor-ui-number.element.ts      | 16 ++++++++--
 .../property-editor-ui-slider.element.ts      | 30 +++++++++++++++++--
 .../property-editor-ui-toggle.element.ts      |  4 +--
 .../tags-input/tags-input.element.ts          |  6 +++-
 .../tags/property-editor-ui-tags.element.ts   | 26 +++++++++++-----
 6 files changed, 98 insertions(+), 14 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/components/input-slider/input-slider.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/components/input-slider/input-slider.element.ts
index b35c4c86b8cd..c330d5be0801 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/components/input-slider/input-slider.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/components/input-slider/input-slider.element.ts
@@ -3,13 +3,23 @@ import { customElement, html, property } from '@umbraco-cms/backoffice/external/
 import { UmbChangeEvent } from '@umbraco-cms/backoffice/event';
 import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element';
 import type { UUISliderEvent } from '@umbraco-cms/backoffice/external/uui';
+import { UMB_VALIDATION_EMPTY_LOCALIZATION_KEY } from '@umbraco-cms/backoffice/validation';
 
+/**
+ *
+ * @param value
+ */
 function splitString(value: string | undefined): Partial<[number | undefined, number | undefined]> {
 	const [from, to] = (value ?? ',').split(',');
 	const fromNumber = makeNumberOrUndefined(from);
 	return [fromNumber, makeNumberOrUndefined(to, fromNumber)];
 }
 
+/**
+ *
+ * @param value
+ * @param fallback
+ */
 function makeNumberOrUndefined(value: string | undefined, fallback?: undefined | number) {
 	if (value === undefined) {
 		return fallback;
@@ -21,6 +31,11 @@ function makeNumberOrUndefined(value: string | undefined, fallback?: undefined |
 	return n;
 }
 
+/**
+ *
+ * @param value
+ * @param fallback
+ */
 function undefinedFallbackToString(value: number | undefined, fallback: number): string {
 	return (value === undefined ? fallback : value).toString();
 }
@@ -48,6 +63,15 @@ export class UmbInputSliderElement extends UmbFormControlMixin<string, typeof Um
 
 	@property({ type: Number })
 	step = 1;
+	/**
+	 * Sets the input to required, meaning validation will fail if the value is empty.
+	 * @type {boolean}
+	 */
+	@property({ type: Boolean })
+	required?: boolean;
+
+	@property({ type: String })
+	requiredMessage?: string;
 
 	@property({ type: Number })
 	public get valueLow(): number | undefined {
@@ -92,6 +116,12 @@ export class UmbInputSliderElement extends UmbFormControlMixin<string, typeof Um
 	constructor() {
 		super();
 
+		this.addValidator(
+			'valueMissing',
+			() => this.requiredMessage ?? UMB_VALIDATION_EMPTY_LOCALIZATION_KEY,
+			() => !this.readonly && !!this.required && (this.value === undefined || this.value === null || this.value === ''),
+		);
+
 		this.addValidator(
 			'rangeUnderflow',
 			() => {
diff --git a/src/Umbraco.Web.UI.Client/src/packages/property-editors/number/property-editor-ui-number.element.ts b/src/Umbraco.Web.UI.Client/src/packages/property-editors/number/property-editor-ui-number.element.ts
index a7a1f1656daf..91dd6d35fadf 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/property-editors/number/property-editor-ui-number.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/property-editors/number/property-editor-ui-number.element.ts
@@ -1,5 +1,5 @@
 import { css, customElement, html, ifDefined, property, state } from '@umbraco-cms/backoffice/external/lit';
-import { UmbFormControlMixin } from '@umbraco-cms/backoffice/validation';
+import { UMB_VALIDATION_EMPTY_LOCALIZATION_KEY, UmbFormControlMixin } from '@umbraco-cms/backoffice/validation';
 import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element';
 import { UMB_PROPERTY_CONTEXT } from '@umbraco-cms/backoffice/property';
 import type {
@@ -10,7 +10,7 @@ import { UmbChangeEvent } from '@umbraco-cms/backoffice/event';
 
 @customElement('umb-property-editor-ui-number')
 export class UmbPropertyEditorUINumberElement
-	extends UmbFormControlMixin<number | undefined, typeof UmbLitElement, undefined>(UmbLitElement)
+	extends UmbFormControlMixin<number, typeof UmbLitElement, undefined>(UmbLitElement, undefined)
 	implements UmbPropertyEditorUiElement
 {
 	/**
@@ -22,6 +22,15 @@ export class UmbPropertyEditorUINumberElement
 	@property({ type: Boolean, reflect: true })
 	readonly = false;
 
+	/**
+	 * Sets the input to mandatory, meaning validation will fail if the value is empty.
+	 * @type {boolean}
+	 */
+	@property({ type: Boolean })
+	mandatory?: boolean;
+	@property({ type: String })
+	mandatoryMessage = UMB_VALIDATION_EMPTY_LOCALIZATION_KEY;
+
 	@state()
 	private _label?: string;
 
@@ -78,6 +87,7 @@ export class UmbPropertyEditorUINumberElement
 				this,
 			);
 		}
+		this.addFormControlElement(this.shadowRoot!.querySelector('uui-input')!);
 	}
 
 	#parseNumber(input: unknown): number | undefined {
@@ -103,6 +113,8 @@ export class UmbPropertyEditorUINumberElement
 				placeholder=${ifDefined(this._placeholder)}
 				value=${this.value?.toString() ?? ''}
 				@change=${this.#onChange}
+				?required=${this.mandatory}
+				.requiredMessage=${this.mandatoryMessage}
 				?readonly=${this.readonly}>
 			</uui-input>
 		`;
diff --git a/src/Umbraco.Web.UI.Client/src/packages/property-editors/slider/property-editor-ui-slider.element.ts b/src/Umbraco.Web.UI.Client/src/packages/property-editors/slider/property-editor-ui-slider.element.ts
index 8e3de47b85ea..9cef6edb21b1 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/property-editors/slider/property-editor-ui-slider.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/property-editors/slider/property-editor-ui-slider.element.ts
@@ -8,14 +8,23 @@ import type {
 	UmbPropertyEditorConfigCollection,
 	UmbPropertyEditorUiElement,
 } from '@umbraco-cms/backoffice/property-editor';
-import { UmbFormControlMixin } from '@umbraco-cms/backoffice/validation';
+import { UMB_VALIDATION_EMPTY_LOCALIZATION_KEY, UmbFormControlMixin } from '@umbraco-cms/backoffice/validation';
 
+/**
+ *
+ * @param value
+ */
 function stringToValueObject(value: string | undefined): Partial<UmbSliderPropertyEditorUiValueObject> {
 	const [from, to] = (value ?? ',').split(',');
 	const fromNumber = makeNumberOrUndefined(from);
 	return { from: fromNumber, to: makeNumberOrUndefined(to, fromNumber) };
 }
 
+/**
+ *
+ * @param value
+ * @param fallback
+ */
 function makeNumberOrUndefined(value: string | undefined, fallback?: undefined | number) {
 	if (value === undefined) {
 		return fallback;
@@ -27,6 +36,11 @@ function makeNumberOrUndefined(value: string | undefined, fallback?: undefined |
 	return n;
 }
 
+/**
+ *
+ * @param value
+ * @param fallback
+ */
 function undefinedFallback(value: number | undefined, fallback: number) {
 	return value === undefined ? fallback : value;
 }
@@ -48,6 +62,16 @@ export class UmbPropertyEditorUISliderElement
 	@property({ type: Boolean, reflect: true })
 	readonly = false;
 
+	/**
+	 * Sets the input to mandatory, meaning validation will fail if the value is empty.
+	 * @type {boolean}
+	 */
+	@property({ type: Boolean })
+	mandatory?: boolean;
+
+	@property({ type: String })
+	mandatoryMessage = UMB_VALIDATION_EMPTY_LOCALIZATION_KEY;
+
 	@state()
 	private _enableRange = false;
 
@@ -139,7 +163,9 @@ export class UmbPropertyEditorUISliderElement
 				.max=${this._max}
 				?enable-range=${this._enableRange}
 				@change=${this.#onChange}
-				?readonly=${this.readonly}>
+				?readonly=${this.readonly}
+				?required=${this.mandatory}
+				.requiredMessage=${this.mandatoryMessage}>
 			</umb-input-slider>
 		`;
 	}
diff --git a/src/Umbraco.Web.UI.Client/src/packages/property-editors/toggle/property-editor-ui-toggle.element.ts b/src/Umbraco.Web.UI.Client/src/packages/property-editors/toggle/property-editor-ui-toggle.element.ts
index 5c71b27a5e9e..121d06c9f5b9 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/property-editors/toggle/property-editor-ui-toggle.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/property-editors/toggle/property-editor-ui-toggle.element.ts
@@ -59,8 +59,8 @@ export class UmbPropertyEditorUIToggleElement
 	}
 
 	#onChange(event: CustomEvent & { target: UmbInputToggleElement }) {
-		const checked = event.target.checked;
-		this.value = this.mandatory ? (checked ?? null) : checked;
+		//checked is never null/undefined
+		this.value = event.target.checked;
 		this.dispatchEvent(new UmbChangeEvent());
 	}
 
diff --git a/src/Umbraco.Web.UI.Client/src/packages/tags/components/tags-input/tags-input.element.ts b/src/Umbraco.Web.UI.Client/src/packages/tags/components/tags-input/tags-input.element.ts
index 5a84f467c66a..b84e527e9c9d 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/tags/components/tags-input/tags-input.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/tags/components/tags-input/tags-input.element.ts
@@ -23,10 +23,14 @@ export class UmbTagsInputElement extends UUIFormControlMixin(UmbLitElement, '')
 
 	@property({ type: String })
 	culture?: string | null;
+	@property({ type: Boolean })
+	override required = false;
+	@property({ type: String })
+	override requiredMessage = 'This field is required';
 
 	@property({ type: Array })
 	public set items(newTags: string[]) {
-		const newItems = newTags.filter((x) => x !== '');
+		const newItems = newTags?.filter((x) => x !== '') || [];
 		this.#items = newItems;
 		super.value = this.#items.join(',');
 	}
diff --git a/src/Umbraco.Web.UI.Client/src/packages/tags/property-editors/tags/property-editor-ui-tags.element.ts b/src/Umbraco.Web.UI.Client/src/packages/tags/property-editors/tags/property-editor-ui-tags.element.ts
index ec160153b703..b9b8814ce9ba 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/tags/property-editors/tags/property-editor-ui-tags.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/tags/property-editors/tags/property-editor-ui-tags.element.ts
@@ -9,20 +9,22 @@ import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element';
 
 import '../../components/tags-input/tags-input.element.js';
 import { UmbChangeEvent } from '@umbraco-cms/backoffice/event';
+import { UMB_VALIDATION_EMPTY_LOCALIZATION_KEY, UmbFormControlMixin } from '@umbraco-cms/backoffice/validation';
 
 /**
  * @element umb-property-editor-ui-tags
  */
 @customElement('umb-property-editor-ui-tags')
-export class UmbPropertyEditorUITagsElement extends UmbLitElement implements UmbPropertyEditorUiElement {
-	private _value: Array<string> = [];
-
+export class UmbPropertyEditorUITagsElement
+	extends UmbFormControlMixin<Array<string>, typeof UmbLitElement, undefined>(UmbLitElement, undefined)
+	implements UmbPropertyEditorUiElement
+{
 	@property({ type: Array })
-	public set value(value: Array<string>) {
-		this._value = value || [];
+	public override set value(value: Array<string>) {
+		super.value = value || [];
 	}
-	public get value(): Array<string> {
-		return this._value;
+	public override get value(): Array<string> {
+		return super.value as string[];
 	}
 
 	/**
@@ -33,6 +35,10 @@ export class UmbPropertyEditorUITagsElement extends UmbLitElement implements Umb
 	 */
 	@property({ type: Boolean, reflect: true })
 	readonly = false;
+	@property({ type: Boolean })
+	mandatory?: boolean;
+	@property({ type: String })
+	mandatoryMessage = UMB_VALIDATION_EMPTY_LOCALIZATION_KEY;
 
 	@state()
 	private _group?: string;
@@ -61,6 +67,10 @@ export class UmbPropertyEditorUITagsElement extends UmbLitElement implements Umb
 		});
 	}
 
+	protected override firstUpdated() {
+		this.addFormControlElement(this.shadowRoot!.querySelector('umb-tags-input')!);
+	}
+
 	#onChange(event: CustomEvent) {
 		this.value = ((event.target as UmbTagsInputElement).value as string).split(',');
 		this.dispatchEvent(new UmbChangeEvent());
@@ -72,6 +82,8 @@ export class UmbPropertyEditorUITagsElement extends UmbLitElement implements Umb
 			.culture=${this._culture}
 			.items=${this.value}
 			@change=${this.#onChange}
+			?required=${!!this.mandatory}
+			.requiredMessage=${this.mandatoryMessage}
 			?readonly=${this.readonly}></umb-tags-input>`;
 	}
 }

From e7ccfaaaacd5df164d63472a034e72af076d8093 Mon Sep 17 00:00:00 2001
From: Andy Butland <abutland73@gmail.com>
Date: Wed, 29 Oct 2025 09:47:17 +0100
Subject: [PATCH 090/155] Routing: Added method to `IDocumentUrlService` for
 retrieving document key from URI (closes #20666) (#20673)

Added method to IDocumentUrlService for retrieving document key from URI.
---
 src/Umbraco.Core/Routing/DomainUtilities.cs   |  2 -
 .../Services/DocumentUrlService.cs            | 78 +++++++++++++++++++
 .../Services/IDocumentUrlService.cs           |  9 ++-
 .../Builders/TemplateBuilder.cs               |  4 +-
 .../Services/DocumentUrlServiceTests.cs       | 64 ++++++++++++++-
 5 files changed, 151 insertions(+), 6 deletions(-)

diff --git a/src/Umbraco.Core/Routing/DomainUtilities.cs b/src/Umbraco.Core/Routing/DomainUtilities.cs
index 41270367219e..4b1815389859 100644
--- a/src/Umbraco.Core/Routing/DomainUtilities.cs
+++ b/src/Umbraco.Core/Routing/DomainUtilities.cs
@@ -1,7 +1,5 @@
 using System.Diagnostics.CodeAnalysis;
 using System.Globalization;
-using Microsoft.Extensions.DependencyInjection;
-using Umbraco.Cms.Core.DependencyInjection;
 using Umbraco.Cms.Core.Models.PublishedContent;
 using Umbraco.Cms.Core.PublishedCache;
 using Umbraco.Cms.Core.Services.Navigation;
diff --git a/src/Umbraco.Core/Services/DocumentUrlService.cs b/src/Umbraco.Core/Services/DocumentUrlService.cs
index 6cee0e0f5c89..c2b65a097dc5 100644
--- a/src/Umbraco.Core/Services/DocumentUrlService.cs
+++ b/src/Umbraco.Core/Services/DocumentUrlService.cs
@@ -2,9 +2,11 @@
 using System.Diagnostics.CodeAnalysis;
 using System.Globalization;
 using System.Runtime.CompilerServices;
+using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
 using Umbraco.Cms.Core.Configuration.Models;
+using Umbraco.Cms.Core.DependencyInjection;
 using Umbraco.Cms.Core.Models;
 using Umbraco.Cms.Core.Persistence.Repositories;
 using Umbraco.Cms.Core.PublishedCache;
@@ -28,6 +30,7 @@ public class DocumentUrlService : IDocumentUrlService
     private readonly IDocumentRepository _documentRepository;
     private readonly ICoreScopeProvider _coreScopeProvider;
     private readonly GlobalSettings _globalSettings;
+    private readonly WebRoutingSettings _webRoutingSettings;
     private readonly UrlSegmentProviderCollection _urlSegmentProviderCollection;
     private readonly IContentService _contentService;
     private readonly IShortStringHelper _shortStringHelper;
@@ -37,6 +40,7 @@ public class DocumentUrlService : IDocumentUrlService
     private readonly IDocumentNavigationQueryService _documentNavigationQueryService;
     private readonly IPublishStatusQueryService _publishStatusQueryService;
     private readonly IDomainCacheService _domainCacheService;
+    private readonly IDefaultCultureAccessor _defaultCultureAccessor;
 
     private readonly ConcurrentDictionary<string, PublishedDocumentUrlSegments> _cache = new();
     private bool _isInitialized;
@@ -96,6 +100,7 @@ public UrlSegment(string segment, bool isPrimary)
     /// <summary>
     /// Initializes a new instance of the <see cref="DocumentUrlService"/> class.
     /// </summary>
+    [Obsolete("Please use the constructor taking all parameters. Scheduled for removal in Umbraco 19.")]
     public DocumentUrlService(
         ILogger<DocumentUrlService> logger,
         IDocumentUrlRepository documentUrlRepository,
@@ -111,12 +116,53 @@ public DocumentUrlService(
         IDocumentNavigationQueryService documentNavigationQueryService,
         IPublishStatusQueryService publishStatusQueryService,
         IDomainCacheService domainCacheService)
+        :this(
+            logger,
+            documentUrlRepository,
+            documentRepository,
+            coreScopeProvider,
+            globalSettings,
+            StaticServiceProvider.Instance.GetRequiredService<IOptions<WebRoutingSettings>>(),
+            urlSegmentProviderCollection,
+            contentService,
+            shortStringHelper,
+            languageService,
+            keyValueService,
+            idKeyMap,
+            documentNavigationQueryService,
+            publishStatusQueryService,
+            domainCacheService,
+            StaticServiceProvider.Instance.GetRequiredService<IDefaultCultureAccessor>())
+    {
+    }
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="DocumentUrlService"/> class.
+    /// </summary>
+    public DocumentUrlService(
+        ILogger<DocumentUrlService> logger,
+        IDocumentUrlRepository documentUrlRepository,
+        IDocumentRepository documentRepository,
+        ICoreScopeProvider coreScopeProvider,
+        IOptions<GlobalSettings> globalSettings,
+        IOptions<WebRoutingSettings> webRoutingSettings,
+        UrlSegmentProviderCollection urlSegmentProviderCollection,
+        IContentService contentService,
+        IShortStringHelper shortStringHelper,
+        ILanguageService languageService,
+        IKeyValueService keyValueService,
+        IIdKeyMap idKeyMap,
+        IDocumentNavigationQueryService documentNavigationQueryService,
+        IPublishStatusQueryService publishStatusQueryService,
+        IDomainCacheService domainCacheService,
+        IDefaultCultureAccessor defaultCultureAccessor)
     {
         _logger = logger;
         _documentUrlRepository = documentUrlRepository;
         _documentRepository = documentRepository;
         _coreScopeProvider = coreScopeProvider;
         _globalSettings = globalSettings.Value;
+        _webRoutingSettings = webRoutingSettings.Value;
         _urlSegmentProviderCollection = urlSegmentProviderCollection;
         _contentService = contentService;
         _shortStringHelper = shortStringHelper;
@@ -126,6 +172,7 @@ public DocumentUrlService(
         _documentNavigationQueryService = documentNavigationQueryService;
         _publishStatusQueryService = publishStatusQueryService;
         _domainCacheService = domainCacheService;
+        _defaultCultureAccessor = defaultCultureAccessor;
     }
 
     /// <inheritdoc/>
@@ -494,6 +541,37 @@ public async Task DeleteUrlsFromCacheAsync(IEnumerable<Guid> documentKeysEnumera
         scope.Complete();
     }
 
+    /// <inheritdoc/>
+    public Guid? GetDocumentKeyByUri(Uri uri, bool isDraft)
+    {
+        IEnumerable<Domain> domains = _domainCacheService.GetAll(false);
+        DomainAndUri? domain = DomainUtilities.SelectDomain(domains, uri, defaultCulture: _defaultCultureAccessor.DefaultCulture);
+
+        string route;
+        if (domain is not null)
+        {
+            route = domain.ContentId + DomainUtilities.PathRelativeToDomain(domain.Uri, uri.GetAbsolutePathDecoded());
+        }
+        else
+        {
+            // If we have configured strict domain matching, and a domain has not been found for the request configured on an ancestor node,
+            // do not route the content by URL.
+            if (_webRoutingSettings.UseStrictDomainMatching)
+            {
+                return null;
+            }
+
+            // Default behaviour if strict domain matching is not enabled will be to route under the to the first root node found.
+            route = uri.GetAbsolutePathDecoded();
+        }
+
+        return GetDocumentKeyByRoute(
+            domain is null ? route : route[domain.ContentId.ToString().Length..],
+            domain?.Culture,
+            domain?.ContentId,
+            isDraft);
+    }
+
     /// <inheritdoc/>
     public Guid? GetDocumentKeyByRoute(string route, string? culture, int? documentStartNodeId, bool isDraft)
     {
diff --git a/src/Umbraco.Core/Services/IDocumentUrlService.cs b/src/Umbraco.Core/Services/IDocumentUrlService.cs
index 8020a7726991..eab37488df1c 100644
--- a/src/Umbraco.Core/Services/IDocumentUrlService.cs
+++ b/src/Umbraco.Core/Services/IDocumentUrlService.cs
@@ -1,5 +1,4 @@
 using Umbraco.Cms.Core.Models;
-using Umbraco.Cms.Core.Routing;
 
 namespace Umbraco.Cms.Core.Services;
 
@@ -64,6 +63,14 @@ IEnumerable<string> GetUrlSegments(Guid documentKey, string culture, bool isDraf
     /// <param name="documentKeys">The collection of document keys.</param>
     Task DeleteUrlsFromCacheAsync(IEnumerable<Guid> documentKeys);
 
+    /// <summary>
+    /// Gets a document key by <see cref="Uri" />.
+    /// </summary>
+    /// <param name="uri">The uniform resource identifier.</param>
+    /// <param name="isDraft">Whether to get the url of the draft or published document.</param>
+    /// <returns>The document key, or null if not found.</returns>
+    Guid? GetDocumentKeyByUri(Uri uri, bool isDraft) => throw new NotImplementedException(); // TODO (V19): Remove default implementation.
+
     /// <summary>
     /// Gets a document key by route.
     /// </summary>
diff --git a/tests/Umbraco.Tests.Common/Builders/TemplateBuilder.cs b/tests/Umbraco.Tests.Common/Builders/TemplateBuilder.cs
index 4c87e3ca6436..a030b4c4a800 100644
--- a/tests/Umbraco.Tests.Common/Builders/TemplateBuilder.cs
+++ b/tests/Umbraco.Tests.Common/Builders/TemplateBuilder.cs
@@ -129,9 +129,9 @@ public override ITemplate Build()
         return template;
     }
 
-    public static Template CreateTextPageTemplate(string alias = "textPage") =>
+    public static Template CreateTextPageTemplate(string alias = "textPage", string name = "Text page") =>
         (Template)new TemplateBuilder()
             .WithAlias(alias)
-            .WithName("Text page")
+            .WithName(name)
             .Build();
 }
diff --git a/tests/Umbraco.Tests.Integration/Umbraco.Core/Services/DocumentUrlServiceTests.cs b/tests/Umbraco.Tests.Integration/Umbraco.Core/Services/DocumentUrlServiceTests.cs
index 9c8b266bc586..a695a1bb1079 100644
--- a/tests/Umbraco.Tests.Integration/Umbraco.Core/Services/DocumentUrlServiceTests.cs
+++ b/tests/Umbraco.Tests.Integration/Umbraco.Core/Services/DocumentUrlServiceTests.cs
@@ -1,11 +1,13 @@
 using NUnit.Framework;
 using Umbraco.Cms.Core.Cache;
 using Umbraco.Cms.Core.Models;
+using Umbraco.Cms.Core.Models.ContentEditing;
 using Umbraco.Cms.Core.Notifications;
 using Umbraco.Cms.Core.Services;
 using Umbraco.Cms.Core.Strings;
 using Umbraco.Cms.Core.Sync;
 using Umbraco.Cms.Tests.Common.Builders;
+using Umbraco.Cms.Tests.Common.Builders.Extensions;
 using Umbraco.Cms.Tests.Common.Testing;
 using Umbraco.Cms.Tests.Integration.Testing;
 using Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Scoping;
@@ -23,6 +25,8 @@ internal sealed class DocumentUrlServiceTests : UmbracoIntegrationTestWithConten
 
     protected ILanguageService LanguageService => GetRequiredService<ILanguageService>();
 
+    protected IDomainService DomainService => GetRequiredService<IDomainService>();
+
     protected override void CustomTestSetup(IUmbracoBuilder builder)
     {
         builder.Services.AddUnique<IServerMessenger, ScopedRepositoryTests.LocalServerMessenger>();
@@ -148,6 +152,64 @@ public async Task GetUrlSegment_For_Published_Then_Deleted_Document_Does_Not_Hav
         Assert.IsNull(actual);
     }
 
+    [TestCase("/", ExpectedResult = TextpageKey)]
+    [TestCase("/text-page-1", ExpectedResult = SubPageKey)]
+    public string? GetDocumentKeyByUri_Without_Domains_Returns_Expected_DocumentKey(string path)
+    {
+        ContentService.PublishBranch(Textpage, PublishBranchFilter.IncludeUnpublished, ["*"]);
+
+        var uri = new Uri("http://example.com" + path);
+        return DocumentUrlService.GetDocumentKeyByUri(uri, false)?.ToString()?.ToUpper();
+    }
+
+    private const string VariantRootPageKey = "1D3283C7-64FD-4F4D-A741-442BDA487B71";
+    private const string VariantChildPageKey = "1D3283C7-64FD-4F4D-A741-442BDA487B72";
+
+    [TestCase("/", "/en", "http://example.com/en/", ExpectedResult = VariantRootPageKey)]
+    [TestCase("/child-page", "/en", "http://example.com/en/", ExpectedResult = VariantChildPageKey)]
+    [TestCase("/", "example.com", "http://example.com/", ExpectedResult = VariantRootPageKey)]
+    [TestCase("/child-page", "example.com", "http://example.com/", ExpectedResult = VariantChildPageKey)]
+    public async Task<string?> GetDocumentKeyByUri_With_Domains_Returns_Expected_DocumentKey(string path, string domain, string rootUrl)
+    {
+        var template = TemplateBuilder.CreateTextPageTemplate("variantPageTemplate", "Variant Page Template");
+        FileService.SaveTemplate(template);
+
+        var contentType = new ContentTypeBuilder()
+            .WithAlias("variantPage")
+            .WithName("Variant Page")
+            .WithContentVariation(ContentVariation.Culture)
+            .WithAllowAsRoot(true)
+            .WithDefaultTemplateId(template.Id)
+            .Build();
+        ContentTypeService.Save(contentType);
+
+        var rootPage = new ContentBuilder()
+            .WithKey(Guid.Parse(VariantRootPageKey))
+            .WithContentType(contentType)
+            .WithCultureName("en-US", $"Root Page")
+            .Build();
+        var childPage = new ContentBuilder()
+            .WithKey(Guid.Parse(VariantChildPageKey))
+            .WithContentType(contentType)
+            .WithCultureName("en-US", $"Child Page")
+            .WithParent(rootPage)
+            .Build();
+        ContentService.Save(rootPage, -1);
+        ContentService.Save(childPage, -1);
+        ContentService.PublishBranch(rootPage, PublishBranchFilter.IncludeUnpublished, ["*"]);
+
+        var updateDomainResult = await DomainService.UpdateDomainsAsync(
+            rootPage.Key,
+            new DomainsUpdateModel
+            {
+                Domains = [new DomainModel { DomainName = domain, IsoCode = "en-US" }],
+            });
+        Assert.IsTrue(updateDomainResult.Success);
+
+        var uri = new Uri(rootUrl + path);
+        return DocumentUrlService.GetDocumentKeyByUri(uri, false)?.ToString()?.ToUpper();
+    }
+
     [TestCase("/", "en-US", true, ExpectedResult = TextpageKey)]
     [TestCase("/text-page-1", "en-US", true, ExpectedResult = SubPageKey)]
     [TestCase("/text-page-1-custom", "en-US", true, ExpectedResult = SubPageKey)] // Uses the segment registered by the custom IIUrlSegmentProvider that allows for more than one segment per document.
@@ -160,7 +222,7 @@ public async Task GetUrlSegment_For_Published_Then_Deleted_Document_Does_Not_Hav
     [TestCase("/text-page-2", "en-US", false, ExpectedResult = null)]
     [TestCase("/text-page-2-custom", "en-US", false, ExpectedResult = SubPage2Key)] // Uses the segment registered by the custom IIUrlSegmentProvider that does not allow for more than one segment per document.
     [TestCase("/text-page-3", "en-US", false, ExpectedResult = SubPage3Key)]
-    public string? GetDocumentKeyByRoute_Returns_Expected_Route(string route, string isoCode, bool loadDraft)
+    public string? GetDocumentKeyByRoute_Returns_Expected_DocumentKey(string route, string isoCode, bool loadDraft)
     {
         if (loadDraft is false)
         {

From f87e15b941768143253cc10321a85a904996a8a4 Mon Sep 17 00:00:00 2001
From: Jacob Overgaard <752371+iOvergaard@users.noreply.github.com>
Date: Wed, 29 Oct 2025 11:38:44 +0100
Subject: [PATCH 091/155] build: adds back the ^ missing from openapi-ts to
 allow newer versions to be used

---
 src/Umbraco.Web.UI.Client/package-lock.json              | 2 +-
 src/Umbraco.Web.UI.Client/src/packages/core/package.json | 2 +-
 templates/UmbracoExtension/Client/package.json           | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/package-lock.json b/src/Umbraco.Web.UI.Client/package-lock.json
index cf63f6c06461..c0ca19212fc2 100644
--- a/src/Umbraco.Web.UI.Client/package-lock.json
+++ b/src/Umbraco.Web.UI.Client/package-lock.json
@@ -17062,7 +17062,7 @@
 		"src/packages/core": {
 			"name": "@umbraco-backoffice/core",
 			"dependencies": {
-				"@hey-api/openapi-ts": "0.85.0",
+				"@hey-api/openapi-ts": "^0.85.0",
 				"@types/diff": "^7.0.2",
 				"diff": "^7.0.0",
 				"uuid": "^13.0.0"
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/package.json b/src/Umbraco.Web.UI.Client/src/packages/core/package.json
index 0574513f6e0b..8df750a2a56d 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/package.json
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/package.json
@@ -10,7 +10,7 @@
 		"@types/diff": "^7.0.2",
 		"diff": "^7.0.0",
 		"uuid": "^13.0.0",
-		"@hey-api/openapi-ts": "0.85.0"
+		"@hey-api/openapi-ts": "^0.85.0"
 	},
 	"devDependencies": {
 		"lucide-static": "^0.544.0",
diff --git a/templates/UmbracoExtension/Client/package.json b/templates/UmbracoExtension/Client/package.json
index 47cfc4028c15..1102668edf48 100644
--- a/templates/UmbracoExtension/Client/package.json
+++ b/templates/UmbracoExtension/Client/package.json
@@ -9,7 +9,7 @@
     "generate-client": "node scripts/generate-openapi.js https://localhost:44339/umbraco/swagger/umbracoextension/swagger.json"
   },
   "devDependencies": {
-    "@hey-api/openapi-ts": "0.85.0",
+    "@hey-api/openapi-ts": "^0.85.0",
     "@umbraco-cms/backoffice": "^UMBRACO_VERSION_FROM_TEMPLATE",
     "chalk": "^5.6.2",
     "cross-env": "^10.1.0",

From ce59537006357261cccfa6558b47127e82378ced Mon Sep 17 00:00:00 2001
From: Jacob Overgaard <752371+iOvergaard@users.noreply.github.com>
Date: Wed, 29 Oct 2025 11:40:10 +0100
Subject: [PATCH 092/155] build: updates lockfile

---
 src/Umbraco.Web.UI.Login/package-lock.json | 174 +++------------------
 src/Umbraco.Web.UI.Login/package.json      |   4 +-
 2 files changed, 21 insertions(+), 157 deletions(-)

diff --git a/src/Umbraco.Web.UI.Login/package-lock.json b/src/Umbraco.Web.UI.Login/package-lock.json
index 7a81a473af42..6c509232c623 100644
--- a/src/Umbraco.Web.UI.Login/package-lock.json
+++ b/src/Umbraco.Web.UI.Login/package-lock.json
@@ -6,8 +6,8 @@
     "": {
       "name": "login",
       "devDependencies": {
-        "@hey-api/openapi-ts": "0.85.0",
-        "@umbraco-cms/backoffice": "16.2.0",
+        "@hey-api/openapi-ts": "^0.85.0",
+        "@umbraco-cms/backoffice": "^16.2.0",
         "msw": "^2.11.3",
         "typescript": "^5.9.3",
         "vite": "^7.1.11"
@@ -529,6 +529,7 @@
       "integrity": "sha512-LSBHP2/wTF1BnaccHGX1t+0Ss+2VJQxotrLz/0+LK2z8ocuyVZXOYhfBSd7FP8sK78MDJVDBYrPCsBUvNSlH1g==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@hey-api/codegen-core": "^0.2.0",
         "@hey-api/json-schema-ref-parser": "1.2.0",
@@ -643,8 +644,7 @@
       "resolved": "https://registry.npmjs.org/@lit-labs/ssr-dom-shim/-/ssr-dom-shim-1.4.0.tgz",
       "integrity": "sha512-ficsEARKnmmW5njugNYKipTm4SFnbik7CXtoencDZzmzo/dQ+2Q0bgkzJuoJP20Aj0F+izzJjOqsnkd6F/o1bw==",
       "dev": true,
-      "license": "BSD-3-Clause",
-      "peer": true
+      "license": "BSD-3-Clause"
     },
     "node_modules/@lit/reactive-element": {
       "version": "2.1.1",
@@ -652,7 +652,6 @@
       "integrity": "sha512-N+dm5PAYdQ8e6UlywyyrgI2t++wFGXfHx+dSJ1oBrg6FAxUj40jId++EaRm80MKX5JnlH1sBsyZ5h0bcZKemCg==",
       "dev": true,
       "license": "BSD-3-Clause",
-      "peer": true,
       "dependencies": {
         "@lit-labs/ssr-dom-shim": "^1.4.0"
       }
@@ -705,8 +704,7 @@
       "resolved": "https://registry.npmjs.org/@remirror/core-constants/-/core-constants-3.0.0.tgz",
       "integrity": "sha512-42aWfPrimMfDKDi4YegyS7x+/0tlzaqwPQCULLanv3DMIlu96KTJR0fM5isWX2UViOqlGnX6YFgqWepcX+XMNg==",
       "dev": true,
-      "license": "MIT",
-      "peer": true
+      "license": "MIT"
     },
     "node_modules/@rollup/rollup-android-arm-eabi": {
       "version": "4.47.1",
@@ -1009,7 +1007,6 @@
       "integrity": "sha512-viQ6AHRhjCYYipKK6ZepBzwZpkuMvO9yhRHeUZDvlSOAh8rvsUTSre0y74nu8QRYUt4a44lJJ6BpphJK7bEgYA==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "funding": {
         "type": "github",
         "url": "https://github.com/sponsors/ueberdosis"
@@ -1024,7 +1021,6 @@
       "integrity": "sha512-zCce9PRuTNhadFir71luLo99HERDpGJ0EEflGm7RN8I1SnNi9gD5ooK42BOIQtejGCJqg3hTPZiYDJC2hXvckQ==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "funding": {
         "type": "github",
         "url": "https://github.com/sponsors/ueberdosis"
@@ -1039,7 +1035,6 @@
       "integrity": "sha512-HHakuV4ckYCDOnBbne088FvCEP4YICw+wgPBz/V2dfpiFYQ4WzT0LPK9s7OFMCN+ROraoug+1ryN1Z1KdIgujQ==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "funding": {
         "type": "github",
         "url": "https://github.com/sponsors/ueberdosis"
@@ -1070,7 +1065,6 @@
       "integrity": "sha512-GU9deB1A/Tr4FMPu71CvlcjGKwRhGYz60wQ8m4aM+ELZcVIcZRa1ebR8bExRIEWnvRztQuyRiCQzw2N0xQJ1QQ==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "funding": {
         "type": "github",
         "url": "https://github.com/sponsors/ueberdosis"
@@ -1085,7 +1079,6 @@
       "integrity": "sha512-/TDDOwONl0qEUc4+B6V9NnWtSjz95eg7/8uCb8Y8iRbGvI9vT4/znRKofFxstvKmW4URu/H74/g0ywV57h0B+A==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "funding": {
         "type": "github",
         "url": "https://github.com/sponsors/ueberdosis"
@@ -1101,7 +1094,6 @@
       "integrity": "sha512-2P2IZp1NRAE+21mRuFBiP3X2WKfZ6kUC23NJKpn8bcOamY3obYqCt0ltGPhE4eR8n8QAl2fI/3jIgjR07dC8ow==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "funding": {
         "type": "github",
         "url": "https://github.com/sponsors/ueberdosis"
@@ -1116,7 +1108,6 @@
       "integrity": "sha512-JkDQU2ZYFOuT5mNYb8OiWGwD1HcjbtmX8tLNugQbToECmz9WvVPqJmn7V/q8VGpP81iEECz/IsyRmuf2kSD4uA==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "funding": {
         "type": "github",
         "url": "https://github.com/sponsors/ueberdosis"
@@ -1132,7 +1123,6 @@
       "integrity": "sha512-KOiMZc3PwJS3hR0nSq5d0TJi2jkNZkLZElcT6pCEnhRHzPH6dRMu9GM5Jj798ZRUy0T9UFcKJalFZaDxnmRnpg==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "funding": {
         "type": "github",
         "url": "https://github.com/sponsors/ueberdosis"
@@ -1148,7 +1138,6 @@
       "integrity": "sha512-d6uStdNKi8kjPlHAyO59M6KGWATNwhLCD7dng0NXfwGndc22fthzIk/6j9F6ltQx30huy5qQram6j3JXwNACoA==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "funding": {
         "type": "github",
         "url": "https://github.com/sponsors/ueberdosis"
@@ -1163,7 +1152,6 @@
       "integrity": "sha512-KSzL8WZV3pjJG9ke4RaU70+B5UlYR2S6olNt5UCAawM+fi11mobVztiBoC19xtpSVqIXC1AmXOqUgnuSvmE4ZA==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "funding": {
         "type": "github",
         "url": "https://github.com/sponsors/ueberdosis"
@@ -1178,7 +1166,6 @@
       "integrity": "sha512-m6YR1gkkauIDo3PRl0gP+7Oc4n5OqDzcjVh6LvWREmZP8nmi94hfseYbqOXUb6RPHIc0JKF02eiRifT4MSd2nw==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "funding": {
         "type": "github",
         "url": "https://github.com/sponsors/ueberdosis"
@@ -1194,7 +1181,6 @@
       "integrity": "sha512-mT6baqOhs/NakgrAeDeed194E/ZJFGL692H0C7f1N7WDRaWxUu2oR0LrnRqSH5OyPjELkzu6nQnNy0+0tFGHHg==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "funding": {
         "type": "github",
         "url": "https://github.com/sponsors/ueberdosis"
@@ -1225,7 +1211,6 @@
       "integrity": "sha512-pOs6oU4LyGO89IrYE4jbE8ZYsPwMMIiKkYfXcfeD9NtpGNBnjeVXXF5I9ndY2ANrCAgC8k58C3/powDRf0T2yA==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "funding": {
         "type": "github",
         "url": "https://github.com/sponsors/ueberdosis"
@@ -1259,7 +1244,6 @@
       "integrity": "sha512-quOXckC73Luc3x+Dcm88YAEBW+Crh3x5uvtQOQtn2GEG91AshrvbnhGRiYnfvEN7UhWIS+FYI5liHFcRKSUKrQ==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "funding": {
         "type": "github",
         "url": "https://github.com/sponsors/ueberdosis"
@@ -1274,7 +1258,6 @@
       "integrity": "sha512-UHKNRxq6TBnXMGFSq91knD6QaHsyyOwLOsXMzupmKM5Su0s+CRXEjfav3qKlbb9e4m7D7S/a0aPm8nC9KIXNhQ==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "funding": {
         "type": "github",
         "url": "https://github.com/sponsors/ueberdosis"
@@ -1289,7 +1272,6 @@
       "integrity": "sha512-UezvM9VDRAVJlX1tykgHWSD1g3MKfVMWWZ+Tg+PE4+kizOwoYkRWznVPgCAxjmyHajxpCKRXgqTZkOxjJ9Kjzg==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "funding": {
         "type": "github",
         "url": "https://github.com/sponsors/ueberdosis"
@@ -1320,7 +1302,6 @@
       "integrity": "sha512-CkoRH+pAi6MgdCh7K0cVZl4N2uR4pZdabXAnFSoLZRSg6imLvEUmWHfSi1dl3Z7JOvd3a4yZ4NxerQn5MWbJ7g==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "funding": {
         "type": "github",
         "url": "https://github.com/sponsors/ueberdosis"
@@ -1426,7 +1407,6 @@
       "integrity": "sha512-p2n8WVMd/2vckdJlol24acaTDIZAhI7qle5cM75bn01sOEZoFlSw6SwINOULrUCzNJsYb43qrLEibZb4j2LeQw==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "funding": {
         "type": "github",
         "url": "https://github.com/sponsors/ueberdosis"
@@ -1456,7 +1436,6 @@
       "integrity": "sha512-t9Nc/UkrbCfnSHEUi1gvUQ2ZPzvfdYFT5TExoV2DTiUCkhG6+mecT5bTVFGW3QkPmbToL+nFhGn4ZRMDD0SP3Q==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "funding": {
         "type": "github",
         "url": "https://github.com/sponsors/ueberdosis"
@@ -1581,8 +1560,7 @@
       "resolved": "https://registry.npmjs.org/@types/linkify-it/-/linkify-it-5.0.0.tgz",
       "integrity": "sha512-sVDA58zAw4eWAffKOaQH5/5j3XeayukzDk+ewSsnv3p4yJEZHCCzMDiZM8e0OUrRvmpGZ85jf4yDHkHsgBNr9Q==",
       "dev": true,
-      "license": "MIT",
-      "peer": true
+      "license": "MIT"
     },
     "node_modules/@types/markdown-it": {
       "version": "14.1.2",
@@ -1590,7 +1568,6 @@
       "integrity": "sha512-promo4eFwuiW+TfGxhi+0x3czqTYJkG8qB17ZUJiVF10Xm7NLVRSLUsfRTU/6h1e24VvRnXCx+hG7li58lkzog==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@types/linkify-it": "^5",
         "@types/mdurl": "^2"
@@ -1601,8 +1578,7 @@
       "resolved": "https://registry.npmjs.org/@types/mdurl/-/mdurl-2.0.0.tgz",
       "integrity": "sha512-RGdgjQUZba5p6QEFAVx2OGb8rQDL/cPRG7GiedRzMcJ1tYnUANBncjbSB1NRGwbvjcPeikRABz2nshyPk1bhWg==",
       "dev": true,
-      "license": "MIT",
-      "peer": true
+      "license": "MIT"
     },
     "node_modules/@types/statuses": {
       "version": "2.0.5",
@@ -1616,8 +1592,7 @@
       "resolved": "https://registry.npmjs.org/@types/trusted-types/-/trusted-types-2.0.7.tgz",
       "integrity": "sha512-ScaPdn1dQczgbl0QFTeTOmVHFULt394XJgOQNoyVhZ6r2vLnMLJfBPd53SB52T/3G36VI1/g2MZaX0cwDuXsfw==",
       "dev": true,
-      "license": "MIT",
-      "peer": true
+      "license": "MIT"
     },
     "node_modules/@umbraco-cms/backoffice": {
       "version": "16.2.0",
@@ -1759,7 +1734,6 @@
       "integrity": "sha512-O0807+bWVWV/rsFihFVKSOkg9wBtLXKCszE5+eZk2KmONm93BFhIAE35rp7eD6X2SuJMHwYzInIxMIMjHzdpUQ==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@umbraco-ui/uui-base": "1.15.0",
         "@umbraco-ui/uui-button-group": "1.15.0"
@@ -1771,7 +1745,6 @@
       "integrity": "sha512-eEX83zwRN3tCiHScKcmkROWAfLu3TgFI9SntlbyxiuSSYfhJxWSZXOf6lVvQ/1CyvKq8XqSbBnN3VKXgcaKOpg==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@umbraco-ui/uui-base": "1.15.0"
       }
@@ -1782,7 +1755,6 @@
       "integrity": "sha512-CGYAFAHgNoQK2UTupP7pO0mwP6t9/Ms6WZ0gIC40a+kPjrGtaDWU52hiPsuXrUcR6WjJwZ5WRrJHOboRpdmM0g==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@umbraco-ui/uui-avatar": "1.15.0",
         "@umbraco-ui/uui-base": "1.15.0"
@@ -1794,7 +1766,6 @@
       "integrity": "sha512-9aGmhRvey98kcR7wfsnno0BNftIRwJ0r2lCH6cNK2lhe69enYm0MWjp+4uutnlEWWskTLEI344BOqmqOHH1NPA==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@umbraco-ui/uui-base": "1.15.0"
       }
@@ -1805,7 +1776,6 @@
       "integrity": "sha512-0vtKmjzUOn/tIUHNrsx7aZpy3eq9aRKqV9kkJTrhH92S4WcMy+cOB1iw9t3Fe3xlBPuL3JpszwuxMTIuIqJTgQ==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "peerDependencies": {
         "lit": ">=2.8.0"
       }
@@ -1816,7 +1786,6 @@
       "integrity": "sha512-LkYX+p44mFVdvlZSliP5ClMcyHoOIVLWI3WVkaMLQdNi2LO9bbfaTneLzu4ruW6v0iF+kLsznr3bl73VHk7oEg==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@umbraco-ui/uui-base": "1.15.0"
       }
@@ -1827,7 +1796,6 @@
       "integrity": "sha512-MhSNcKsVNymD/yt3NFXujuaQmAqMqj5S+CBoDHEk88H7Id9NMw9RStZFJ37mI2CxHWkeHDotNVgOhSBiHJNJnw==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@umbraco-ui/uui-base": "1.15.0",
         "@umbraco-ui/uui-css": "1.15.0"
@@ -1839,7 +1807,6 @@
       "integrity": "sha512-TaUY+hNB0VIwv9SBi9fDjIFRtrmmkcT7hlhLCJLUVfQ7jJlGLPISAAdypSplNeCPthYvP1cJQ9m28OzscXHZxQ==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@umbraco-ui/uui-base": "1.15.0"
       }
@@ -1850,7 +1817,6 @@
       "integrity": "sha512-3Oaqj6Yta/Q/Ndme20YA1XbHdBBL71iNhpqREfTHli2YV4TEcgIiNy0s2op2oPhKjIEQPEfitU2BrruYEEWa7Q==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@umbraco-ui/uui-base": "1.15.0",
         "@umbraco-ui/uui-icon-registry-essential": "1.15.0"
@@ -1862,7 +1828,6 @@
       "integrity": "sha512-MAaJzpwVnlyGJNvLv6qIwrYsI5SaXXiVKgVi47I8+x//QmnArmetCN04766gGzmAb0m2uuC3ht0BXMDv05pxvw==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@umbraco-ui/uui-base": "1.15.0",
         "@umbraco-ui/uui-button": "1.15.0"
@@ -1874,7 +1839,6 @@
       "integrity": "sha512-YPEnubKNbKmw04eWRH24/3Uxu+zhtLPeJoaT6ykPCyjr/EKc82rSTvn8fwQuP41UokQrXOac2pKn7SncyoST1Q==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@umbraco-ui/uui-base": "1.15.0"
       }
@@ -1885,7 +1849,6 @@
       "integrity": "sha512-nLJZ6P5eK1rYgqjP5zCxbZp8g4WJ23RnUZQ49o7QpU/7zoPOK72/fuM3Ky00Iapixm/kAD6dYHO/P+GtNz8/CA==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@umbraco-ui/uui-base": "1.15.0"
       }
@@ -1896,7 +1859,6 @@
       "integrity": "sha512-pNjpk2iIdSsmTtDdBsWaEr8JX0RcWbl8yKGaqLvo/S7d3bly5z+FjcsgGnX1i1GHo7dqmgVJfbdvN9V1jgn+FA==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@umbraco-ui/uui-base": "1.15.0",
         "@umbraco-ui/uui-checkbox": "1.15.0"
@@ -1908,7 +1870,6 @@
       "integrity": "sha512-cWag+D0XrogYZesAN8NMPQCCuU7L7uZ4Xz8dmirKQk1gjMrFDC4vYPZRQ/5O3ETTFupfDipVKimgRDsmarbLSQ==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@umbraco-ui/uui-base": "1.15.0",
         "@umbraco-ui/uui-card": "1.15.0"
@@ -1920,7 +1881,6 @@
       "integrity": "sha512-DZ6JYNvGb5wVkhhLShENMm+Y6kTpz37YrApQTJVUUgPXhIABO2CDCnqgpH5tkQX73s9jjVB3Ca7SeivuYv8G9A==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@umbraco-ui/uui-base": "1.15.0",
         "@umbraco-ui/uui-card": "1.15.0",
@@ -1933,7 +1893,6 @@
       "integrity": "sha512-EzYebWCzR0wHY902NmAcTRSVSscYac3QntCz+xwSulrhzfy4copeOd1qE+Lz7FjHs+ho0IBPZol8sF4W6rK8FQ==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@umbraco-ui/uui-base": "1.15.0",
         "@umbraco-ui/uui-card": "1.15.0",
@@ -1947,7 +1906,6 @@
       "integrity": "sha512-oo7gCs3RGJ4ujFs+LpG9I1DS/XSNkz9gaqvp4BkaR0kBXzw5f2SLLGhA9S3M6M+OPlsXuuJNKlTV1tn2+LF6Ng==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@umbraco-ui/uui-avatar": "1.15.0",
         "@umbraco-ui/uui-base": "1.15.0",
@@ -1960,7 +1918,6 @@
       "integrity": "sha512-cnKP5GeaI028hGabVCki1kPqAVSekFeP7QEwu7lncA+dcX8uvg+ffV6kW9FV0emOhI5Tmxvh8o+UDKlLs28q3A==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@umbraco-ui/uui-base": "1.15.0"
       }
@@ -1971,7 +1928,6 @@
       "integrity": "sha512-vPkgrFAPDMvJdJTADIWNj48D8gJWD3dBotucUghg/wHhvJv8h/2MvnwMUNnnSB1REHbanl7hJBVvKcNkoil0gA==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@umbraco-ui/uui-base": "1.15.0",
         "@umbraco-ui/uui-boolean-input": "1.15.0",
@@ -1984,7 +1940,6 @@
       "integrity": "sha512-k6u//b+s6UYmzKYMizIf2MRGD4kFy1qWdSk1GnIeDdiQxABJuBZEtkACIe66j+lxnonFvZ/assbLbhRiu15ZCw==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@umbraco-ui/uui-base": "1.15.0",
         "colord": "^2.9.3"
@@ -1996,7 +1951,6 @@
       "integrity": "sha512-I4KGyzZZazjeifcavHp7qnMbP0Jh0dM+gzZhV+YtdPR2JT0o7y6stkbY0f+dOln0K6Bu6BQLV0HLHl/1f/1NDg==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@umbraco-ui/uui-base": "1.15.0",
         "@umbraco-ui/uui-popover-container": "1.15.0",
@@ -2009,7 +1963,6 @@
       "integrity": "sha512-lpT9kapypGkTelG9COSk169VKs0MSiKweX8menDDn0p6I4RfKQBy0N27HecCcf1RqPsCnTbP3lPr5DJy00KdzA==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@umbraco-ui/uui-base": "1.15.0"
       }
@@ -2020,7 +1973,6 @@
       "integrity": "sha512-1AI0QMr046fKc8xZ4aBO7FDwvggsS9plIpY0W4AGrqQxqGUR2u/mTU49+8xMtboaFOen5RQpJ65DN9hAgeNZ+w==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@umbraco-ui/uui-base": "1.15.0",
         "@umbraco-ui/uui-icon-registry-essential": "1.15.0",
@@ -2033,7 +1985,6 @@
       "integrity": "sha512-UzlgWdsVHyCM/znFThrfA4A/S/K/R9Nc2KyRYiyy2xgBoP7x2vJ5Rn4mnR02W4bhI3gNgCJ2fqhmyiW4dxyk0Q==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@umbraco-ui/uui-base": "1.15.0",
         "@umbraco-ui/uui-color-swatch": "1.15.0"
@@ -2045,7 +1996,6 @@
       "integrity": "sha512-CKslvVRCKCReMr/ZZh4wc3TKJNvFjKVm/hSIvFqCIoJuSKfC4XuLU9SK9FL1s42NUAUmccSD3hATZJZ9VXqY+Q==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@umbraco-ui/uui-base": "1.15.0",
         "@umbraco-ui/uui-button": "1.15.0",
@@ -2062,7 +2012,6 @@
       "integrity": "sha512-e8IhqU9AC5pOqXuzPzI+BDsW97Ac0u1GU/5MIJqRcBZ+ZttPcH4fsm4u8siCHbK1khCG0Vzo7HiKPZ0IuuOslg==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@umbraco-ui/uui-base": "1.15.0"
       }
@@ -2084,7 +2033,6 @@
       "integrity": "sha512-iVsrVVnvBrCCT9uJhyBE7b1kXwWUUKDmimhs/TyF1SFjxWP/U0Z99QqqI1pawdad+BuK3oVCmxYOdaReWDQXkQ==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@umbraco-ui/uui-base": "1.15.0",
         "@umbraco-ui/uui-css": "1.15.0"
@@ -2096,7 +2044,6 @@
       "integrity": "sha512-JdDRIzSGGDnvVqXSIhc+5rDXMdYMO+Hd7s2hqLp+iRSn8IHISN/qT1nfFVO9LMbLdcApanl3JJ4Rru9LN4Q3HA==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@umbraco-ui/uui-base": "1.15.0"
       }
@@ -2107,7 +2054,6 @@
       "integrity": "sha512-MhJRkVdDQWKEBvemNRD4bZCuIS0JUll1nNoPK7scA+e6vDmbv25vqPHNXGE/sIpVkChY/L+v+twokzlHn57XMw==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@umbraco-ui/uui-base": "1.15.0",
         "@umbraco-ui/uui-symbol-file-dropzone": "1.15.0"
@@ -2119,7 +2065,6 @@
       "integrity": "sha512-AHKIdYLC0ga4Wgr68xtW/gG3NDqn+QhD2aus0l2n4lBoq6OAQ5aZiPwD9i1fCD7dgyjKQ6Ov9PJSaqRYQkOlNA==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@umbraco-ui/uui-base": "1.15.0",
         "@umbraco-ui/uui-symbol-file": "1.15.0",
@@ -2133,7 +2078,6 @@
       "integrity": "sha512-4u9ZryfVBunpb0IL0+TevytrISA6S1+AajiK/PUk0JMJfqMuQMjmpnNPdtYRNVgFFIcQFQKipjT/mrHbDVawxw==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@umbraco-ui/uui-base": "1.15.0"
       }
@@ -2144,7 +2088,6 @@
       "integrity": "sha512-fiWGeQpREnl6k+6VNHz9ixNdEmOoFNm7qsgdIYJ1jCDXBGME1mjxJOr2Eq7UWJuzQM8BeyQEcXq5SVIOv21PRw==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@umbraco-ui/uui-base": "1.15.0",
         "@umbraco-ui/uui-form-validation-message": "1.15.0"
@@ -2156,7 +2099,6 @@
       "integrity": "sha512-RYfwmjPkY0KumjaalLW8gkasW25Mj87YFAzJn7mAYiZigURape9RqGpvrBfwcMmGj3W2/uVuHxpAHrvweQOt4A==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@umbraco-ui/uui-base": "1.15.0"
       }
@@ -2167,7 +2109,6 @@
       "integrity": "sha512-e8/W6gu6kwrodH0f0U70LR5rHQhiZGq3NqLqikAQ1rvmwitXUqtkVXIhkGxSf7M6yPhpmoi2qEEZDQH9cvCE5A==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@umbraco-ui/uui-base": "1.15.0"
       }
@@ -2178,7 +2119,6 @@
       "integrity": "sha512-nIdzCqoABeRVG6jW045ok649MiAhm5zPdfuMKc1a+TNw9xkKj+vnA1YcjaBN502+AekMhhwnqgj9mLL+mC2VPQ==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@umbraco-ui/uui-base": "1.15.0",
         "@umbraco-ui/uui-icon": "1.15.0"
@@ -2190,7 +2130,6 @@
       "integrity": "sha512-llHFVMlV3Uyg2fHiNt1qfDgRhLthD37uQD2FzlQb0GEYjp+4dE8Jyc/eZW2mqABPweUJACVwbrwBUVrCeQJ1OQ==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@umbraco-ui/uui-base": "1.15.0",
         "@umbraco-ui/uui-icon-registry": "1.15.0"
@@ -2202,7 +2141,6 @@
       "integrity": "sha512-vPc4I/kkQM9RWfHI0F/OQhoTu+KefplbQp0JEQ4gfr6MwxIm6bBTEuw8T5K9t1DQs8EZ7yeLEsSh65FDPepRtg==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@umbraco-ui/uui-base": "1.15.0"
       }
@@ -2213,7 +2151,6 @@
       "integrity": "sha512-VVn2FMsflvEWd6fOX0HQ3JaUh7haznqSqCLTSTOduh/H3jE+dVYCW6YC5uTsxArmOwsSBYSfBQNetW23eJim3Q==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@umbraco-ui/uui-action-bar": "1.15.0",
         "@umbraco-ui/uui-base": "1.15.0",
@@ -2229,7 +2166,6 @@
       "integrity": "sha512-AFyVYNeExHXe10b3/5/BLZOmMKyMxzftsO0HKbaQQuxrxL2SCHsQJRUpxSY+/0vAl2JbNdmrk0HTsP1O4Y9zig==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@umbraco-ui/uui-base": "1.15.0",
         "@umbraco-ui/uui-button": "1.15.0",
@@ -2243,7 +2179,6 @@
       "integrity": "sha512-Pe8lNdHz/6IfbQyWEi0o+pKJ6/zunQ2b8HARCU0a9HFXRDk+XsAuBsn79zQXZl5MvseAUQrnouLwPHpdtMbeMg==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@umbraco-ui/uui-base": "1.15.0",
         "@umbraco-ui/uui-icon-registry-essential": "1.15.0",
@@ -2256,7 +2191,6 @@
       "integrity": "sha512-8Q/G5Lg6949BbMHQ1BhZ9UpoJjOQ19w1tl2y0d/rP3w/mKnTQaBSf+MQmA/6kQ/Unb2wHXJANr4pAGpUklOg6A==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@umbraco-ui/uui-base": "1.15.0"
       }
@@ -2267,7 +2201,6 @@
       "integrity": "sha512-fnmRl+RGUROERvt+Jw0WiW3Btlddg0Xka6F+gR95gy5gr/v8s34uf1/bbPD3hWUXZPukLmxeMjbzyuqMrO8rpQ==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@umbraco-ui/uui-base": "1.15.0"
       }
@@ -2278,7 +2211,6 @@
       "integrity": "sha512-HQ2zCp2kz45GWQ3wV153ytuYD2KcdeAA5RRUVrN0Zn3GQB3wfG7xMkQQNRAOWMUdnfqmdQHeK+COO7NaET3VBA==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@umbraco-ui/uui-base": "1.15.0"
       }
@@ -2289,7 +2221,6 @@
       "integrity": "sha512-4eMeerunFc5yZsJIwpHADn8oGcu0Nn36oyKbSd0qC0mNmmN2i8UOF9w4O+lndd2L0Mhv23FGvBRo7mb5EAvWlg==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@umbraco-ui/uui-base": "1.15.0"
       }
@@ -2300,7 +2231,6 @@
       "integrity": "sha512-4rG8UHvyS2qvsjQYEmYjKX01SRwfk60oH8SSSx8r3z2BM62dCOa+4SBhLxqiBciC/u8FtN8X20MIGE0+eMdtoA==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@umbraco-ui/uui-base": "1.15.0"
       }
@@ -2311,7 +2241,6 @@
       "integrity": "sha512-BOebCMB/p4TaK4kJYrYgimC6SSGBHN4y1MytK3tyvObbuj3gVqkbwHW5CZrhK4jMaywRgGq96OsuaGfc52HFog==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@umbraco-ui/uui-base": "1.15.0",
         "@umbraco-ui/uui-loader-bar": "1.15.0",
@@ -2324,7 +2253,6 @@
       "integrity": "sha512-EDz1Qx+mTXNvOu565IculPCyuuFHwBon2wYnfWDBMoHJ5+P54jBHzg2U/8fUVse7xKPvU21hF4JneAvycNIiGQ==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@umbraco-ui/uui-base": "1.15.0"
       }
@@ -2335,7 +2263,6 @@
       "integrity": "sha512-sPVs1bApKupNd2JcSMwFS1060Y++Fti1ybJrafcLh1+h4IjmLDIRTHTTL8C+kei5G2Oi3+Z7vGpLu7lrTAmRlw==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@umbraco-ui/uui-base": "1.15.0",
         "@umbraco-ui/uui-button": "1.15.0",
@@ -2348,7 +2275,6 @@
       "integrity": "sha512-VCHVvO0fd5eL5UvB/RPL/K68UhOgsIpuyr+aXLblaYT/6at2LNosUxR4eRW2r0WOQzOiyE+Nu69pExBKyfT8bw==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@umbraco-ui/uui-base": "1.15.0"
       }
@@ -2359,7 +2285,6 @@
       "integrity": "sha512-54M4G0ru8j5ltPAdDGIxogdmos33hxeQeusI/uMFxo2yqHHyMHRi95vvCdcwFmGlEdFd2rsnxZKfNMUKM99GKQ==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@umbraco-ui/uui-base": "1.15.0"
       }
@@ -2370,7 +2295,6 @@
       "integrity": "sha512-vtGUwHaG4EDLQERkwym51OasoWLj30LQLhcCCYXDJtTL1dG2nIKScEtlSUiVh5qRsI+V+kaBYPGD4TFD5o43tQ==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@umbraco-ui/uui-base": "1.15.0"
       }
@@ -2381,7 +2305,6 @@
       "integrity": "sha512-5TUF/iWUzbVXvBs9Z273q6s9yLbns8itTiFHCITw5w5fZzDn8R6O5hrOW7tV79kCxAnBSOAVP8v1JhGTwXw19Q==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@umbraco-ui/uui-base": "1.15.0"
       }
@@ -2392,7 +2315,6 @@
       "integrity": "sha512-HMHVdBoB1O39rojofezee2aXGv6CMn7dUFvNefdF9HxmNrIcpFBYXSL8aBt5QJeziFQMwbCtqyY21aUag0nzfw==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@umbraco-ui/uui-base": "1.15.0"
       }
@@ -2403,7 +2325,6 @@
       "integrity": "sha512-w7FZIe5mtsgvsf6hOH5mHKDBzg9Rd/+viyk/xNVs1NeZBn1nWEIHZs0R7YMpv+QxulklhAOpBcbGoUTB8xE+vA==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@umbraco-ui/uui-base": "1.15.0"
       }
@@ -2414,7 +2335,6 @@
       "integrity": "sha512-UT65bpUmRlEgVuvn2RlTZ5l2WDF82jH1t8g+6HV6OJctpqTKlOfPkQmd6AluESPhHFEwwTydS/M7x+X3Adkdtw==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@umbraco-ui/uui-base": "1.15.0"
       }
@@ -2425,7 +2345,6 @@
       "integrity": "sha512-ybDqIt1cXd7AiZLZsDrSHCMp2zM8I+0lmN599b3NROjm59SZXIvpbY1TS1gJ45htgsc18x2y+S4laInYu2dGUg==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@umbraco-ui/uui-base": "1.15.0",
         "@umbraco-ui/uui-icon": "1.15.0",
@@ -2438,7 +2357,6 @@
       "integrity": "sha512-59s16558ySCX7b9IT/Sorq0fdFeCRENSTa7DIkQUrvVPaFWqKFz9jCYFEqDnH11jZHGsNiYh5YCmWlF/VNbwJQ==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@umbraco-ui/uui-base": "1.15.0",
         "@umbraco-ui/uui-ref-node": "1.15.0"
@@ -2450,7 +2368,6 @@
       "integrity": "sha512-AWPZPkFGcAkRx4j6JnOi2r3EJxnvZUXfhOWNyWB2/dFRckatPH56+lVkqV+fRC+81emKBSQWkx2NphFzLEMr0A==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@umbraco-ui/uui-base": "1.15.0",
         "@umbraco-ui/uui-ref-node": "1.15.0"
@@ -2462,7 +2379,6 @@
       "integrity": "sha512-knIIbbfoWtepOvyC54dCo3xF0Vuap6i5uMQPd+wITCmg56a+yiJFuke+dyzatOIeXzgspLgFUngwQZEj5mJnWA==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@umbraco-ui/uui-base": "1.15.0",
         "@umbraco-ui/uui-ref-node": "1.15.0"
@@ -2474,7 +2390,6 @@
       "integrity": "sha512-pXvL523m2JR3P8OO+E1AE4YAaYhJLc519CtjNXSuctNIk1yWvwxBu8VozLIQV+xrOXGz+SiXwDkoaRPwjTQKtg==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@umbraco-ui/uui-base": "1.15.0",
         "@umbraco-ui/uui-ref-node": "1.15.0"
@@ -2486,7 +2401,6 @@
       "integrity": "sha512-bQWfZPKJyAf2O/YvOD6fVSSpKaYZMBsrEGT+ydLPv3BNJroYHS8+NEbulZxExWztNApTcs6Vo5T19AUz+vsnLQ==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@umbraco-ui/uui-base": "1.15.0",
         "@umbraco-ui/uui-ref-node": "1.15.0"
@@ -2498,7 +2412,6 @@
       "integrity": "sha512-4GpRzhGedMwjqW1Wk7AvgakNCc6S1edYpHWeO6cfmryIm0hvnCfkU132lzLmB+Ag2QIOI8p4Ak0OQHYWd+XZHw==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@umbraco-ui/uui-base": "1.15.0",
         "@umbraco-ui/uui-ref-node": "1.15.0"
@@ -2510,7 +2423,6 @@
       "integrity": "sha512-L4qM6GPDqu0/9B2OVb3EljZT3zYxbwp6uOz1nfVYpGAWBxd6INOtNbn8WYdZLq6qqa8NR6qK+su2554nInvQGA==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@umbraco-ui/uui-base": "1.15.0"
       }
@@ -2521,7 +2433,6 @@
       "integrity": "sha512-yRx+TlXBB05jM8ShThRooFgCS5nSN7eAAnpttZgBWqY3sccIVy2Knbkz3kXLJE6ld+bO5nUXhsZBZ34MEHkiog==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@umbraco-ui/uui-base": "1.15.0"
       }
@@ -2532,7 +2443,6 @@
       "integrity": "sha512-+OAzOutyUB2WCI+e5aFRoUNsFFuc/hUXnpIjx4P1moOYiggc/NxjaTHz5mxbmkC11yyS+0vpl8lVSZglkLCH5w==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@umbraco-ui/uui-base": "1.15.0"
       }
@@ -2543,7 +2453,6 @@
       "integrity": "sha512-6y9rpFfhtuWMnaAamlzrB5Q12dsZ8dprmQaGtKr+g97PTNRPC3/dc5sdROam8VMDAhL9MkfBAZBoS6yAoJsPcQ==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@umbraco-ui/uui-base": "1.15.0"
       }
@@ -2554,7 +2463,6 @@
       "integrity": "sha512-F0BueWxu6J5P7xyzkp1c/eFZJjStsw65hB3bNEmWBOqkm/jbBKg9+Xs99tov+VwCHYOt8T+DuEDkkKmdxVAxyQ==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@umbraco-ui/uui-base": "1.15.0"
       }
@@ -2565,7 +2473,6 @@
       "integrity": "sha512-D5DottbukIFxL+YTVEMujHPdqB8Hhw02TKpegfDQb8UGSPC5pCQw4O212TSuyTalKb598niNmCzcjEG5TWNqww==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@umbraco-ui/uui-base": "1.15.0"
       }
@@ -2576,7 +2483,6 @@
       "integrity": "sha512-JLcEVnJqv2LL8VtscPCtPKda9ywWzV4vd0XODHLE3iI1cgHeNwMBhxqgkah0ULuw5w2Hrq8gwQ7/DuPHMSIFxw==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@umbraco-ui/uui-base": "1.15.0"
       }
@@ -2587,7 +2493,6 @@
       "integrity": "sha512-CPsr1K5IkdxBgID+xoIcgbumm/z0q+Z/1NPxTO40EL7kx3KOLQ8vwLdOTSW1cTj90JFA9+XuRtOpmMEY0XjICg==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@umbraco-ui/uui-base": "1.15.0"
       }
@@ -2598,7 +2503,6 @@
       "integrity": "sha512-5QyDNFjiBeuPgalT9zwPMP220zJUHPpbPvCohWCFLn/2JJsa6IjSMtsAcqxI154ZJ9vYX7vYiYUn8tJTY8CHpA==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@umbraco-ui/uui-base": "1.15.0"
       }
@@ -2609,7 +2513,6 @@
       "integrity": "sha512-BQq7BwZ7nCcgKE5tMhG6OVYTrrMEIXpx8kQKec/ULgVfs0/Ws6qeH9u4rGVK/yHU8gecd6DSeUczjjq2iS4djA==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@umbraco-ui/uui-base": "1.15.0"
       }
@@ -2620,7 +2523,6 @@
       "integrity": "sha512-5Akw8T0SV2OrwvPk1JSeFr1clvHE4N0DwceSU9bn9f6gLIGGRxvniJAclQDRI/Woe3hm8waMy6cC2fXfSdc6lg==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@umbraco-ui/uui-base": "1.15.0"
       }
@@ -2631,7 +2533,6 @@
       "integrity": "sha512-AnPp0QJeI70ucX8ludr3qaFmlxjKZUarX10DI8ieIB8VJiQZo0TjoPcPdSGmZupaPBLiszlpb3rKzGkZhXEIHg==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@umbraco-ui/uui-base": "1.15.0"
       }
@@ -2642,7 +2543,6 @@
       "integrity": "sha512-oS0eA5Z8+s+5o2ks3WCED5VGP8AunRLyuB2y7kVdRUfhCfck7B9v83zNfxPVoGoVsTDLtAQM1S4P8SHwNRmk7g==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@umbraco-ui/uui-base": "1.15.0",
         "@umbraco-ui/uui-button": "1.15.0",
@@ -2656,7 +2556,6 @@
       "integrity": "sha512-PgyZvAiOZmXmiRW4UhfD6Tybx3ft755aKAVqT8ELpskLSvVr1oz4uTI6+QxoeQ1AkrHovenvIdBX+Iwi91SheQ==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@umbraco-ui/uui-base": "1.15.0"
       }
@@ -2667,7 +2566,6 @@
       "integrity": "sha512-tk/RVzCxs+KPSJ+qH2Xlr9RYxcdrSNulDKk5sBCQR0A9nwOffa15SGreSMKWgq+gYOVYChHBg/WxLWLq3d7Rlg==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@umbraco-ui/uui-base": "1.15.0"
       }
@@ -2678,7 +2576,6 @@
       "integrity": "sha512-nz+snpjPFE+ftH5R/ekgZYy9ofGAf51yQYjWCtBwkrQ6D1dIBYA6kynZFdqIefrRwJJ5zHpe25BcS/AyRPc/9Q==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@umbraco-ui/uui-base": "1.15.0",
         "@umbraco-ui/uui-button": "1.15.0",
@@ -2693,7 +2590,6 @@
       "integrity": "sha512-fd5d0DU/x2+u15rP0wrjw29M0oqsDFmnAfbPEdgQoPV+hvq9/SLhxJtzx10ZSNXoyuO9sTK50Q7nYsqOvGCzqg==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@umbraco-ui/uui-base": "1.15.0",
         "@umbraco-ui/uui-toast-notification": "1.15.0"
@@ -2705,7 +2601,6 @@
       "integrity": "sha512-uf/e/dVN6kqX76vcawiQM3w1nMHa8A+ZTtNwxtmAZi8bNPwjXLNaqKfeSp2thTByCIzFz7imnft56QtYLbksOA==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@umbraco-ui/uui-base": "1.15.0",
         "@umbraco-ui/uui-css": "1.15.0"
@@ -2717,7 +2612,6 @@
       "integrity": "sha512-WLooENcxuAobbXxN1W2uKGh/cN9k0f3cRmDDtCZdgjeheGlBYWatkc5HQte7zchXHUi0xTrsvBCBa9CsLKN/3Q==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@umbraco-ui/uui-base": "1.15.0",
         "@umbraco-ui/uui-boolean-input": "1.15.0"
@@ -2729,7 +2623,6 @@
       "integrity": "sha512-vn3dbpYGekAqG944Vkwd0ILQRtTaZtL1BVdsge2UsU8sOsEKwv5YzQal4b+o8yu8nb4vZbWHZ2zRmnpnPgPmjg==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@umbraco-ui/uui-base": "1.15.0"
       }
@@ -2955,8 +2848,7 @@
       "resolved": "https://registry.npmjs.org/colord/-/colord-2.9.3.tgz",
       "integrity": "sha512-jeC1axXpnb0/2nn/Y1LPuLdgXBLH7aDcHu4KEKfqw3CUhX7ZpfBSlPKyqXE6btIgEzfWtrX3/tyBCaCvXvMkOw==",
       "dev": true,
-      "license": "MIT",
-      "peer": true
+      "license": "MIT"
     },
     "node_modules/commander": {
       "version": "13.0.0",
@@ -3000,8 +2892,7 @@
       "resolved": "https://registry.npmjs.org/crelt/-/crelt-1.0.6.tgz",
       "integrity": "sha512-VQ2MBenTq1fWZUH9DJNGti7kKv6EeAuYr3cLwxUWhIu1baTaXh4Ib5W2CqHVqib4/MqbYGJqiL3Zb8GJZr3l4g==",
       "dev": true,
-      "license": "MIT",
-      "peer": true
+      "license": "MIT"
     },
     "node_modules/default-browser": {
       "version": "5.2.1",
@@ -3116,7 +3007,6 @@
       "integrity": "sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw==",
       "dev": true,
       "license": "BSD-2-Clause",
-      "peer": true,
       "engines": {
         "node": ">=0.12"
       },
@@ -3181,7 +3071,6 @@
       "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "engines": {
         "node": ">=10"
       },
@@ -3393,7 +3282,6 @@
       "integrity": "sha512-5aHCbzQRADcdP+ATqnDuhhJ/MRIqDkZX5pyjFHRRysS8vZ5AbqGEoFIb6pYHPZ+L/OC2Lc+xT8uHVVR5CAK/wQ==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "uc.micro": "^2.0.0"
       }
@@ -3403,8 +3291,7 @@
       "resolved": "https://registry.npmjs.org/linkifyjs/-/linkifyjs-4.3.2.tgz",
       "integrity": "sha512-NT1CJtq3hHIreOianA8aSXn6Cw0JzYOuDQbOrSPe7gqFnCpKP++MQe3ODgO3oh2GJFORkAAdqredOa60z63GbA==",
       "dev": true,
-      "license": "MIT",
-      "peer": true
+      "license": "MIT"
     },
     "node_modules/lit": {
       "version": "3.3.1",
@@ -3425,7 +3312,6 @@
       "integrity": "sha512-WGAWRGzirAgyphK2urmYOV72tlvnxw7YfyLDgQ+OZnM9vQQBQnumQ7jUJe6unEzwGU3ahFOjuz1iz1jjrpCPuw==",
       "dev": true,
       "license": "BSD-3-Clause",
-      "peer": true,
       "dependencies": {
         "@lit-labs/ssr-dom-shim": "^1.4.0",
         "@lit/reactive-element": "^2.1.0",
@@ -3438,7 +3324,6 @@
       "integrity": "sha512-S9hbyDu/vs1qNrithiNyeyv64c9yqiW9l+DBgI18fL+MTvOtWoFR0FWiyq1TxaYef5wNlpEmzlXoBlZEO+WjoA==",
       "dev": true,
       "license": "BSD-3-Clause",
-      "peer": true,
       "dependencies": {
         "@types/trusted-types": "^2.0.2"
       }
@@ -3456,7 +3341,6 @@
       "integrity": "sha512-a54IwgWPaeBCAAsv13YgmALOF1elABB08FxO9i+r4VFk5Vl4pKokRPeX8u5TCgSsPi6ec1otfLjdOpVcgbpshg==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "argparse": "^2.0.1",
         "entities": "^4.4.0",
@@ -3488,8 +3372,7 @@
       "resolved": "https://registry.npmjs.org/mdurl/-/mdurl-2.0.0.tgz",
       "integrity": "sha512-Lf+9+2r+Tdp5wXDXC4PcIBjTDtq4UKjCPMQhKIuzpJNW0b96kVqSwW0bT7FhRSfmAiFYgP+SCRvdrDozfh0U5w==",
       "dev": true,
-      "license": "MIT",
-      "peer": true
+      "license": "MIT"
     },
     "node_modules/minimist": {
       "version": "1.2.8",
@@ -3649,8 +3532,7 @@
       "resolved": "https://registry.npmjs.org/orderedmap/-/orderedmap-2.1.1.tgz",
       "integrity": "sha512-TvAWxi0nDe1j/rtMcWcIj94+Ffe6n7zhow33h40SKxmsmozs6dz/e+EajymfoFcHd7sxNn8yHM8839uixMOV6g==",
       "dev": true,
-      "license": "MIT",
-      "peer": true
+      "license": "MIT"
     },
     "node_modules/outvariant": {
       "version": "1.4.3",
@@ -3693,6 +3575,7 @@
       "integrity": "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "engines": {
         "node": ">=12"
       },
@@ -3747,7 +3630,6 @@
       "integrity": "sha512-j0kORIBm8ayJNl3zQvD1TTPHJX3g042et6y/KQhZhnPrruO8exkTgG8X+NRpj7kIyMMEx74Xb3DyMIBtO0IKkQ==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "prosemirror-transform": "^1.0.0"
       }
@@ -3758,7 +3640,6 @@
       "integrity": "sha512-4SnynYR9TTYaQVXd/ieUvsVV4PDMBzrq2xPUWutHivDuOshZXqQ5rGbZM84HEaXKbLdItse7weMGOUdDVcLKEQ==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "prosemirror-state": "^1.0.0"
       }
@@ -3769,7 +3650,6 @@
       "integrity": "sha512-rT7qZnQtx5c0/y/KlYaGvtG411S97UaL6gdp6RIZ23DLHanMYLyfGBV5DtSnZdthQql7W+lEVbpSfwtO8T+L2w==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "prosemirror-model": "^1.0.0",
         "prosemirror-state": "^1.0.0",
@@ -3782,7 +3662,6 @@
       "integrity": "sha512-CCk6Gyx9+Tt2sbYk5NK0nB1ukHi2ryaRgadV/LvyNuO3ena1payM2z6Cg0vO1ebK8cxbzo41ku2DE5Axj1Zuiw==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "prosemirror-state": "^1.0.0",
         "prosemirror-transform": "^1.1.0",
@@ -3795,7 +3674,6 @@
       "integrity": "sha512-wtjswVBd2vaQRrnYZaBCbyDqr232Ed4p2QPtRIUK5FuqHYKGWkEwl08oQM4Tw7DOR0FsasARV5uJFvMZWxdNxQ==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "prosemirror-keymap": "^1.0.0",
         "prosemirror-model": "^1.0.0",
@@ -3809,7 +3687,6 @@
       "integrity": "sha512-2JZD8z2JviJrboD9cPuX/Sv/1ChFng+xh2tChQ2X4bB2HeK+rra/bmJ3xGntCcjhOqIzSDG6Id7e8RJ9QPXLEQ==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "prosemirror-state": "^1.2.2",
         "prosemirror-transform": "^1.0.0",
@@ -3823,7 +3700,6 @@
       "integrity": "sha512-K0xJRCmt+uSw7xesnHmcn72yBGTbY45vm8gXI4LZXbx2Z0jwh5aF9xrGQgrVPu0WbyFVFF3E/o9VhJYz6SQWnA==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "prosemirror-state": "^1.0.0",
         "prosemirror-transform": "^1.0.0"
@@ -3835,7 +3711,6 @@
       "integrity": "sha512-4HucRlpiLd1IPQQXNqeo81BGtkY8Ai5smHhKW9jjPKRc2wQIxksg7Hl1tTI2IfT2B/LgX6bfYvXxEpJl7aKYKw==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "prosemirror-state": "^1.0.0",
         "w3c-keyname": "^2.2.0"
@@ -3847,7 +3722,6 @@
       "integrity": "sha512-FPD9rHPdA9fqzNmIIDhhnYQ6WgNoSWX9StUZ8LEKapaXU9i6XgykaHKhp6XMyXlOWetmaFgGDS/nu/w9/vUc5g==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@types/markdown-it": "^14.0.0",
         "markdown-it": "^14.0.0",
@@ -3860,7 +3734,6 @@
       "integrity": "sha512-qwXzynnpBIeg1D7BAtjOusR+81xCp53j7iWu/IargiRZqRjGIlQuu1f3jFi+ehrHhWMLoyOQTSRx/IWZJqOYtQ==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "crelt": "^1.0.0",
         "prosemirror-commands": "^1.0.0",
@@ -3885,7 +3758,6 @@
       "integrity": "sha512-ELxP4TlX3yr2v5rM7Sb70SqStq5NvI15c0j9j/gjsrO5vaw+fnnpovCLEGIcpeGfifkuqJwl4fon6b+KdrODYQ==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "prosemirror-model": "^1.25.0"
       }
@@ -3896,7 +3768,6 @@
       "integrity": "sha512-927lFx/uwyQaGwJxLWCZRkjXG0p48KpMj6ueoYiu4JX05GGuGcgzAy62dfiV8eFZftgyBUvLx76RsMe20fJl+Q==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "prosemirror-model": "^1.0.0",
         "prosemirror-state": "^1.0.0",
@@ -3922,7 +3793,6 @@
       "integrity": "sha512-eRQ97Bf+i9Eby99QbyAiyov43iOKgWa7QCGly+lrDt7efZ1v8NWolhXiB43hSDGIXT1UXgbs4KJN3a06FGpr1Q==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "prosemirror-keymap": "^1.2.2",
         "prosemirror-model": "^1.25.0",
@@ -3937,7 +3807,6 @@
       "integrity": "sha512-xiun5/3q0w5eRnGYfNlW1uU9W6x5MoFKWwq/0TIRgt09lv7Hcser2QYV8t4muXbEr+Fwo0geYn79Xs4GKywrRQ==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@remirror/core-constants": "3.0.0",
         "escape-string-regexp": "^4.0.0"
@@ -3954,7 +3823,6 @@
       "integrity": "sha512-pwDy22nAnGqNR1feOQKHxoFkkUtepoFAd3r2hbEDsnf4wp57kKA36hXsB3njA9FtONBEwSDnDeCiJe+ItD+ykw==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "prosemirror-model": "^1.21.0"
       }
@@ -3978,7 +3846,6 @@
       "integrity": "sha512-uxFIHU0YlHYhDQtV4R9J6a52SLx28BCjT+4ieh7IGbgwVJWO+km431c4yRlREUAsAmt/uMjQUyQHNEPf0M39CA==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "engines": {
         "node": ">=6"
       }
@@ -4070,8 +3937,7 @@
       "resolved": "https://registry.npmjs.org/rope-sequence/-/rope-sequence-1.3.4.tgz",
       "integrity": "sha512-UT5EDe2cu2E/6O4igUr5PSFs23nvvukicWHx6GnOPlHAiiYbzNuCRQCuiUdHJQcqKalLKlrYJnjY0ySGsXNQXQ==",
       "dev": true,
-      "license": "MIT",
-      "peer": true
+      "license": "MIT"
     },
     "node_modules/run-applescript": {
       "version": "7.0.0",
@@ -4250,8 +4116,7 @@
       "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz",
       "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==",
       "dev": true,
-      "license": "0BSD",
-      "peer": true
+      "license": "0BSD"
     },
     "node_modules/type-fest": {
       "version": "4.34.1",
@@ -4272,6 +4137,7 @@
       "integrity": "sha512-jl1vZzPDinLr9eUt3J/t7V6FgNEw9QjvBPdysz9KfQDD41fQrC2Y4vKQdiaUpFT4bXlb1RHhLpp8wtm6M5TgSw==",
       "dev": true,
       "license": "Apache-2.0",
+      "peer": true,
       "bin": {
         "tsc": "bin/tsc",
         "tsserver": "bin/tsserver"
@@ -4285,8 +4151,7 @@
       "resolved": "https://registry.npmjs.org/uc.micro/-/uc.micro-2.1.0.tgz",
       "integrity": "sha512-ARDJmphmdvUk6Glw7y9DQ2bFkKBHwQHLi2lsaH6PPmz/Ka9sFOBsBluozhDltWmnv9u/cF6Rt87znRTPV+yp/A==",
       "dev": true,
-      "license": "MIT",
-      "peer": true
+      "license": "MIT"
     },
     "node_modules/uglify-js": {
       "version": "3.19.3",
@@ -4407,8 +4272,7 @@
       "resolved": "https://registry.npmjs.org/w3c-keyname/-/w3c-keyname-2.2.8.tgz",
       "integrity": "sha512-dpojBhNsCNN7T82Tm7k26A6G9ML3NkhDsnw9n/eoxSRlVBB4CEtIQ/KTCLI2Fwf3ataSXRhYFkQi3SlnFwPvPQ==",
       "dev": true,
-      "license": "MIT",
-      "peer": true
+      "license": "MIT"
     },
     "node_modules/wordwrap": {
       "version": "1.0.0",
diff --git a/src/Umbraco.Web.UI.Login/package.json b/src/Umbraco.Web.UI.Login/package.json
index e53f3f3c5fbe..c0f863dc50f8 100644
--- a/src/Umbraco.Web.UI.Login/package.json
+++ b/src/Umbraco.Web.UI.Login/package.json
@@ -14,8 +14,8 @@
     "npm": ">=10.9"
   },
   "devDependencies": {
-    "@hey-api/openapi-ts": "0.85.0",
-    "@umbraco-cms/backoffice": "16.2.0",
+    "@hey-api/openapi-ts": "^0.85.0",
+    "@umbraco-cms/backoffice": "^16.2.0",
     "msw": "^2.11.3",
     "typescript": "^5.9.3",
     "vite": "^7.1.11"

From 7af67d294462cf1e99877ef662981461e0dc7189 Mon Sep 17 00:00:00 2001
From: Lucas Bach Bisgaard <rammi@rammi.dk>
Date: Wed, 29 Oct 2025 20:00:36 +0100
Subject: [PATCH 093/155] =?UTF-8?q?Have=20to=20control=20of=20the=20state?=
 =?UTF-8?q?=20store=20navigation=20for=20custom=20sections=20or=20?=
 =?UTF-8?q?=E2=80=A6=20(#20637)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Have to control of the state store navigation for custom sections or overrides

* revert wording

* move logic and update comment

---------

Co-authored-by: Lucas Bach Bisgaard <lucas.bisgaard@kraftvaerk.com>
Co-authored-by: Niels Lyngsø <niels.lyngso@gmail.com>
---
 .../components/backoffice-header-sections.element.ts         | 5 +++--
 .../packages/core/section/extensions/section.extension.ts    | 1 +
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/apps/backoffice/components/backoffice-header-sections.element.ts b/src/Umbraco.Web.UI.Client/src/apps/backoffice/components/backoffice-header-sections.element.ts
index 117867336b65..d75a4ee5a62d 100644
--- a/src/Umbraco.Web.UI.Client/src/apps/backoffice/components/backoffice-header-sections.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/apps/backoffice/components/backoffice-header-sections.element.ts
@@ -83,8 +83,9 @@ export class UmbBackofficeHeaderSectionsElement extends UmbLitElement {
 
 		const clickedSectionAlias = manifest.alias;
 
-		// If the clicked section is the same as the current section, we just load the original section path to load the section root
-		if (this._currentSectionAlias === clickedSectionAlias) {
+		// If preventUrlRetention is set to true then go to the section root.
+		// Or if the clicked section is the current active one, then navigate to the section root
+		if (manifest?.meta.preventUrlRetention === true || this._currentSectionAlias === clickedSectionAlias) {
 			const sectionPath = this.#getSectionPath(manifest);
 			history.pushState(null, '', sectionPath);
 			return;
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/section/extensions/section.extension.ts b/src/Umbraco.Web.UI.Client/src/packages/core/section/extensions/section.extension.ts
index b3d90397f536..cb64f73dc6a8 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/section/extensions/section.extension.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/section/extensions/section.extension.ts
@@ -12,4 +12,5 @@ export interface ManifestSection
 export interface MetaSection {
 	label: string;
 	pathname: string;
+	preventUrlRetention?: boolean;
 }

From 1c6d4f360da21653c70839b498869cf11029d513 Mon Sep 17 00:00:00 2001
From: Jacob Overgaard <752371+iOvergaard@users.noreply.github.com>
Date: Thu, 30 Oct 2025 11:50:19 +0100
Subject: [PATCH 094/155] bumps package.json version to 17.1.0-rc

---
 src/Umbraco.Web.UI.Client/package-lock.json | 4 ++--
 src/Umbraco.Web.UI.Client/package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/package-lock.json b/src/Umbraco.Web.UI.Client/package-lock.json
index c836825ee782..9e960fe1fbf7 100644
--- a/src/Umbraco.Web.UI.Client/package-lock.json
+++ b/src/Umbraco.Web.UI.Client/package-lock.json
@@ -1,12 +1,12 @@
 {
 	"name": "@umbraco-cms/backoffice",
-	"version": "17.0.0-rc1",
+	"version": "17.1.0-rc",
 	"lockfileVersion": 3,
 	"requires": true,
 	"packages": {
 		"": {
 			"name": "@umbraco-cms/backoffice",
-			"version": "17.0.0-rc1",
+			"version": "17.1.0-rc",
 			"license": "MIT",
 			"workspaces": [
 				"./src/packages/*",
diff --git a/src/Umbraco.Web.UI.Client/package.json b/src/Umbraco.Web.UI.Client/package.json
index 56e089fc453f..16e3c7157891 100644
--- a/src/Umbraco.Web.UI.Client/package.json
+++ b/src/Umbraco.Web.UI.Client/package.json
@@ -1,7 +1,7 @@
 {
 	"name": "@umbraco-cms/backoffice",
 	"license": "MIT",
-	"version": "17.0.0-rc1",
+	"version": "17.1.0-rc",
 	"type": "module",
 	"exports": {
 		".": null,

From 3d24f0a51eac2170766baf08c0b0edf981445443 Mon Sep 17 00:00:00 2001
From: Mathias Helsengren <mhe@umbraco.dk>
Date: Thu, 30 Oct 2025 11:56:15 +0100
Subject: [PATCH 095/155] Implementing an inline toggle button to show/hide
 password. (#20611)

* Implimented an inline toggle button to show/hide your password, also changed the css to accommodate these changes

* Cleaned the css

Added the svg's to their own const for easy reuse

Added localization for the arialabel on the button

Seperated the createFormLayoutItem so there is a seperate for the password input

Moved all the conditional logic in the onclick event to fit inside one if/else statement

* Removed old logic that added a 100ms timeout that would sometimes be enough for localization to load, and replaced it with a function.
The function will try and resolve the promise by checking if the localize.terms methods returns a changed value, if not then it retries every 50ms or untill it hits a max retry of 40/2 seconds.

* Re adding the hide for -ms-reveal to support Microsoft Edge browsers

* Removed a console.log

* Alligned the button behavior so it fits better with what we have in the uui libary.
Now the button is always visible instead of appearing  on hover or when in focus

* Update src/Umbraco.Web.UI.Login/src/auth.element.ts

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

* Update src/Umbraco.Web.UI.Login/src/auth.element.ts

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

* Apply suggestion from @Copilot

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

* Apply suggestion from @Copilot

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

* Apply suggestion from @iOvergaard

* Apply suggestion from @iOvergaard

* Adding the requested changes via my own fork (#20664)

Changed the logic for waitForLocallization Added the svg's as files that are imported instead of having the raw svg in the code

---------

Co-authored-by: Jacob Overgaard <752371+iOvergaard@users.noreply.github.com>
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
---
 src/Umbraco.Web.UI.Login/public/closedEye.svg |   6 +
 src/Umbraco.Web.UI.Login/public/openEye.svg   |   4 +
 src/Umbraco.Web.UI.Login/src/auth-styles.css  | 100 ++++++++++-----
 src/Umbraco.Web.UI.Login/src/auth.element.ts  | 115 ++++++++++++++++--
 .../src/localization/lang/da.ts               |   2 +
 .../src/localization/lang/en.ts               |   2 +
 6 files changed, 192 insertions(+), 37 deletions(-)
 create mode 100644 src/Umbraco.Web.UI.Login/public/closedEye.svg
 create mode 100644 src/Umbraco.Web.UI.Login/public/openEye.svg

diff --git a/src/Umbraco.Web.UI.Login/public/closedEye.svg b/src/Umbraco.Web.UI.Login/public/closedEye.svg
new file mode 100644
index 000000000000..3a29b4297436
--- /dev/null
+++ b/src/Umbraco.Web.UI.Login/public/closedEye.svg
@@ -0,0 +1,6 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="1.75" stroke-linecap="round" stroke-linejoin="round">
+	<path d="M9.88 9.88a3 3 0 1 0 4.24 4.24"></path>
+	<path d="M10.73 5.08A10.43 10.43 0 0 1 12 5c7 0 10 7 10 7a13.16 13.16 0 0 1-1.67 2.68"></path>
+	<path d="M6.61 6.61A13.526 13.526 0 0 0 2 12s3 7 10 7a9.74 9.74 0 0 0 5.39-1.61"></path>
+    <line x1="2" x2="22" y1="2" y2="22"></line>
+</svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Login/public/openEye.svg b/src/Umbraco.Web.UI.Login/public/openEye.svg
new file mode 100644
index 000000000000..5f28e8e03ff5
--- /dev/null
+++ b/src/Umbraco.Web.UI.Login/public/openEye.svg
@@ -0,0 +1,4 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="1.75" stroke-linecap="round" stroke-linejoin="round">
+	<path d="M2 12s3-7 10-7 10 7 10 7-3 7-10 7-10-7-10-7Z"></path>
+	<circle cx="12" cy="12" r="3"></circle>
+</svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Login/src/auth-styles.css b/src/Umbraco.Web.UI.Login/src/auth-styles.css
index f63dfa92e60d..9ea9111fc88a 100644
--- a/src/Umbraco.Web.UI.Login/src/auth-styles.css
+++ b/src/Umbraco.Web.UI.Login/src/auth-styles.css
@@ -1,44 +1,84 @@
-#umb-login-form input {
-  width: 100%;
-  height: var(--input-height);
-  box-sizing: border-box;
-  display: block;
-  border: 1px solid var(--uui-color-border);
-  border-radius: var(--uui-border-radius);
-  background-color: var(--uui-color-surface);
-  padding: var(--uui-size-1, 3px) var(--uui-size-space-4, 9px);
+#umb-login-form #username-input {
+	width: 100%;
+	height: var(--input-height);
+	box-sizing: border-box;
+	display: block;
+	border: 1px solid var(--uui-color-border);
+	border-radius: var(--uui-border-radius);
+	background-color: var(--uui-color-surface);
+	padding: var(--uui-size-1, 3px) var(--uui-size-space-4, 9px);
 }
 
 #umb-login-form uui-form-layout-item {
-  margin-top: var(--uui-size-space-4);
-  margin-bottom: var(--uui-size-space-4);
+	margin-top: var(--uui-size-space-4);
+	margin-bottom: var(--uui-size-space-4);
 }
 
-#umb-login-form input:focus-within {
-  border-color: var(--uui-input-border-color-focus, var(--uui-color-border-emphasis, #a1a1a1));
-  outline: calc(2px * var(--uui-show-focus-outline, 1)) solid var(--uui-color-focus);
+#umb-login-form #username-input:focus-within {
+	border-color: var(--uui-input-border-color-focus, var(--uui-color-border-emphasis, #a1a1a1));
+	outline: calc(2px * var(--uui-show-focus-outline, 1)) solid var(--uui-color-focus);
 }
 
-#umb-login-form input:hover:not(:focus-within) {
-  border-color: var(--uui-input-border-color-hover, var(--uui-color-border-standalone, #c2c2c2));
+#umb-login-form #username-input:hover:not(:focus-within) {
+	border-color: var(--uui-input-border-color-hover, var(--uui-color-border-standalone, #c2c2c2));
 }
 
-#umb-login-form input::-ms-reveal {
-  display: none;
+#umb-login-form #password-input-span button {
+	color: var(--uui-color-default-standalone);
+	display: inline-flex;
+	justify-content: center;
+	align-items: center;
+	vertical-align: middle;
+	min-width: 24px;
+	min-height: 24px;
+	border-color: transparent;
+	background-color: transparent;
+	padding: 0;
+	transition-property: color;
+	transition-duration: 0.1s;
+	transition-timing-function: linear;
+}
+
+#umb-login-form #password-input-span button:hover {
+	color: var(--uui-color-default-emphasis);
+	cursor: pointer;
+}
+
+#umb-login-form #password-input-span {
+	display: inline-flex;
+	width: 100%;
+	align-items: center;
+	flex-wrap: nowrap;
+	position: relative;
+	vertical-align: middle;
+	column-gap: 0;
+	height: var(--input-height);
+	box-sizing: border-box;
+	border: 1px solid var(--uui-color-border);
+	border-radius: var(--uui-border-radius);
+	background-color: var(--uui-color-surface);
+	padding: var(--uui-size-1, 3px) var(--uui-size-space-4, 9px);
 }
 
-#umb-login-form input span {
-  position: absolute;
-  right: 1px;
-  top: 50%;
-  transform: translateY(-50%);
-  z-index: 100;
+#umb-login-form #password-input-span input {
+	flex-grow: 1;
+	align-self: stretch;
+	min-width: 0;
+	display: block;
+	border-style: none;
+	padding: 0;
+	outline-style: none;
 }
 
-#umb-login-form input span svg {
-  background-color: white;
-  display: block;
-  padding: .2em;
-  width: 1.3em;
-  height: 1.3em;
+#umb-login-form #password-input-span:focus-within {
+	border-color: var(--uui-input-border-color-focus, var(--uui-color-border-emphasis, #a1a1a1));
+	outline: calc(2px * var(--uui-show-focus-outline, 1)) solid var(--uui-color-focus);
+}
+
+#umb-login-form #password-input-span:hover:not(:focus-within) {
+	border-color: var(--uui-input-border-color-hover, var(--uui-color-border-standalone, #c2c2c2));
+}
+
+#umb-login-form input::-ms-reveal {
+	display: none;
 }
diff --git a/src/Umbraco.Web.UI.Login/src/auth.element.ts b/src/Umbraco.Web.UI.Login/src/auth.element.ts
index d2fb5e1bc07a..d574ef460186 100644
--- a/src/Umbraco.Web.UI.Login/src/auth.element.ts
+++ b/src/Umbraco.Web.UI.Login/src/auth.element.ts
@@ -9,6 +9,10 @@ import { UmbSlimBackofficeController } from './controllers';
 // We import the authStyles here so that we can inline it in the shadow DOM that is created outside of the UmbAuthElement.
 import authStyles from './auth-styles.css?inline';
 
+// Import the SVG files
+import openEyeSVG from '../public/openEye.svg?raw';
+import closedEyeSVG from '../public/closedEye.svg?raw';
+
 // Import the main bundle
 import { extensions } from './umbraco-package.js';
 
@@ -42,14 +46,73 @@ const createLabel = (opts: { forId: string; localizeAlias: string; localizeFallb
 	return label;
 };
 
+const createShowPasswordToggleButton = (opts: {
+	id: string;
+	name: string;
+	ariaLabelShowPassword: string;
+	ariaLabelHidePassword: string;
+}) => {
+	const button = document.createElement('button');
+	button.id = opts.id;
+	button.ariaLabel = opts.ariaLabelShowPassword;
+	button.name = opts.name;
+	button.type = 'button';
+
+	button.innerHTML = openEyeSVG;
+
+	button.onclick = () => {
+		const passwordInput = document.getElementById('password-input') as HTMLInputElement;
+
+		if (passwordInput.type === 'password') {
+			passwordInput.type = 'text';
+			button.ariaLabel = opts.ariaLabelHidePassword;
+			button.innerHTML = closedEyeSVG;
+		} else {
+			passwordInput.type = 'password';
+			button.ariaLabel = opts.ariaLabelShowPassword;
+			button.innerHTML = openEyeSVG;
+		}
+
+		passwordInput.focus();
+	};
+
+	return button;
+};
+
+const createShowPasswordToggleItem = (button: HTMLButtonElement) => {
+	const span = document.createElement('span');
+	span.id = 'password-show-toggle-span';
+	span.appendChild(button);
+
+	return span;
+};
+
 const createFormLayoutItem = (label: HTMLLabelElement, input: HTMLInputElement) => {
 	const formLayoutItem = document.createElement('uui-form-layout-item') as UUIFormLayoutItemElement;
+
 	formLayoutItem.appendChild(label);
 	formLayoutItem.appendChild(input);
 
 	return formLayoutItem;
 };
 
+const createFormLayoutPasswordItem = (
+	label: HTMLLabelElement,
+	input: HTMLInputElement,
+	showPasswordToggle: HTMLSpanElement
+) => {
+	const formLayoutItem = document.createElement('uui-form-layout-item') as UUIFormLayoutItemElement;
+
+	formLayoutItem.appendChild(label);
+	const span = document.createElement('span');
+	span.id = 'password-input-span';
+	span.appendChild(input);
+	span.appendChild(showPasswordToggle);
+	formLayoutItem.appendChild(span);
+
+	return formLayoutItem;
+};
+
 const createForm = (elements: HTMLElement[]) => {
 	const styles = document.createElement('style');
 	styles.innerHTML = authStyles;
@@ -112,6 +175,8 @@ export default class UmbAuthElement extends UmbLitElement {
 	_passwordInput?: HTMLInputElement;
 	_usernameLabel?: HTMLLabelElement;
 	_passwordLabel?: HTMLLabelElement;
+	_passwordShowPasswordToggleItem?: HTMLSpanElement;
+	_passwordShowPasswordToggleButton?: HTMLButtonElement;
 
 	#authContext = new UmbAuthContext(this, UMB_AUTH_CONTEXT);
 
@@ -133,11 +198,35 @@ export default class UmbAuthElement extends UmbLitElement {
 		// Register the main package for Umbraco.Auth
 		umbExtensionsRegistry.registerMany(extensions);
 
-		setTimeout(() => {
-			requestAnimationFrame(() => {
-				this.#initializeForm();
-			});
-		}, 100);
+		// Wait for localization to be ready before loading the form
+		await this.#waitForLocalization();
+
+		this.#initializeForm();
+	}
+
+	async #waitForLocalization(): Promise<void> {
+		return new Promise((resolve, reject) => {
+			let retryCount = 0;
+			// Retries 40 times with a 50ms interval = 2 seconds
+			const maxRetries = 40;
+
+			// We check periodically until it is available or we reach the max retries
+			const checkInterval = setInterval(() => {
+				// If we reach max retries, we give up and reject the promise
+				if (retryCount > maxRetries) {
+					clearInterval(checkInterval);
+					reject('Localization not available');
+					return;
+				}
+				// Check if localization is available
+				if (this.localize.term('auth_showPassword') !== 'auth_showPassword') {
+					clearInterval(checkInterval);
+					resolve();
+					return;
+				}
+				retryCount++;
+			}, 50);
+		});
 	}
 
 	disconnectedCallback() {
@@ -148,6 +237,8 @@ export default class UmbAuthElement extends UmbLitElement {
 		this._usernameInput?.remove();
 		this._passwordLabel?.remove();
 		this._passwordInput?.remove();
+		this._passwordShowPasswordToggleItem?.remove();
+		this._passwordShowPasswordToggleButton?.remove();
 	}
 
 	/**
@@ -173,6 +264,13 @@ export default class UmbAuthElement extends UmbLitElement {
 			autocomplete: 'current-password',
 			inputmode: '',
 		});
+		this._passwordShowPasswordToggleButton = createShowPasswordToggleButton({
+			id: 'password-show-toggle',
+			name: 'password-show-toggle',
+			ariaLabelShowPassword: this.localize.term('auth_showPassword'),
+			ariaLabelHidePassword: this.localize.term('auth_hidePassword'),
+		});
+		this._passwordShowPasswordToggleItem = createShowPasswordToggleItem(this._passwordShowPasswordToggleButton);
 		this._usernameLabel = createLabel({
 			forId: 'username-input',
 			localizeAlias: this.usernameIsEmail ? 'auth_email' : 'auth_username',
@@ -183,9 +281,12 @@ export default class UmbAuthElement extends UmbLitElement {
 			localizeAlias: 'auth_password',
 			localizeFallback: 'Password',
 		});
-
 		this._usernameLayoutItem = createFormLayoutItem(this._usernameLabel, this._usernameInput);
-		this._passwordLayoutItem = createFormLayoutItem(this._passwordLabel, this._passwordInput);
+		this._passwordLayoutItem = createFormLayoutPasswordItem(
+			this._passwordLabel,
+			this._passwordInput,
+			this._passwordShowPasswordToggleItem
+		);
 
 		this._form = createForm([this._usernameLayoutItem, this._passwordLayoutItem]);
 
diff --git a/src/Umbraco.Web.UI.Login/src/localization/lang/da.ts b/src/Umbraco.Web.UI.Login/src/localization/lang/da.ts
index fb15444c0d18..dda9767dd638 100644
--- a/src/Umbraco.Web.UI.Login/src/localization/lang/da.ts
+++ b/src/Umbraco.Web.UI.Login/src/localization/lang/da.ts
@@ -47,5 +47,7 @@ export default {
     returnToLogin: 'Tilbage til log ind',
     localLoginDisabled: 'Desværre er det ikke muligt at logge ind direkte. Det er blevet deaktiveret af en login-udbyder.',
     friendlyGreeting: 'Hej!',
+    showPassword: 'Vis adgangskode',
+    hidePassword: 'Skjul adgangskode',
   },
 } satisfies UmbLocalizationDictionary;
diff --git a/src/Umbraco.Web.UI.Login/src/localization/lang/en.ts b/src/Umbraco.Web.UI.Login/src/localization/lang/en.ts
index edbecc1972ea..0ee9e4c57aaf 100644
--- a/src/Umbraco.Web.UI.Login/src/localization/lang/en.ts
+++ b/src/Umbraco.Web.UI.Login/src/localization/lang/en.ts
@@ -47,5 +47,7 @@ export default {
     returnToLogin: 'Return to login',
     localLoginDisabled: 'Unfortunately, direct login is not possible. It has been disabled by a provider.',
     friendlyGreeting: 'Hello',
+    showPassword: 'Show password',
+    hidePassword: 'Hide password',
   },
 } satisfies UmbLocalizationDictionary;

From 5032b25e3cfcf194792997e69a7a5befd47c68d4 Mon Sep 17 00:00:00 2001
From: Bjarne Fyrstenborg <bf@mcb.dk>
Date: Thu, 30 Oct 2025 13:34:58 +0100
Subject: [PATCH 096/155] Icon picker: Better title for icon colors (#20649)

* Better title for icon colors

* Add name for legacy colors

* Translations of colors

* Fixed import, adding missing colour, added Italian translations.

---------

Co-authored-by: Andy Butland <abutland73@gmail.com>
---
 src/Umbraco.Web.UI.Client/src/assets/lang/da.ts       | 11 +++++++++++
 src/Umbraco.Web.UI.Client/src/assets/lang/de.ts       | 11 +++++++++++
 src/Umbraco.Web.UI.Client/src/assets/lang/en-us.ts    |  3 +++
 src/Umbraco.Web.UI.Client/src/assets/lang/en.ts       | 11 +++++++++++
 src/Umbraco.Web.UI.Client/src/assets/lang/it.ts       | 11 +++++++++++
 .../icon-picker-modal/icon-picker-modal.element.ts    |  6 +++---
 6 files changed, 50 insertions(+), 3 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/assets/lang/da.ts b/src/Umbraco.Web.UI.Client/src/assets/lang/da.ts
index d0f96464b3cf..24fc31883c91 100644
--- a/src/Umbraco.Web.UI.Client/src/assets/lang/da.ts
+++ b/src/Umbraco.Web.UI.Client/src/assets/lang/da.ts
@@ -1009,7 +1009,18 @@ export default {
 		document: 'Dokument',
 	},
 	colors: {
+		black: 'Sort',
 		blue: 'Blå',
+		brown: 'Brun',
+		cyan: 'Cyan',
+		green: 'Grøn',
+		lightBlue: 'Lyseblå',
+		pink: 'Lyserød',
+		red: 'Rød',
+		text: 'Sort',
+		yellow: 'Gul',
+		white: 'Hvid',
+		grey: 'Grå',
 	},
 	shortcuts: {
 		addGroup: 'Tilføj fane',
diff --git a/src/Umbraco.Web.UI.Client/src/assets/lang/de.ts b/src/Umbraco.Web.UI.Client/src/assets/lang/de.ts
index 3e23a5355c51..d8ee0250545d 100644
--- a/src/Umbraco.Web.UI.Client/src/assets/lang/de.ts
+++ b/src/Umbraco.Web.UI.Client/src/assets/lang/de.ts
@@ -903,7 +903,18 @@ export default {
 		newVersionAvailable: 'Neue Version verfügbar',
 	},
 	colors: {
+		black: 'Schwarz',
 		blue: 'Blau',
+		brown: 'Braun',
+		cyan: 'Cyan',
+		green: 'Grün',
+		lightBlue: 'Hellblau',
+		pink: 'Pink',
+		red: 'Rot',
+		text: 'Schwarz',
+		yellow: 'Gelb',
+		white: 'Weiß',
+		grey: 'Grau',
 	},
 	shortcuts: {
 		addTab: 'Tab hinzufügen',
diff --git a/src/Umbraco.Web.UI.Client/src/assets/lang/en-us.ts b/src/Umbraco.Web.UI.Client/src/assets/lang/en-us.ts
index c674813e1ddd..74fbdbe0f6c2 100644
--- a/src/Umbraco.Web.UI.Client/src/assets/lang/en-us.ts
+++ b/src/Umbraco.Web.UI.Client/src/assets/lang/en-us.ts
@@ -35,6 +35,9 @@ export default {
 		showLabelDescription:
 			'Displays colored field and a label for each color in the color picker, rather than just a colored field.',
 	},
+	colors: {
+		grey: 'Gray',
+	},
 	create: {
 		folderDescription: 'Used to organize items and other folders. Keep items structured and easy to access.',
 	},
diff --git a/src/Umbraco.Web.UI.Client/src/assets/lang/en.ts b/src/Umbraco.Web.UI.Client/src/assets/lang/en.ts
index b93b314941c5..ef9d2d080460 100644
--- a/src/Umbraco.Web.UI.Client/src/assets/lang/en.ts
+++ b/src/Umbraco.Web.UI.Client/src/assets/lang/en.ts
@@ -1019,7 +1019,18 @@ export default {
 		},
 	},
 	colors: {
+		black: 'Black',
 		blue: 'Blue',
+		brown: 'Brown',
+		cyan: 'Cyan',
+		green: 'Green',
+		lightBlue: 'Light Blue',
+		pink: 'Pink',
+		red: 'Red',
+		text: 'Black',
+		yellow: 'Yellow',
+		white: 'White',
+		grey: 'Grey',
 	},
 	shortcuts: {
 		addGroup: 'Add group',
diff --git a/src/Umbraco.Web.UI.Client/src/assets/lang/it.ts b/src/Umbraco.Web.UI.Client/src/assets/lang/it.ts
index 93d63be4111f..247a63e190ea 100644
--- a/src/Umbraco.Web.UI.Client/src/assets/lang/it.ts
+++ b/src/Umbraco.Web.UI.Client/src/assets/lang/it.ts
@@ -850,7 +850,18 @@ export default {
 		avatar: 'Avatar per',
 	},
 	colors: {
+		black: 'Nero',
 		blue: 'Blu',
+		brown: 'Marrone',
+		cyan: 'Ciano',
+		green: 'Verde',
+		lightBlue: 'Azzurro',
+		pink: 'Rosa',
+		red: 'Rosso',
+		text: 'Nero',
+		yellow: 'Giallo',
+		white: 'Bianco',
+		grey: 'Grigio',
 	},
 	shortcuts: {
 		addGroup: 'Aggiungi gruppo',
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/icon-registry/icon-picker-modal/icon-picker-modal.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/icon-registry/icon-picker-modal/icon-picker-modal.element.ts
index 7227be73a0d3..ea94404e2f84 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/icon-registry/icon-picker-modal/icon-picker-modal.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/icon-registry/icon-picker-modal/icon-picker-modal.element.ts
@@ -16,6 +16,7 @@ import { umbFocus } from '@umbraco-cms/backoffice/lit-element';
 import { UmbModalBaseElement } from '@umbraco-cms/backoffice/modal';
 import { UmbTextStyles } from '@umbraco-cms/backoffice/style';
 import type { UUIColorSwatchesEvent } from '@umbraco-cms/backoffice/external/uui';
+import { toCamelCase } from '@umbraco-cms/backoffice/utils';
 
 @customElement('umb-icon-picker-modal')
 export class UmbIconPickerModalElement extends UmbModalBaseElement<UmbIconPickerModalData, UmbIconPickerModalValue> {
@@ -87,12 +88,11 @@ export class UmbIconPickerModalElement extends UmbModalBaseElement<UmbIconPicker
 						label=${this.localize.term('defaultdialogs_colorSwitcher')}
 						@change=${this.#onColorChange}>
 						${
-							// TODO: Missing localization for the color aliases. [NL]
 							this._colorList.map(
 								(color) => html`
 									<uui-color-swatch
-										label=${color.alias}
-										title=${color.alias}
+										label=${this.localize.term('colors_' + toCamelCase(color.alias))}
+										title=${this.localize.term('colors_' + toCamelCase(color.alias))}
 										value=${color.alias}
 										style="--uui-swatch-color: var(${color.varName})">
 									</uui-color-swatch>

From b8cb198a1ab8e23df7c72ddf54ac4ef64be37c00 Mon Sep 17 00:00:00 2001
From: Mads Rasmussen <madsr@hey.com>
Date: Thu, 30 Oct 2025 13:41:20 +0100
Subject: [PATCH 097/155] Document Recycle Bin: Remove non-relevant entity bulk
 actions (closes #20677) (#20685)

Add 'not trashed' condition to document bulk actions

Introduces the UMB_ENTITY_IS_NOT_TRASHED_CONDITION_ALIAS to various document-related bulk action manifests, ensuring actions like duplicate, move, publish, unpublish, and trash are only available for entities that are not already in the recycle bin.
---
 .../documents/documents/collection/action/manifests.ts        | 4 ++++
 .../documents/entity-bulk-actions/duplicate-to/manifests.ts   | 4 ++++
 .../documents/entity-bulk-actions/move-to/manifests.ts        | 4 ++++
 .../publishing/publish/entity-bulk-action/manifests.ts        | 4 ++++
 .../publishing/unpublish/entity-bulk-action/manifests.ts      | 4 ++++
 .../recycle-bin/entity-action/bulk-trash/manifests.ts         | 4 ++++
 6 files changed, 24 insertions(+)

diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/collection/action/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/collection/action/manifests.ts
index 4cfb22b82da6..4d25a471f1f5 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/collection/action/manifests.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/collection/action/manifests.ts
@@ -1,4 +1,5 @@
 import { UMB_COLLECTION_ALIAS_CONDITION } from '@umbraco-cms/backoffice/collection';
+import { UMB_ENTITY_IS_NOT_TRASHED_CONDITION_ALIAS } from '@umbraco-cms/backoffice/recycle-bin';
 
 export const manifests: Array<UmbExtensionManifest> = [
 	{
@@ -16,6 +17,9 @@ export const manifests: Array<UmbExtensionManifest> = [
 				alias: UMB_COLLECTION_ALIAS_CONDITION,
 				match: 'Umb.Collection.Document',
 			},
+			{
+				alias: UMB_ENTITY_IS_NOT_TRASHED_CONDITION_ALIAS,
+			},
 		],
 	},
 ];
diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-bulk-actions/duplicate-to/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-bulk-actions/duplicate-to/manifests.ts
index cd6babebd346..ccd6fce0c4e3 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-bulk-actions/duplicate-to/manifests.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-bulk-actions/duplicate-to/manifests.ts
@@ -4,6 +4,7 @@ import { UMB_DOCUMENT_TREE_ALIAS } from '../../tree/manifests.js';
 import { UMB_USER_PERMISSION_DOCUMENT_DUPLICATE } from '../../user-permissions/document/constants.js';
 import { UMB_BULK_DUPLICATE_DOCUMENT_REPOSITORY_ALIAS } from './repository/constants.js';
 import { manifests as repositoryManifests } from './repository/manifests.js';
+import { UMB_ENTITY_IS_NOT_TRASHED_CONDITION_ALIAS } from '@umbraco-cms/backoffice/recycle-bin';
 import { UMB_COLLECTION_ALIAS_CONDITION } from '@umbraco-cms/backoffice/collection';
 
 export const manifests: Array<UmbExtensionManifest> = [
@@ -27,6 +28,9 @@ export const manifests: Array<UmbExtensionManifest> = [
 				alias: 'Umb.Condition.UserPermission.Document',
 				allOf: [UMB_USER_PERMISSION_DOCUMENT_DUPLICATE],
 			},
+			{
+				alias: UMB_ENTITY_IS_NOT_TRASHED_CONDITION_ALIAS,
+			},
 		],
 	},
 	...repositoryManifests,
diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-bulk-actions/move-to/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-bulk-actions/move-to/manifests.ts
index 835beba3486d..de1d90a7a360 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-bulk-actions/move-to/manifests.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-bulk-actions/move-to/manifests.ts
@@ -1,3 +1,4 @@
+import { UMB_ENTITY_IS_NOT_TRASHED_CONDITION_ALIAS } from '@umbraco-cms/backoffice/recycle-bin';
 import { UMB_DOCUMENT_COLLECTION_ALIAS } from '../../collection/constants.js';
 import { UMB_DOCUMENT_ENTITY_TYPE } from '../../entity.js';
 import { UMB_DOCUMENT_TREE_ALIAS } from '../../tree/manifests.js';
@@ -27,6 +28,9 @@ export const manifests: Array<UmbExtensionManifest> = [
 				alias: 'Umb.Condition.UserPermission.Document',
 				allOf: [UMB_USER_PERMISSION_DOCUMENT_MOVE],
 			},
+			{
+				alias: UMB_ENTITY_IS_NOT_TRASHED_CONDITION_ALIAS,
+			},
 		],
 	},
 	...repositoryManifests,
diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/publishing/publish/entity-bulk-action/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/publishing/publish/entity-bulk-action/manifests.ts
index 017228b8c5ed..a6377e6e2b0d 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/publishing/publish/entity-bulk-action/manifests.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/publishing/publish/entity-bulk-action/manifests.ts
@@ -2,6 +2,7 @@ import { UMB_DOCUMENT_ENTITY_TYPE } from '../../../entity.js';
 import { UMB_DOCUMENT_COLLECTION_ALIAS } from '../../../collection/constants.js';
 import { UMB_USER_PERMISSION_DOCUMENT_PUBLISH } from '../../../user-permissions/document/constants.js';
 import { UMB_COLLECTION_ALIAS_CONDITION } from '@umbraco-cms/backoffice/collection';
+import { UMB_ENTITY_IS_NOT_TRASHED_CONDITION_ALIAS } from '@umbraco-cms/backoffice/recycle-bin';
 
 export const manifests: Array<UmbExtensionManifest> = [
 	{
@@ -25,6 +26,9 @@ export const manifests: Array<UmbExtensionManifest> = [
 				alias: 'Umb.Condition.UserPermission.Document',
 				allOf: [UMB_USER_PERMISSION_DOCUMENT_PUBLISH],
 			},
+			{
+				alias: UMB_ENTITY_IS_NOT_TRASHED_CONDITION_ALIAS,
+			},
 		],
 	},
 ];
diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/publishing/unpublish/entity-bulk-action/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/publishing/unpublish/entity-bulk-action/manifests.ts
index 0bd4d3396cd4..245cf987bd98 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/publishing/unpublish/entity-bulk-action/manifests.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/publishing/unpublish/entity-bulk-action/manifests.ts
@@ -2,6 +2,7 @@ import { UMB_DOCUMENT_ENTITY_TYPE } from '../../../entity.js';
 import { UMB_DOCUMENT_COLLECTION_ALIAS } from '../../../collection/constants.js';
 import { UMB_USER_PERMISSION_DOCUMENT_UNPUBLISH } from '../../../user-permissions/document/constants.js';
 import { UMB_COLLECTION_ALIAS_CONDITION } from '@umbraco-cms/backoffice/collection';
+import { UMB_ENTITY_IS_NOT_TRASHED_CONDITION_ALIAS } from '@umbraco-cms/backoffice/recycle-bin';
 
 export const manifests: Array<UmbExtensionManifest> = [
 	{
@@ -25,6 +26,9 @@ export const manifests: Array<UmbExtensionManifest> = [
 				alias: 'Umb.Condition.UserPermission.Document',
 				allOf: [UMB_USER_PERMISSION_DOCUMENT_UNPUBLISH],
 			},
+			{
+				alias: UMB_ENTITY_IS_NOT_TRASHED_CONDITION_ALIAS,
+			},
 		],
 	},
 ];
diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/recycle-bin/entity-action/bulk-trash/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/recycle-bin/entity-action/bulk-trash/manifests.ts
index 5820d8c769b0..8629513cf877 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/recycle-bin/entity-action/bulk-trash/manifests.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/recycle-bin/entity-action/bulk-trash/manifests.ts
@@ -6,6 +6,7 @@ import { UMB_DOCUMENT_REFERENCE_REPOSITORY_ALIAS } from '../../../reference/cons
 import { UMB_DOCUMENT_COLLECTION_ALIAS } from '../../../collection/constants.js';
 import { UMB_COLLECTION_ALIAS_CONDITION } from '@umbraco-cms/backoffice/collection';
 import { UMB_ENTITY_BULK_ACTION_TRASH_WITH_RELATION_KIND } from '@umbraco-cms/backoffice/relations';
+import { UMB_ENTITY_IS_NOT_TRASHED_CONDITION_ALIAS } from '@umbraco-cms/backoffice/recycle-bin';
 
 export const manifests: Array<UmbExtensionManifest> = [
 	{
@@ -29,6 +30,9 @@ export const manifests: Array<UmbExtensionManifest> = [
 				alias: 'Umb.Condition.UserPermission.Document',
 				allOf: [UMB_USER_PERMISSION_DOCUMENT_DELETE],
 			},
+			{
+				alias: UMB_ENTITY_IS_NOT_TRASHED_CONDITION_ALIAS,
+			},
 		],
 	},
 ];

From f27fb58e13caf94119e8ff0346cc35ae89637b4d Mon Sep 17 00:00:00 2001
From: Nathan Woulfe <nathan@nathanw.com.au>
Date: Fri, 31 Oct 2025 15:42:45 +1000
Subject: [PATCH 098/155] box-sizing to ensure height is correct (#20694)

---
 .../language/app-language-select/app-language-select.element.ts  | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/Umbraco.Web.UI.Client/src/packages/language/app-language-select/app-language-select.element.ts b/src/Umbraco.Web.UI.Client/src/packages/language/app-language-select/app-language-select.element.ts
index 6ea183dae178..fe294fc11d44 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/language/app-language-select/app-language-select.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/language/app-language-select/app-language-select.element.ts
@@ -234,6 +234,7 @@ export class UmbAppLanguageSelectElement extends UmbLitElement {
 				justify-content: space-between;
 				cursor: pointer;
 				font-family: inherit;
+				box-sizing: border-box;
 			}
 
 			#toggle:hover {

From 66409b9ebd379c28c7f97bc4f8d65a31c35f0a62 Mon Sep 17 00:00:00 2001
From: Andy Butland <abutland73@gmail.com>
Date: Fri, 31 Oct 2025 10:49:26 +0100
Subject: [PATCH 099/155] Performance: Request cache referenced entities when
 saving documents with block editors (#20590)

* Added request cache to content and media lookups in mult URL picker.

* Allow property editors to cache referenced entities from block data.

* Update src/Umbraco.Infrastructure/PropertyEditors/MultiUrlPickerValueEditor.cs

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

* Add obsoletions.

* Minor spellcheck

* Ensure request cache is available before relying on it.

---------

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
Co-authored-by: kjac <kja@umbraco.dk>
---
 .../PropertyEditors/DataValueEditor.cs        | 156 ++++++++++++++++++
 .../ICacheReferencedEntities.cs               |  19 +++
 .../BlockEditorPropertyValueEditor.cs         |   2 +
 .../BlockValuePropertyValueEditorBase.cs      |  39 +++++
 .../MediaPicker3PropertyEditor.cs             |  85 ++++++----
 .../MultiUrlPickerValueEditor.cs              | 104 +++++++++++-
 ...ultiUrlPickerValueEditorValidationTests.cs |   4 +-
 7 files changed, 368 insertions(+), 41 deletions(-)
 create mode 100644 src/Umbraco.Core/PropertyEditors/ICacheReferencedEntities.cs

diff --git a/src/Umbraco.Core/PropertyEditors/DataValueEditor.cs b/src/Umbraco.Core/PropertyEditors/DataValueEditor.cs
index 211d36f65f7a..1c32dc3de6eb 100644
--- a/src/Umbraco.Core/PropertyEditors/DataValueEditor.cs
+++ b/src/Umbraco.Core/PropertyEditors/DataValueEditor.cs
@@ -3,12 +3,14 @@
 using System.Runtime.Serialization;
 using System.Xml.Linq;
 using Microsoft.Extensions.Logging;
+using Umbraco.Cms.Core.Cache;
 using Umbraco.Cms.Core.IO;
 using Umbraco.Cms.Core.Models;
 using Umbraco.Cms.Core.Models.Editors;
 using Umbraco.Cms.Core.Models.Validation;
 using Umbraco.Cms.Core.PropertyEditors.Validators;
 using Umbraco.Cms.Core.Serialization;
+using Umbraco.Cms.Core.Services;
 using Umbraco.Cms.Core.Strings;
 using Umbraco.Extensions;
 
@@ -20,6 +22,9 @@ namespace Umbraco.Cms.Core.PropertyEditors;
 [DataContract]
 public class DataValueEditor : IDataValueEditor
 {
+    private const string ContentCacheKeyFormat = nameof(DataValueEditor) + "_Content_{0}";
+    private const string MediaCacheKeyFormat = nameof(DataValueEditor) + "_Media_{0}";
+
     private readonly IJsonSerializer? _jsonSerializer;
     private readonly IShortStringHelper _shortStringHelper;
 
@@ -415,4 +420,155 @@ public virtual string ConvertDbToString(IPropertyType propertyType, object? valu
 
         return value.TryConvertTo(valueType);
     }
+
+    /// <summary>
+    /// Retrieves a <see cref="IContent"/> instance by its unique identifier, using the provided request cache to avoid redundant
+    /// lookups within the same request.
+    /// </summary>
+    /// <remarks>
+    /// This method caches content lookups for the duration of the current request to improve performance when the same content
+    /// item may be accessed multiple times. This is particularly useful in scenarios involving multiple languages or blocks.
+    /// </remarks>
+    /// <param name="key">The unique identifier of the content item to retrieve.</param>
+    /// <param name="requestCache">The request-scoped cache used to store and retrieve content items for the duration of the current request.</param>
+    /// <param name="contentService">The content service used to fetch the content item if it is not found in the cache.</param>
+    /// <returns>The <see cref="IContent"/> instance corresponding to the specified key, or null if no such content item exists.</returns>
+    [Obsolete("This method is available for support of request caching retrieved entities in derived property value editors. " +
+          "The intention is to supersede this with lazy loaded read locks, which will make this unnecessary. " +
+          "Scheduled for removal in Umbraco 19.")]
+    protected static IContent? GetAndCacheContentById(Guid key, IRequestCache requestCache, IContentService contentService)
+    {
+        if (requestCache.IsAvailable is false)
+        {
+            return contentService.GetById(key);
+        }
+
+        var cacheKey = string.Format(ContentCacheKeyFormat, key);
+        IContent? content = requestCache.GetCacheItem<IContent?>(cacheKey);
+        if (content is null)
+        {
+            content = contentService.GetById(key);
+            if (content is not null)
+            {
+                requestCache.Set(cacheKey, content);
+            }
+        }
+
+        return content;
+    }
+
+    /// <summary>
+    /// Adds the specified <see cref="IContent"/> item to the request cache using its unique key.
+    /// </summary>
+    /// <param name="content">The content item to cache.</param>
+    /// <param name="requestCache">The request cache in which to store the content item.</param>
+    [Obsolete("This method is available for support of request caching retrieved entities in derived property value editors. " +
+          "The intention is to supersede this with lazy loaded read locks, which will make this unnecessary. " +
+          "Scheduled for removal in Umbraco 19.")]
+    protected static void CacheContentById(IContent content, IRequestCache requestCache)
+    {
+        if (requestCache.IsAvailable is false)
+        {
+            return;
+        }
+
+        var cacheKey = string.Format(ContentCacheKeyFormat, content.Key);
+        requestCache.Set(cacheKey, content);
+    }
+
+    /// <summary>
+    /// Retrieves a <see cref="IMedia"/> instance by its unique identifier, using the provided request cache to avoid redundant
+    /// lookups within the same request.
+    /// </summary>
+    /// <remarks>
+    /// This method caches media lookups for the duration of the current request to improve performance when the same media
+    /// item may be accessed multiple times. This is particularly useful in scenarios involving multiple languages or blocks.
+    /// </remarks>
+    /// <param name="key">The unique identifier of the media item to retrieve.</param>
+    /// <param name="requestCache">The request-scoped cache used to store and retrieve media items for the duration of the current request.</param>
+    /// <param name="mediaService">The media service used to fetch the media item if it is not found in the cache.</param>
+    /// <returns>The <see cref="IMedia"/> instance corresponding to the specified key, or null if no such media item exists.</returns>
+    [Obsolete("This method is available for support of request caching retrieved entities in derived property value editors. " +
+          "The intention is to supersede this with lazy loaded read locks, which will make this unnecessary. " +
+          "Scheduled for removal in Umbraco 19.")]
+    protected static IMedia? GetAndCacheMediaById(Guid key, IRequestCache requestCache, IMediaService mediaService)
+    {
+        if (requestCache.IsAvailable is false)
+        {
+            return mediaService.GetById(key);
+        }
+
+        var cacheKey = string.Format(MediaCacheKeyFormat, key);
+        IMedia? media = requestCache.GetCacheItem<IMedia?>(cacheKey);
+
+        if (media is null)
+        {
+            media = mediaService.GetById(key);
+            if (media is not null)
+            {
+                requestCache.Set(cacheKey, media);
+            }
+        }
+
+        return media;
+    }
+
+    /// <summary>
+    /// Adds the specified <see cref="IMedia"/> item to the request cache using its unique key.
+    /// </summary>
+    /// <param name="media">The media item to cache.</param>
+    /// <param name="requestCache">The request cache in which to store the media item.</param>
+    [Obsolete("This method is available for support of request caching retrieved entities in derived property value editors. " +
+          "The intention is to supersede this with lazy loaded read locks, which will make this unnecessary. " +
+          "Scheduled for removal in Umbraco 19.")]
+    protected static void CacheMediaById(IMedia media, IRequestCache requestCache)
+    {
+        if (requestCache.IsAvailable is false)
+        {
+            return;
+        }
+
+        var cacheKey = string.Format(MediaCacheKeyFormat, media.Key);
+        requestCache.Set(cacheKey, media);
+    }
+
+    /// <summary>
+    /// Determines whether the content item identified by the specified key is present in the request cache.
+    /// </summary>
+    /// <param name="key">The unique identifier for the content item to check for in the cache.</param>
+    /// <param name="requestCache">The request cache in which to look for the content item.</param>
+    /// <returns>true if the content item is already cached in the request cache; otherwise, false.</returns>
+    [Obsolete("This method is available for support of request caching retrieved entities in derived property value editors. " +
+          "The intention is to supersede this with lazy loaded read locks, which will make this unnecessary. " +
+          "Scheduled for removal in Umbraco 19.")]
+    protected static bool IsContentAlreadyCached(Guid key, IRequestCache requestCache)
+    {
+        if (requestCache.IsAvailable is false)
+        {
+            return false;
+        }
+
+        var cacheKey = string.Format(ContentCacheKeyFormat, key);
+        return requestCache.GetCacheItem<IContent?>(cacheKey) is not null;
+    }
+
+    /// <summary>
+    /// Determines whether the media item identified by the specified key is present in the request cache.
+    /// </summary>
+    /// <param name="key">The unique identifier for the media item to check for in the cache.</param>
+    /// <param name="requestCache">The request cache in which to look for the media item.</param>
+    /// <returns>true if the media item is already cached in the request cache; otherwise, false.</returns>
+    [Obsolete("This method is available for support of request caching retrieved entities in derived property value editors. " +
+              "The intention is to supersede this with lazy loaded read locks, which will make this unnecessary. " +
+              "Scheduled for removal in Umbraco 19.")]
+    protected static bool IsMediaAlreadyCached(Guid key, IRequestCache requestCache)
+    {
+        if (requestCache.IsAvailable is false)
+        {
+            return false;
+        }
+
+        var cacheKey = string.Format(MediaCacheKeyFormat, key);
+        return requestCache.GetCacheItem<IMedia?>(cacheKey) is not null;
+    }
 }
diff --git a/src/Umbraco.Core/PropertyEditors/ICacheReferencedEntities.cs b/src/Umbraco.Core/PropertyEditors/ICacheReferencedEntities.cs
new file mode 100644
index 000000000000..cf655a91678b
--- /dev/null
+++ b/src/Umbraco.Core/PropertyEditors/ICacheReferencedEntities.cs
@@ -0,0 +1,19 @@
+namespace Umbraco.Cms.Core.PropertyEditors;
+
+/// <summary>
+/// Optionally implemented by property editors, this defines a contract for caching entities that are referenced in block values.
+/// </summary>
+[Obsolete("This interface is available for support of request caching retrieved entities in property value editors that implement it. " +
+          "The intention is to supersede this with lazy loaded read locks, which will make this unnecessary. " +
+          "Scheduled for removal in Umbraco 19.")]
+public interface ICacheReferencedEntities
+{
+    /// <summary>
+    /// Caches the entities referenced by the provided block data values.
+    /// </summary>
+    /// <param name="values">An enumerable collection of block values that may contain the entities to be cached.</param>
+    [Obsolete("This method is available for support of request caching retrieved entities in derived property value editors. " +
+              "The intention is to supersede this with lazy loaded read locks, which will make this unnecessary. " +
+              "Scheduled for removal in Umbraco 19.")]
+    void CacheReferencedEntities(IEnumerable<object> values);
+}
diff --git a/src/Umbraco.Infrastructure/PropertyEditors/BlockEditorPropertyValueEditor.cs b/src/Umbraco.Infrastructure/PropertyEditors/BlockEditorPropertyValueEditor.cs
index a2e7f4bee982..07a735b8e11a 100644
--- a/src/Umbraco.Infrastructure/PropertyEditors/BlockEditorPropertyValueEditor.cs
+++ b/src/Umbraco.Infrastructure/PropertyEditors/BlockEditorPropertyValueEditor.cs
@@ -107,6 +107,8 @@ public override object ToEditor(IProperty property, string? culture = null, stri
         BlockEditorData<TValue, TLayout>? currentBlockEditorData = SafeParseBlockEditorData(currentValue);
         BlockEditorData<TValue, TLayout>? blockEditorData = SafeParseBlockEditorData(editorValue.Value);
 
+        CacheReferencedEntities(blockEditorData);
+
         // We can skip MapBlockValueFromEditor if both editorValue and currentValue values are empty.
         if (IsBlockEditorDataEmpty(currentBlockEditorData) && IsBlockEditorDataEmpty(blockEditorData))
         {
diff --git a/src/Umbraco.Infrastructure/PropertyEditors/BlockValuePropertyValueEditorBase.cs b/src/Umbraco.Infrastructure/PropertyEditors/BlockValuePropertyValueEditorBase.cs
index 8128643d9ab6..333df828e964 100644
--- a/src/Umbraco.Infrastructure/PropertyEditors/BlockValuePropertyValueEditorBase.cs
+++ b/src/Umbraco.Infrastructure/PropertyEditors/BlockValuePropertyValueEditorBase.cs
@@ -43,6 +43,45 @@ protected BlockValuePropertyValueEditorBase(
         _languageService = languageService;
     }
 
+    /// <summary>
+    /// Caches referenced entities for all property values with supporting property editors within the specified block editor data
+    /// optimising subsequent retrieval of entities when parsing and converting property values.
+    /// </summary>
+    /// <remarks>
+    /// This method iterates through all property values associated with data editors in the provided
+    /// block editor data and invokes caching for referenced entities where supported by the property editor.
+    /// </remarks>
+    /// <param name="blockEditorData">The block editor data containing content and settings property values to analyze for referenced entities.</param>
+    [Obsolete("This method is available for support of request caching retrieved entities in derived property value editors. " +
+              "The intention is to supersede this with lazy loaded read locks, which will make this unnecessary. " +
+              "Scheduled for removal in Umbraco 19.")]
+    protected void CacheReferencedEntities(BlockEditorData<TValue, TLayout>? blockEditorData)
+    {
+        // Group property values by their associated data editor alias.
+        IEnumerable<IGrouping<string, BlockPropertyValue>> valuesByDataEditors = (blockEditorData?.BlockValue.ContentData ?? []).Union(blockEditorData?.BlockValue.SettingsData ?? [])
+            .SelectMany(x => x.Values)
+            .Where(x => x.EditorAlias is not null && x.Value is not null)
+            .GroupBy(x => x.EditorAlias!);
+
+        // Iterate through each group and cache referenced entities if supported by the data editor.
+        foreach (IGrouping<string, BlockPropertyValue> valueByDataEditor in valuesByDataEditors)
+        {
+            IDataEditor? dataEditor = _propertyEditors[valueByDataEditor.Key];
+            if (dataEditor is null)
+            {
+                continue;
+            }
+
+            IDataValueEditor valueEditor = dataEditor.GetValueEditor();
+
+            if (valueEditor is ICacheReferencedEntities valueEditorWithPrecaching)
+            {
+                valueEditorWithPrecaching.CacheReferencedEntities(valueByDataEditor.Select(x => x.Value!));
+            }
+        }
+    }
+
+
     /// <inheritdoc />
     public abstract IEnumerable<UmbracoEntityReference> GetReferences(object? value);
 
diff --git a/src/Umbraco.Infrastructure/PropertyEditors/MediaPicker3PropertyEditor.cs b/src/Umbraco.Infrastructure/PropertyEditors/MediaPicker3PropertyEditor.cs
index d4a9e492bd17..50fe850e04f2 100644
--- a/src/Umbraco.Infrastructure/PropertyEditors/MediaPicker3PropertyEditor.cs
+++ b/src/Umbraco.Infrastructure/PropertyEditors/MediaPicker3PropertyEditor.cs
@@ -52,10 +52,8 @@ protected override IDataValueEditor CreateValueEditor() =>
     /// <summary>
     /// Defines the value editor for the media picker property editor.
     /// </summary>
-    internal sealed class MediaPicker3PropertyValueEditor : DataValueEditor, IDataValueReference
+    internal sealed class MediaPicker3PropertyValueEditor : DataValueEditor, IDataValueReference, ICacheReferencedEntities
     {
-        private const string MediaCacheKeyFormat = nameof(MediaPicker3PropertyValueEditor) + "_Media_{0}";
-
         private readonly IDataTypeConfigurationCache _dataTypeReadCache;
         private readonly IJsonSerializer _jsonSerializer;
         private readonly IMediaImportService _mediaImportService;
@@ -107,6 +105,27 @@ public MediaPicker3PropertyValueEditor(
             Validators.Add(validators);
         }
 
+        /// <inheritdoc/>
+        public void CacheReferencedEntities(IEnumerable<object> values)
+        {
+            var mediaKeys = values
+                .SelectMany(value => Deserialize(_jsonSerializer, value))
+                .Select(dto => dto.MediaKey)
+                .Distinct()
+                .Where(x => IsMediaAlreadyCached(x, _appCaches.RequestCache) is false)
+                .ToList();
+            if (mediaKeys.Count == 0)
+            {
+                return;
+            }
+
+            IEnumerable<IMedia> mediaItems = _mediaService.GetByIds(mediaKeys);
+            foreach (IMedia media in mediaItems)
+            {
+                CacheMediaById(media, _appCaches.RequestCache);
+            }
+        }
+
         /// <inheritdoc/>
         public IEnumerable<UmbracoEntityReference> GetReferences(object? value)
         {
@@ -208,31 +227,13 @@ private List<MediaWithCropsDto> UpdateMediaTypeAliases(List<MediaWithCropsDto> m
 
             foreach (MediaWithCropsDto mediaWithCropsDto in mediaWithCropsDtos)
             {
-                IMedia? media = GetMediaById(mediaWithCropsDto.MediaKey);
+                IMedia? media = GetAndCacheMediaById(mediaWithCropsDto.MediaKey, _appCaches.RequestCache, _mediaService);
                 mediaWithCropsDto.MediaTypeAlias = media?.ContentType.Alias ?? unknownMediaType;
             }
 
             return mediaWithCropsDtos.Where(m => m.MediaTypeAlias != unknownMediaType).ToList();
         }
 
-        private IMedia? GetMediaById(Guid key)
-        {
-            // Cache media lookups in case the same media is handled multiple times across a save operation,
-            // which is possible, particularly if we have multiple languages and blocks.
-            var cacheKey = string.Format(MediaCacheKeyFormat, key);
-            IMedia? media = _appCaches.RequestCache.GetCacheItem<IMedia?>(cacheKey);
-            if (media is null)
-            {
-                media = _mediaService.GetById(key);
-                if (media is not null)
-                {
-                    _appCaches.RequestCache.Set(cacheKey, media);
-                }
-            }
-
-            return media;
-        }
-
         private List<MediaWithCropsDto> HandleTemporaryMediaUploads(List<MediaWithCropsDto> mediaWithCropsDtos, MediaPicker3Configuration configuration)
         {
             var invalidDtos = new List<MediaWithCropsDto>();
@@ -240,7 +241,7 @@ private List<MediaWithCropsDto> HandleTemporaryMediaUploads(List<MediaWithCropsD
             foreach (MediaWithCropsDto mediaWithCropsDto in mediaWithCropsDtos)
             {
                 // if the media already exist, don't bother with it
-                if (GetMediaById(mediaWithCropsDto.MediaKey) != null)
+                if (GetAndCacheMediaById(mediaWithCropsDto.MediaKey, _appCaches.RequestCache, _mediaService) != null)
                 {
                     continue;
                 }
@@ -480,18 +481,7 @@ public IEnumerable<ValidationResult> Validate(
 
                 foreach (var typeAlias in distinctTypeAliases)
                 {
-                    // Cache media type lookups since the same media type is likely to be used multiple times in validation,
-                    // particularly if we have multiple languages and blocks.
-                    var cacheKey = string.Format(MediaTypeCacheKeyFormat, typeAlias);
-                    string? typeKey = _appCaches.RequestCache.GetCacheItem<string?>(cacheKey);
-                    if (typeKey is null)
-                    {
-                        typeKey = _mediaTypeService.Get(typeAlias)?.Key.ToString();
-                        if (typeKey is not null)
-                        {
-                            _appCaches.RequestCache.Set(cacheKey, typeKey);
-                        }
-                    }
+                    string? typeKey = GetMediaTypeKey(typeAlias);
 
                     if (typeKey is null || allowedTypes.Contains(typeKey) is false)
                     {
@@ -506,6 +496,31 @@ public IEnumerable<ValidationResult> Validate(
 
                 return [];
             }
+
+            private string? GetMediaTypeKey(string typeAlias)
+            {
+                // Cache media type lookups since the same media type is likely to be used multiple times in validation,
+                // particularly if we have multiple languages and blocks.
+                string? GetMediaTypeKeyFromService(string typeAlias) => _mediaTypeService.Get(typeAlias)?.Key.ToString();
+
+                if (_appCaches.RequestCache.IsAvailable is false)
+                {
+                    return GetMediaTypeKeyFromService(typeAlias);
+                }
+
+                var cacheKey = string.Format(MediaTypeCacheKeyFormat, typeAlias);
+                string? typeKey = _appCaches.RequestCache.GetCacheItem<string?>(cacheKey);
+                if (typeKey is null)
+                {
+                    typeKey = GetMediaTypeKeyFromService(typeAlias);
+                    if (typeKey is not null)
+                    {
+                        _appCaches.RequestCache.Set(cacheKey, typeKey);
+                    }
+                }
+
+                return typeKey;
+            }
         }
 
         /// <summary>
diff --git a/src/Umbraco.Infrastructure/PropertyEditors/MultiUrlPickerValueEditor.cs b/src/Umbraco.Infrastructure/PropertyEditors/MultiUrlPickerValueEditor.cs
index 2f0a2b279b11..2359e5537d0c 100644
--- a/src/Umbraco.Infrastructure/PropertyEditors/MultiUrlPickerValueEditor.cs
+++ b/src/Umbraco.Infrastructure/PropertyEditors/MultiUrlPickerValueEditor.cs
@@ -3,7 +3,10 @@
 
 using System.ComponentModel.DataAnnotations;
 using System.Runtime.Serialization;
+using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
+using Umbraco.Cms.Core.Cache;
+using Umbraco.Cms.Core.DependencyInjection;
 using Umbraco.Cms.Core.IO;
 using Umbraco.Cms.Core.Models;
 using Umbraco.Cms.Core.Models.ContentEditing;
@@ -19,14 +22,16 @@
 
 namespace Umbraco.Cms.Core.PropertyEditors;
 
-public class MultiUrlPickerValueEditor : DataValueEditor, IDataValueReference
+public class MultiUrlPickerValueEditor : DataValueEditor, IDataValueReference, ICacheReferencedEntities
 {
     private readonly ILogger<MultiUrlPickerValueEditor> _logger;
     private readonly IPublishedUrlProvider _publishedUrlProvider;
     private readonly IJsonSerializer _jsonSerializer;
     private readonly IContentService _contentService;
     private readonly IMediaService _mediaService;
+    private readonly AppCaches _appCaches;
 
+    [Obsolete("Please use the constructor taking all parameters. Scheduled for removal in Umbraco 19.")]
     public MultiUrlPickerValueEditor(
         ILogger<MultiUrlPickerValueEditor> logger,
         ILocalizedTextService localizedTextService,
@@ -37,19 +42,102 @@ public MultiUrlPickerValueEditor(
         IIOHelper ioHelper,
         IContentService contentService,
         IMediaService mediaService)
+        : this(
+            logger,
+            localizedTextService,
+            shortStringHelper,
+            attribute,
+            publishedUrlProvider,
+            jsonSerializer,
+            ioHelper,
+            contentService,
+            mediaService,
+            StaticServiceProvider.Instance.GetRequiredService<AppCaches>())
+    {
+    }
+
+    public MultiUrlPickerValueEditor(
+        ILogger<MultiUrlPickerValueEditor> logger,
+        ILocalizedTextService localizedTextService,
+        IShortStringHelper shortStringHelper,
+        DataEditorAttribute attribute,
+        IPublishedUrlProvider publishedUrlProvider,
+        IJsonSerializer jsonSerializer,
+        IIOHelper ioHelper,
+        IContentService contentService,
+        IMediaService mediaService,
+        AppCaches appCaches)
         : base(shortStringHelper, jsonSerializer, ioHelper, attribute)
     {
-        _logger = logger ?? throw new ArgumentNullException(nameof(logger));
+        _logger = logger;
         _publishedUrlProvider = publishedUrlProvider;
-
         _jsonSerializer = jsonSerializer;
         _contentService = contentService;
         _mediaService = mediaService;
+        _appCaches = appCaches;
+
         Validators.Add(new TypedJsonValidatorRunner<LinkDisplay[], MultiUrlPickerConfiguration>(
             _jsonSerializer,
             new MinMaxValidator(localizedTextService)));
     }
 
+    /// <inheritdoc/>
+    public void CacheReferencedEntities(IEnumerable<object> values)
+    {
+        var dtos = values
+            .Select(value =>
+            {
+                var asString = value is string str ? str : value.ToString();
+                if (string.IsNullOrEmpty(asString))
+                {
+                    return null;
+                }
+
+                return _jsonSerializer.Deserialize<List<LinkDto>>(asString);
+            })
+            .WhereNotNull()
+            .SelectMany(x => x)
+            .Where(x => x.Type == Constants.UdiEntityType.Document || x.Type == Constants.UdiEntityType.Media)
+            .ToList();
+
+        IList<Guid> contentKeys = GetKeys(Constants.UdiEntityType.Document, dtos);
+        IList<Guid> mediaKeys = GetKeys(Constants.UdiEntityType.Media, dtos);
+
+        if (contentKeys.Count > 0)
+        {
+            IEnumerable<IContent> contentItems = _contentService.GetByIds(contentKeys);
+            foreach (IContent content in contentItems)
+            {
+                CacheContentById(content, _appCaches.RequestCache);
+            }
+        }
+
+        if (mediaKeys.Count > 0)
+        {
+            IEnumerable<IMedia> mediaItems = _mediaService.GetByIds(mediaKeys);
+            foreach (IMedia media in mediaItems)
+            {
+                CacheMediaById(media, _appCaches.RequestCache);
+            }
+        }
+    }
+
+    private IList<Guid> GetKeys(string entityType, IEnumerable<LinkDto> dtos) =>
+        dtos
+            .Where(x => x.Type == entityType)
+            .Select(x => x.Unique ?? (x.Udi is not null ? x.Udi.Guid : Guid.Empty))
+            .Where(x => x != Guid.Empty)
+            .Distinct()
+            .Where(x => IsAlreadyCached(x, entityType) is false)
+            .ToList();
+
+    private bool IsAlreadyCached(Guid key, string entityType) => entityType switch
+    {
+        Constants.UdiEntityType.Document => IsContentAlreadyCached(key, _appCaches.RequestCache),
+        Constants.UdiEntityType.Media => IsMediaAlreadyCached(key, _appCaches.RequestCache),
+        _ => false,
+    };
+
     public IEnumerable<UmbracoEntityReference> GetReferences(object? value)
     {
         var asString = value == null ? string.Empty : value is string str ? str : value.ToString();
@@ -105,7 +193,7 @@ public IEnumerable<UmbracoEntityReference> GetReferences(object? value)
                     if (dto.Udi.EntityType == Constants.UdiEntityType.Document)
                     {
                         url =  _publishedUrlProvider.GetUrl(dto.Udi.Guid, UrlMode.Relative, culture);
-                        IContent? c = _contentService.GetById(dto.Udi.Guid);
+                        IContent? c = GetAndCacheContentById(dto.Udi.Guid, _appCaches.RequestCache, _contentService);
 
                         if (c is not null)
                         {
@@ -119,7 +207,7 @@ public IEnumerable<UmbracoEntityReference> GetReferences(object? value)
                     else if (dto.Udi.EntityType == Constants.UdiEntityType.Media)
                     {
                         url = _publishedUrlProvider.GetMediaUrl(dto.Udi.Guid, UrlMode.Relative, culture);
-                        IMedia? m = _mediaService.GetById(dto.Udi.Guid);
+                        IMedia? m = GetAndCacheMediaById(dto.Udi.Guid, _appCaches.RequestCache, _mediaService);
                         if (m is not null)
                         {
                             published = m.Trashed is false;
@@ -207,6 +295,12 @@ public class LinkDto
         [DataMember(Name = "target")]
         public string? Target { get; set; }
 
+        [DataMember(Name = "unique")]
+        public Guid? Unique { get; set; }
+
+        [DataMember(Name = "type")]
+        public string? Type { get; set; }
+
         [DataMember(Name = "udi")]
         public GuidUdi? Udi { get; set; }
 
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/PropertyEditors/Validators/MultiUrlPickerValueEditorValidationTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/PropertyEditors/Validators/MultiUrlPickerValueEditorValidationTests.cs
index dae1d885b2cc..c9264d59355e 100644
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/PropertyEditors/Validators/MultiUrlPickerValueEditorValidationTests.cs
+++ b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/PropertyEditors/Validators/MultiUrlPickerValueEditorValidationTests.cs
@@ -2,6 +2,7 @@
 using Microsoft.Extensions.Logging;
 using Moq;
 using NUnit.Framework;
+using Umbraco.Cms.Core.Cache;
 using Umbraco.Cms.Core.IO;
 using Umbraco.Cms.Core.Models.Validation;
 using Umbraco.Cms.Core.PropertyEditors;
@@ -68,7 +69,8 @@ private static MultiUrlPickerValueEditor CreateValueEditor() =>
             new SystemTextJsonSerializer(new DefaultJsonSerializerEncoderFactory()),
             Mock.Of<IIOHelper>(),
             Mock.Of<IContentService>(),
-            Mock.Of<IMediaService>())
+            Mock.Of<IMediaService>(),
+            AppCaches.Disabled)
         {
             ConfigurationObject = new MultiUrlPickerConfiguration(),
         };

From 973a9573ccae1d06fc9eb95f24a7cffd4762e3c7 Mon Sep 17 00:00:00 2001
From: Laura Neto <12862535+lauraneto@users.noreply.github.com>
Date: Fri, 31 Oct 2025 10:53:57 +0100
Subject: [PATCH 100/155] Task: Dependency track (#20670)

* Generate BOM files on build

* Upload BOM to Dependency Track

* Move Backoffice BOM generation to right after install

The build and/or pack steps are deleting files that are needed for the BOM to be generated properly.

* Split the BOM uploads into different jobs

* Fix wrong usage of parameters

* Move order of dependency track stage

* Fix wrong umbracoVersion value

* Small fixes

* Log curl response headers

* Correct version sent to dependency track

* Adjusted curl flags

* Fix bom file path

* Fix dotnet bom file name

* Add Login UI to dependency track

* Generate BOM for E2E Tests

* Move dependency track stage

* Move acceptance test .env generation to e2e install template

Needed as the post install script is expecting this to exist.

* Use major version if public release

* Missing ')'

* Reverted npm install command changes in static assets project
---
 build/azure-pipelines.yml            | 81 ++++++++++++++++++++++++++++
 build/nightly-E2E-setup-template.yml | 34 +++---------
 build/templates/dependency-track.yml | 56 +++++++++++++++++++
 build/templates/e2e-install.yml      | 49 +++++++++++++++++
 4 files changed, 193 insertions(+), 27 deletions(-)
 create mode 100644 build/templates/dependency-track.yml
 create mode 100644 build/templates/e2e-install.yml

diff --git a/build/azure-pipelines.yml b/build/azure-pipelines.yml
index 2246e09e7b35..f2f18175fabe 100644
--- a/build/azure-pipelines.yml
+++ b/build/azure-pipelines.yml
@@ -34,6 +34,10 @@ parameters:
     displayName: Upload API docs
     type: boolean
     default: false
+  - name: uploadDependencyTrack
+    displayName: Upload BOMs to Dependency Track
+    type: boolean
+    default: false
   - name: forceReleaseTestFilter
     displayName: Force to use the release test filters
     type: boolean
@@ -103,6 +107,15 @@ stages:
               command: build
               projects: $(solution)
               arguments: "--configuration $(buildConfiguration) --no-restore --property:ContinuousIntegrationBuild=true --property:GeneratePackageOnBuild=true --property:PackageOutputPath=$(Build.ArtifactStagingDirectory)/nupkg"
+          - powershell: |
+              dotnet tool install --global CycloneDX
+              dotnet-CycloneDX $(solution) --output $(Build.ArtifactStagingDirectory)/bom --filename bom-dotnet.xml
+            displayName: 'Generate Backend BOM'
+          - powershell: |
+              npm install --global @cyclonedx/cyclonedx-npm
+              cyclonedx-npm -o $(Build.ArtifactStagingDirectory)\bom\bom-login.xml --ignore-npm-errors --verbose
+            displayName: Generate Login UI BOM
+            workingDirectory: src/Umbraco.Web.UI.Login
           - task: PublishPipelineArtifact@1
             displayName: Publish nupkg
             inputs:
@@ -113,6 +126,11 @@ stages:
             inputs:
               targetPath: $(Build.SourcesDirectory)
               artifactName: build_output
+          - task: PublishPipelineArtifact@1
+            displayName: Publish Backend BOM
+            inputs:
+              targetPath: $(Build.ArtifactStagingDirectory)/bom
+              artifactName: bom-backend
 
       - job: B
         displayName: Build Bellissima Package
@@ -124,6 +142,11 @@ stages:
             lfs: false,
             fetchDepth: 500
           - template: templates/backoffice-install.yml
+          - powershell: |
+              npm install --global @cyclonedx/cyclonedx-npm
+              cyclonedx-npm -o $(Build.ArtifactStagingDirectory)/bom/bom-backoffice.xml --ignore-npm-errors --verbose
+            displayName: Generate Backoffice UI BOM
+            workingDirectory: src/Umbraco.Web.UI.Client
           - script: npm run build:for:npm
             displayName: Run build:for:npm
             workingDirectory: src/Umbraco.Web.UI.Client
@@ -140,6 +163,35 @@ stages:
             inputs:
               targetPath: $(Build.ArtifactStagingDirectory)/npm
               artifactName: npm
+          - publish: $(Build.ArtifactStagingDirectory)/bom
+            artifact: bom-frontend
+            displayName: 'Publish Frontend BOM'
+
+  - stage: E2E_BOM
+    displayName: E2E Tests BOM Generation
+    dependsOn: []
+    jobs:
+    - job:
+      displayName: E2E Generate BOM
+      pool:
+        vmImage: "ubuntu-latest"
+      steps:
+        - checkout: self
+          submodules: false
+          lfs: false,
+          fetchDepth: 500
+        - template: templates/e2e-install.yml
+          parameters:
+            nodeVersion: ${{ variables.nodeVersion }}
+            npm_config_cache: ${{ variables.npm_config_cache }}
+        - powershell: |
+            npm install --global @cyclonedx/cyclonedx-npm
+            cyclonedx-npm -o $(Build.ArtifactStagingDirectory)/bom/bom-e2e.xml --ignore-npm-errors --verbose
+          displayName: Generate E2E Tests BOM
+          workingDirectory: tests/Umbraco.Tests.AcceptanceTest
+        - publish: $(Build.ArtifactStagingDirectory)/bom
+          artifact: bom-e2e
+          displayName: 'Publish E2E BOM'
 
   - stage: Build_Docs
     condition: and(succeeded(), or(eq(dependencies.Build.outputs['A.build.NBGV_PublicRelease'], 'True'), ${{parameters.buildApiDocs}}))
@@ -668,6 +720,34 @@ stages:
               ASPNETCORE_URLS: ${{ variables.ASPNETCORE_URLS }}
               DatabaseType: ${{ variables.DatabaseType }}
 
+  - stage: Dependency_Track
+    displayName: Dependency Track
+    dependsOn:
+      - Build
+      - E2E_BOM
+    condition: and(succeeded(), or(eq(dependencies.Build.outputs['A.build.NBGV_PublicRelease'], 'True'), ${{parameters.uploadDependencyTrack}}))
+    variables:
+      # Determine Umbraco version based on whether it's a public release or not. If public release, use major version, else use full NuGet package version.
+      umbracoVersion: $[ iif(eq(stageDependencies.Build.A.outputs['build.NBGV_PublicRelease'], 'True'), stageDependencies.Build.A.outputs['build.NBGV_VersionMajor'], stageDependencies.Build.A.outputs['build.NBGV_NuGetPackageVersion']) ]
+    jobs:
+      - template: templates/dependency-track.yml
+        parameters:
+          projectName: "Umbraco-CMS"
+          umbracoVersion: $(umbracoVersion)
+          projects:
+            - name: "Backend"
+              artifact: "bom-backend"
+              bomFilePath: "bom-dotnet.xml"
+            - name: "Login"
+              artifact: "bom-backend"
+              bomFilePath: "bom-login.xml"
+            - name: "Backoffice"
+              artifact: "bom-frontend"
+              bomFilePath: "bom-backoffice.xml"
+            - name: "E2E"
+              artifact: "bom-e2e"
+              bomFilePath: "bom-e2e.xml"
+
   ###############################################
   ## Release
   ###############################################
@@ -874,3 +954,4 @@ stages:
               ContainerName: "$web"
               BlobPrefix: v$(umbracoMajorVersion)/ui-api
               CleanTargetBeforeCopy: true
+
diff --git a/build/nightly-E2E-setup-template.yml b/build/nightly-E2E-setup-template.yml
index 8085561900a5..907ace6b726f 100644
--- a/build/nightly-E2E-setup-template.yml
+++ b/build/nightly-E2E-setup-template.yml
@@ -26,38 +26,18 @@ steps:
       artifact: nupkg
       path: $(Agent.BuildDirectory)/app/nupkg
 
-  - task: NodeTool@0
-    displayName: Use Node.js $(nodeVersion)
-    inputs:
-      versionSpec: $(nodeVersion)
-
   - task: UseDotNet@2
     displayName: Use .NET SDK from global.json
     inputs:
       useGlobalJson: true
 
-  - pwsh: |
-      "UMBRACO_USER_LOGIN=${{ parameters.PlaywrightUserEmail }}
-      UMBRACO_USER_PASSWORD=${{ parameters.PlaywrightPassword }}
-      URL=${{ parameters.ASPNETCORE_URLS }}
-      STORAGE_STAGE_PATH=$(Build.SourcesDirectory)/tests/Umbraco.Tests.AcceptanceTest/playwright/.auth/user.json
-      CONSOLE_ERRORS_PATH=$(Build.SourcesDirectory)/tests/Umbraco.Tests.AcceptanceTest/console-errors.json" | Out-File .env
-    displayName: Generate .env
-    workingDirectory: $(Build.SourcesDirectory)/tests/Umbraco.Tests.AcceptanceTest
-
-  # Cache and restore NPM packages
-  - task: Cache@2
-    displayName: Cache NPM packages
-    inputs:
-      key: 'npm_e2e | "$(Agent.OS)" | $(Build.SourcesDirectory)/tests/Umbraco.Tests.AcceptanceTest/package-lock.json'
-      restoreKeys: |
-        npm_e2e | "$(Agent.OS)"
-        npm_e2e
-      path: ${{ parameters.npm_config_cache }}
-
-  - script: npm ci --no-fund --no-audit --prefer-offline
-    workingDirectory: $(Build.SourcesDirectory)/tests/Umbraco.Tests.AcceptanceTest
-    displayName: Restore NPM packages
+  - template: templates/e2e-install.yml
+    parameters:
+      nodeVersion: ${{ parameters.nodeVersion }}
+      npm_config_cache: ${{ parameters.npm_config_cache }}
+      PlaywrightUserEmail: ${{ parameters.PlaywrightUserEmail }}
+      PlaywrightPassword: ${{ parameters.PlaywrightPassword }}
+      ASPNETCORE_URLS: ${{ parameters.ASPNETCORE_URLS }}
 
   # Install Template
   - pwsh: |
diff --git a/build/templates/dependency-track.yml b/build/templates/dependency-track.yml
new file mode 100644
index 000000000000..74968b46161c
--- /dev/null
+++ b/build/templates/dependency-track.yml
@@ -0,0 +1,56 @@
+parameters:
+  - name: projectName
+    type: string
+  - name: umbracoVersion
+    type: string
+  - name: projects
+    type: object
+
+jobs:
+- job: Create_DT_Project
+  displayName: Create Dependency Track Project
+  steps:
+    - checkout: none
+
+    - bash: |
+        project_id=$(curl --no-progress-meter -H "X-Api-Key: $(DT_API_KEY)" "$(DT_API_URL)/v1/project/lookup?name=${{ parameters.projectName }}&version=${{ parameters.umbracoVersion }}" | jq -r '.uuid')
+        if [ "$project_id" != "null" ] && [ -n "$project_id" ]; then
+          echo "Project '${{ parameters.projectName }}' with version '${{ parameters.umbracoVersion }}' already exists (ID: $project_id)."
+        else
+          project_id=$(curl --no-progress-meter \
+            -X PUT "$(DT_API_URL)/v1/project" \
+            -H "X-Api-Key: $(DT_API_KEY)" \
+            -H "Content-Type: application/json" \
+            -d '{"name": "${{ parameters.projectName }}", "version": "${{ parameters.umbracoVersion }}", "collectionLogic": "AGGREGATE_DIRECT_CHILDREN"}' \
+            | jq -r '.uuid')
+          if [ -z "$project_id" ] || [ "$project_id" == "null" ]; then
+            echo "Failed to create project '${{ parameters.projectName }}' version '${{ parameters.umbracoVersion }}'."
+            exit 1
+          fi
+          echo "Created project '${{ parameters.projectName }}' with version '${{ parameters.umbracoVersion }}' (ID: $project_id)."
+        fi
+      displayName: Ensure main project exists in Dependency Track
+
+- ${{ each project in parameters.projects }}:
+  - job:
+    displayName: Upload ${{ project.name }} BOM
+    dependsOn: Create_DT_Project
+    steps:
+      - checkout: none
+
+      - download: current
+        artifact: ${{ project.artifact }}
+        displayName: Download ${{ project.artifact }} artifact
+
+      - script: |
+          curl --no-progress-meter --fail-with-body \
+            -X POST "$(DT_API_URL)/v1/bom" \
+            -H "X-Api-Key: $(DT_API_KEY)" \
+            -H "Content-Type: multipart/form-data" \
+            -F "autoCreate=true" \
+            -F "projectName=${{ parameters.projectName }}-${{ project.name }}" \
+            -F "projectVersion=${{ parameters.umbracoVersion }}" \
+            -F "parentName=${{ parameters.projectName }}" \
+            -F "parentVersion=${{ parameters.umbracoVersion }}" \
+            -F "bom=@$(Pipeline.Workspace)/${{ project.artifact }}/${{ project.bomFilePath }}"
+        displayName: Upload ${{ project.name }} BOM to Dependency Track
diff --git a/build/templates/e2e-install.yml b/build/templates/e2e-install.yml
new file mode 100644
index 000000000000..3c2909f3fba9
--- /dev/null
+++ b/build/templates/e2e-install.yml
@@ -0,0 +1,49 @@
+parameters:
+  - name: nodeVersion
+    type: string
+    default: ''
+
+  - name: npm_config_cache
+    type: string
+    default: ''
+
+  - name: PlaywrightUserEmail
+    type: string
+    default: ''
+
+  - name: PlaywrightPassword
+    type: string
+    default: ''
+
+  - name: ASPNETCORE_URLS
+    type: string
+    default: ''
+
+steps:
+  - task: NodeTool@0
+    displayName: Use Node.js $(nodeVersion)
+    inputs:
+      versionSpec: $(nodeVersion)
+
+  - pwsh: |
+      "UMBRACO_USER_LOGIN=${{ parameters.PlaywrightUserEmail }}
+      UMBRACO_USER_PASSWORD=${{ parameters.PlaywrightPassword }}
+      URL=${{ parameters.ASPNETCORE_URLS }}
+      STORAGE_STAGE_PATH=$(Build.SourcesDirectory)/tests/Umbraco.Tests.AcceptanceTest/playwright/.auth/user.json
+      CONSOLE_ERRORS_PATH=$(Build.SourcesDirectory)/tests/Umbraco.Tests.AcceptanceTest/console-errors.json" | Out-File .env
+    displayName: Generate .env
+    workingDirectory: $(Build.SourcesDirectory)/tests/Umbraco.Tests.AcceptanceTest
+
+  # Cache and restore NPM packages
+  - task: Cache@2
+    displayName: Cache NPM packages
+    inputs:
+      key: 'npm_e2e | "$(Agent.OS)" | $(Build.SourcesDirectory)/tests/Umbraco.Tests.AcceptanceTest/package-lock.json'
+      restoreKeys: |
+        npm_e2e | "$(Agent.OS)"
+        npm_e2e
+      path: ${{ parameters.npm_config_cache }}
+
+  - script: npm ci --no-fund --no-audit --prefer-offline
+    workingDirectory: $(Build.SourcesDirectory)/tests/Umbraco.Tests.AcceptanceTest
+    displayName: Restore NPM packages

From b4220a4d80ec93ab720bac729c8267df377b8d56 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= <nsl@umbraco.dk>
Date: Fri, 31 Oct 2025 10:52:10 +0100
Subject: [PATCH 101/155] Collection children: A slim navigation of collection
 children + higher take above target (#20641)

* enforce update of children when collection

* only load one above and below collection children

* take 50 above a target for default experience

* revert reset target

* remove old impl
---
 .../core/tree/tree-item/tree-item-children.manager.ts     | 8 +++++++-
 .../core/tree/tree-item/tree-item-expansion.manager.ts    | 6 ------
 .../tree/tree-item/document-tree-item.context.ts          | 2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/tree/tree-item/tree-item-children.manager.ts b/src/Umbraco.Web.UI.Client/src/packages/core/tree/tree-item/tree-item-children.manager.ts
index 164abc3c0729..381dadae9bd7 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/tree/tree-item/tree-item-children.manager.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/tree/tree-item/tree-item-children.manager.ts
@@ -188,6 +188,12 @@ export class UmbTreeItemChildrenManager<
 	 * @memberof UmbTreeItemChildrenManager
 	 */
 	public async loadChildren(): Promise<void> {
+		const target = this.targetPagination.getBaseTarget();
+		/* If a new target is set we only want to reload children if the new target isn’t among the already loaded items. */
+		if (target && this.isChildLoaded(target)) {
+			return;
+		}
+
 		return this.#loadChildren();
 	}
 
@@ -244,7 +250,7 @@ export class UmbTreeItemChildrenManager<
 							? this.targetPagination.getNumberOfCurrentItemsBeforeBaseTarget()
 							: this.#takeBeforeTarget !== undefined
 								? this.#takeBeforeTarget
-								: 5,
+								: this.targetPagination.getTakeSize(),
 						takeAfter: reload
 							? this.targetPagination.getNumberOfCurrentItemsAfterBaseTarget()
 							: this.#takeAfterTarget !== undefined
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/tree/tree-item/tree-item-expansion.manager.ts b/src/Umbraco.Web.UI.Client/src/packages/core/tree/tree-item/tree-item-expansion.manager.ts
index ce620ec08f2f..4c09f3632554 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/tree/tree-item/tree-item-expansion.manager.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/tree/tree-item/tree-item-expansion.manager.ts
@@ -94,12 +94,6 @@ export class UmbTreeItemTargetExpansionManager<
 					return;
 				}
 
-				/* If a new target is set we only want to reload children if the new target isn’t among the already loaded items. */
-				const targetIsLoaded = this.#childrenManager.isChildLoaded(target);
-				if (target && targetIsLoaded) {
-					return;
-				}
-
 				// If we already have children and the target didn't change then we don't have to load new children
 				const isNewTarget = target !== currentBaseTarget;
 				if (isExpanded && this.#childrenManager.hasLoadedChildren() && !isNewTarget) {
diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/tree/tree-item/document-tree-item.context.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/tree/tree-item/document-tree-item.context.ts
index 29cbc3d63bf3..2c788681338b 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/tree/tree-item/document-tree-item.context.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/tree/tree-item/document-tree-item.context.ts
@@ -40,7 +40,7 @@ export class UmbDocumentTreeItemContext extends UmbDefaultTreeItemContext<
 				this.hasCollection,
 				(hasCollection) => {
 					if (hasCollection) {
-						this._treeItemChildrenManager.setTargetTakeSize(2, 2);
+						this._treeItemChildrenManager.setTargetTakeSize(1, 1);
 
 						this.observe(
 							this.hasActiveDescendant,

From 5e87dead442da420afc5cf813dd351e2dca479e8 Mon Sep 17 00:00:00 2001
From: Laura Neto <12862535+lauraneto@users.noreply.github.com>
Date: Fri, 31 Oct 2025 10:53:57 +0100
Subject: [PATCH 102/155] Task: Dependency track (#20670)

* Generate BOM files on build

* Upload BOM to Dependency Track

* Move Backoffice BOM generation to right after install

The build and/or pack steps are deleting files that are needed for the BOM to be generated properly.

* Split the BOM uploads into different jobs

* Fix wrong usage of parameters

* Move order of dependency track stage

* Fix wrong umbracoVersion value

* Small fixes

* Log curl response headers

* Correct version sent to dependency track

* Adjusted curl flags

* Fix bom file path

* Fix dotnet bom file name

* Add Login UI to dependency track

* Generate BOM for E2E Tests

* Move dependency track stage

* Move acceptance test .env generation to e2e install template

Needed as the post install script is expecting this to exist.

* Use major version if public release

* Missing ')'

* Reverted npm install command changes in static assets project
---
 build/azure-pipelines.yml            | 81 ++++++++++++++++++++++++++++
 build/nightly-E2E-setup-template.yml | 34 +++---------
 build/templates/dependency-track.yml | 56 +++++++++++++++++++
 build/templates/e2e-install.yml      | 49 +++++++++++++++++
 4 files changed, 193 insertions(+), 27 deletions(-)
 create mode 100644 build/templates/dependency-track.yml
 create mode 100644 build/templates/e2e-install.yml

diff --git a/build/azure-pipelines.yml b/build/azure-pipelines.yml
index b53a2d0ad2b9..8b97f87ee5c7 100644
--- a/build/azure-pipelines.yml
+++ b/build/azure-pipelines.yml
@@ -34,6 +34,10 @@ parameters:
     displayName: Upload API docs
     type: boolean
     default: false
+  - name: uploadDependencyTrack
+    displayName: Upload BOMs to Dependency Track
+    type: boolean
+    default: false
   - name: forceReleaseTestFilter
     displayName: Force to use the release test filters
     type: boolean
@@ -103,6 +107,15 @@ stages:
               command: build
               projects: $(solution)
               arguments: "--configuration $(buildConfiguration) --no-restore --property:ContinuousIntegrationBuild=true --property:GeneratePackageOnBuild=true --property:PackageOutputPath=$(Build.ArtifactStagingDirectory)/nupkg"
+          - powershell: |
+              dotnet tool install --global CycloneDX
+              dotnet-CycloneDX $(solution) --output $(Build.ArtifactStagingDirectory)/bom --filename bom-dotnet.xml
+            displayName: 'Generate Backend BOM'
+          - powershell: |
+              npm install --global @cyclonedx/cyclonedx-npm
+              cyclonedx-npm -o $(Build.ArtifactStagingDirectory)\bom\bom-login.xml --ignore-npm-errors --verbose
+            displayName: Generate Login UI BOM
+            workingDirectory: src/Umbraco.Web.UI.Login
           - task: PublishPipelineArtifact@1
             displayName: Publish nupkg
             inputs:
@@ -113,6 +126,11 @@ stages:
             inputs:
               targetPath: $(Build.SourcesDirectory)
               artifactName: build_output
+          - task: PublishPipelineArtifact@1
+            displayName: Publish Backend BOM
+            inputs:
+              targetPath: $(Build.ArtifactStagingDirectory)/bom
+              artifactName: bom-backend
 
       - job: B
         displayName: Build Bellissima Package
@@ -124,6 +142,11 @@ stages:
             lfs: false,
             fetchDepth: 500
           - template: templates/backoffice-install.yml
+          - powershell: |
+              npm install --global @cyclonedx/cyclonedx-npm
+              cyclonedx-npm -o $(Build.ArtifactStagingDirectory)/bom/bom-backoffice.xml --ignore-npm-errors --verbose
+            displayName: Generate Backoffice UI BOM
+            workingDirectory: src/Umbraco.Web.UI.Client
           - script: npm run build:for:npm
             displayName: Run build:for:npm
             workingDirectory: src/Umbraco.Web.UI.Client
@@ -140,6 +163,35 @@ stages:
             inputs:
               targetPath: $(Build.ArtifactStagingDirectory)/npm
               artifactName: npm
+          - publish: $(Build.ArtifactStagingDirectory)/bom
+            artifact: bom-frontend
+            displayName: 'Publish Frontend BOM'
+
+  - stage: E2E_BOM
+    displayName: E2E Tests BOM Generation
+    dependsOn: []
+    jobs:
+    - job:
+      displayName: E2E Generate BOM
+      pool:
+        vmImage: "ubuntu-latest"
+      steps:
+        - checkout: self
+          submodules: false
+          lfs: false,
+          fetchDepth: 500
+        - template: templates/e2e-install.yml
+          parameters:
+            nodeVersion: ${{ variables.nodeVersion }}
+            npm_config_cache: ${{ variables.npm_config_cache }}
+        - powershell: |
+            npm install --global @cyclonedx/cyclonedx-npm
+            cyclonedx-npm -o $(Build.ArtifactStagingDirectory)/bom/bom-e2e.xml --ignore-npm-errors --verbose
+          displayName: Generate E2E Tests BOM
+          workingDirectory: tests/Umbraco.Tests.AcceptanceTest
+        - publish: $(Build.ArtifactStagingDirectory)/bom
+          artifact: bom-e2e
+          displayName: 'Publish E2E BOM'
 
   - stage: Build_Docs
     condition: and(succeeded(), or(eq(dependencies.Build.outputs['A.build.NBGV_PublicRelease'], 'True'), ${{parameters.buildApiDocs}}))
@@ -668,6 +720,34 @@ stages:
               ASPNETCORE_URLS: ${{ variables.ASPNETCORE_URLS }}
               DatabaseType: ${{ variables.DatabaseType }}
 
+  - stage: Dependency_Track
+    displayName: Dependency Track
+    dependsOn:
+      - Build
+      - E2E_BOM
+    condition: and(succeeded(), or(eq(dependencies.Build.outputs['A.build.NBGV_PublicRelease'], 'True'), ${{parameters.uploadDependencyTrack}}))
+    variables:
+      # Determine Umbraco version based on whether it's a public release or not. If public release, use major version, else use full NuGet package version.
+      umbracoVersion: $[ iif(eq(stageDependencies.Build.A.outputs['build.NBGV_PublicRelease'], 'True'), stageDependencies.Build.A.outputs['build.NBGV_VersionMajor'], stageDependencies.Build.A.outputs['build.NBGV_NuGetPackageVersion']) ]
+    jobs:
+      - template: templates/dependency-track.yml
+        parameters:
+          projectName: "Umbraco-CMS"
+          umbracoVersion: $(umbracoVersion)
+          projects:
+            - name: "Backend"
+              artifact: "bom-backend"
+              bomFilePath: "bom-dotnet.xml"
+            - name: "Login"
+              artifact: "bom-backend"
+              bomFilePath: "bom-login.xml"
+            - name: "Backoffice"
+              artifact: "bom-frontend"
+              bomFilePath: "bom-backoffice.xml"
+            - name: "E2E"
+              artifact: "bom-e2e"
+              bomFilePath: "bom-e2e.xml"
+
   ###############################################
   ## Release
   ###############################################
@@ -874,3 +954,4 @@ stages:
               ContainerName: "$web"
               BlobPrefix: v$(umbracoMajorVersion)/ui-api
               CleanTargetBeforeCopy: true
+
diff --git a/build/nightly-E2E-setup-template.yml b/build/nightly-E2E-setup-template.yml
index 8085561900a5..907ace6b726f 100644
--- a/build/nightly-E2E-setup-template.yml
+++ b/build/nightly-E2E-setup-template.yml
@@ -26,38 +26,18 @@ steps:
       artifact: nupkg
       path: $(Agent.BuildDirectory)/app/nupkg
 
-  - task: NodeTool@0
-    displayName: Use Node.js $(nodeVersion)
-    inputs:
-      versionSpec: $(nodeVersion)
-
   - task: UseDotNet@2
     displayName: Use .NET SDK from global.json
     inputs:
       useGlobalJson: true
 
-  - pwsh: |
-      "UMBRACO_USER_LOGIN=${{ parameters.PlaywrightUserEmail }}
-      UMBRACO_USER_PASSWORD=${{ parameters.PlaywrightPassword }}
-      URL=${{ parameters.ASPNETCORE_URLS }}
-      STORAGE_STAGE_PATH=$(Build.SourcesDirectory)/tests/Umbraco.Tests.AcceptanceTest/playwright/.auth/user.json
-      CONSOLE_ERRORS_PATH=$(Build.SourcesDirectory)/tests/Umbraco.Tests.AcceptanceTest/console-errors.json" | Out-File .env
-    displayName: Generate .env
-    workingDirectory: $(Build.SourcesDirectory)/tests/Umbraco.Tests.AcceptanceTest
-
-  # Cache and restore NPM packages
-  - task: Cache@2
-    displayName: Cache NPM packages
-    inputs:
-      key: 'npm_e2e | "$(Agent.OS)" | $(Build.SourcesDirectory)/tests/Umbraco.Tests.AcceptanceTest/package-lock.json'
-      restoreKeys: |
-        npm_e2e | "$(Agent.OS)"
-        npm_e2e
-      path: ${{ parameters.npm_config_cache }}
-
-  - script: npm ci --no-fund --no-audit --prefer-offline
-    workingDirectory: $(Build.SourcesDirectory)/tests/Umbraco.Tests.AcceptanceTest
-    displayName: Restore NPM packages
+  - template: templates/e2e-install.yml
+    parameters:
+      nodeVersion: ${{ parameters.nodeVersion }}
+      npm_config_cache: ${{ parameters.npm_config_cache }}
+      PlaywrightUserEmail: ${{ parameters.PlaywrightUserEmail }}
+      PlaywrightPassword: ${{ parameters.PlaywrightPassword }}
+      ASPNETCORE_URLS: ${{ parameters.ASPNETCORE_URLS }}
 
   # Install Template
   - pwsh: |
diff --git a/build/templates/dependency-track.yml b/build/templates/dependency-track.yml
new file mode 100644
index 000000000000..74968b46161c
--- /dev/null
+++ b/build/templates/dependency-track.yml
@@ -0,0 +1,56 @@
+parameters:
+  - name: projectName
+    type: string
+  - name: umbracoVersion
+    type: string
+  - name: projects
+    type: object
+
+jobs:
+- job: Create_DT_Project
+  displayName: Create Dependency Track Project
+  steps:
+    - checkout: none
+
+    - bash: |
+        project_id=$(curl --no-progress-meter -H "X-Api-Key: $(DT_API_KEY)" "$(DT_API_URL)/v1/project/lookup?name=${{ parameters.projectName }}&version=${{ parameters.umbracoVersion }}" | jq -r '.uuid')
+        if [ "$project_id" != "null" ] && [ -n "$project_id" ]; then
+          echo "Project '${{ parameters.projectName }}' with version '${{ parameters.umbracoVersion }}' already exists (ID: $project_id)."
+        else
+          project_id=$(curl --no-progress-meter \
+            -X PUT "$(DT_API_URL)/v1/project" \
+            -H "X-Api-Key: $(DT_API_KEY)" \
+            -H "Content-Type: application/json" \
+            -d '{"name": "${{ parameters.projectName }}", "version": "${{ parameters.umbracoVersion }}", "collectionLogic": "AGGREGATE_DIRECT_CHILDREN"}' \
+            | jq -r '.uuid')
+          if [ -z "$project_id" ] || [ "$project_id" == "null" ]; then
+            echo "Failed to create project '${{ parameters.projectName }}' version '${{ parameters.umbracoVersion }}'."
+            exit 1
+          fi
+          echo "Created project '${{ parameters.projectName }}' with version '${{ parameters.umbracoVersion }}' (ID: $project_id)."
+        fi
+      displayName: Ensure main project exists in Dependency Track
+
+- ${{ each project in parameters.projects }}:
+  - job:
+    displayName: Upload ${{ project.name }} BOM
+    dependsOn: Create_DT_Project
+    steps:
+      - checkout: none
+
+      - download: current
+        artifact: ${{ project.artifact }}
+        displayName: Download ${{ project.artifact }} artifact
+
+      - script: |
+          curl --no-progress-meter --fail-with-body \
+            -X POST "$(DT_API_URL)/v1/bom" \
+            -H "X-Api-Key: $(DT_API_KEY)" \
+            -H "Content-Type: multipart/form-data" \
+            -F "autoCreate=true" \
+            -F "projectName=${{ parameters.projectName }}-${{ project.name }}" \
+            -F "projectVersion=${{ parameters.umbracoVersion }}" \
+            -F "parentName=${{ parameters.projectName }}" \
+            -F "parentVersion=${{ parameters.umbracoVersion }}" \
+            -F "bom=@$(Pipeline.Workspace)/${{ project.artifact }}/${{ project.bomFilePath }}"
+        displayName: Upload ${{ project.name }} BOM to Dependency Track
diff --git a/build/templates/e2e-install.yml b/build/templates/e2e-install.yml
new file mode 100644
index 000000000000..3c2909f3fba9
--- /dev/null
+++ b/build/templates/e2e-install.yml
@@ -0,0 +1,49 @@
+parameters:
+  - name: nodeVersion
+    type: string
+    default: ''
+
+  - name: npm_config_cache
+    type: string
+    default: ''
+
+  - name: PlaywrightUserEmail
+    type: string
+    default: ''
+
+  - name: PlaywrightPassword
+    type: string
+    default: ''
+
+  - name: ASPNETCORE_URLS
+    type: string
+    default: ''
+
+steps:
+  - task: NodeTool@0
+    displayName: Use Node.js $(nodeVersion)
+    inputs:
+      versionSpec: $(nodeVersion)
+
+  - pwsh: |
+      "UMBRACO_USER_LOGIN=${{ parameters.PlaywrightUserEmail }}
+      UMBRACO_USER_PASSWORD=${{ parameters.PlaywrightPassword }}
+      URL=${{ parameters.ASPNETCORE_URLS }}
+      STORAGE_STAGE_PATH=$(Build.SourcesDirectory)/tests/Umbraco.Tests.AcceptanceTest/playwright/.auth/user.json
+      CONSOLE_ERRORS_PATH=$(Build.SourcesDirectory)/tests/Umbraco.Tests.AcceptanceTest/console-errors.json" | Out-File .env
+    displayName: Generate .env
+    workingDirectory: $(Build.SourcesDirectory)/tests/Umbraco.Tests.AcceptanceTest
+
+  # Cache and restore NPM packages
+  - task: Cache@2
+    displayName: Cache NPM packages
+    inputs:
+      key: 'npm_e2e | "$(Agent.OS)" | $(Build.SourcesDirectory)/tests/Umbraco.Tests.AcceptanceTest/package-lock.json'
+      restoreKeys: |
+        npm_e2e | "$(Agent.OS)"
+        npm_e2e
+      path: ${{ parameters.npm_config_cache }}
+
+  - script: npm ci --no-fund --no-audit --prefer-offline
+    workingDirectory: $(Build.SourcesDirectory)/tests/Umbraco.Tests.AcceptanceTest
+    displayName: Restore NPM packages

From 96ecef0a9267b3de564ad027a984e2e731ee4493 Mon Sep 17 00:00:00 2001
From: Andy Butland <abutland73@gmail.com>
Date: Fri, 31 Oct 2025 10:49:26 +0100
Subject: [PATCH 103/155] Performance: Request cache referenced entities when
 saving documents with block editors (#20590)

* Added request cache to content and media lookups in mult URL picker.

* Allow property editors to cache referenced entities from block data.

* Update src/Umbraco.Infrastructure/PropertyEditors/MultiUrlPickerValueEditor.cs

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

* Add obsoletions.

* Minor spellcheck

* Ensure request cache is available before relying on it.

---------

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
Co-authored-by: kjac <kja@umbraco.dk>
---
 .../PropertyEditors/DataValueEditor.cs        | 156 ++++++++++++++++++
 .../ICacheReferencedEntities.cs               |  19 +++
 .../BlockEditorPropertyValueEditor.cs         |   2 +
 .../BlockValuePropertyValueEditorBase.cs      |  39 +++++
 .../MediaPicker3PropertyEditor.cs             |  85 ++++++----
 .../MultiUrlPickerValueEditor.cs              | 104 +++++++++++-
 ...ultiUrlPickerValueEditorValidationTests.cs |   4 +-
 7 files changed, 368 insertions(+), 41 deletions(-)
 create mode 100644 src/Umbraco.Core/PropertyEditors/ICacheReferencedEntities.cs

diff --git a/src/Umbraco.Core/PropertyEditors/DataValueEditor.cs b/src/Umbraco.Core/PropertyEditors/DataValueEditor.cs
index 211d36f65f7a..1c32dc3de6eb 100644
--- a/src/Umbraco.Core/PropertyEditors/DataValueEditor.cs
+++ b/src/Umbraco.Core/PropertyEditors/DataValueEditor.cs
@@ -3,12 +3,14 @@
 using System.Runtime.Serialization;
 using System.Xml.Linq;
 using Microsoft.Extensions.Logging;
+using Umbraco.Cms.Core.Cache;
 using Umbraco.Cms.Core.IO;
 using Umbraco.Cms.Core.Models;
 using Umbraco.Cms.Core.Models.Editors;
 using Umbraco.Cms.Core.Models.Validation;
 using Umbraco.Cms.Core.PropertyEditors.Validators;
 using Umbraco.Cms.Core.Serialization;
+using Umbraco.Cms.Core.Services;
 using Umbraco.Cms.Core.Strings;
 using Umbraco.Extensions;
 
@@ -20,6 +22,9 @@ namespace Umbraco.Cms.Core.PropertyEditors;
 [DataContract]
 public class DataValueEditor : IDataValueEditor
 {
+    private const string ContentCacheKeyFormat = nameof(DataValueEditor) + "_Content_{0}";
+    private const string MediaCacheKeyFormat = nameof(DataValueEditor) + "_Media_{0}";
+
     private readonly IJsonSerializer? _jsonSerializer;
     private readonly IShortStringHelper _shortStringHelper;
 
@@ -415,4 +420,155 @@ public virtual string ConvertDbToString(IPropertyType propertyType, object? valu
 
         return value.TryConvertTo(valueType);
     }
+
+    /// <summary>
+    /// Retrieves a <see cref="IContent"/> instance by its unique identifier, using the provided request cache to avoid redundant
+    /// lookups within the same request.
+    /// </summary>
+    /// <remarks>
+    /// This method caches content lookups for the duration of the current request to improve performance when the same content
+    /// item may be accessed multiple times. This is particularly useful in scenarios involving multiple languages or blocks.
+    /// </remarks>
+    /// <param name="key">The unique identifier of the content item to retrieve.</param>
+    /// <param name="requestCache">The request-scoped cache used to store and retrieve content items for the duration of the current request.</param>
+    /// <param name="contentService">The content service used to fetch the content item if it is not found in the cache.</param>
+    /// <returns>The <see cref="IContent"/> instance corresponding to the specified key, or null if no such content item exists.</returns>
+    [Obsolete("This method is available for support of request caching retrieved entities in derived property value editors. " +
+          "The intention is to supersede this with lazy loaded read locks, which will make this unnecessary. " +
+          "Scheduled for removal in Umbraco 19.")]
+    protected static IContent? GetAndCacheContentById(Guid key, IRequestCache requestCache, IContentService contentService)
+    {
+        if (requestCache.IsAvailable is false)
+        {
+            return contentService.GetById(key);
+        }
+
+        var cacheKey = string.Format(ContentCacheKeyFormat, key);
+        IContent? content = requestCache.GetCacheItem<IContent?>(cacheKey);
+        if (content is null)
+        {
+            content = contentService.GetById(key);
+            if (content is not null)
+            {
+                requestCache.Set(cacheKey, content);
+            }
+        }
+
+        return content;
+    }
+
+    /// <summary>
+    /// Adds the specified <see cref="IContent"/> item to the request cache using its unique key.
+    /// </summary>
+    /// <param name="content">The content item to cache.</param>
+    /// <param name="requestCache">The request cache in which to store the content item.</param>
+    [Obsolete("This method is available for support of request caching retrieved entities in derived property value editors. " +
+          "The intention is to supersede this with lazy loaded read locks, which will make this unnecessary. " +
+          "Scheduled for removal in Umbraco 19.")]
+    protected static void CacheContentById(IContent content, IRequestCache requestCache)
+    {
+        if (requestCache.IsAvailable is false)
+        {
+            return;
+        }
+
+        var cacheKey = string.Format(ContentCacheKeyFormat, content.Key);
+        requestCache.Set(cacheKey, content);
+    }
+
+    /// <summary>
+    /// Retrieves a <see cref="IMedia"/> instance by its unique identifier, using the provided request cache to avoid redundant
+    /// lookups within the same request.
+    /// </summary>
+    /// <remarks>
+    /// This method caches media lookups for the duration of the current request to improve performance when the same media
+    /// item may be accessed multiple times. This is particularly useful in scenarios involving multiple languages or blocks.
+    /// </remarks>
+    /// <param name="key">The unique identifier of the media item to retrieve.</param>
+    /// <param name="requestCache">The request-scoped cache used to store and retrieve media items for the duration of the current request.</param>
+    /// <param name="mediaService">The media service used to fetch the media item if it is not found in the cache.</param>
+    /// <returns>The <see cref="IMedia"/> instance corresponding to the specified key, or null if no such media item exists.</returns>
+    [Obsolete("This method is available for support of request caching retrieved entities in derived property value editors. " +
+          "The intention is to supersede this with lazy loaded read locks, which will make this unnecessary. " +
+          "Scheduled for removal in Umbraco 19.")]
+    protected static IMedia? GetAndCacheMediaById(Guid key, IRequestCache requestCache, IMediaService mediaService)
+    {
+        if (requestCache.IsAvailable is false)
+        {
+            return mediaService.GetById(key);
+        }
+
+        var cacheKey = string.Format(MediaCacheKeyFormat, key);
+        IMedia? media = requestCache.GetCacheItem<IMedia?>(cacheKey);
+
+        if (media is null)
+        {
+            media = mediaService.GetById(key);
+            if (media is not null)
+            {
+                requestCache.Set(cacheKey, media);
+            }
+        }
+
+        return media;
+    }
+
+    /// <summary>
+    /// Adds the specified <see cref="IMedia"/> item to the request cache using its unique key.
+    /// </summary>
+    /// <param name="media">The media item to cache.</param>
+    /// <param name="requestCache">The request cache in which to store the media item.</param>
+    [Obsolete("This method is available for support of request caching retrieved entities in derived property value editors. " +
+          "The intention is to supersede this with lazy loaded read locks, which will make this unnecessary. " +
+          "Scheduled for removal in Umbraco 19.")]
+    protected static void CacheMediaById(IMedia media, IRequestCache requestCache)
+    {
+        if (requestCache.IsAvailable is false)
+        {
+            return;
+        }
+
+        var cacheKey = string.Format(MediaCacheKeyFormat, media.Key);
+        requestCache.Set(cacheKey, media);
+    }
+
+    /// <summary>
+    /// Determines whether the content item identified by the specified key is present in the request cache.
+    /// </summary>
+    /// <param name="key">The unique identifier for the content item to check for in the cache.</param>
+    /// <param name="requestCache">The request cache in which to look for the content item.</param>
+    /// <returns>true if the content item is already cached in the request cache; otherwise, false.</returns>
+    [Obsolete("This method is available for support of request caching retrieved entities in derived property value editors. " +
+          "The intention is to supersede this with lazy loaded read locks, which will make this unnecessary. " +
+          "Scheduled for removal in Umbraco 19.")]
+    protected static bool IsContentAlreadyCached(Guid key, IRequestCache requestCache)
+    {
+        if (requestCache.IsAvailable is false)
+        {
+            return false;
+        }
+
+        var cacheKey = string.Format(ContentCacheKeyFormat, key);
+        return requestCache.GetCacheItem<IContent?>(cacheKey) is not null;
+    }
+
+    /// <summary>
+    /// Determines whether the media item identified by the specified key is present in the request cache.
+    /// </summary>
+    /// <param name="key">The unique identifier for the media item to check for in the cache.</param>
+    /// <param name="requestCache">The request cache in which to look for the media item.</param>
+    /// <returns>true if the media item is already cached in the request cache; otherwise, false.</returns>
+    [Obsolete("This method is available for support of request caching retrieved entities in derived property value editors. " +
+              "The intention is to supersede this with lazy loaded read locks, which will make this unnecessary. " +
+              "Scheduled for removal in Umbraco 19.")]
+    protected static bool IsMediaAlreadyCached(Guid key, IRequestCache requestCache)
+    {
+        if (requestCache.IsAvailable is false)
+        {
+            return false;
+        }
+
+        var cacheKey = string.Format(MediaCacheKeyFormat, key);
+        return requestCache.GetCacheItem<IMedia?>(cacheKey) is not null;
+    }
 }
diff --git a/src/Umbraco.Core/PropertyEditors/ICacheReferencedEntities.cs b/src/Umbraco.Core/PropertyEditors/ICacheReferencedEntities.cs
new file mode 100644
index 000000000000..cf655a91678b
--- /dev/null
+++ b/src/Umbraco.Core/PropertyEditors/ICacheReferencedEntities.cs
@@ -0,0 +1,19 @@
+namespace Umbraco.Cms.Core.PropertyEditors;
+
+/// <summary>
+/// Optionally implemented by property editors, this defines a contract for caching entities that are referenced in block values.
+/// </summary>
+[Obsolete("This interface is available for support of request caching retrieved entities in property value editors that implement it. " +
+          "The intention is to supersede this with lazy loaded read locks, which will make this unnecessary. " +
+          "Scheduled for removal in Umbraco 19.")]
+public interface ICacheReferencedEntities
+{
+    /// <summary>
+    /// Caches the entities referenced by the provided block data values.
+    /// </summary>
+    /// <param name="values">An enumerable collection of block values that may contain the entities to be cached.</param>
+    [Obsolete("This method is available for support of request caching retrieved entities in derived property value editors. " +
+              "The intention is to supersede this with lazy loaded read locks, which will make this unnecessary. " +
+              "Scheduled for removal in Umbraco 19.")]
+    void CacheReferencedEntities(IEnumerable<object> values);
+}
diff --git a/src/Umbraco.Infrastructure/PropertyEditors/BlockEditorPropertyValueEditor.cs b/src/Umbraco.Infrastructure/PropertyEditors/BlockEditorPropertyValueEditor.cs
index 84299d63992a..d328e2a2e68a 100644
--- a/src/Umbraco.Infrastructure/PropertyEditors/BlockEditorPropertyValueEditor.cs
+++ b/src/Umbraco.Infrastructure/PropertyEditors/BlockEditorPropertyValueEditor.cs
@@ -135,6 +135,8 @@ public override object ToEditor(IProperty property, string? culture = null, stri
         BlockEditorData<TValue, TLayout>? currentBlockEditorData = SafeParseBlockEditorData(currentValue);
         BlockEditorData<TValue, TLayout>? blockEditorData = SafeParseBlockEditorData(editorValue.Value);
 
+        CacheReferencedEntities(blockEditorData);
+
         // We can skip MapBlockValueFromEditor if both editorValue and currentValue values are empty.
         if (IsBlockEditorDataEmpty(currentBlockEditorData) && IsBlockEditorDataEmpty(blockEditorData))
         {
diff --git a/src/Umbraco.Infrastructure/PropertyEditors/BlockValuePropertyValueEditorBase.cs b/src/Umbraco.Infrastructure/PropertyEditors/BlockValuePropertyValueEditorBase.cs
index 18578d495f8c..6d6465a447d5 100644
--- a/src/Umbraco.Infrastructure/PropertyEditors/BlockValuePropertyValueEditorBase.cs
+++ b/src/Umbraco.Infrastructure/PropertyEditors/BlockValuePropertyValueEditorBase.cs
@@ -43,6 +43,45 @@ protected BlockValuePropertyValueEditorBase(
         _languageService = languageService;
     }
 
+    /// <summary>
+    /// Caches referenced entities for all property values with supporting property editors within the specified block editor data
+    /// optimising subsequent retrieval of entities when parsing and converting property values.
+    /// </summary>
+    /// <remarks>
+    /// This method iterates through all property values associated with data editors in the provided
+    /// block editor data and invokes caching for referenced entities where supported by the property editor.
+    /// </remarks>
+    /// <param name="blockEditorData">The block editor data containing content and settings property values to analyze for referenced entities.</param>
+    [Obsolete("This method is available for support of request caching retrieved entities in derived property value editors. " +
+              "The intention is to supersede this with lazy loaded read locks, which will make this unnecessary. " +
+              "Scheduled for removal in Umbraco 19.")]
+    protected void CacheReferencedEntities(BlockEditorData<TValue, TLayout>? blockEditorData)
+    {
+        // Group property values by their associated data editor alias.
+        IEnumerable<IGrouping<string, BlockPropertyValue>> valuesByDataEditors = (blockEditorData?.BlockValue.ContentData ?? []).Union(blockEditorData?.BlockValue.SettingsData ?? [])
+            .SelectMany(x => x.Values)
+            .Where(x => x.EditorAlias is not null && x.Value is not null)
+            .GroupBy(x => x.EditorAlias!);
+
+        // Iterate through each group and cache referenced entities if supported by the data editor.
+        foreach (IGrouping<string, BlockPropertyValue> valueByDataEditor in valuesByDataEditors)
+        {
+            IDataEditor? dataEditor = _propertyEditors[valueByDataEditor.Key];
+            if (dataEditor is null)
+            {
+                continue;
+            }
+
+            IDataValueEditor valueEditor = dataEditor.GetValueEditor();
+
+            if (valueEditor is ICacheReferencedEntities valueEditorWithPrecaching)
+            {
+                valueEditorWithPrecaching.CacheReferencedEntities(valueByDataEditor.Select(x => x.Value!));
+            }
+        }
+    }
+
+
     /// <inheritdoc />
     public abstract IEnumerable<UmbracoEntityReference> GetReferences(object? value);
 
diff --git a/src/Umbraco.Infrastructure/PropertyEditors/MediaPicker3PropertyEditor.cs b/src/Umbraco.Infrastructure/PropertyEditors/MediaPicker3PropertyEditor.cs
index d4a9e492bd17..50fe850e04f2 100644
--- a/src/Umbraco.Infrastructure/PropertyEditors/MediaPicker3PropertyEditor.cs
+++ b/src/Umbraco.Infrastructure/PropertyEditors/MediaPicker3PropertyEditor.cs
@@ -52,10 +52,8 @@ protected override IDataValueEditor CreateValueEditor() =>
     /// <summary>
     /// Defines the value editor for the media picker property editor.
     /// </summary>
-    internal sealed class MediaPicker3PropertyValueEditor : DataValueEditor, IDataValueReference
+    internal sealed class MediaPicker3PropertyValueEditor : DataValueEditor, IDataValueReference, ICacheReferencedEntities
     {
-        private const string MediaCacheKeyFormat = nameof(MediaPicker3PropertyValueEditor) + "_Media_{0}";
-
         private readonly IDataTypeConfigurationCache _dataTypeReadCache;
         private readonly IJsonSerializer _jsonSerializer;
         private readonly IMediaImportService _mediaImportService;
@@ -107,6 +105,27 @@ public MediaPicker3PropertyValueEditor(
             Validators.Add(validators);
         }
 
+        /// <inheritdoc/>
+        public void CacheReferencedEntities(IEnumerable<object> values)
+        {
+            var mediaKeys = values
+                .SelectMany(value => Deserialize(_jsonSerializer, value))
+                .Select(dto => dto.MediaKey)
+                .Distinct()
+                .Where(x => IsMediaAlreadyCached(x, _appCaches.RequestCache) is false)
+                .ToList();
+            if (mediaKeys.Count == 0)
+            {
+                return;
+            }
+
+            IEnumerable<IMedia> mediaItems = _mediaService.GetByIds(mediaKeys);
+            foreach (IMedia media in mediaItems)
+            {
+                CacheMediaById(media, _appCaches.RequestCache);
+            }
+        }
+
         /// <inheritdoc/>
         public IEnumerable<UmbracoEntityReference> GetReferences(object? value)
         {
@@ -208,31 +227,13 @@ private List<MediaWithCropsDto> UpdateMediaTypeAliases(List<MediaWithCropsDto> m
 
             foreach (MediaWithCropsDto mediaWithCropsDto in mediaWithCropsDtos)
             {
-                IMedia? media = GetMediaById(mediaWithCropsDto.MediaKey);
+                IMedia? media = GetAndCacheMediaById(mediaWithCropsDto.MediaKey, _appCaches.RequestCache, _mediaService);
                 mediaWithCropsDto.MediaTypeAlias = media?.ContentType.Alias ?? unknownMediaType;
             }
 
             return mediaWithCropsDtos.Where(m => m.MediaTypeAlias != unknownMediaType).ToList();
         }
 
-        private IMedia? GetMediaById(Guid key)
-        {
-            // Cache media lookups in case the same media is handled multiple times across a save operation,
-            // which is possible, particularly if we have multiple languages and blocks.
-            var cacheKey = string.Format(MediaCacheKeyFormat, key);
-            IMedia? media = _appCaches.RequestCache.GetCacheItem<IMedia?>(cacheKey);
-            if (media is null)
-            {
-                media = _mediaService.GetById(key);
-                if (media is not null)
-                {
-                    _appCaches.RequestCache.Set(cacheKey, media);
-                }
-            }
-
-            return media;
-        }
-
         private List<MediaWithCropsDto> HandleTemporaryMediaUploads(List<MediaWithCropsDto> mediaWithCropsDtos, MediaPicker3Configuration configuration)
         {
             var invalidDtos = new List<MediaWithCropsDto>();
@@ -240,7 +241,7 @@ private List<MediaWithCropsDto> HandleTemporaryMediaUploads(List<MediaWithCropsD
             foreach (MediaWithCropsDto mediaWithCropsDto in mediaWithCropsDtos)
             {
                 // if the media already exist, don't bother with it
-                if (GetMediaById(mediaWithCropsDto.MediaKey) != null)
+                if (GetAndCacheMediaById(mediaWithCropsDto.MediaKey, _appCaches.RequestCache, _mediaService) != null)
                 {
                     continue;
                 }
@@ -480,18 +481,7 @@ public IEnumerable<ValidationResult> Validate(
 
                 foreach (var typeAlias in distinctTypeAliases)
                 {
-                    // Cache media type lookups since the same media type is likely to be used multiple times in validation,
-                    // particularly if we have multiple languages and blocks.
-                    var cacheKey = string.Format(MediaTypeCacheKeyFormat, typeAlias);
-                    string? typeKey = _appCaches.RequestCache.GetCacheItem<string?>(cacheKey);
-                    if (typeKey is null)
-                    {
-                        typeKey = _mediaTypeService.Get(typeAlias)?.Key.ToString();
-                        if (typeKey is not null)
-                        {
-                            _appCaches.RequestCache.Set(cacheKey, typeKey);
-                        }
-                    }
+                    string? typeKey = GetMediaTypeKey(typeAlias);
 
                     if (typeKey is null || allowedTypes.Contains(typeKey) is false)
                     {
@@ -506,6 +496,31 @@ public IEnumerable<ValidationResult> Validate(
 
                 return [];
             }
+
+            private string? GetMediaTypeKey(string typeAlias)
+            {
+                // Cache media type lookups since the same media type is likely to be used multiple times in validation,
+                // particularly if we have multiple languages and blocks.
+                string? GetMediaTypeKeyFromService(string typeAlias) => _mediaTypeService.Get(typeAlias)?.Key.ToString();
+
+                if (_appCaches.RequestCache.IsAvailable is false)
+                {
+                    return GetMediaTypeKeyFromService(typeAlias);
+                }
+
+                var cacheKey = string.Format(MediaTypeCacheKeyFormat, typeAlias);
+                string? typeKey = _appCaches.RequestCache.GetCacheItem<string?>(cacheKey);
+                if (typeKey is null)
+                {
+                    typeKey = GetMediaTypeKeyFromService(typeAlias);
+                    if (typeKey is not null)
+                    {
+                        _appCaches.RequestCache.Set(cacheKey, typeKey);
+                    }
+                }
+
+                return typeKey;
+            }
         }
 
         /// <summary>
diff --git a/src/Umbraco.Infrastructure/PropertyEditors/MultiUrlPickerValueEditor.cs b/src/Umbraco.Infrastructure/PropertyEditors/MultiUrlPickerValueEditor.cs
index 2f0a2b279b11..2359e5537d0c 100644
--- a/src/Umbraco.Infrastructure/PropertyEditors/MultiUrlPickerValueEditor.cs
+++ b/src/Umbraco.Infrastructure/PropertyEditors/MultiUrlPickerValueEditor.cs
@@ -3,7 +3,10 @@
 
 using System.ComponentModel.DataAnnotations;
 using System.Runtime.Serialization;
+using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
+using Umbraco.Cms.Core.Cache;
+using Umbraco.Cms.Core.DependencyInjection;
 using Umbraco.Cms.Core.IO;
 using Umbraco.Cms.Core.Models;
 using Umbraco.Cms.Core.Models.ContentEditing;
@@ -19,14 +22,16 @@
 
 namespace Umbraco.Cms.Core.PropertyEditors;
 
-public class MultiUrlPickerValueEditor : DataValueEditor, IDataValueReference
+public class MultiUrlPickerValueEditor : DataValueEditor, IDataValueReference, ICacheReferencedEntities
 {
     private readonly ILogger<MultiUrlPickerValueEditor> _logger;
     private readonly IPublishedUrlProvider _publishedUrlProvider;
     private readonly IJsonSerializer _jsonSerializer;
     private readonly IContentService _contentService;
     private readonly IMediaService _mediaService;
+    private readonly AppCaches _appCaches;
 
+    [Obsolete("Please use the constructor taking all parameters. Scheduled for removal in Umbraco 19.")]
     public MultiUrlPickerValueEditor(
         ILogger<MultiUrlPickerValueEditor> logger,
         ILocalizedTextService localizedTextService,
@@ -37,19 +42,102 @@ public MultiUrlPickerValueEditor(
         IIOHelper ioHelper,
         IContentService contentService,
         IMediaService mediaService)
+        : this(
+            logger,
+            localizedTextService,
+            shortStringHelper,
+            attribute,
+            publishedUrlProvider,
+            jsonSerializer,
+            ioHelper,
+            contentService,
+            mediaService,
+            StaticServiceProvider.Instance.GetRequiredService<AppCaches>())
+    {
+    }
+
+    public MultiUrlPickerValueEditor(
+        ILogger<MultiUrlPickerValueEditor> logger,
+        ILocalizedTextService localizedTextService,
+        IShortStringHelper shortStringHelper,
+        DataEditorAttribute attribute,
+        IPublishedUrlProvider publishedUrlProvider,
+        IJsonSerializer jsonSerializer,
+        IIOHelper ioHelper,
+        IContentService contentService,
+        IMediaService mediaService,
+        AppCaches appCaches)
         : base(shortStringHelper, jsonSerializer, ioHelper, attribute)
     {
-        _logger = logger ?? throw new ArgumentNullException(nameof(logger));
+        _logger = logger;
         _publishedUrlProvider = publishedUrlProvider;
-
         _jsonSerializer = jsonSerializer;
         _contentService = contentService;
         _mediaService = mediaService;
+        _appCaches = appCaches;
+
         Validators.Add(new TypedJsonValidatorRunner<LinkDisplay[], MultiUrlPickerConfiguration>(
             _jsonSerializer,
             new MinMaxValidator(localizedTextService)));
     }
 
+    /// <inheritdoc/>
+    public void CacheReferencedEntities(IEnumerable<object> values)
+    {
+        var dtos = values
+            .Select(value =>
+            {
+                var asString = value is string str ? str : value.ToString();
+                if (string.IsNullOrEmpty(asString))
+                {
+                    return null;
+                }
+
+                return _jsonSerializer.Deserialize<List<LinkDto>>(asString);
+            })
+            .WhereNotNull()
+            .SelectMany(x => x)
+            .Where(x => x.Type == Constants.UdiEntityType.Document || x.Type == Constants.UdiEntityType.Media)
+            .ToList();
+
+        IList<Guid> contentKeys = GetKeys(Constants.UdiEntityType.Document, dtos);
+        IList<Guid> mediaKeys = GetKeys(Constants.UdiEntityType.Media, dtos);
+
+        if (contentKeys.Count > 0)
+        {
+            IEnumerable<IContent> contentItems = _contentService.GetByIds(contentKeys);
+            foreach (IContent content in contentItems)
+            {
+                CacheContentById(content, _appCaches.RequestCache);
+            }
+        }
+
+        if (mediaKeys.Count > 0)
+        {
+            IEnumerable<IMedia> mediaItems = _mediaService.GetByIds(mediaKeys);
+            foreach (IMedia media in mediaItems)
+            {
+                CacheMediaById(media, _appCaches.RequestCache);
+            }
+        }
+    }
+
+    private IList<Guid> GetKeys(string entityType, IEnumerable<LinkDto> dtos) =>
+        dtos
+            .Where(x => x.Type == entityType)
+            .Select(x => x.Unique ?? (x.Udi is not null ? x.Udi.Guid : Guid.Empty))
+            .Where(x => x != Guid.Empty)
+            .Distinct()
+            .Where(x => IsAlreadyCached(x, entityType) is false)
+            .ToList();
+
+    private bool IsAlreadyCached(Guid key, string entityType) => entityType switch
+    {
+        Constants.UdiEntityType.Document => IsContentAlreadyCached(key, _appCaches.RequestCache),
+        Constants.UdiEntityType.Media => IsMediaAlreadyCached(key, _appCaches.RequestCache),
+        _ => false,
+    };
+
     public IEnumerable<UmbracoEntityReference> GetReferences(object? value)
     {
         var asString = value == null ? string.Empty : value is string str ? str : value.ToString();
@@ -105,7 +193,7 @@ public IEnumerable<UmbracoEntityReference> GetReferences(object? value)
                     if (dto.Udi.EntityType == Constants.UdiEntityType.Document)
                     {
                         url =  _publishedUrlProvider.GetUrl(dto.Udi.Guid, UrlMode.Relative, culture);
-                        IContent? c = _contentService.GetById(dto.Udi.Guid);
+                        IContent? c = GetAndCacheContentById(dto.Udi.Guid, _appCaches.RequestCache, _contentService);
 
                         if (c is not null)
                         {
@@ -119,7 +207,7 @@ public IEnumerable<UmbracoEntityReference> GetReferences(object? value)
                     else if (dto.Udi.EntityType == Constants.UdiEntityType.Media)
                     {
                         url = _publishedUrlProvider.GetMediaUrl(dto.Udi.Guid, UrlMode.Relative, culture);
-                        IMedia? m = _mediaService.GetById(dto.Udi.Guid);
+                        IMedia? m = GetAndCacheMediaById(dto.Udi.Guid, _appCaches.RequestCache, _mediaService);
                         if (m is not null)
                         {
                             published = m.Trashed is false;
@@ -207,6 +295,12 @@ public class LinkDto
         [DataMember(Name = "target")]
         public string? Target { get; set; }
 
+        [DataMember(Name = "unique")]
+        public Guid? Unique { get; set; }
+
+        [DataMember(Name = "type")]
+        public string? Type { get; set; }
+
         [DataMember(Name = "udi")]
         public GuidUdi? Udi { get; set; }
 
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/PropertyEditors/Validators/MultiUrlPickerValueEditorValidationTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/PropertyEditors/Validators/MultiUrlPickerValueEditorValidationTests.cs
index dae1d885b2cc..c9264d59355e 100644
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/PropertyEditors/Validators/MultiUrlPickerValueEditorValidationTests.cs
+++ b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/PropertyEditors/Validators/MultiUrlPickerValueEditorValidationTests.cs
@@ -2,6 +2,7 @@
 using Microsoft.Extensions.Logging;
 using Moq;
 using NUnit.Framework;
+using Umbraco.Cms.Core.Cache;
 using Umbraco.Cms.Core.IO;
 using Umbraco.Cms.Core.Models.Validation;
 using Umbraco.Cms.Core.PropertyEditors;
@@ -68,7 +69,8 @@ private static MultiUrlPickerValueEditor CreateValueEditor() =>
             new SystemTextJsonSerializer(new DefaultJsonSerializerEncoderFactory()),
             Mock.Of<IIOHelper>(),
             Mock.Of<IContentService>(),
-            Mock.Of<IMediaService>())
+            Mock.Of<IMediaService>(),
+            AppCaches.Disabled)
         {
             ConfigurationObject = new MultiUrlPickerConfiguration(),
         };

From 4fc79ad1f8225105dfdb065d245fa81713306819 Mon Sep 17 00:00:00 2001
From: Rick Butterfield <rcb@umbraco.dk>
Date: Fri, 31 Oct 2025 12:34:36 +0000
Subject: [PATCH 104/155] Preview: Add `allow-forms` to iframe sandbox
 attributes (#20701)

Add 'allow-forms' to iframe sandbox attributes
---
 src/Umbraco.Web.UI.Client/src/apps/preview/preview.element.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Umbraco.Web.UI.Client/src/apps/preview/preview.element.ts b/src/Umbraco.Web.UI.Client/src/apps/preview/preview.element.ts
index e9bce3c441a0..81046d2e5b9d 100644
--- a/src/Umbraco.Web.UI.Client/src/apps/preview/preview.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/apps/preview/preview.element.ts
@@ -65,7 +65,7 @@ export class UmbPreviewElement extends UmbLitElement {
 						src=${this._previewUrl}
 						title="Page preview"
 						@load=${this.#onIFrameLoad}
-						sandbox="allow-scripts allow-same-origin"></iframe>
+						sandbox="allow-scripts allow-same-origin allow-forms"></iframe>
 				</div>
 			</div>
 			<div id="menu">

From 43ac32282cdd3c5ae9f1303d3cecf7a417700b35 Mon Sep 17 00:00:00 2001
From: Rick Butterfield <rcb@umbraco.dk>
Date: Fri, 31 Oct 2025 12:34:36 +0000
Subject: [PATCH 105/155] Preview: Add `allow-forms` to iframe sandbox
 attributes (#20701)

Add 'allow-forms' to iframe sandbox attributes
---
 src/Umbraco.Web.UI.Client/src/apps/preview/preview.element.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Umbraco.Web.UI.Client/src/apps/preview/preview.element.ts b/src/Umbraco.Web.UI.Client/src/apps/preview/preview.element.ts
index 4897f21190dc..41b13d8a661e 100644
--- a/src/Umbraco.Web.UI.Client/src/apps/preview/preview.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/apps/preview/preview.element.ts
@@ -63,7 +63,7 @@ export class UmbPreviewElement extends UmbLitElement {
 						src=${this._previewUrl}
 						title="Page preview"
 						@load=${this.#onIFrameLoad}
-						sandbox="allow-scripts allow-same-origin"></iframe>
+						sandbox="allow-scripts allow-same-origin allow-forms"></iframe>
 				</div>
 			</div>
 			<div id="menu">

From cfa530487b406f5bd4a506f7e4a2e264e32473bc Mon Sep 17 00:00:00 2001
From: Engiber Lozada <89547469+engijlr@users.noreply.github.com>
Date: Mon, 3 Nov 2025 10:56:37 +0100
Subject: [PATCH 106/155] Property Editors: Add mandatory support to Number
 Range (Refactor). (#20570)

* Added mandatory property to number range property editor and bind it to the inner input.

* Added mandatory message support.

---------

Co-authored-by: Mads Rasmussen <madsr@hey.com>
---
 .../input-number-range.element.ts             | 19 ++++++++++++++++---
 ...property-editor-ui-number-range.element.ts | 15 ++++++++++++---
 2 files changed, 28 insertions(+), 6 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/components/input-number-range/input-number-range.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/components/input-number-range/input-number-range.element.ts
index 41d300a752df..242f3fa8526e 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/components/input-number-range/input-number-range.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/components/input-number-range/input-number-range.element.ts
@@ -1,6 +1,6 @@
 import { css, customElement, html, ifDefined, property, state } from '@umbraco-cms/backoffice/external/lit';
 import { UmbChangeEvent } from '@umbraco-cms/backoffice/event';
-import { UmbFormControlMixin } from '@umbraco-cms/backoffice/validation';
+import { UMB_VALIDATION_EMPTY_LOCALIZATION_KEY, UmbFormControlMixin } from '@umbraco-cms/backoffice/validation';
 import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element';
 import type { UmbNumberRangeValueType } from '@umbraco-cms/backoffice/models';
 import type { UUIInputElement } from '@umbraco-cms/backoffice/external/uui';
@@ -34,6 +34,11 @@ export class UmbInputNumberRangeElement extends UmbFormControlMixin(UmbLitElemen
 		return this._minValue;
 	}
 
+	@property({ type: Boolean })
+	required = false;
+	@property({ type: String })
+	requiredMessage = UMB_VALIDATION_EMPTY_LOCALIZATION_KEY;
+
 	@state()
 	private _maxValue?: number;
 
@@ -90,6 +95,12 @@ export class UmbInputNumberRangeElement extends UmbFormControlMixin(UmbLitElemen
 	constructor() {
 		super();
 
+		this.addValidator(
+			'valueMissing',
+			() => this.requiredMessage,
+			() => this.required && (this._minValue == null || this._maxValue == null),
+		);
+
 		this.addValidator(
 			'patternMismatch',
 			() => {
@@ -129,7 +140,8 @@ export class UmbInputNumberRangeElement extends UmbFormControlMixin(UmbLitElemen
 				min=${ifDefined(this.validationRange?.min)}
 				max=${ifDefined(this.validationRange?.max)}
 				placeholder=${this._minPlaceholder}
-				.value=${this._minValue}
+				?required=${this.required}
+				.value=${this._minValue?.toString() ?? ''}
 				@input=${this.#onMinInput}></uui-input>
 			<b>–</b>
 			<uui-input
@@ -138,7 +150,8 @@ export class UmbInputNumberRangeElement extends UmbFormControlMixin(UmbLitElemen
 				min=${ifDefined(this.validationRange?.min)}
 				max=${ifDefined(this.validationRange?.max)}
 				placeholder=${this._maxPlaceholder}
-				.value=${this._maxValue}
+				?required=${this.required}
+				.value=${this._maxValue?.toString() ?? ''}
 				@input=${this.#onMaxInput}></uui-input>
 		`;
 	}
diff --git a/src/Umbraco.Web.UI.Client/src/packages/property-editors/number-range/property-editor-ui-number-range.element.ts b/src/Umbraco.Web.UI.Client/src/packages/property-editors/number-range/property-editor-ui-number-range.element.ts
index aaeeb1a5aef6..792276779bae 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/property-editors/number-range/property-editor-ui-number-range.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/property-editors/number-range/property-editor-ui-number-range.element.ts
@@ -1,6 +1,6 @@
 import type { UmbInputNumberRangeElement } from '@umbraco-cms/backoffice/components';
 import { customElement, html, property, state } from '@umbraco-cms/backoffice/external/lit';
-import { UmbFormControlMixin } from '@umbraco-cms/backoffice/validation';
+import { UMB_VALIDATION_EMPTY_LOCALIZATION_KEY, UmbFormControlMixin } from '@umbraco-cms/backoffice/validation';
 import { UmbChangeEvent } from '@umbraco-cms/backoffice/event';
 import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element';
 import type { UmbNumberRangeValueType } from '@umbraco-cms/backoffice/models';
@@ -26,9 +26,14 @@ export class UmbPropertyEditorUINumberRangeElement
 	@state()
 	private _validationRange?: UmbNumberRangeValueType;
 
+	@property({ type: Boolean })
+	mandatory = false;
+	@property({ type: String })
+	mandatoryMessage = UMB_VALIDATION_EMPTY_LOCALIZATION_KEY;
+
 	@property({ type: Object })
 	public override set value(value: UmbNumberRangeValueType | undefined) {
-		super.value = value || { min: undefined, max: undefined };
+		super.value = value;
 		this._minValue = value?.min;
 		this._maxValue = value?.max;
 	}
@@ -42,7 +47,9 @@ export class UmbPropertyEditorUINumberRangeElement
 	}
 
 	#onChange(event: CustomEvent & { target: UmbInputNumberRangeElement }) {
-		this.value = { min: event.target.minValue, max: event.target.maxValue };
+		const min = event.target.minValue;
+		const max = event.target.maxValue;
+		this.value = min == null && max == null ? undefined : { min, max };
 		this.dispatchEvent(new UmbChangeEvent());
 	}
 
@@ -59,6 +66,8 @@ export class UmbPropertyEditorUINumberRangeElement
 			<umb-input-number-range
 				.minValue=${this._minValue}
 				.maxValue=${this._maxValue}
+				?required=${this.mandatory}
+				.requiredMessage=${this.mandatoryMessage}
 				.validationRange=${this._validationRange}
 				@change=${this.#onChange}>
 			</umb-input-number-range>

From c1a8500f12d1b13fa00b5e192f738cb83b040ac3 Mon Sep 17 00:00:00 2001
From: Lee Kelleher <leekelleher@users.noreply.github.com>
Date: Mon, 3 Nov 2025 12:49:55 +0100
Subject: [PATCH 107/155] Tiptap RTE: Localizes property editor UI label
 (removes "[Tiptap]" from label) (closes #20439) (#20713)

* Localized RTE property-editor UI label, removing "[Tiptap]"

* Updated acceptance test

* Localized the button label in the data-type and property-editor picker modals

* Based on @copilot suggestion, localized the property-editor UI label in the other places
---
 .../property-editor-ui-picker-modal.element.ts  |  2 +-
 .../data-type-picker-flow-modal.element.ts      | 17 +++++++----------
 .../property-editors/tiptap-rte/manifests.ts    |  2 +-
 .../tests/DefaultConfig/DataType/Tiptap.spec.ts |  2 +-
 4 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/ui-picker-modal/property-editor-ui-picker-modal.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/ui-picker-modal/property-editor-ui-picker-modal.element.ts
index 5ec7de734e67..176107a44bb4 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/ui-picker-modal/property-editor-ui-picker-modal.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/ui-picker-modal/property-editor-ui-picker-modal.element.ts
@@ -116,7 +116,7 @@ export class UmbPropertyEditorUIPickerModalElement extends UmbModalBaseElement<
 						<li class="item" ?selected=${this.value.selection.includes(propertyEditorUI.alias)}>
 							<button type="button" @click=${() => this.#handleClick(propertyEditorUI)}>
 								<umb-icon name=${propertyEditorUI.meta.icon} class="icon"></umb-icon>
-								${propertyEditorUI.meta.label || propertyEditorUI.name}
+								${this.localize.string(propertyEditorUI.meta.label || propertyEditorUI.name)}
 							</button>
 						</li>
 					`,
diff --git a/src/Umbraco.Web.UI.Client/src/packages/data-type/modals/data-type-picker-flow/data-type-picker-flow-modal.element.ts b/src/Umbraco.Web.UI.Client/src/packages/data-type/modals/data-type-picker-flow/data-type-picker-flow-modal.element.ts
index a04ad471500c..d35e86ba0889 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/data-type/modals/data-type-picker-flow/data-type-picker-flow-modal.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/data-type/modals/data-type-picker-flow/data-type-picker-flow-modal.element.ts
@@ -347,30 +347,27 @@ export class UmbDataTypePickerFlowModalElement extends UmbModalBaseElement<
 	}
 
 	#renderDataTypeButton(propertyEditorUI: ManifestPropertyEditorUi, createAsNewOnPick?: boolean) {
+		const label = this.localize.string(propertyEditorUI.meta.label || propertyEditorUI.name);
 		if (createAsNewOnPick) {
 			return html`
-				<uui-button
-					label=${propertyEditorUI.meta.label || propertyEditorUI.name}
-					@click=${() => this.#createDataType(propertyEditorUI.alias)}>
-					${this.#renderItemContent(propertyEditorUI)}
+				<uui-button label=${label} @click=${() => this.#createDataType(propertyEditorUI.alias)}>
+					${this.#renderItemContent(label, propertyEditorUI)}
 				</uui-button>
 			`;
 		} else {
 			return html`
-				<uui-button
-					label=${propertyEditorUI.meta.label || propertyEditorUI.name}
-					href=${this._dataTypePickerModalRouteBuilder!({ uiAlias: propertyEditorUI.alias })}>
-					${this.#renderItemContent(propertyEditorUI)}
+				<uui-button label=${label} href=${this._dataTypePickerModalRouteBuilder!({ uiAlias: propertyEditorUI.alias })}>
+					${this.#renderItemContent(label, propertyEditorUI)}
 				</uui-button>
 			`;
 		}
 	}
 
-	#renderItemContent(propertyEditorUI: ManifestPropertyEditorUi) {
+	#renderItemContent(label: string, propertyEditorUI: ManifestPropertyEditorUi) {
 		return html`
 			<div class="item-content">
 				<umb-icon name=${propertyEditorUI.meta.icon} class="icon"></umb-icon>
-				${propertyEditorUI.meta.label || propertyEditorUI.name}
+				${label}
 			</div>
 		`;
 	}
diff --git a/src/Umbraco.Web.UI.Client/src/packages/tiptap/property-editors/tiptap-rte/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/tiptap/property-editors/tiptap-rte/manifests.ts
index 9394f778d2e2..6fefe64b7122 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/tiptap/property-editors/tiptap-rte/manifests.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/tiptap/property-editors/tiptap-rte/manifests.ts
@@ -7,7 +7,7 @@ export const manifests: Array<ManifestPropertyEditorUi> = [
 		name: 'Rich Text Editor [Tiptap] Property Editor UI',
 		element: () => import('./property-editor-ui-tiptap.element.js'),
 		meta: {
-			label: 'Rich Text Editor [Tiptap]',
+			label: '#rte_label',
 			propertyEditorSchemaAlias: 'Umbraco.RichText',
 			icon: 'icon-browser-window',
 			group: 'richContent',
diff --git a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/DataType/Tiptap.spec.ts b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/DataType/Tiptap.spec.ts
index 9d525a57e5f0..9c3e7ec46d27 100644
--- a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/DataType/Tiptap.spec.ts
+++ b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/DataType/Tiptap.spec.ts
@@ -15,7 +15,7 @@ test.afterEach(async ({umbracoApi}) => {
 
 test('can create a rich text editor with tiptap', {tag: '@smoke'}, async ({umbracoApi, umbracoUi}) => {
   //  Arrange
-  const tipTapLocatorName = 'Rich Text Editor [Tiptap]';
+  const tipTapLocatorName = 'Rich Text Editor';
   const tipTapAlias = 'Umbraco.RichText';
   const tipTapUiAlias = 'Umb.PropertyEditorUi.Tiptap';
 

From 76fed82e91a254fe2a52779614cc985644c0e374 Mon Sep 17 00:00:00 2001
From: Andreas Zerbst <73799582+andr317c@users.noreply.github.com>
Date: Tue, 4 Nov 2025 08:23:04 +0100
Subject: [PATCH 108/155] E2E: QA cherry picked acceptance tests updates from
 17   (#20714)

* Updated tests

* Bumped version

* Added v16 to nightly e2e run
---
 build/nightly-E2E-test-pipelines.yml               |  3 ++-
 .../Umbraco.Tests.AcceptanceTest/package-lock.json |  8 ++++----
 tests/Umbraco.Tests.AcceptanceTest/package.json    |  2 +-
 .../Clipboard/ClipboardBlockGridBlocks.spec.ts     |  3 ++-
 .../Clipboard/ClipboardBlockListBlocks.spec.ts     |  3 ++-
 .../tests/DefaultConfig/Content/Content.spec.ts    |  4 ++--
 .../Content/ContentWithTrueFalse.spec.ts           |  2 +-
 .../CreateContentFromDocumentBlueprint.spec.ts     | 14 +++++++-------
 .../DataType/BlockGrid/BlockGridEditor.spec.ts     |  2 +-
 .../BlockListEditor/BlockListEditor.spec.ts        |  2 +-
 .../tests/DefaultConfig/Media/Media.spec.ts        |  1 +
 .../tests/DefaultConfig/Webhook/Webhook.spec.ts    |  8 ++++----
 12 files changed, 28 insertions(+), 24 deletions(-)

diff --git a/build/nightly-E2E-test-pipelines.yml b/build/nightly-E2E-test-pipelines.yml
index e95d6ac403c8..b7f261fa8e45 100644
--- a/build/nightly-E2E-test-pipelines.yml
+++ b/build/nightly-E2E-test-pipelines.yml
@@ -9,6 +9,7 @@ schedules:
     branches:
       include:
         - v15/dev
+        - v16/dev
         - main
 
 parameters:
@@ -674,4 +675,4 @@ stages:
                 --data "$PAYLOAD" \
                 "$SLACK_WEBHOOK_URL"
             env:
-              SLACK_WEBHOOK_URL: $(E2ESLACKWEBHOOKURL)
\ No newline at end of file
+              SLACK_WEBHOOK_URL: $(E2ESLACKWEBHOOKURL)
diff --git a/tests/Umbraco.Tests.AcceptanceTest/package-lock.json b/tests/Umbraco.Tests.AcceptanceTest/package-lock.json
index 6a65872266d9..780a70464ba3 100644
--- a/tests/Umbraco.Tests.AcceptanceTest/package-lock.json
+++ b/tests/Umbraco.Tests.AcceptanceTest/package-lock.json
@@ -8,7 +8,7 @@
       "hasInstallScript": true,
       "dependencies": {
         "@umbraco/json-models-builders": "^2.0.40",
-        "@umbraco/playwright-testhelpers": "^16.0.55",
+        "@umbraco/playwright-testhelpers": "^16.0.58",
         "camelize": "^1.0.0",
         "dotenv": "^16.3.1",
         "node-fetch": "^2.6.7"
@@ -67,9 +67,9 @@
       }
     },
     "node_modules/@umbraco/playwright-testhelpers": {
-      "version": "16.0.55",
-      "resolved": "https://registry.npmjs.org/@umbraco/playwright-testhelpers/-/playwright-testhelpers-16.0.55.tgz",
-      "integrity": "sha512-715l112FHB7snWq0sY7e0fUD2ppWSSysBKHFhcQkGGw+3Gbo68Z6iXfeAketzKohWji19un4KC3mvZU0IICr9g==",
+      "version": "16.0.58",
+      "resolved": "https://registry.npmjs.org/@umbraco/playwright-testhelpers/-/playwright-testhelpers-16.0.58.tgz",
+      "integrity": "sha512-8NWupbb526Ni3eDF/0dVGDSuIYGPP+4lGxtcpTtA0/0p3Ud/9vTYym/k+KgBElDdlY278yXaWez0IpKhShdLOw==",
       "license": "MIT",
       "dependencies": {
         "@umbraco/json-models-builders": "2.0.40",
diff --git a/tests/Umbraco.Tests.AcceptanceTest/package.json b/tests/Umbraco.Tests.AcceptanceTest/package.json
index adf43dd3260b..d0bb5fee820f 100644
--- a/tests/Umbraco.Tests.AcceptanceTest/package.json
+++ b/tests/Umbraco.Tests.AcceptanceTest/package.json
@@ -22,7 +22,7 @@
   },
   "dependencies": {
     "@umbraco/json-models-builders": "^2.0.40",
-    "@umbraco/playwright-testhelpers": "^16.0.55",
+    "@umbraco/playwright-testhelpers": "^16.0.58",
     "camelize": "^1.0.0",
     "dotenv": "^16.3.1",
     "node-fetch": "^2.6.7"
diff --git a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/Clipboard/ClipboardBlockGridBlocks.spec.ts b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/Clipboard/ClipboardBlockGridBlocks.spec.ts
index 0cfdccd38baf..6c3f51690fbb 100644
--- a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/Clipboard/ClipboardBlockGridBlocks.spec.ts
+++ b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/Clipboard/ClipboardBlockGridBlocks.spec.ts
@@ -106,7 +106,8 @@ test('can copy and paste a single block into the same document but different gro
   await umbracoUi.content.doesBlockEditorBlockWithNameContainValue(elementGroupName, elementPropertyName, ConstantHelper.inputTypes.tipTap, blockPropertyValue);
 });
 
-test('can copy and paste a single block into another document', async ({umbracoApi, umbracoUi}) => {
+// Remove skip after this issue is resolved: https://github.com/umbraco/Umbraco-CMS/issues/20680
+test.skip('can copy and paste a single block into another document', async ({umbracoApi, umbracoUi}) => {
   // Arrange
   await umbracoApi.document.ensureNameNotExists(secondContentName);
   await umbracoApi.document.createDefaultDocumentWithABlockGridEditorAndBlockWithValue(contentName, documentTypeName, blockGridDataTypeName, elementTypeId, AliasHelper.toAlias(elementPropertyName), blockPropertyValue, richTextDataTypeUiAlias);
diff --git a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/Clipboard/ClipboardBlockListBlocks.spec.ts b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/Clipboard/ClipboardBlockListBlocks.spec.ts
index 615112ef4542..40ccfe598c37 100644
--- a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/Clipboard/ClipboardBlockListBlocks.spec.ts
+++ b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/Clipboard/ClipboardBlockListBlocks.spec.ts
@@ -106,7 +106,8 @@ test('can copy and paste a single block into the same document but different gro
   await umbracoUi.content.doesBlockEditorBlockWithNameContainValue(elementGroupName, elementPropertyName, ConstantHelper.inputTypes.tipTap, blockPropertyValue);
 });
 
-test('can copy and paste a single block into another document', async ({umbracoApi, umbracoUi}) => {
+// Remove skip after this issue is resolved: https://github.com/umbraco/Umbraco-CMS/issues/20680
+test.skip('can copy and paste a single block into another document', async ({umbracoApi, umbracoUi}) => {
   // Arrange
   await umbracoApi.document.ensureNameNotExists(secondContentName);
   await umbracoApi.document.createDefaultDocumentWithABlockListEditorAndBlockWithValue(contentName, documentTypeName, blockListDataTypeName, elementTypeId, AliasHelper.toAlias(elementPropertyName), blockPropertyValue, elementDataTypeUiAlias, groupName);
diff --git a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/Content.spec.ts b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/Content.spec.ts
index f4b69a1231be..edea7a59e422 100644
--- a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/Content.spec.ts
+++ b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/Content.spec.ts
@@ -234,8 +234,8 @@ test('can duplicate a content node to other parent', async ({umbracoApi, umbraco
   await umbracoUi.content.doesSuccessNotificationHaveText(NotificationConstantHelper.success.duplicated);
   await umbracoUi.content.isContentInTreeVisible(contentName);
   await umbracoUi.content.isContentInTreeVisible(parentContentName);
-  await umbracoUi.content.openContentCaretButtonForName(parentContentName);
-  await umbracoUi.content.isChildContentInTreeVisible(parentContentName, contentName);
+  await umbracoUi.content.goToContentWithName(parentContentName);
+  await umbracoUi.content.isContentWithNameVisibleInList(contentName);
 
   // Clean
   await umbracoApi.document.ensureNameNotExists(parentContentName);
diff --git a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/ContentWithTrueFalse.spec.ts b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/ContentWithTrueFalse.spec.ts
index 75e252c28cf5..f58f224b6cb4 100644
--- a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/ContentWithTrueFalse.spec.ts
+++ b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/ContentWithTrueFalse.spec.ts
@@ -58,7 +58,7 @@ test('can publish content with the true/false data type', async ({umbracoApi, um
   expect(await umbracoApi.document.doesNameExist(contentName)).toBeTruthy();
   const contentData = await umbracoApi.document.getByName(contentName);
   expect(contentData.variants[0].state).toBe(expectedState);
-  expect(contentData.values).toEqual([]);
+  expect(contentData.values[0].value).toEqual(false);
 });
 
 test('can toggle the true/false value in the content', {tag: '@release'}, async ({umbracoApi, umbracoUi}) => {
diff --git a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/CreateContentFromDocumentBlueprint.spec.ts b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/CreateContentFromDocumentBlueprint.spec.ts
index 7ec3a9223f02..0b3bf06cf08f 100644
--- a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/CreateContentFromDocumentBlueprint.spec.ts
+++ b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/CreateContentFromDocumentBlueprint.spec.ts
@@ -51,7 +51,7 @@ test('can create content using an invariant document blueprint', async ({umbraco
   await umbracoUi.content.clickActionsMenuAtRoot();
   await umbracoUi.content.clickCreateActionMenuOption();
   await umbracoUi.content.chooseDocumentType(documentTypeName);
-  await umbracoUi.content.clickModalMenuItemWithName(documentBlueprintName);
+  await umbracoUi.content.selectDocumentBlueprintWithName(documentBlueprintName);
   await umbracoUi.content.clickSaveButtonForContent();
 
   // Assert
@@ -75,7 +75,7 @@ test('can create content using a variant document blueprint', async ({umbracoApi
   await umbracoUi.content.clickActionsMenuAtRoot();
   await umbracoUi.content.clickCreateActionMenuOption();
   await umbracoUi.content.chooseDocumentType(documentTypeName);
-  await umbracoUi.content.clickModalMenuItemWithName(documentBlueprintName);
+  await umbracoUi.content.selectDocumentBlueprintWithName(documentBlueprintName);
   await umbracoUi.content.clickSaveButtonForContent();
   await umbracoUi.content.clickSaveButton();
 
@@ -104,7 +104,7 @@ test('can create content with different name using an invariant document bluepri
   await umbracoUi.content.clickActionsMenuAtRoot();
   await umbracoUi.content.clickCreateActionMenuOption();
   await umbracoUi.content.chooseDocumentType(documentTypeName);
-  await umbracoUi.content.clickModalMenuItemWithName(documentBlueprintName);
+  await umbracoUi.content.selectDocumentBlueprintWithName(documentBlueprintName);
   await umbracoUi.content.enterContentName(contentName);
   await umbracoUi.content.clickSaveButtonForContent();
 
@@ -130,7 +130,7 @@ test('can create content with different name using a variant document blueprint'
   await umbracoUi.content.clickActionsMenuAtRoot();
   await umbracoUi.content.clickCreateActionMenuOption();
   await umbracoUi.content.chooseDocumentType(documentTypeName);
-  await umbracoUi.content.clickModalMenuItemWithName(documentBlueprintName);
+  await umbracoUi.content.selectDocumentBlueprintWithName(documentBlueprintName);
   await umbracoUi.content.enterContentName(contentName);
   await umbracoUi.content.clickSaveButtonForContent();
   await umbracoUi.content.clickSaveButton();
@@ -161,7 +161,7 @@ test('can create content using a document blueprint with block list', async ({um
   await umbracoUi.content.clickActionsMenuAtRoot();
   await umbracoUi.content.clickCreateActionMenuOption();
   await umbracoUi.content.chooseDocumentType(documentTypeName);
-  await umbracoUi.content.clickModalMenuItemWithName(documentBlueprintName);
+  await umbracoUi.content.selectDocumentBlueprintWithName(documentBlueprintName);
   await umbracoUi.content.clickSaveButtonForContent();
 
   // Assert
@@ -187,7 +187,7 @@ test('can create content using a document blueprint with block grid', async ({um
   await umbracoUi.content.clickActionsMenuAtRoot();
   await umbracoUi.content.clickCreateActionMenuOption();
   await umbracoUi.content.chooseDocumentType(documentTypeName);
-  await umbracoUi.content.clickModalMenuItemWithName(documentBlueprintName);
+  await umbracoUi.content.selectDocumentBlueprintWithName(documentBlueprintName);
   await umbracoUi.content.clickSaveButtonForContent();
 
   // Assert
@@ -197,4 +197,4 @@ test('can create content using a document blueprint with block grid', async ({um
   expect(contentData.values[0].value.contentData[0].values[0].value.markup).toEqual(textContent);
   const blockListValue = contentData.values.find(item => item.editorAlias === "Umbraco.BlockGrid")?.value;
   expect(blockListValue).toBeTruthy();
-});
\ No newline at end of file
+});
diff --git a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/DataType/BlockGrid/BlockGridEditor.spec.ts b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/DataType/BlockGrid/BlockGridEditor.spec.ts
index 54eed6a46446..e2b5d799eca5 100644
--- a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/DataType/BlockGrid/BlockGridEditor.spec.ts
+++ b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/DataType/BlockGrid/BlockGridEditor.spec.ts
@@ -275,7 +275,7 @@ test('max can not be less than min in a block grid editor', async ({umbracoApi,
 
   // Assert
   await umbracoUi.dataType.isFailedStateButtonVisible();
-  await umbracoUi.dataType.doesAmountContainErrorMessageWithText('The low value must not be exceed the high value');
+  await umbracoUi.dataType.doesAmountContainErrorMessageWithText('The low value must not exceed the high value.');
   const dataTypeData = await umbracoApi.dataType.getByName(blockGridEditorName);
   expect(dataTypeData.values[0].value.min).toBe(minAmount);
   // The max value should not be updated
diff --git a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/DataType/BlockListEditor/BlockListEditor.spec.ts b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/DataType/BlockListEditor/BlockListEditor.spec.ts
index 1239425d2001..5db02e7d48d0 100644
--- a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/DataType/BlockListEditor/BlockListEditor.spec.ts
+++ b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/DataType/BlockListEditor/BlockListEditor.spec.ts
@@ -173,7 +173,7 @@ test('max can not be less than min', async ({umbracoApi, umbracoUi}) => {
   // Assert
   await umbracoUi.dataType.isFailedStateButtonVisible();
   const dataTypeData = await umbracoApi.dataType.getByName(blockListEditorName);
-  await umbracoUi.dataType.doesAmountContainErrorMessageWithText('The low value must not be exceed the high value');
+  await umbracoUi.dataType.doesAmountContainErrorMessageWithText('The low value must not exceed the high value.');
   expect(dataTypeData.values[0].value.min).toBe(minAmount);
   // The max value should not be updated
   expect(dataTypeData.values[0].value.max).toBe(oldMaxAmount);
diff --git a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Media/Media.spec.ts b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Media/Media.spec.ts
index ab749dc20a88..e70132f3c5ea 100644
--- a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Media/Media.spec.ts
+++ b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Media/Media.spec.ts
@@ -73,6 +73,7 @@ for (const mediaFileType of mediaFileTypes) {
 
     // Assert
     await umbracoUi.media.waitForMediaItemToBeCreated();
+    await umbracoUi.media.goToSection(ConstantHelper.sections.media);
     const mediaData = await umbracoApi.media.getByName(mediaFileType.fileName);
     const mediaUrl = await umbracoApi.media.getFullMediaUrl(mediaData.id);
     await umbracoUi.media.doesMediaHaveThumbnail(mediaData.id, mediaFileType.thumbnail, mediaUrl);
diff --git a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Webhook/Webhook.spec.ts b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Webhook/Webhook.spec.ts
index 650c7d09d67c..2caf82691953 100644
--- a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Webhook/Webhook.spec.ts
+++ b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Webhook/Webhook.spec.ts
@@ -14,7 +14,7 @@ test.afterEach(async ({umbracoApi}) => {
   await umbracoApi.webhook.ensureNameNotExists(webhookName);
 });
 
-test('can create a webhook', {tag: '@release'}, async ({umbracoApi, umbracoUi}) => {
+test('can create a webhook', async ({umbracoApi, umbracoUi}) => {
   // Arrange
   const event = 'Content Deleted';
   const webhookSiteUrl = umbracoApi.webhook.webhookSiteUrl + webhookSiteToken;
@@ -122,7 +122,7 @@ test('can disable a webhook', async ({umbracoApi, umbracoUi}) => {
   await umbracoApi.webhook.isWebhookEnabled(webhookName, false);
 });
 
-test('cannot remove all events from a webhook', {tag: '@release'}, async ({umbracoApi, umbracoUi}) => {
+test('cannot remove all events from a webhook', async ({umbracoApi, umbracoUi}) => {
   // Arrange
   const event = 'Content Deleted';
   await umbracoApi.webhook.createDefaultWebhook(webhookName, webhookSiteToken, event);
@@ -173,7 +173,7 @@ test('can remove a header from a webhook', async ({umbracoApi, umbracoUi}) => {
   expect(await umbracoApi.webhook.doesWebhookHaveHeader(webhookName, headerName, headerValue)).toBeFalsy();
 });
 
-test('cannot add both content event and media event for a webhook', {tag: '@release'}, async ({umbracoApi, umbracoUi}) => {
+test('cannot add both content event and media event for a webhook', async ({umbracoApi, umbracoUi}) => {
   // Arrange
   const event = 'Content Published';
   await umbracoApi.webhook.createDefaultWebhook(webhookName, webhookSiteToken, event);
@@ -185,4 +185,4 @@ test('cannot add both content event and media event for a webhook', {tag: '@rele
   // Assert
   await umbracoUi.webhook.isModalMenuItemWithNameDisabled('Media Saved');
   await umbracoUi.webhook.isModalMenuItemWithNameDisabled('Media Deleted');
-});
\ No newline at end of file
+});

From 2b8146f72d9ef74e46d3e65fba5e2b9efb184a38 Mon Sep 17 00:00:00 2001
From: Andy Butland <abutland73@gmail.com>
Date: Tue, 4 Nov 2025 08:39:44 +0100
Subject: [PATCH 109/155] Media: Add protection to restrict access to media in
 recycle bin (closes #2931) (#20378)

* Add MoveFile it IFileSystem and implement on file systems.

* Rename media file on move to recycle bin.

* Rename file on restore from recycle bin.

* Add configuration to enabled recycle bin media protection.

* Expose backoffice authentication as cookie for non-backoffice usage.
Protected requests for media in recycle bin.

* Display protected image when viewing image cropper in the backoffice media recycle bin.

* Code tidy and comments.

* Apply suggestions from code review

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

* Introduced helper class to DRY up repeated code between image cropper and file upload notification handlers.

* Reverted client-side and management API updates.

* Moved update of path to media file in recycle bin with deleted suffix to the server.

* Separate integration tests for add and remove.

* Use interpolated strings.

* Renamed variable.

* Move EnableMediaRecycleBinProtection to ContentSettings.

* Tidied up comments.

* Added TODO for 18.

---------

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
---
 ...enticationOpenIddictServerEventsHandler.cs | 84 +++++++++++++++++++
 .../BackOfficeAuthBuilderExtensions.cs        | 30 ++++++-
 .../Mapping/Media/MediaMapDefinition.cs       | 59 ++++++++++++-
 .../Configuration/Models/ContentSettings.cs   | 15 ++++
 .../Configuration/Models/ImagingSettings.cs   |  2 +
 src/Umbraco.Core/Constants-Conventions.cs     |  5 ++
 src/Umbraco.Core/Constants-Security.cs        | 11 +++
 src/Umbraco.Core/IO/IFileSystem.cs            | 36 +++++++-
 src/Umbraco.Core/IO/MediaFileManager.cs       | 65 +++++++++++---
 src/Umbraco.Core/IO/PhysicalFileSystem.cs     | 39 +++++++--
 src/Umbraco.Core/IO/ShadowFileSystem.cs       | 58 ++++++++++++-
 src/Umbraco.Core/IO/ShadowWrapper.cs          |  2 +
 .../MediaMovedToRecycleBinNotification.cs     |  1 +
 .../UmbracoBuilder.CoreServices.cs            |  4 +
 .../ImageCropperPropertyEditor.cs             | 67 ++++++++++++++-
 ...UploadContentDeletedNotificationHandler.cs | 63 +++++++++++++-
 .../RecycleBinMediaProtectionHelper.cs        | 30 +++++++
 .../UmbracoBuilderExtensions.cs               |  1 +
 .../ApplicationBuilderExtensions.cs           |  1 +
 .../Extensions/StringExtensions.cs            | 38 +++++++++
 .../ProtectRecycleBinMediaMiddleware.cs       | 65 ++++++++++++++
 .../Umbraco.Core/IO/FileSystemsTests.cs       | 50 ++++++++++-
 .../Umbraco.Core/IO/ShadowFileSystemTests.cs  | 46 +++++++++-
 .../IO/PhysicalFileSystemTests.cs             | 19 ++++-
 24 files changed, 757 insertions(+), 34 deletions(-)
 create mode 100644 src/Umbraco.Cms.Api.Common/Security/ExposeBackOfficeAuthenticationOpenIddictServerEventsHandler.cs
 create mode 100644 src/Umbraco.Infrastructure/PropertyEditors/NotificationHandlers/RecycleBinMediaProtectionHelper.cs
 create mode 100644 src/Umbraco.Web.Common/Extensions/StringExtensions.cs
 create mode 100644 src/Umbraco.Web.Common/Middleware/ProtectRecycleBinMediaMiddleware.cs

diff --git a/src/Umbraco.Cms.Api.Common/Security/ExposeBackOfficeAuthenticationOpenIddictServerEventsHandler.cs b/src/Umbraco.Cms.Api.Common/Security/ExposeBackOfficeAuthenticationOpenIddictServerEventsHandler.cs
new file mode 100644
index 000000000000..4f3444ae31a5
--- /dev/null
+++ b/src/Umbraco.Cms.Api.Common/Security/ExposeBackOfficeAuthenticationOpenIddictServerEventsHandler.cs
@@ -0,0 +1,84 @@
+using System.Security.Claims;
+using Microsoft.AspNetCore.Authentication;
+using Microsoft.AspNetCore.Http;
+using Microsoft.Extensions.Options;
+using OpenIddict.Server;
+using Umbraco.Cms.Core.Configuration.Models;
+using Umbraco.Cms.Core.Security;
+using Umbraco.Extensions;
+
+namespace Umbraco.Cms.Infrastructure.Security;
+
+/// <summary>
+/// Provides OpenIddict server event handlers to expose the backoffice authentication token via a custom authentication scheme.
+/// </summary>
+public class ExposeBackOfficeAuthenticationOpenIddictServerEventsHandler : IOpenIddictServerHandler<OpenIddictServerEvents.GenerateTokenContext>,
+    IOpenIddictServerHandler<OpenIddictServerEvents.ApplyRevocationResponseContext>
+{
+    private readonly IHttpContextAccessor _httpContextAccessor;
+    private readonly string[] _claimTypes;
+    private readonly TimeSpan _timeOut;
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="ExposeBackOfficeAuthenticationOpenIddictServerEventsHandler"/> class.
+    /// </summary>
+    public ExposeBackOfficeAuthenticationOpenIddictServerEventsHandler(
+        IHttpContextAccessor httpContextAccessor,
+        IOptions<GlobalSettings> globalSettings,
+        IOptions<BackOfficeIdentityOptions> backOfficeIdentityOptions)
+    {
+        _httpContextAccessor = httpContextAccessor;
+        _timeOut = globalSettings.Value.TimeOut;
+
+        // These are the type identifiers for the claims required by the principal
+        // for the custom authentication scheme.
+        // We make available the ID, user name and allowed applications (sections) claims.
+        _claimTypes =
+        [
+            backOfficeIdentityOptions.Value.ClaimsIdentity.UserIdClaimType,
+            backOfficeIdentityOptions.Value.ClaimsIdentity.UserNameClaimType,
+            Core.Constants.Security.AllowedApplicationsClaimType,
+        ];
+    }
+
+    /// <inheritdoc/>
+    /// <remarks>
+    /// Event handler for when access tokens are generated (created or refreshed).
+    /// </remarks>
+    public async ValueTask HandleAsync(OpenIddictServerEvents.GenerateTokenContext context)
+    {
+        // Only proceed if this is a back-office sign-in.
+        if (context.Principal.Identity?.AuthenticationType != Core.Constants.Security.BackOfficeAuthenticationType)
+        {
+            return;
+        }
+
+        // Create a new principal with the claims from the authenticated principal.
+        var principal = new ClaimsPrincipal(
+            new ClaimsIdentity(
+                context.Principal.Claims.Where(claim => _claimTypes.Contains(claim.Type)),
+                Core.Constants.Security.BackOfficeExposedAuthenticationType));
+
+        // Sign-in the new principal for the custom authentication scheme.
+        await _httpContextAccessor
+            .GetRequiredHttpContext()
+            .SignInAsync(Core.Constants.Security.BackOfficeExposedAuthenticationType, principal, GetAuthenticationProperties());
+    }
+
+    /// <inheritdoc/>
+    /// <remarks>
+    /// Event handler for when access tokens are revoked.
+    /// </remarks>
+    public async ValueTask HandleAsync(OpenIddictServerEvents.ApplyRevocationResponseContext context)
+        => await _httpContextAccessor
+            .GetRequiredHttpContext()
+            .SignOutAsync(Core.Constants.Security.BackOfficeExposedAuthenticationType, GetAuthenticationProperties());
+
+    private AuthenticationProperties GetAuthenticationProperties()
+        => new()
+        {
+            IsPersistent = true,
+            IssuedUtc = DateTimeOffset.UtcNow,
+            ExpiresUtc = DateTimeOffset.UtcNow.Add(_timeOut)
+        };
+}
diff --git a/src/Umbraco.Cms.Api.Management/DependencyInjection/BackOfficeAuthBuilderExtensions.cs b/src/Umbraco.Cms.Api.Management/DependencyInjection/BackOfficeAuthBuilderExtensions.cs
index b633f7bdd6ef..3811587e4bfd 100644
--- a/src/Umbraco.Cms.Api.Management/DependencyInjection/BackOfficeAuthBuilderExtensions.cs
+++ b/src/Umbraco.Cms.Api.Management/DependencyInjection/BackOfficeAuthBuilderExtensions.cs
@@ -1,5 +1,7 @@
-using Microsoft.AspNetCore.Builder;
+using Microsoft.AspNetCore.Builder;
+using Microsoft.AspNetCore.Http;
 using Microsoft.Extensions.DependencyInjection;
+using OpenIddict.Server;
 using Umbraco.Cms.Api.Common.DependencyInjection;
 using Umbraco.Cms.Api.Management.Configuration;
 using Umbraco.Cms.Api.Management.Handlers;
@@ -50,6 +52,7 @@ private static IUmbracoBuilder AddBackOfficeLogin(this IUmbracoBuilder builder)
     {
         builder.Services
             .AddAuthentication()
+
             // Add our custom schemes which are cookie handlers
             .AddCookie(Constants.Security.BackOfficeAuthenticationType)
             .AddCookie(Constants.Security.BackOfficeExternalAuthenticationType, o =>
@@ -58,6 +61,15 @@ private static IUmbracoBuilder AddBackOfficeLogin(this IUmbracoBuilder builder)
                 o.ExpireTimeSpan = TimeSpan.FromMinutes(5);
             })
 
+            // Add a cookie scheme that can be used for authenticating backoffice users outside the scope of the backoffice.
+            .AddCookie(Constants.Security.BackOfficeExposedAuthenticationType, options =>
+            {
+                options.Cookie.Name = Constants.Security.BackOfficeExposedCookieName;
+                options.Cookie.HttpOnly = true;
+                options.Cookie.SecurePolicy = CookieSecurePolicy.Always;
+                options.SlidingExpiration = true;
+            })
+
             // Although we don't natively support this, we add it anyways so that if end-users implement the required logic
             // they don't have to worry about manually adding this scheme or modifying the sign in manager
             .AddCookie(Constants.Security.BackOfficeTwoFactorAuthenticationType, options =>
@@ -71,6 +83,22 @@ private static IUmbracoBuilder AddBackOfficeLogin(this IUmbracoBuilder builder)
                 o.ExpireTimeSpan = TimeSpan.FromMinutes(5);
             });
 
+        // Add OpnIddict server event handler to refresh the cookie that exposes the backoffice authentication outside the scope of the backoffice.
+        builder.Services.AddSingleton<ExposeBackOfficeAuthenticationOpenIddictServerEventsHandler>();
+        builder.Services.Configure<OpenIddictServerOptions>(options =>
+        {
+            options.Handlers.Add(
+                OpenIddictServerHandlerDescriptor
+                    .CreateBuilder<OpenIddictServerEvents.GenerateTokenContext>()
+                    .UseSingletonHandler<ExposeBackOfficeAuthenticationOpenIddictServerEventsHandler>()
+                    .Build());
+            options.Handlers.Add(
+                OpenIddictServerHandlerDescriptor
+                    .CreateBuilder<OpenIddictServerEvents.ApplyRevocationResponseContext>()
+                    .UseSingletonHandler<ExposeBackOfficeAuthenticationOpenIddictServerEventsHandler>()
+                    .Build());
+        });
+
         builder.Services.AddScoped<BackOfficeSecurityStampValidator>();
         builder.Services.ConfigureOptions<ConfigureBackOfficeCookieOptions>();
         builder.Services.ConfigureOptions<ConfigureBackOfficeSecurityStampValidatorOptions>();
diff --git a/src/Umbraco.Cms.Api.Management/Mapping/Media/MediaMapDefinition.cs b/src/Umbraco.Cms.Api.Management/Mapping/Media/MediaMapDefinition.cs
index 5d3f579c58b9..6ec71e8a5c11 100644
--- a/src/Umbraco.Cms.Api.Management/Mapping/Media/MediaMapDefinition.cs
+++ b/src/Umbraco.Cms.Api.Management/Mapping/Media/MediaMapDefinition.cs
@@ -1,13 +1,16 @@
 using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Options;
 using Umbraco.Cms.Api.Management.Mapping.Content;
 using Umbraco.Cms.Api.Management.ViewModels.Media;
 using Umbraco.Cms.Api.Management.ViewModels.Media.Collection;
 using Umbraco.Cms.Api.Management.ViewModels.MediaType;
+using Umbraco.Cms.Core.Configuration.Models;
 using Umbraco.Cms.Core.DependencyInjection;
 using Umbraco.Cms.Core.Mapping;
 using Umbraco.Cms.Core.Models;
 using Umbraco.Cms.Core.Models.Mapping;
 using Umbraco.Cms.Core.PropertyEditors;
+using Umbraco.Cms.Core.PropertyEditors.ValueConverters;
 using Umbraco.Extensions;
 
 namespace Umbraco.Cms.Api.Management.Mapping.Media;
@@ -15,13 +18,32 @@ namespace Umbraco.Cms.Api.Management.Mapping.Media;
 public class MediaMapDefinition : ContentMapDefinition<IMedia, MediaValueResponseModel, MediaVariantResponseModel>, IMapDefinition
 {
     private readonly CommonMapper _commonMapper;
+    private ContentSettings _contentSettings;
 
     public MediaMapDefinition(
         PropertyEditorCollection propertyEditorCollection,
         CommonMapper commonMapper,
-        IDataValueEditorFactory dataValueEditorFactory)
+        IDataValueEditorFactory dataValueEditorFactory,
+        IOptionsMonitor<ContentSettings> contentSettings)
         : base(propertyEditorCollection, dataValueEditorFactory)
-        => _commonMapper = commonMapper;
+    {
+        _commonMapper = commonMapper;
+        _contentSettings = contentSettings.CurrentValue;
+        contentSettings.OnChange(x => _contentSettings = x);
+    }
+
+    [Obsolete("Please use the non-obsolete constructor. Scheduled for removal in Umbraco 18.")]
+    public MediaMapDefinition(
+        PropertyEditorCollection propertyEditorCollection,
+        CommonMapper commonMapper,
+        IDataValueEditorFactory dataValueEditorFactory)
+        : this(
+              propertyEditorCollection,
+              commonMapper,
+              dataValueEditorFactory,
+              StaticServiceProvider.Instance.GetRequiredService<IOptionsMonitor<ContentSettings>>())
+    {
+    }
 
     [Obsolete("Please use the non-obsolete constructor. Scheduled for removal in Umbraco 18.")]
     public MediaMapDefinition(
@@ -48,6 +70,39 @@ private void Map(IMedia source, MediaResponseModel target, MapperContext context
         target.Values = MapValueViewModels(source.Properties);
         target.Variants = MapVariantViewModels(source);
         target.IsTrashed = source.Trashed;
+
+        // If protection for media files in the recycle bin is enabled, and the media item is trashed, amend the value of the file path
+        // to have the `.deleted` suffix that will have been added to the persisted file.
+        if (target.IsTrashed && _contentSettings.EnableMediaRecycleBinProtection)
+        {
+            foreach (MediaValueResponseModel valueModel in target.Values
+                .Where(x => x.EditorAlias.Equals(Core.Constants.PropertyEditors.Aliases.ImageCropper)))
+            {
+                if (valueModel.Value is not null &&
+                    valueModel.Value is ImageCropperValue imageCropperValue &&
+                    string.IsNullOrWhiteSpace(imageCropperValue.Src) is false)
+                {
+                    valueModel.Value = new ImageCropperValue
+                    {
+                        Crops = imageCropperValue.Crops,
+                        FocalPoint = imageCropperValue.FocalPoint,
+                        TemporaryFileId = imageCropperValue.TemporaryFileId,
+                        Src = SuffixMediaPath(imageCropperValue.Src, Core.Constants.Conventions.Media.TrashedMediaSuffix),
+                    };
+                }
+            }
+        }
+    }
+
+    private static string SuffixMediaPath(string filePath, string suffix)
+    {
+        int lastDotIndex = filePath.LastIndexOf('.');
+        if (lastDotIndex == -1)
+        {
+            return filePath + suffix;
+        }
+
+        return filePath[..lastDotIndex] + suffix + filePath[lastDotIndex..];
     }
 
     // Umbraco.Code.MapAll -Flags
diff --git a/src/Umbraco.Core/Configuration/Models/ContentSettings.cs b/src/Umbraco.Core/Configuration/Models/ContentSettings.cs
index 6df9b429e907..645d21c56711 100644
--- a/src/Umbraco.Core/Configuration/Models/ContentSettings.cs
+++ b/src/Umbraco.Core/Configuration/Models/ContentSettings.cs
@@ -31,6 +31,9 @@ public class ContentSettings
     internal const bool StaticShowDomainWarnings = true;
     internal const bool StaticShowUnroutableContentWarnings = true;
 
+    // TODO (V18): Consider enabling this by default and documenting as a behavioural breaking change.
+    private const bool StaticEnableMediaRecycleBinProtection = false;
+
     /// <summary>
     ///     Gets or sets a value for the content notification settings.
     /// </summary>
@@ -158,4 +161,16 @@ public class ContentSettings
     /// </summary>
     [DefaultValue(StaticShowUnroutableContentWarnings)]
     public bool ShowUnroutableContentWarnings { get; set; } = StaticShowUnroutableContentWarnings;
+
+    /// <summary>
+    /// Gets or sets a value indicating whether to enable or disable the recycle bin protection for media.
+    /// </summary>
+    /// <remarks>
+    /// When set to true, this will:
+    ///  - Rename media moved to the recycle bin to have a .deleted suffice (e.g. image.jpg will be renamed to image.deleted.jpg).
+    ///  - On restore, the media file will be renamed back to its original name.
+    ///  - A middleware component will be enabled to prevent access to media files in the recycle bin unless the user is authenticated with access to the media section.
+    /// </remarks>
+    [DefaultValue(StaticEnableMediaRecycleBinProtection)]
+    public bool EnableMediaRecycleBinProtection { get; set; } = StaticEnableMediaRecycleBinProtection;
 }
diff --git a/src/Umbraco.Core/Configuration/Models/ImagingSettings.cs b/src/Umbraco.Core/Configuration/Models/ImagingSettings.cs
index 32bfeedb51ed..9227c3158501 100644
--- a/src/Umbraco.Core/Configuration/Models/ImagingSettings.cs
+++ b/src/Umbraco.Core/Configuration/Models/ImagingSettings.cs
@@ -1,6 +1,8 @@
 // Copyright (c) Umbraco.
 // See LICENSE for more details.
 
+using System.ComponentModel;
+
 namespace Umbraco.Cms.Core.Configuration.Models;
 
 /// <summary>
diff --git a/src/Umbraco.Core/Constants-Conventions.cs b/src/Umbraco.Core/Constants-Conventions.cs
index 2d21c544e50f..e117b42189ae 100644
--- a/src/Umbraco.Core/Constants-Conventions.cs
+++ b/src/Umbraco.Core/Constants-Conventions.cs
@@ -100,6 +100,11 @@ public static class Media
             ///     The default height/width of an image file if the size can't be determined from the metadata
             /// </summary>
             public const int DefaultSize = 200;
+
+            /// <summary>
+            ///     Suffix added to media files when moved to the recycle bin when recycle bin media protection is enabled.
+            /// </summary>
+            public const string TrashedMediaSuffix = ".deleted";
         }
 
         /// <summary>
diff --git a/src/Umbraco.Core/Constants-Security.cs b/src/Umbraco.Core/Constants-Security.cs
index eb77642f1bb9..6567fc99b33e 100644
--- a/src/Umbraco.Core/Constants-Security.cs
+++ b/src/Umbraco.Core/Constants-Security.cs
@@ -73,6 +73,17 @@ public static class Security
         public const string BackOfficeTokenAuthenticationType = "UmbracoBackOfficeToken";
         public const string BackOfficeTwoFactorAuthenticationType = "UmbracoTwoFactorCookie";
         public const string BackOfficeTwoFactorRememberMeAuthenticationType = "UmbracoTwoFactorRememberMeCookie";
+
+        /// <summary>
+        /// Authentication type and scheme used for backoffice users when it is exposed out of the backoffice context via a cookie.
+        /// </summary>
+        public const string BackOfficeExposedAuthenticationType = "UmbracoBackOfficeExposed";
+
+        /// <summary>
+        /// Represents the name of the authentication cookie used to expose the backoffice authentication token outside of the backoffice context.
+        /// </summary>
+        public const string BackOfficeExposedCookieName = "UMB_UCONTEXT_EXPOSED";
+
         public const string EmptyPasswordPrefix = "___UIDEMPTYPWORD__";
 
         public const string DefaultMemberTypeAlias = "Member";
diff --git a/src/Umbraco.Core/IO/IFileSystem.cs b/src/Umbraco.Core/IO/IFileSystem.cs
index da9dd0b9bba4..390556f74e59 100644
--- a/src/Umbraco.Core/IO/IFileSystem.cs
+++ b/src/Umbraco.Core/IO/IFileSystem.cs
@@ -168,10 +168,42 @@ public interface IFileSystem
     /// <param name="copy">A value indicating whether to move (default) or copy.</param>
     void AddFile(string path, string physicalPath, bool overrideIfExists = true, bool copy = false);
 
+    /// <summary>
+    /// Moves a file from the specified source path to the specified target path.
+    /// </summary>
+    /// <param name="source">The path of the file or directory to move.</param>
+    /// <param name="target">The destination path where the file or directory will be moved.</param>
+    /// <param name="overrideIfExists">A value indicating what to do if the file already exists.</param>
+    void MoveFile(string source, string target, bool overrideIfExists = true)
+    {
+        // Provide a default implementation for implementations of IFileSystem that do not implement this method.
+        if (FileExists(source) is false)
+        {
+            throw new FileNotFoundException($"File at path '{source}' could not be found.");
+        }
+
+        if (FileExists(target))
+        {
+            if (overrideIfExists)
+            {
+                DeleteFile(target);
+            }
+            else
+            {
+                throw new IOException($"A file at path '{target}' already exists.");
+            }
+        }
+
+        using (Stream sourceStream = OpenFile(source))
+        {
+            AddFile(target, sourceStream);
+        }
+
+        DeleteFile(source);
+    }
+
     // TODO: implement these
     //
     // void CreateDirectory(string path);
     //
-    //// move or rename, directory or file
-    // void Move(string source, string target);
 }
diff --git a/src/Umbraco.Core/IO/MediaFileManager.cs b/src/Umbraco.Core/IO/MediaFileManager.cs
index fe9f829567b9..6b100db532e1 100644
--- a/src/Umbraco.Core/IO/MediaFileManager.cs
+++ b/src/Umbraco.Core/IO/MediaFileManager.cs
@@ -1,7 +1,5 @@
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
-using Microsoft.Extensions.Options;
-using Umbraco.Cms.Core.Configuration.Models;
 using Umbraco.Cms.Core.Models;
 using Umbraco.Cms.Core.PropertyEditors;
 using Umbraco.Cms.Core.Strings;
@@ -40,7 +38,58 @@ public MediaFileManager(
     ///     Delete media files.
     /// </summary>
     /// <param name="files">Files to delete (filesystem-relative paths).</param>
-    public void DeleteMediaFiles(IEnumerable<string> files)
+    public void DeleteMediaFiles(IEnumerable<string> files) =>
+        PerformMediaFileOperation(
+            files,
+            file =>
+            {
+                FileSystem.DeleteFile(file);
+
+                var directory = _mediaPathScheme.GetDeleteDirectory(this, file);
+                if (!directory.IsNullOrWhiteSpace())
+                {
+                    FileSystem.DeleteDirectory(directory!, true);
+                }
+            },
+            "Failed to delete media file '{File}'.");
+
+    /// <summary>
+    /// Adds a suffix to media files.
+    /// </summary>
+    /// <param name="files">Files to append a suffix to.</param>
+    /// <param name="suffix">The suffix to append.</param>
+    /// <remarks>
+    /// The suffix will be added prior to the file extension, e.g. "image.jpg" with suffix ".deleted" will become "image.deleted.jpg".
+    /// </remarks>
+    public void SuffixMediaFiles(IEnumerable<string> files, string suffix)
+        => PerformMediaFileOperation(
+            files,
+            file =>
+            {
+                var suffixedFile = Path.ChangeExtension(file, suffix + Path.GetExtension(file));
+                FileSystem.MoveFile(file, suffixedFile);
+            },
+            "Failed to rename media file '{File}'.");
+
+    /// <summary>
+    /// Removes a suffix from media files.
+    /// </summary>
+    /// <param name="files">Files to remove a suffix from.</param>
+    /// <param name="suffix">The suffix to remove.</param>
+    /// <remarks>
+    /// The suffix will be removed prior to the file extension, e.g. "image.deleted.jpg" with suffix ".deleted" will become "image.jpg".
+    /// </remarks>
+    public void RemoveSuffixFromMediaFiles(IEnumerable<string> files, string suffix)
+        => PerformMediaFileOperation(
+            files,
+            file =>
+            {
+                var fileWithSuffixRemoved = file.Replace(suffix + Path.GetExtension(file), Path.GetExtension(file));
+                FileSystem.MoveFile(file, fileWithSuffixRemoved);
+            },
+            "Failed to rename media file '{File}'.");
+
+    private void PerformMediaFileOperation(IEnumerable<string> files, Action<string> fileOperation, string errorMessage)
     {
         files = files.Distinct();
 
@@ -61,17 +110,11 @@ public void DeleteMediaFiles(IEnumerable<string> files)
                     return;
                 }
 
-                FileSystem.DeleteFile(file);
-
-                var directory = _mediaPathScheme.GetDeleteDirectory(this, file);
-                if (!directory.IsNullOrWhiteSpace())
-                {
-                    FileSystem.DeleteDirectory(directory!, true);
-                }
+                fileOperation(file);
             }
             catch (Exception e)
             {
-                _logger.LogError(e, "Failed to delete media file '{File}'.", file);
+                _logger.LogError(e, errorMessage, file);
             }
         });
     }
diff --git a/src/Umbraco.Core/IO/PhysicalFileSystem.cs b/src/Umbraco.Core/IO/PhysicalFileSystem.cs
index 32f0d0fdabcc..9c21d056db04 100644
--- a/src/Umbraco.Core/IO/PhysicalFileSystem.cs
+++ b/src/Umbraco.Core/IO/PhysicalFileSystem.cs
@@ -428,13 +428,9 @@ public void AddFile(string path, string physicalPath, bool overrideIfExists = tr
                 WithRetry(() => File.Delete(fullPath));
             }
 
-            var directory = Path.GetDirectoryName(fullPath);
-            if (directory == null)
-            {
-                throw new InvalidOperationException("Could not get directory.");
-            }
-
-            Directory.CreateDirectory(directory); // ensure it exists
+            // Ensure the directory exists.
+            var directory = Path.GetDirectoryName(fullPath) ?? throw new InvalidOperationException("Could not get directory.");
+            Directory.CreateDirectory(directory);
 
             if (copy)
             {
@@ -446,6 +442,35 @@ public void AddFile(string path, string physicalPath, bool overrideIfExists = tr
             }
         }
 
+        /// <inheritdoc/>
+        public void MoveFile(string source, string target, bool overrideIfExists = true)
+        {
+            var fullSourcePath = GetFullPath(source);
+            if (File.Exists(fullSourcePath) is false)
+            {
+                throw new FileNotFoundException($"File at path '{source}' could not be found.");
+            }
+
+            var fullTargetPath = GetFullPath(target);
+            if (File.Exists(fullTargetPath))
+            {
+                if (overrideIfExists)
+                {
+                    DeleteFile(target);
+                }
+                else
+                {
+                    throw new IOException($"A file at path '{target}' already exists.");
+                }
+            }
+
+            // Ensure the directory exists.
+            var directory = Path.GetDirectoryName(fullTargetPath) ?? throw new InvalidOperationException("Could not get directory.");
+            Directory.CreateDirectory(directory);
+
+            WithRetry(() => File.Move(fullSourcePath, fullTargetPath));
+        }
+
         #region Helper Methods
 
         protected virtual void EnsureDirectory(string path)
diff --git a/src/Umbraco.Core/IO/ShadowFileSystem.cs b/src/Umbraco.Core/IO/ShadowFileSystem.cs
index 31e884454f7b..db39fe74f4f4 100644
--- a/src/Umbraco.Core/IO/ShadowFileSystem.cs
+++ b/src/Umbraco.Core/IO/ShadowFileSystem.cs
@@ -91,7 +91,7 @@ public void AddFile(string path, Stream stream, bool overrideIfExists)
         var normPath = NormPath(path);
         if (Nodes.TryGetValue(normPath, out ShadowNode? sf) && sf.IsExist && (sf.IsDir || overrideIfExists == false))
         {
-            throw new InvalidOperationException(string.Format("A file at path '{0}' already exists", path));
+            throw new InvalidOperationException($"A file at path '{path}' already exists");
         }
 
         var parts = normPath.Split(Constants.CharArrays.ForwardSlash);
@@ -167,6 +167,60 @@ public void DeleteFile(string path)
         Nodes[NormPath(path)] = new ShadowNode(true, false);
     }
 
+    public void MoveFile(string source, string target, bool overrideIfExists = true)
+    {
+        var normSource = NormPath(source);
+        var normTarget = NormPath(target);
+        if (Nodes.TryGetValue(normSource, out ShadowNode? sf) == false || sf.IsDir || sf.IsDelete)
+        {
+            if (Inner.FileExists(source) == false)
+            {
+                throw new FileNotFoundException("Source file does not exist.");
+            }
+        }
+
+        if (Nodes.TryGetValue(normTarget, out ShadowNode? tf) && tf.IsExist && (tf.IsDir || overrideIfExists == false))
+        {
+            throw new IOException($"A file at path '{target}' already exists");
+        }
+
+        var parts = normTarget.Split(Constants.CharArrays.ForwardSlash);
+        for (var i = 0; i < parts.Length - 1; i++)
+        {
+            var dirPath = string.Join("/", parts.Take(i + 1));
+            if (Nodes.TryGetValue(dirPath, out ShadowNode? sd))
+            {
+                if (sd.IsFile)
+                {
+                    throw new InvalidOperationException("Invalid path.");
+                }
+
+                if (sd.IsDelete)
+                {
+                    Nodes[dirPath] = new ShadowNode(false, true);
+                }
+            }
+            else
+            {
+                if (Inner.DirectoryExists(dirPath))
+                {
+                    continue;
+                }
+
+                if (Inner.FileExists(dirPath))
+                {
+                    throw new InvalidOperationException("Invalid path.");
+                }
+
+                Nodes[dirPath] = new ShadowNode(false, true);
+            }
+        }
+
+        _sfs.MoveFile(normSource, normTarget, overrideIfExists);
+        Nodes[normSource] = new ShadowNode(true, false);
+        Nodes[normTarget] = new ShadowNode(false, false);
+    }
+
     public bool FileExists(string path)
     {
         if (Nodes.TryGetValue(NormPath(path), out ShadowNode? sf))
@@ -241,7 +295,7 @@ public void AddFile(string path, string physicalPath, bool overrideIfExists = tr
         var normPath = NormPath(path);
         if (Nodes.TryGetValue(normPath, out ShadowNode? sf) && sf.IsExist && (sf.IsDir || overrideIfExists == false))
         {
-            throw new InvalidOperationException(string.Format("A file at path '{0}' already exists", path));
+            throw new InvalidOperationException($"A file at path '{path}' already exists");
         }
 
         var parts = normPath.Split(Constants.CharArrays.ForwardSlash);
diff --git a/src/Umbraco.Core/IO/ShadowWrapper.cs b/src/Umbraco.Core/IO/ShadowWrapper.cs
index aa3d7c9b971e..9f4abc916085 100644
--- a/src/Umbraco.Core/IO/ShadowWrapper.cs
+++ b/src/Umbraco.Core/IO/ShadowWrapper.cs
@@ -81,6 +81,8 @@ private IFileSystem FileSystem
 
     public void DeleteFile(string path) => FileSystem.DeleteFile(path);
 
+    public void MoveFile(string source, string target) => FileSystem.MoveFile(source, target);
+
     public bool FileExists(string path) => FileSystem.FileExists(path);
 
     public string GetRelativePath(string fullPathOrUrl) => FileSystem.GetRelativePath(fullPathOrUrl);
diff --git a/src/Umbraco.Core/Notifications/MediaMovedToRecycleBinNotification.cs b/src/Umbraco.Core/Notifications/MediaMovedToRecycleBinNotification.cs
index 57897587b882..c9e7a19b4424 100644
--- a/src/Umbraco.Core/Notifications/MediaMovedToRecycleBinNotification.cs
+++ b/src/Umbraco.Core/Notifications/MediaMovedToRecycleBinNotification.cs
@@ -5,6 +5,7 @@
 using Umbraco.Cms.Core.Models;
 
 namespace Umbraco.Cms.Core.Notifications;
+
 /// <summary>
 ///  A notification that is used to trigger the IMediaService when the MoveToRecycleBin method is called in the API, after the media object has been moved to the RecycleBin.
 /// </summary>
diff --git a/src/Umbraco.Infrastructure/DependencyInjection/UmbracoBuilder.CoreServices.cs b/src/Umbraco.Infrastructure/DependencyInjection/UmbracoBuilder.CoreServices.cs
index c9f8db1154c0..d9a9c025eb51 100644
--- a/src/Umbraco.Infrastructure/DependencyInjection/UmbracoBuilder.CoreServices.cs
+++ b/src/Umbraco.Infrastructure/DependencyInjection/UmbracoBuilder.CoreServices.cs
@@ -370,12 +370,16 @@ public static IUmbracoBuilder AddCoreNotifications(this IUmbracoBuilder builder)
             .AddNotificationHandler<ContentDeletedNotification, FileUploadContentDeletedNotificationHandler>()
             .AddNotificationHandler<ContentDeletedBlueprintNotification, FileUploadContentDeletedNotificationHandler>()
             .AddNotificationHandler<MediaDeletedNotification, FileUploadContentDeletedNotificationHandler>()
+            .AddNotificationHandler<MediaMovedToRecycleBinNotification, FileUploadContentDeletedNotificationHandler>()
+            .AddNotificationHandler<MediaMovedNotification, FileUploadContentDeletedNotificationHandler>()
             .AddNotificationHandler<MemberDeletedNotification, FileUploadContentDeletedNotificationHandler>()
             .AddNotificationHandler<MediaSavingNotification, FileUploadMediaSavingNotificationHandler>()
             .AddNotificationHandler<ContentCopiedNotification, ImageCropperPropertyEditor>()
             .AddNotificationHandler<ContentDeletedNotification, ImageCropperPropertyEditor>()
             .AddNotificationHandler<MediaDeletedNotification, ImageCropperPropertyEditor>()
             .AddNotificationHandler<MediaSavingNotification, ImageCropperPropertyEditor>()
+            .AddNotificationHandler<MediaMovedToRecycleBinNotification, ImageCropperPropertyEditor>()
+            .AddNotificationHandler<MediaMovedNotification, ImageCropperPropertyEditor>()
             .AddNotificationHandler<MemberDeletedNotification, ImageCropperPropertyEditor>()
             .AddNotificationHandler<ContentTypeCacheRefresherNotification, ConstructorCacheClearNotificationHandler>()
             .AddNotificationHandler<DataTypeCacheRefresherNotification, ConstructorCacheClearNotificationHandler>();
diff --git a/src/Umbraco.Infrastructure/PropertyEditors/ImageCropperPropertyEditor.cs b/src/Umbraco.Infrastructure/PropertyEditors/ImageCropperPropertyEditor.cs
index fe978283c4fd..1af39f76851b 100644
--- a/src/Umbraco.Infrastructure/PropertyEditors/ImageCropperPropertyEditor.cs
+++ b/src/Umbraco.Infrastructure/PropertyEditors/ImageCropperPropertyEditor.cs
@@ -1,9 +1,11 @@
 // Copyright (c) Umbraco.
 // See LICENSE for more details.
 
+using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
 using Umbraco.Cms.Core.Configuration.Models;
+using Umbraco.Cms.Core.DependencyInjection;
 using Umbraco.Cms.Core.Events;
 using Umbraco.Cms.Core.IO;
 using Umbraco.Cms.Core.Media;
@@ -12,6 +14,7 @@
 using Umbraco.Cms.Core.PropertyEditors.ValueConverters;
 using Umbraco.Cms.Core.Serialization;
 using Umbraco.Cms.Core.Services;
+using Umbraco.Cms.Infrastructure.PropertyEditors.NotificationHandlers;
 using Umbraco.Extensions;
 
 namespace Umbraco.Cms.Core.PropertyEditors;
@@ -24,8 +27,12 @@ namespace Umbraco.Cms.Core.PropertyEditors;
     ValueType = ValueTypes.Json,
     ValueEditorIsReusable = true)]
 public class ImageCropperPropertyEditor : DataEditor, IMediaUrlGenerator,
-    INotificationHandler<ContentCopiedNotification>, INotificationHandler<ContentDeletedNotification>,
-    INotificationHandler<MediaDeletedNotification>, INotificationHandler<MediaSavingNotification>,
+    INotificationHandler<ContentCopiedNotification>,
+    INotificationHandler<ContentDeletedNotification>,
+    INotificationHandler<MediaDeletedNotification>,
+    INotificationHandler<MediaSavingNotification>,
+    INotificationHandler<MediaMovedToRecycleBinNotification>,
+    INotificationHandler<MediaMovedNotification>,
     INotificationHandler<MemberDeletedNotification>
 {
     private readonly UploadAutoFillProperties _autoFillProperties;
@@ -60,6 +67,7 @@ public ImageCropperPropertyEditor(
         _logger = loggerFactory.CreateLogger<ImageCropperPropertyEditor>();
 
         contentSettings.OnChange(x => _contentSettings = x);
+
         SupportsReadOnly = true;
     }
 
@@ -119,10 +127,13 @@ public void Handle(ContentCopiedNotification notification)
         }
     }
 
+    /// <inheritdoc/>
     public void Handle(ContentDeletedNotification notification) => DeleteContainedFiles(notification.DeletedEntities);
 
+    /// <inheritdoc/>
     public void Handle(MediaDeletedNotification notification) => DeleteContainedFiles(notification.DeletedEntities);
 
+    /// <inheritdoc/>
     public void Handle(MediaSavingNotification notification)
     {
         foreach (IMedia entity in notification.SavedEntities)
@@ -131,6 +142,34 @@ public void Handle(MediaSavingNotification notification)
         }
     }
 
+    /// <inheritdoc/>
+    public void Handle(MediaMovedToRecycleBinNotification notification)
+    {
+        if (_contentSettings.EnableMediaRecycleBinProtection is false)
+        {
+            return;
+        }
+
+        SuffixContainedFiles(
+            notification.MoveInfoCollection
+                .Select(x => x.Entity));
+    }
+
+    /// <inheritdoc/>
+    public void Handle(MediaMovedNotification notification)
+    {
+        if (_contentSettings.EnableMediaRecycleBinProtection is false)
+        {
+            return;
+        }
+
+        RemoveSuffixFromContainedFiles(
+            notification.MoveInfoCollection
+                .Where(x => x.OriginalPath.StartsWith($"{Constants.System.RootString},{Constants.System.RecycleBinMediaString}"))
+                .Select(x => x.Entity));
+    }
+
+    /// <inheritdoc/>
     public void Handle(MemberDeletedNotification notification) => DeleteContainedFiles(notification.DeletedEntities);
 
     /// <summary>
@@ -233,12 +272,36 @@ private IEnumerable<string> GetFilePathsFromPropertyValues(IProperty prop)
         return relative ? _mediaFileManager.FileSystem.GetRelativePath(source) : source;
     }
 
+    /// <summary>
+    /// Deletes all file upload property files contained within a collection of content entities.
+    /// </summary>
+    /// <param name="deletedEntities">Delete media entities.</param>
     private void DeleteContainedFiles(IEnumerable<IContentBase> deletedEntities)
     {
         IEnumerable<string> filePathsToDelete = ContainedFilePaths(deletedEntities);
         _mediaFileManager.DeleteMediaFiles(filePathsToDelete);
     }
 
+    /// <summary>
+    /// Renames all file upload property files contained within a collection of media entities that have been moved to the recycle bin.
+    /// </summary>
+    /// <param name="trashedMedia">Media entities that have been moved to the recycle bin.</param>
+    private void SuffixContainedFiles(IEnumerable<IMedia> trashedMedia)
+    {
+        IEnumerable<string> filePathsToRename = ContainedFilePaths(trashedMedia);
+        RecycleBinMediaProtectionHelper.SuffixContainedFiles(filePathsToRename, _mediaFileManager);
+    }
+
+    /// <summary>
+    /// Renames all file upload property files contained within a collection of media entities that have been restore from the recycle bin.
+    /// </summary>
+    /// <param name="restoredMedia">Media entities that have been restored from the recycle bin.</param>
+    private void RemoveSuffixFromContainedFiles(IEnumerable<IMedia> restoredMedia)
+    {
+        IEnumerable<string> filePathsToRename = ContainedFilePaths(restoredMedia);
+        RecycleBinMediaProtectionHelper.RemoveSuffixFromContainedFiles(filePathsToRename, _mediaFileManager);
+    }
+
     /// <summary>
     ///     Auto-fill properties (or clear).
     /// </summary>
diff --git a/src/Umbraco.Infrastructure/PropertyEditors/NotificationHandlers/FileUploadContentDeletedNotificationHandler.cs b/src/Umbraco.Infrastructure/PropertyEditors/NotificationHandlers/FileUploadContentDeletedNotificationHandler.cs
index 4203209b580a..1c36bea04df8 100644
--- a/src/Umbraco.Infrastructure/PropertyEditors/NotificationHandlers/FileUploadContentDeletedNotificationHandler.cs
+++ b/src/Umbraco.Infrastructure/PropertyEditors/NotificationHandlers/FileUploadContentDeletedNotificationHandler.cs
@@ -1,6 +1,8 @@
 using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Options;
 using Umbraco.Cms.Core;
 using Umbraco.Cms.Core.Cache.PropertyEditors;
+using Umbraco.Cms.Core.Configuration.Models;
 using Umbraco.Cms.Core.Events;
 using Umbraco.Cms.Core.IO;
 using Umbraco.Cms.Core.Models;
@@ -14,16 +16,20 @@
 namespace Umbraco.Cms.Infrastructure.PropertyEditors.NotificationHandlers;
 
 /// <summary>
-/// Provides base class for notification handler that processes file uploads when a content entity is deleted, removing associated files.
+/// Provides base class for notification handler that processes file uploads when a content entity is deleted or media
+/// operations are carried out, processing the associated files.
 /// </summary>
 internal sealed class FileUploadContentDeletedNotificationHandler : FileUploadNotificationHandlerBase,
     INotificationHandler<ContentDeletedNotification>,
     INotificationHandler<ContentDeletedBlueprintNotification>,
     INotificationHandler<MediaDeletedNotification>,
+    INotificationHandler<MediaMovedToRecycleBinNotification>,
+    INotificationHandler<MediaMovedNotification>,
     INotificationHandler<MemberDeletedNotification>
 {
     private readonly BlockEditorValues<BlockListValue, BlockListLayoutItem> _blockListEditorValues;
     private readonly BlockEditorValues<BlockGridValue, BlockGridLayoutItem> _blockGridEditorValues;
+    private ContentSettings _contentSettings;
 
     /// <summary>
     /// Initializes a new instance of the <see cref="FileUploadContentDeletedNotificationHandler"/> class.
@@ -32,11 +38,15 @@ public FileUploadContentDeletedNotificationHandler(
         IJsonSerializer jsonSerializer,
         MediaFileManager mediaFileManager,
         IBlockEditorElementTypeCache elementTypeCache,
-        ILogger<FileUploadContentDeletedNotificationHandler> logger)
+        ILogger<FileUploadContentDeletedNotificationHandler> logger,
+        IOptionsMonitor<ContentSettings> contentSettngs)
         : base(jsonSerializer, mediaFileManager, elementTypeCache)
     {
         _blockListEditorValues = new(new BlockListEditorDataConverter(jsonSerializer), elementTypeCache, logger);
         _blockGridEditorValues = new(new BlockGridEditorDataConverter(jsonSerializer), elementTypeCache, logger);
+
+        _contentSettings = contentSettngs.CurrentValue;
+        contentSettngs.OnChange(x => _contentSettings = x);
     }
 
     /// <inheritdoc/>
@@ -48,19 +58,66 @@ public FileUploadContentDeletedNotificationHandler(
     /// <inheritdoc/>
     public void Handle(MediaDeletedNotification notification) => DeleteContainedFiles(notification.DeletedEntities);
 
+    /// <inheritdoc/>
+    public void Handle(MediaMovedToRecycleBinNotification notification)
+    {
+        if (_contentSettings.EnableMediaRecycleBinProtection is false)
+        {
+            return;
+        }
+
+        SuffixContainedFiles(
+            notification.MoveInfoCollection
+                .Select(x => x.Entity));
+    }
+
+    /// <inheritdoc/>
+    public void Handle(MediaMovedNotification notification)
+    {
+        if (_contentSettings.EnableMediaRecycleBinProtection is false)
+        {
+            return;
+        }
+
+        RemoveSuffixFromContainedFiles(
+            notification.MoveInfoCollection
+                .Where(x => x.OriginalPath.StartsWith($"{Constants.System.RootString},{Constants.System.RecycleBinMediaString}"))
+                .Select(x => x.Entity));
+    }
+
     /// <inheritdoc/>
     public void Handle(MemberDeletedNotification notification) => DeleteContainedFiles(notification.DeletedEntities);
 
     /// <summary>
     /// Deletes all file upload property files contained within a collection of content entities.
     /// </summary>
-    /// <param name="deletedEntities"></param>
+    /// <param name="deletedEntities">Delete media entities.</param>
     private void DeleteContainedFiles(IEnumerable<IContentBase> deletedEntities)
     {
         IReadOnlyList<string> filePathsToDelete = ContainedFilePaths(deletedEntities);
         MediaFileManager.DeleteMediaFiles(filePathsToDelete);
     }
 
+    /// <summary>
+    /// Renames all file upload property files contained within a collection of media entities that have been moved to the recycle bin.
+    /// </summary>
+    /// <param name="trashedMedia">Media entities that have been moved to the recycle bin.</param>
+    private void SuffixContainedFiles(IEnumerable<IMedia> trashedMedia)
+    {
+        IEnumerable<string> filePathsToRename = ContainedFilePaths(trashedMedia);
+        RecycleBinMediaProtectionHelper.SuffixContainedFiles(filePathsToRename, MediaFileManager);
+    }
+
+    /// <summary>
+    /// Renames all file upload property files contained within a collection of media entities that have been restored from the recycle bin.
+    /// </summary>
+    /// <param name="restoredMedia">Media entities that have been restored from the recycle bin.</param>
+    private void RemoveSuffixFromContainedFiles(IEnumerable<IMedia> restoredMedia)
+    {
+        IEnumerable<string> filePathsToRename = ContainedFilePaths(restoredMedia);
+        MediaFileManager.RemoveSuffixFromMediaFiles(filePathsToRename, Constants.Conventions.Media.TrashedMediaSuffix);
+    }
+
     /// <summary>
     /// Gets the paths to all file upload property files contained within a collection of content entities.
     /// </summary>
diff --git a/src/Umbraco.Infrastructure/PropertyEditors/NotificationHandlers/RecycleBinMediaProtectionHelper.cs b/src/Umbraco.Infrastructure/PropertyEditors/NotificationHandlers/RecycleBinMediaProtectionHelper.cs
new file mode 100644
index 000000000000..ca540b9c6153
--- /dev/null
+++ b/src/Umbraco.Infrastructure/PropertyEditors/NotificationHandlers/RecycleBinMediaProtectionHelper.cs
@@ -0,0 +1,30 @@
+using Umbraco.Cms.Core;
+using Umbraco.Cms.Core.IO;
+
+namespace Umbraco.Cms.Infrastructure.PropertyEditors.NotificationHandlers;
+
+/// <summary>
+/// Provides helper methods for multiple notification handlers dealing with protection of media files for media in the recycle bin.
+/// </summary>
+internal static class RecycleBinMediaProtectionHelper
+{
+    /// <summary>
+    /// Renames all file upload property files contained within a collection of media entities that have been moved to the recycle bin.
+    /// </summary>
+    /// <param name="filePaths">Media file paths.</param>
+    /// <param name="mediaFileManager">The media file manager.</param>
+    public static void SuffixContainedFiles(IEnumerable<string> filePaths, MediaFileManager mediaFileManager)
+        => mediaFileManager.SuffixMediaFiles(filePaths, Constants.Conventions.Media.TrashedMediaSuffix);
+
+    /// <summary>
+    /// Renames all file upload property files contained within a collection of media entities that have been restore from the recycle bin.
+    /// </summary>
+    /// <param name="filePaths">Media file paths.</param>
+    /// <param name="mediaFileManager">The media file manager.</param>
+    public static void RemoveSuffixFromContainedFiles(IEnumerable<string> filePaths, MediaFileManager mediaFileManager)
+    {
+        IEnumerable<string> filePathsToRename = filePaths
+            .Select(x => Path.ChangeExtension(x, Constants.Conventions.Media.TrashedMediaSuffix + Path.GetExtension(x)));
+        mediaFileManager.RemoveSuffixFromMediaFiles(filePathsToRename, Constants.Conventions.Media.TrashedMediaSuffix);
+    }
+}
diff --git a/src/Umbraco.Web.Common/DependencyInjection/UmbracoBuilderExtensions.cs b/src/Umbraco.Web.Common/DependencyInjection/UmbracoBuilderExtensions.cs
index b3d31d323b0f..86bea154c610 100644
--- a/src/Umbraco.Web.Common/DependencyInjection/UmbracoBuilderExtensions.cs
+++ b/src/Umbraco.Web.Common/DependencyInjection/UmbracoBuilderExtensions.cs
@@ -270,6 +270,7 @@ public static IUmbracoBuilder AddWebComponents(this IUmbracoBuilder builder)
         builder.Services.AddSingleton<PreviewAuthenticationMiddleware>();
         builder.Services.AddSingleton<UmbracoRequestMiddleware>();
         builder.Services.AddSingleton<BootFailedMiddleware>();
+        builder.Services.AddSingleton<ProtectRecycleBinMediaMiddleware>();
 
         builder.Services.AddUnique<ITemplateRenderer, TemplateRenderer>();
         builder.Services.AddUnique<IPublicAccessChecker, PublicAccessChecker>();
diff --git a/src/Umbraco.Web.Common/Extensions/ApplicationBuilderExtensions.cs b/src/Umbraco.Web.Common/Extensions/ApplicationBuilderExtensions.cs
index ada8f64fdfa4..76ef786fbf19 100644
--- a/src/Umbraco.Web.Common/Extensions/ApplicationBuilderExtensions.cs
+++ b/src/Umbraco.Web.Common/Extensions/ApplicationBuilderExtensions.cs
@@ -104,6 +104,7 @@ public static IApplicationBuilder UseUmbracoRouting(this IApplicationBuilder app
             app.UseMiddleware<PreviewAuthenticationMiddleware>();
             app.UseMiddleware<UmbracoRequestMiddleware>();
             app.UseMiddleware<MiniProfilerMiddleware>();
+            app.UseMiddleware<ProtectRecycleBinMediaMiddleware>();
         }
 
         return app;
diff --git a/src/Umbraco.Web.Common/Extensions/StringExtensions.cs b/src/Umbraco.Web.Common/Extensions/StringExtensions.cs
new file mode 100644
index 000000000000..29cff82f62a8
--- /dev/null
+++ b/src/Umbraco.Web.Common/Extensions/StringExtensions.cs
@@ -0,0 +1,38 @@
+namespace Umbraco.Cms.Web.Common.Extensions;
+
+internal static class StringExtensions
+{
+    /// <summary>
+    /// Provides a robust way to check if a path starts with another path, normalizing multiple slashes.
+    /// </summary>
+    internal static bool StartsWithNormalizedPath(this string path, string other, StringComparison comparisonType = StringComparison.Ordinal)
+    {
+        // First check without normalizing.
+        if (path.StartsWith(other, comparisonType))
+        {
+            return true;
+        }
+
+        // Normalize paths by splitting them into segments, removing multiple slashes.
+        var otherSegments = other.Split(Core.Constants.CharArrays.ForwardSlash, StringSplitOptions.RemoveEmptyEntries);
+        var pathSegments = path.Split(Core.Constants.CharArrays.ForwardSlash, otherSegments.Length + 1, StringSplitOptions.RemoveEmptyEntries);
+
+        // The path should have at least as many segments as the other path
+        if (otherSegments.Length > pathSegments.Length)
+        {
+            return false;
+        }
+
+        // Check each segment.
+        for (int i = otherSegments.Length - 1; i >= 0; i--)
+        {
+            if (!string.Equals(otherSegments[i], pathSegments[i], comparisonType))
+            {
+                return false;
+            }
+        }
+
+        // All segments match.
+        return true;
+    }
+}
diff --git a/src/Umbraco.Web.Common/Middleware/ProtectRecycleBinMediaMiddleware.cs b/src/Umbraco.Web.Common/Middleware/ProtectRecycleBinMediaMiddleware.cs
new file mode 100644
index 000000000000..2df70c2de5d6
--- /dev/null
+++ b/src/Umbraco.Web.Common/Middleware/ProtectRecycleBinMediaMiddleware.cs
@@ -0,0 +1,65 @@
+using System.Security.Claims;
+using Microsoft.AspNetCore.Authentication;
+using Microsoft.AspNetCore.Http;
+using Microsoft.Extensions.Options;
+using Umbraco.Cms.Core.Configuration.Models;
+using Umbraco.Cms.Web.Common.Extensions;
+
+namespace Umbraco.Cms.Web.Common.Middleware;
+
+/// <summary>
+/// Ensures that requests to the media in the recycle bin are authorized and only authenticated back-office users
+/// with permissions for the media have access.
+/// </summary>
+public class ProtectRecycleBinMediaMiddleware : IMiddleware
+{
+    private ContentSettings _contentSettings;
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="ProtectRecycleBinMediaMiddleware"/> class.
+    /// </summary>
+    public ProtectRecycleBinMediaMiddleware(
+        IOptionsMonitor<ContentSettings> contentSettings)
+    {
+        _contentSettings = contentSettings.CurrentValue;
+        contentSettings.OnChange(x => _contentSettings = x);
+    }
+
+    /// <inheritdoc/>
+    public async Task InvokeAsync(HttpContext context, RequestDelegate next)
+    {
+        if (_contentSettings.EnableMediaRecycleBinProtection is false)
+        {
+            await next(context);
+            return;
+        }
+
+        string? requestPath = context.Request.Path.Value;
+
+        if (string.IsNullOrEmpty(requestPath) ||
+            requestPath.StartsWithNormalizedPath($"/media/", StringComparison.OrdinalIgnoreCase) is false ||
+            requestPath.Contains(Core.Constants.Conventions.Media.TrashedMediaSuffix + ".") is false)
+        {
+            await next(context);
+            return;
+        }
+
+        AuthenticateResult authenticateResult = await context.AuthenticateAsync(Core.Constants.Security.BackOfficeExposedAuthenticationType);
+        if (authenticateResult.Succeeded is false)
+        {
+            context.Response.StatusCode = StatusCodes.Status401Unauthorized;
+            return;
+        }
+
+        Claim? mediaSectionClaim = authenticateResult.Principal.Claims
+            .FirstOrDefault(x => x.Type == Core.Constants.Security.AllowedApplicationsClaimType && x.Value == Core.Constants.Applications.Media);
+
+        if (mediaSectionClaim is null)
+        {
+            context.Response.StatusCode = StatusCodes.Status403Forbidden;
+            return;
+        }
+
+        await next(context);
+    }
+}
diff --git a/tests/Umbraco.Tests.Integration/Umbraco.Core/IO/FileSystemsTests.cs b/tests/Umbraco.Tests.Integration/Umbraco.Core/IO/FileSystemsTests.cs
index 498e6b1f61da..5893333e8ace 100644
--- a/tests/Umbraco.Tests.Integration/Umbraco.Core/IO/FileSystemsTests.cs
+++ b/tests/Umbraco.Tests.Integration/Umbraco.Core/IO/FileSystemsTests.cs
@@ -1,7 +1,6 @@
 // Copyright (c) Umbraco.
 // See LICENSE for more details.
 
-using System.IO;
 using System.Text;
 using NUnit.Framework;
 using Umbraco.Cms.Core.Hosting;
@@ -69,6 +68,55 @@ public void Can_Delete_MediaFiles()
         Assert.IsTrue(Directory.Exists(physPath));
     }
 
+    [Test]
+    public void Can_Add_Suffix_To_Media_Files()
+    {
+        var mediaFileManager = GetRequiredService<MediaFileManager>();
+        var hostingEnvironment = GetRequiredService<IHostingEnvironment>();
+
+        CreateMediaFile(mediaFileManager, hostingEnvironment, out string virtualPath, out string physicalPath);
+        Assert.IsTrue(File.Exists(physicalPath));
+
+        mediaFileManager.SuffixMediaFiles([virtualPath], Cms.Core.Constants.Conventions.Media.TrashedMediaSuffix);
+        Assert.IsFalse(File.Exists(physicalPath));
+
+        var virtualPathWithSuffix = virtualPath.Replace("file.txt", $"file{Cms.Core.Constants.Conventions.Media.TrashedMediaSuffix}.txt");
+        physicalPath = hostingEnvironment.MapPathWebRoot(Path.Combine("media", virtualPathWithSuffix));
+        Assert.IsTrue(File.Exists(physicalPath));
+    }
+
+    [Test]
+    public void Can_Remove_Suffix_From_Media_Files()
+    {
+        var mediaFileManager = GetRequiredService<MediaFileManager>();
+        var hostingEnvironment = GetRequiredService<IHostingEnvironment>();
+
+        CreateMediaFile(mediaFileManager, hostingEnvironment, out string virtualPath, out string physicalPath);
+        mediaFileManager.SuffixMediaFiles([virtualPath], Cms.Core.Constants.Conventions.Media.TrashedMediaSuffix);
+        Assert.IsFalse(File.Exists(physicalPath));
+
+        mediaFileManager.RemoveSuffixFromMediaFiles([virtualPath], Cms.Core.Constants.Conventions.Media.TrashedMediaSuffix);
+        Assert.IsFalse(File.Exists(physicalPath));
+
+        var virtualPathWithSuffix = virtualPath.Replace("file.txt", $"file{Cms.Core.Constants.Conventions.Media.TrashedMediaSuffix}.txt");
+        physicalPath = hostingEnvironment.MapPathWebRoot(Path.Combine("media", virtualPathWithSuffix));
+        Assert.IsTrue(File.Exists(physicalPath));
+    }
+
+    private static void CreateMediaFile(
+        MediaFileManager mediaFileManager,
+        IHostingEnvironment hostingEnvironment,
+        out string virtualPath,
+        out string physicalPath)
+    {
+        virtualPath = mediaFileManager.GetMediaPath("file.txt", Guid.NewGuid(), Guid.NewGuid());
+        physicalPath = hostingEnvironment.MapPathWebRoot(Path.Combine("media", virtualPath));
+
+        var memoryStream = new MemoryStream(Encoding.UTF8.GetBytes("test"));
+        mediaFileManager.FileSystem.AddFile(virtualPath, memoryStream);
+        Assert.IsTrue(File.Exists(physicalPath));
+    }
+
     // TODO: don't make sense anymore
     /*
     [Test]
diff --git a/tests/Umbraco.Tests.Integration/Umbraco.Core/IO/ShadowFileSystemTests.cs b/tests/Umbraco.Tests.Integration/Umbraco.Core/IO/ShadowFileSystemTests.cs
index e994e888662d..c3932fabb390 100644
--- a/tests/Umbraco.Tests.Integration/Umbraco.Core/IO/ShadowFileSystemTests.cs
+++ b/tests/Umbraco.Tests.Integration/Umbraco.Core/IO/ShadowFileSystemTests.cs
@@ -38,8 +38,7 @@ private void ClearFiles(IHostingEnvironment hostingEnvironment)
     {
         TestHelper.DeleteDirectory(hostingEnvironment.MapPathContentRoot("FileSysTests"));
         TestHelper.DeleteDirectory(
-            hostingEnvironment.MapPathContentRoot(Constants.SystemDirectories.TempData.EnsureEndsWith('/') +
-                                                  "ShadowFs"));
+            hostingEnvironment.MapPathContentRoot(Constants.SystemDirectories.TempData.EnsureEndsWith('/') + "ShadowFs"));
     }
 
     private static string NormPath(string path) => path.Replace('\\', Path.AltDirectorySeparatorChar);
@@ -166,6 +165,49 @@ public void ShadowDeleteFile()
         Assert.IsTrue(files.Contains("f2.txt"));
     }
 
+    [Test]
+    public void ShadowMoveFile()
+    {
+        var path = HostingEnvironment.MapPathContentRoot("FileSysTests");
+        Directory.CreateDirectory(path);
+        Directory.CreateDirectory(path + "/ShadowTests");
+        Directory.CreateDirectory(path + "/ShadowSystem");
+
+        var fs = new PhysicalFileSystem(IOHelper, HostingEnvironment, Logger, path + "/ShadowTests/", "ignore");
+        var sfs = new PhysicalFileSystem(IOHelper, HostingEnvironment, Logger, path + "/ShadowSystem/", "ignore");
+        var ss = new ShadowFileSystem(fs, sfs);
+
+        File.WriteAllText(path + "/ShadowTests/f1.txt", "foo");
+        using (var ms = new MemoryStream(Encoding.UTF8.GetBytes("foo")))
+        {
+            ss.AddFile("f1.txt", ms);
+        }
+
+        var files = fs.GetFiles(string.Empty);
+        Assert.AreEqual(1, files.Count());
+        Assert.IsTrue(files.Contains("f1.txt"));
+
+        files = ss.GetFiles(string.Empty);
+        Assert.AreEqual(1, files.Count());
+        Assert.IsTrue(files.Contains("f1.txt"));
+
+        var dirs = ss.GetDirectories(string.Empty);
+        Assert.AreEqual(0, dirs.Count());
+
+        ss.MoveFile("f1.txt", "f2.txt");
+
+        Assert.IsTrue(File.Exists(path + "/ShadowTests/f1.txt"));
+        Assert.IsFalse(File.Exists(path + "/ShadowTests/f2.txt"));
+        Assert.IsTrue(fs.FileExists("f1.txt"));
+        Assert.IsFalse(fs.FileExists("f2.txt"));
+        Assert.IsFalse(ss.FileExists("f1.txt"));
+        Assert.IsTrue(ss.FileExists("f2.txt"));
+
+        files = ss.GetFiles(string.Empty);
+        Assert.AreEqual(1, files.Count());
+        Assert.IsTrue(files.Contains("f2.txt"));
+    }
+
     [Test]
     public void ShadowDeleteFileInDir()
     {
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/IO/PhysicalFileSystemTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/IO/PhysicalFileSystemTests.cs
index 396ad944154c..fcd922a43824 100644
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/IO/PhysicalFileSystemTests.cs
+++ b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/IO/PhysicalFileSystemTests.cs
@@ -1,7 +1,6 @@
 // Copyright (c) Umbraco.
 // See LICENSE for more details.
 
-using System.IO;
 using System.Text;
 using Microsoft.Extensions.Logging;
 using Moq;
@@ -82,6 +81,24 @@ public void SaveFileTest()
         });
     }
 
+    [Test]
+    public void MoveFileTest()
+    {
+        var basePath = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "FileSysTests");
+
+        using (var ms = new MemoryStream(Encoding.UTF8.GetBytes("foo")))
+        {
+            _fileSystem.AddFile("sub/f3.txt", ms);
+        }
+
+        Assert.IsTrue(File.Exists(Path.Combine(basePath, "sub/f3.txt")));
+
+        _fileSystem.MoveFile("sub/f3.txt", "sub2/f4.txt");
+
+        Assert.IsFalse(File.Exists(Path.Combine(basePath, "sub/f3.txt")));
+        Assert.IsTrue(File.Exists(Path.Combine(basePath, "sub2/f4.txt")));
+    }
+
     [Test]
     public void GetFullPathTest()
     {

From fa5c53b5719609b4a98d46056575f6bbd8367938 Mon Sep 17 00:00:00 2001
From: Jacob Overgaard <752371+iOvergaard@users.noreply.github.com>
Date: Tue, 4 Nov 2025 12:31:34 +0100
Subject: [PATCH 110/155] Auth: Cleans up stale or completed auth details from
 storage (#20725)

* fix: cleans up stale PKCE keys after auth regardless of success or error

* fix: cleans up stale PKCE data on logout
---
 .../openid/src/redirect_based_handler.ts      | 48 ++++++++++++++++---
 .../src/packages/core/auth/auth-flow.ts       |  4 ++
 2 files changed, 45 insertions(+), 7 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/external/openid/src/redirect_based_handler.ts b/src/Umbraco.Web.UI.Client/src/external/openid/src/redirect_based_handler.ts
index e9bb94a8a748..eb110ba16a03 100644
--- a/src/Umbraco.Web.UI.Client/src/external/openid/src/redirect_based_handler.ts
+++ b/src/Umbraco.Web.UI.Client/src/external/openid/src/redirect_based_handler.ts
@@ -77,6 +77,41 @@ export class RedirectRequestHandler extends AuthorizationRequestHandler {
 		});
 	}
 
+	/**
+	 * Cleanup all stale authorization requests and configurations from storage.
+	 * This scans localStorage for any keys matching the appauth patterns and removes them,
+	 * including the authorization request handle key.
+	 */
+	public cleanupStaleAuthorizationData(): Promise<void> {
+		// Check if we're in a browser environment with localStorage
+		if (typeof window === 'undefined' || !window.localStorage) {
+			return Promise.resolve();
+		}
+
+		const keysToRemove: string[] = [];
+
+		// Scan localStorage for all appauth-related keys
+		for (let i = 0; i < window.localStorage.length; i++) {
+			const key = window.localStorage.key(i);
+			if (
+				key &&
+				(key.includes('_appauth_authorization_request') ||
+					key.includes('_appauth_authorization_service_configuration') ||
+					key === AUTHORIZATION_REQUEST_HANDLE_KEY)
+			) {
+				keysToRemove.push(key);
+			}
+		}
+
+		// Remove all found stale keys
+		const removePromises = keysToRemove.map((key) => this.storageBackend.removeItem(key));
+		return Promise.all(removePromises).then(() => {
+			if (keysToRemove.length > 0) {
+				log(`Cleaned up ${keysToRemove.length} stale authorization data entries`);
+			}
+		});
+	}
+
 	/**
 	 * Attempts to introspect the contents of storage backend and completes the
 	 * request.
@@ -119,12 +154,8 @@ export class RedirectRequestHandler extends AuthorizationRequestHandler {
 								} else {
 									authorizationResponse = new AuthorizationResponse({ code: code, state: state });
 								}
-								// cleanup state
-								return Promise.all([
-									this.storageBackend.removeItem(AUTHORIZATION_REQUEST_HANDLE_KEY),
-									this.storageBackend.removeItem(authorizationRequestKey(handle)),
-									this.storageBackend.removeItem(authorizationServiceConfigurationKey(handle)),
-								]).then(() => {
+								// cleanup all authorization data including current and stale entries
+								return this.cleanupStaleAuthorizationData().then(() => {
 									log('Delivering authorization response');
 									return {
 										request: request,
@@ -134,7 +165,10 @@ export class RedirectRequestHandler extends AuthorizationRequestHandler {
 								});
 							} else {
 								log('Mismatched request (state and request_uri) dont match.');
-								return Promise.resolve(null);
+								// cleanup all authorization data even on mismatch to prevent stale PKCE data
+								return this.cleanupStaleAuthorizationData().then(() => {
+									return null;
+								});
 							}
 						})
 				);
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/auth/auth-flow.ts b/src/Umbraco.Web.UI.Client/src/packages/core/auth/auth-flow.ts
index 0e0254642377..fc6f5d1ab2d2 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/auth/auth-flow.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/auth/auth-flow.ts
@@ -247,6 +247,10 @@ export class UmbAuthFlow {
 
 		// clear the internal state
 		this.#tokenResponse.setValue(undefined);
+
+		// Also cleanup any OAuth/PKCE artifacts that may still be in localStorage
+		// This is a defense-in-depth measure during logout
+		await this.#authorizationHandler.cleanupStaleAuthorizationData();
 	}
 
 	/**

From e8f2bb33d767d2cbb49a6846349dd2ad04aeda45 Mon Sep 17 00:00:00 2001
From: Nhu Dinh <150406148+nhudinh0309@users.noreply.github.com>
Date: Wed, 5 Nov 2025 15:54:09 +0700
Subject: [PATCH 111/155] E2E: QA Fixed the failing tests due to the recent UI
 changes (#20576)

* Added skip tag for the failing tests due to the issues and added waits for the flaky tests

* Commentted code as the reference items displays randomly

* Bumped version

* Added more waits to avoid the flaky tests

* Updated tests for setting culture and hostnames since the first content already has the default domain

* Fixed flaky tests

* Updated tests since the reload step is flaky

* Added more waits for the flaky tests in Windows

* Need to publish first document before set domain for second document

* Make permission tests run in the pipeline

* Added step to ensure the rollback action is completed

* Reverted npm command

* Added skip tag for the permission tests

* Fixed test for the culture and hostname permission

* Removed waits as it is includes in test helper

* Fixed test for adding a media in RTE Tiptap property editor

* Updated test helper function to avoid the flaky tests releated to block

* Added more waits to ensure image uploaded

* Bumped version

* Bumped version

* Reverted

* Reverted code

* Bumped version of test helper

* Bumped version

* Reverted code

* Added more waits to avoid flaky tests

* Added more waits

* Updated nightly pipeline: remove v17/dev, run different app setting tests by default and not run Relation Type in Linux as they are too flaky

* Added more waits

* Added npm command for testWindows

* Added more waits after creating a folder
---
 build/nightly-E2E-test-pipelines.yml          | 15 +++++++--------
 .../package-lock.json                         |  8 ++++----
 .../Umbraco.Tests.AcceptanceTest/package.json |  5 +++--
 .../BlockGrid/ContentWithBlockGrid.spec.ts    | 19 +++++++++----------
 .../BlockList/ContentWithBlockList.spec.ts    |  8 ++++----
 .../Content/ContentWithImageCropper.spec.ts   |  2 ++
 .../RichTextEditor/ContentWithTiptap.spec.ts  |  2 +-
 .../RichTextEditor/TiptapToolbar.spec.ts      |  2 +-
 .../Content/TrashContent/TrashContent.spec.ts |  2 +-
 .../BlockListEditor/BlockListBlocks.spec.ts   |  1 +
 .../DataTypeCollectionWorkspace.spec.ts       |  2 ++
 .../DataType/DataTypeFolder.spec.ts           |  3 +++
 .../Settings/Dashboard/Profiling.spec.ts      |  6 +++---
 .../DocumentTypeCollectionWorkspace.spec.ts   |  1 +
 .../DocumentType/DocumentTypeFolder.spec.ts   |  1 +
 .../MediaType/MediaTypeFolder.spec.ts         |  6 +++---
 .../User/ContentStartNodes.spec.ts            |  5 +++--
 .../Permissions/User/MediaStartNodes.spec.ts  |  6 ++++--
 .../UserGroup/ContentStartNodes.spec.ts       |  3 ++-
 .../DefaultPermissionsInContent.spec.ts       |  4 +++-
 ...entPropertyValueGranularPermission.spec.ts |  5 +++--
 .../DocumentPropertyValuePermission.spec.ts   |  3 ++-
 .../GranularPermissionsInContent.spec.ts      | 14 ++++++++++----
 .../UserGroup/MediaStartNodes.spec.ts         |  6 ++++--
 24 files changed, 77 insertions(+), 52 deletions(-)

diff --git a/build/nightly-E2E-test-pipelines.yml b/build/nightly-E2E-test-pipelines.yml
index 74c6f7b0f7f7..8ed64d60303d 100644
--- a/build/nightly-E2E-test-pipelines.yml
+++ b/build/nightly-E2E-test-pipelines.yml
@@ -11,7 +11,6 @@ schedules:
         - v15/dev
         - v16/dev
         - main
-        - v17/dev
 
 parameters:
   - name: skipIntegrationTests
@@ -19,10 +18,10 @@ parameters:
     type: boolean
     default: false
 
-  - name: differentAppSettingsAcceptanceTests
-    displayName: Run acceptance tests with different app settings
+  - name: skipDifferentAppSettingsAcceptanceTests
+    displayName: Skip acceptance tests with different app settings
     type: boolean
-    default: true
+    default: false
 
   - name: skipDefaultConfigAcceptanceTests
     displayName: Skip tests with DefaultConfig
@@ -444,15 +443,15 @@ stages:
               vmImage: "ubuntu-latest"
               CONNECTIONSTRINGS__UMBRACODBDSN: "Server=(local);Database=Umbraco;User Id=sa;Password=$(SA_PASSWORD);Encrypt=True;TrustServerCertificate=True"
             WindowsPart1Of3:
-              testCommand: "npm run test -- --shard=1/3"
+              testCommand: "npm run testWindows -- --shard=1/3"
               testFolder: "DefaultConfig"
               vmImage: "windows-latest"
             WindowsPart2Of3:
-              testCommand: "npm run test -- --shard=2/3"
+              testCommand: "npm run testWindows -- --shard=2/3"
               testFolder: "DefaultConfig"
               vmImage: "windows-latest"
             WindowsPart3Of3:
-              testCommand: "npm run test -- --shard=3/3"
+              testCommand: "npm run testWindows -- --shard=3/3"
               testFolder: "DefaultConfig"
               vmImage: "windows-latest"
         pool:
@@ -506,7 +505,7 @@ stages:
     jobs:
       - job:
         displayName: E2E Tests with Different App settings (SQL Server)
-        condition: ${{ eq(parameters.differentAppSettingsAcceptanceTests, true) }}
+        condition: ${{ eq(parameters.skipDifferentAppSettingsAcceptanceTests, false) }}
         timeoutInMinutes: 180
         variables:
           SA_PASSWORD: UmbracoAcceptance123!
diff --git a/tests/Umbraco.Tests.AcceptanceTest/package-lock.json b/tests/Umbraco.Tests.AcceptanceTest/package-lock.json
index 08bccb81779f..6011fa4e8f65 100644
--- a/tests/Umbraco.Tests.AcceptanceTest/package-lock.json
+++ b/tests/Umbraco.Tests.AcceptanceTest/package-lock.json
@@ -8,7 +8,7 @@
       "hasInstallScript": true,
       "dependencies": {
         "@umbraco/json-models-builders": "^2.0.41",
-        "@umbraco/playwright-testhelpers": "^17.0.0-beta.10",
+        "@umbraco/playwright-testhelpers": "^17.0.3",
         "camelize": "^1.0.0",
         "dotenv": "^16.3.1",
         "node-fetch": "^2.6.7"
@@ -67,9 +67,9 @@
       }
     },
     "node_modules/@umbraco/playwright-testhelpers": {
-      "version": "17.0.0-beta.10",
-      "resolved": "https://registry.npmjs.org/@umbraco/playwright-testhelpers/-/playwright-testhelpers-17.0.0-beta.10.tgz",
-      "integrity": "sha512-ePvtWK2IG/j3TIL1w7xkZR63FHM32hIjZxaxJOQ4rYNuVxBKT7TTKEvASfdwpDBFnlAN186xZRGA9KJq+Jxijg==",
+      "version": "17.0.3",
+      "resolved": "https://registry.npmjs.org/@umbraco/playwright-testhelpers/-/playwright-testhelpers-17.0.3.tgz",
+      "integrity": "sha512-nlc7c7l/E264De+Z/niPfTT8yfRPauEmwbpX+N85PD30iM0mGLHd80InfM0mia19kL2njUm9ww3X8p7ZwBUM/g==",
       "license": "MIT",
       "dependencies": {
         "@umbraco/json-models-builders": "2.0.41",
diff --git a/tests/Umbraco.Tests.AcceptanceTest/package.json b/tests/Umbraco.Tests.AcceptanceTest/package.json
index 953a56cd0c77..4697f58b5428 100644
--- a/tests/Umbraco.Tests.AcceptanceTest/package.json
+++ b/tests/Umbraco.Tests.AcceptanceTest/package.json
@@ -11,7 +11,8 @@
     "createTest": "node createTest.js",
     "smokeTest": "npx playwright test DefaultConfig --grep \"@smoke\"",
     "smokeTestSqlite": "npx playwright test DefaultConfig --grep \"@smoke\" --grep-invert \"Users\"",
-    "releaseTest": "npx playwright test DefaultConfig --grep \"@release\""
+    "releaseTest": "npx playwright test DefaultConfig --grep \"@release\"",
+    "testWindows": "npx playwright test DefaultConfig --grep-invert \"RelationType\""
   },
   "devDependencies": {
     "@playwright/test": "1.50",
@@ -22,7 +23,7 @@
   },
   "dependencies": {
     "@umbraco/json-models-builders": "^2.0.41",
-    "@umbraco/playwright-testhelpers": "^17.0.0-beta.10",
+    "@umbraco/playwright-testhelpers": "^17.0.3",
     "camelize": "^1.0.0",
     "dotenv": "^16.3.1",
     "node-fetch": "^2.6.7"
diff --git a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/BlockGrid/ContentWithBlockGrid.spec.ts b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/BlockGrid/ContentWithBlockGrid.spec.ts
index b16ede4a08c5..6e8a92a7c4df 100644
--- a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/BlockGrid/ContentWithBlockGrid.spec.ts
+++ b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/BlockGrid/ContentWithBlockGrid.spec.ts
@@ -81,7 +81,7 @@ test('can add a block element in the content', async ({umbracoApi, umbracoUi}) =
   // Act
   await umbracoUi.content.goToContentWithName(contentName);
   await umbracoUi.content.clickAddBlockElementButton();
-  await umbracoUi.content.clickTextButtonWithName(elementTypeName);
+  await umbracoUi.content.clickBlockElementWithName(elementTypeName);
   await umbracoUi.content.enterTextstring(inputText);
   await umbracoUi.content.clickCreateModalButton();
   await umbracoUi.content.clickSaveButton();
@@ -160,8 +160,7 @@ test('cannot add number of block element greater than the maximum amount', {tag:
   // Act
   await umbracoUi.content.goToContentWithName(contentName);
   await umbracoUi.content.clickAddBlockElementButton();
-  await umbracoUi.waitForTimeout(500);
-  await umbracoUi.content.clickTextButtonWithName(elementTypeName);
+  await umbracoUi.content.clickBlockElementWithName(elementTypeName);
   await umbracoUi.content.clickCreateModalButton();
 
   // Assert
@@ -196,7 +195,7 @@ test('can set the label of block element in the content', async ({umbracoApi, um
   // Act
   await umbracoUi.content.goToContentWithName(contentName);
   await umbracoUi.content.clickAddBlockElementButton();
-  await umbracoUi.content.clickTextButtonWithName(elementTypeName);
+  await umbracoUi.content.clickBlockElementWithName(elementTypeName);
   await umbracoUi.content.clickCreateModalButton();
   await umbracoUi.content.clickSaveButton();
 
@@ -217,7 +216,7 @@ test('can set the number of columns for the layout in the content', async ({umbr
   // Act
   await umbracoUi.content.goToContentWithName(contentName);
   await umbracoUi.content.clickAddBlockElementButton();
-  await umbracoUi.content.clickTextButtonWithName(elementTypeName);
+  await umbracoUi.content.clickBlockElementWithName(elementTypeName);
   await umbracoUi.content.clickCreateModalButton();
   await umbracoUi.content.clickSaveButton();
 
@@ -245,7 +244,7 @@ test('can add settings model for the block in the content', async ({umbracoApi,
   // Act
   await umbracoUi.content.goToContentWithName(contentName);
   await umbracoUi.content.clickAddBlockElementButton();
-  await umbracoUi.content.clickTextButtonWithName(elementTypeName);
+  await umbracoUi.content.clickBlockElementWithName(elementTypeName);
   await umbracoUi.content.enterTextstring(contentBlockInputText);
   await umbracoUi.content.clickAddBlockSettingsTabButton();
   await umbracoUi.content.enterTextArea(settingBlockInputText);
@@ -298,7 +297,7 @@ test('can add a block element with inline editing mode enabled', async ({umbraco
   // Act
   await umbracoUi.content.goToContentWithName(contentName);
   await umbracoUi.content.clickAddBlockElementButton();
-  await umbracoUi.content.clickTextButtonWithName(elementTypeName);
+  await umbracoUi.content.clickBlockElementWithName(elementTypeName);
   await umbracoUi.content.enterTextstring(inputText);
   await umbracoUi.content.clickCreateModalButton();
   await umbracoUi.content.clickSaveAndPublishButton();
@@ -329,7 +328,7 @@ test('can add an invariant block element with an invariant RTE Tiptap in the con
   // Act
   await umbracoUi.content.goToContentWithName(contentName);
   await umbracoUi.content.clickAddBlockElementButton();
-  await umbracoUi.content.clickTextButtonWithName(customElementTypeName);
+  await umbracoUi.content.clickBlockElementWithName(customElementTypeName);
   await umbracoUi.content.enterRTETipTapEditor(inputText);
   await umbracoUi.content.clickCreateModalButton();
   await umbracoUi.content.clickSaveButtonForContent();
@@ -363,7 +362,7 @@ test('can add a variant block element with variant RTE Tiptap in the content', a
   // Act
   await umbracoUi.content.goToContentWithName(contentName);
   await umbracoUi.content.clickAddBlockElementButton();
-  await umbracoUi.content.clickTextButtonWithName(customElementTypeName);
+  await umbracoUi.content.clickBlockElementWithName(customElementTypeName);
   await umbracoUi.content.enterRTETipTapEditor(inputText);
   await umbracoUi.content.clickCreateModalButton();
   await umbracoUi.content.clickSaveButtonForContent();
@@ -399,7 +398,7 @@ test('can add a variant block element with invariant RTE Tiptap in the content',
   // Act
   await umbracoUi.content.goToContentWithName(contentName);
   await umbracoUi.content.clickAddBlockElementButton();
-  await umbracoUi.content.clickTextButtonWithName(customElementTypeName);
+  await umbracoUi.content.clickBlockElementWithName(customElementTypeName);
   await umbracoUi.content.enterRTETipTapEditor(inputText);
   await umbracoUi.content.clickCreateModalButton();
   await umbracoUi.content.clickSaveButtonForContent();
diff --git a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/BlockList/ContentWithBlockList.spec.ts b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/BlockList/ContentWithBlockList.spec.ts
index 7fed44f11967..398d6aead1f8 100644
--- a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/BlockList/ContentWithBlockList.spec.ts
+++ b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/BlockList/ContentWithBlockList.spec.ts
@@ -194,7 +194,7 @@ test('can add settings model for the block in the content', async ({umbracoApi,
   // Act
   await umbracoUi.content.goToContentWithName(contentName);
   await umbracoUi.content.clickAddBlockElementButton();
-  await umbracoUi.content.clickTextButtonWithName(elementTypeName);
+  await umbracoUi.content.clickBlockElementWithName(elementTypeName);
   await umbracoUi.content.enterTextstring(contentBlockInputText);
   await umbracoUi.content.clickAddBlockSettingsTabButton();
   await umbracoUi.content.enterTextArea(settingBlockInputText);
@@ -276,7 +276,7 @@ test('can add an invariant block element with invariant RTE Tiptap in the conten
   // Act
   await umbracoUi.content.goToContentWithName(contentName);
   await umbracoUi.content.clickAddBlockElementButton();
-  await umbracoUi.content.clickTextButtonWithName(customElementTypeName);
+  await umbracoUi.content.clickBlockElementWithName(customElementTypeName);
   await umbracoUi.content.enterRTETipTapEditor(inputText);
   await umbracoUi.content.clickCreateModalButton();
   await umbracoUi.content.clickSaveButton();
@@ -310,7 +310,7 @@ test('can add a variant block element with variant RTE Tiptap in the content', a
   // Act
   await umbracoUi.content.goToContentWithName(contentName);
   await umbracoUi.content.clickAddBlockElementButton();
-  await umbracoUi.content.clickTextButtonWithName(customElementTypeName);
+  await umbracoUi.content.clickBlockElementWithName(customElementTypeName);
   await umbracoUi.content.enterRTETipTapEditor(inputText);
   await umbracoUi.content.clickCreateModalButton();
   await umbracoUi.content.clickSaveButtonForContent();
@@ -346,7 +346,7 @@ test('can add a variant block element with invariant RTE Tiptap in the content',
   // Act
   await umbracoUi.content.goToContentWithName(contentName);
   await umbracoUi.content.clickAddBlockElementButton();
-  await umbracoUi.content.clickTextButtonWithName(customElementTypeName);
+  await umbracoUi.content.clickBlockElementWithName(customElementTypeName);
   await umbracoUi.content.enterRTETipTapEditor(inputText);
   await umbracoUi.content.clickCreateModalButton();
   await umbracoUi.content.clickSaveButtonForContent();
diff --git a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/ContentWithImageCropper.spec.ts b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/ContentWithImageCropper.spec.ts
index 5b1e1b150d6b..0459dc10c7ec 100644
--- a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/ContentWithImageCropper.spec.ts
+++ b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/ContentWithImageCropper.spec.ts
@@ -36,6 +36,8 @@ test('can create content with the image cropper data type', async ({umbracoApi,
   await umbracoUi.content.chooseDocumentType(documentTypeName);
   await umbracoUi.content.enterContentName(contentName);
   await umbracoUi.content.uploadFile(imageFilePath);
+  // Wait for the upload to complete
+  await umbracoUi.waitForTimeout(1000);
   await umbracoUi.content.clickSaveButton();
 
   // Assert
diff --git a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/RichTextEditor/ContentWithTiptap.spec.ts b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/RichTextEditor/ContentWithTiptap.spec.ts
index fc39dacff658..4933d3c196c6 100644
--- a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/RichTextEditor/ContentWithTiptap.spec.ts
+++ b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/RichTextEditor/ContentWithTiptap.spec.ts
@@ -114,7 +114,7 @@ test('can save a variant content node after removing embedded block in RTE', asy
 
   // Act
   await umbracoUi.content.clickInsertBlockButton();
-  await umbracoUi.content.clickLinkWithName(elementTypeName);
+  await umbracoUi.content.clickBlockElementWithName(elementTypeName);
   await umbracoUi.content.enterTextstring(textStringValue);
   await umbracoUi.content.clickCreateModalButton();
   await umbracoUi.content.clickSaveButtonForContent();
diff --git a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/RichTextEditor/TiptapToolbar.spec.ts b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/RichTextEditor/TiptapToolbar.spec.ts
index 9c61a2495514..84d10ef71c80 100644
--- a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/RichTextEditor/TiptapToolbar.spec.ts
+++ b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/RichTextEditor/TiptapToolbar.spec.ts
@@ -31,7 +31,7 @@ test('can add a media in RTE Tiptap property editor', async ({umbracoApi, umbrac
   // Act
   await umbracoUi.content.goToContentWithName(contentName);
   await umbracoUi.content.clickTipTapToolbarIconWithTitle(iconTitle);
-  await umbracoUi.content.selectMediaWithName(imageName);
+  await umbracoUi.content.selectMediaWithName(imageName, true);
   await umbracoUi.content.clickChooseModalButton();
   await umbracoUi.content.clickMediaCaptionAltTextModalSubmitButton();
   await umbracoUi.content.clickSaveAndPublishButton();
diff --git a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/TrashContent/TrashContent.spec.ts b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/TrashContent/TrashContent.spec.ts
index f65a686143f5..0bed7422332a 100644
--- a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/TrashContent/TrashContent.spec.ts
+++ b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/TrashContent/TrashContent.spec.ts
@@ -1,4 +1,4 @@
-import {ConstantHelper, NotificationConstantHelper, test} from '@umbraco/playwright-testhelpers';
+import {ConstantHelper, test} from '@umbraco/playwright-testhelpers';
 import {expect} from "@playwright/test";
 
 let dataTypeId = '';
diff --git a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/DataType/BlockListEditor/BlockListBlocks.spec.ts b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/DataType/BlockListEditor/BlockListBlocks.spec.ts
index 2196ef194b27..43efd6e55383 100644
--- a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/DataType/BlockListEditor/BlockListBlocks.spec.ts
+++ b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/DataType/BlockListEditor/BlockListBlocks.spec.ts
@@ -427,6 +427,7 @@ test('can add a thumbnail to a block', {tag: '@release'}, async ({umbracoApi, um
   // Act
   await umbracoUi.dataType.goToDataType(blockListEditorName);
   await umbracoUi.dataType.goToBlockWithName(elementTypeName);
+  await umbracoUi.waitForTimeout(500);
   await umbracoUi.dataType.chooseBlockThumbnailWithPath(mediaUrl);
   await umbracoUi.dataType.clickSubmitButton();
   await umbracoUi.dataType.clickSaveButton();
diff --git a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/DataType/DataTypeCollectionWorkspace.spec.ts b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/DataType/DataTypeCollectionWorkspace.spec.ts
index 93f16cf33221..fbbdef935065 100644
--- a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/DataType/DataTypeCollectionWorkspace.spec.ts
+++ b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/DataType/DataTypeCollectionWorkspace.spec.ts
@@ -47,6 +47,7 @@ test('can create a data type folder using create options', async ({umbracoApi, u
 
   // Assert
   await umbracoUi.dataType.waitForDataTypeToBeCreated();
+  await umbracoUi.waitForTimeout(500); // Wait for the folder to be fully created
   expect(await umbracoApi.dataType.doesNameExist(dataTypeFolderName)).toBeTruthy();
   // Check if the created data type is displayed in the collection view and has correct icon
   await umbracoUi.dataType.clickDataTypesMenu();
@@ -89,6 +90,7 @@ test('can create a data type folder in a folder using create options', async ({u
 
   // Assert
   await umbracoUi.dataType.waitForDataTypeToBeCreated();
+  await umbracoUi.waitForTimeout(500); // Wait for folder to be created
   expect(await umbracoApi.dataType.doesNameExist(childFolderName)).toBeTruthy();
   // Check if the created data type is displayed in the collection view and has correct icon
   await umbracoUi.dataType.doesCollectionTreeItemTableRowHaveName(childFolderName);
diff --git a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/DataType/DataTypeFolder.spec.ts b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/DataType/DataTypeFolder.spec.ts
index 0a274fdd1ba6..78ade510fa5c 100644
--- a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/DataType/DataTypeFolder.spec.ts
+++ b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/DataType/DataTypeFolder.spec.ts
@@ -43,6 +43,7 @@ test('can rename a data type folder', async ({umbracoApi, umbracoUi}) => {
 
   // Assert
   await umbracoUi.dataType.waitForDataTypeToBeRenamed();
+  await umbracoUi.waitForTimeout(500); // Wait for the rename to be fully processed
   expect(await umbracoApi.dataType.doesNameExist(dataTypeFolderName)).toBeTruthy();
   expect(await umbracoApi.dataType.doesNameExist(wrongDataTypeFolderName)).toBeFalsy();
 });
@@ -99,6 +100,7 @@ test('can create a folder in a folder', async ({umbracoApi, umbracoUi}) => {
 
   // Assert
   await umbracoUi.dataType.waitForDataTypeToBeCreated();
+  await umbracoUi.waitForTimeout(500); // Wait for folder to be created
   expect(await umbracoApi.dataType.doesNameExist(childFolderName)).toBeTruthy();
   const dataTypeChildren = await umbracoApi.dataType.getChildren(dataTypeFolderId);
   expect(dataTypeChildren[0].name).toBe(childFolderName);
@@ -120,6 +122,7 @@ test('can create a folder in a folder in a folder', async ({umbracoApi, umbracoU
 
   // Assert
   await umbracoUi.dataType.waitForDataTypeToBeCreated();
+  await umbracoUi.waitForTimeout(500); // Wait for folder to be created
   expect(await umbracoApi.dataType.doesNameExist(childOfChildFolderName)).toBeTruthy();
   const childrenFolderData = await umbracoApi.dataType.getChildren(childFolderId);
   expect(childrenFolderData[0].name).toBe(childOfChildFolderName);
diff --git a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Settings/Dashboard/Profiling.spec.ts b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Settings/Dashboard/Profiling.spec.ts
index 7f5d864ba441..64e22f203ba4 100644
--- a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Settings/Dashboard/Profiling.spec.ts
+++ b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Settings/Dashboard/Profiling.spec.ts
@@ -7,11 +7,11 @@ test('can update value of activate the profiler by default', async ({umbracoUi})
   await umbracoUi.profiling.clickProfilingTab();
 
   // Act
+  await umbracoUi.profiling.isActivateProfilerByDefaultToggleChecked(false);
   await umbracoUi.profiling.clickActivateProfilerByDefaultToggle();
-  await umbracoUi.reloadPage();
-  // TODO: We need to wait a bit to make sure the page is loaded after we have reloaded the page, otherwise it can be flaky and it might not find the toggle
-  await umbracoUi.waitForTimeout(500);
 
   // Assert
+  await umbracoUi.profiling.goToSection(ConstantHelper.sections.settings);
+  await umbracoUi.profiling.clickProfilingTab();
   await umbracoUi.profiling.isActivateProfilerByDefaultToggleChecked(true);
 });
diff --git a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Settings/DocumentType/DocumentTypeCollectionWorkspace.spec.ts b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Settings/DocumentType/DocumentTypeCollectionWorkspace.spec.ts
index 855f93fe71d7..b452154a299b 100644
--- a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Settings/DocumentType/DocumentTypeCollectionWorkspace.spec.ts
+++ b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Settings/DocumentType/DocumentTypeCollectionWorkspace.spec.ts
@@ -172,6 +172,7 @@ test('can create a document type folder in a folder using create options', async
   const childFolderName = 'Test Child Folder';
   await umbracoApi.documentType.ensureNameNotExists(childFolderName);
   await umbracoApi.documentType.createFolder(documentFolderName);
+  await umbracoUi.waitForTimeout(500); // Wait for folder to be created before navigating to it
   await umbracoUi.documentType.goToDocumentType(documentFolderName);
 
   // Act
diff --git a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Settings/DocumentType/DocumentTypeFolder.spec.ts b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Settings/DocumentType/DocumentTypeFolder.spec.ts
index 4c571df2245f..6cf5f21ae3fa 100644
--- a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Settings/DocumentType/DocumentTypeFolder.spec.ts
+++ b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Settings/DocumentType/DocumentTypeFolder.spec.ts
@@ -61,6 +61,7 @@ test('can rename a document type folder', async ({umbracoApi, umbracoUi}) => {
 
   // Assert
   await umbracoUi.documentType.waitForDocumentTypeToBeRenamed();
+  await umbracoUi.waitForTimeout(500); // Wait for the rename to be fully processed
   expect(await umbracoApi.documentType.doesNameExist(oldFolderName)).toBeFalsy();
   expect(await umbracoApi.documentType.doesNameExist(documentFolderName)).toBeTruthy();
   await umbracoUi.documentType.isDocumentTreeItemVisible(oldFolderName, false);
diff --git a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Settings/MediaType/MediaTypeFolder.spec.ts b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Settings/MediaType/MediaTypeFolder.spec.ts
index fa19f68f4d2c..26d6fc5c957a 100644
--- a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Settings/MediaType/MediaTypeFolder.spec.ts
+++ b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Settings/MediaType/MediaTypeFolder.spec.ts
@@ -54,14 +54,14 @@ test('can rename a media type folder', async ({umbracoApi, umbracoUi}) => {
   await umbracoUi.mediaType.clickRootFolderCaretButton();
   await umbracoUi.mediaType.clickActionsMenuForName(oldFolderName);
   await umbracoUi.mediaType.clickUpdateActionMenuOption();
-  await umbracoUi.waitForTimeout(500);
   await umbracoUi.mediaType.enterFolderName(mediaTypeFolderName);
   await umbracoUi.mediaType.clickConfirmRenameButton();
 
   // Assert
   await umbracoUi.mediaType.waitForMediaTypeToBeRenamed();
-  const folder = await umbracoApi.mediaType.getByName(mediaTypeFolderName);
-  expect(folder.name).toBe(mediaTypeFolderName);
+  await umbracoUi.waitForTimeout(500); // Small wait to ensure the API has caught up
+  const folderData = await umbracoApi.mediaType.getByName(mediaTypeFolderName);
+  expect(folderData.name).toBe(mediaTypeFolderName);
   await umbracoUi.mediaType.isMediaTypeTreeItemVisible(oldFolderName, false);
   await umbracoUi.mediaType.isMediaTypeTreeItemVisible(mediaTypeFolderName, true);
 });
diff --git a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Users/Permissions/User/ContentStartNodes.spec.ts b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Users/Permissions/User/ContentStartNodes.spec.ts
index b2445d458865..d5b7d00d1007 100644
--- a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Users/Permissions/User/ContentStartNodes.spec.ts
+++ b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Users/Permissions/User/ContentStartNodes.spec.ts
@@ -1,4 +1,4 @@
-import {ConstantHelper, NotificationConstantHelper, test} from '@umbraco/playwright-testhelpers';
+import {ConstantHelper, test} from '@umbraco/playwright-testhelpers';
 
 const testUser = ConstantHelper.testUserCredentials;
 let testUserCookieAndToken = {cookie: "", accessToken: "", refreshToken: ""};
@@ -57,7 +57,8 @@ test('can see root start node and children', async ({umbracoApi, umbracoUi}) =>
   await umbracoUi.content.isChildContentInTreeVisible(rootDocumentName, childDocumentTwoName);
 });
 
-test('can see parent of start node but not access it', async ({umbracoApi, umbracoUi}) => {
+// Skip this test due to this issue: https://github.com/umbraco/Umbraco-CMS/issues/20505
+test.skip('can see parent of start node but not access it', async ({umbracoApi, umbracoUi}) => {
   // Arrange
   await umbracoApi.user.setUserPermissions(testUser.name, testUser.email, testUser.password, userGroupId, [childDocumentOneId]);
   testUserCookieAndToken = await umbracoApi.user.loginToUser(testUser.name, testUser.email, testUser.password);
diff --git a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Users/Permissions/User/MediaStartNodes.spec.ts b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Users/Permissions/User/MediaStartNodes.spec.ts
index f16608353b50..07cbf792a423 100644
--- a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Users/Permissions/User/MediaStartNodes.spec.ts
+++ b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Users/Permissions/User/MediaStartNodes.spec.ts
@@ -1,4 +1,4 @@
-import {ConstantHelper, NotificationConstantHelper, test} from '@umbraco/playwright-testhelpers';
+import {ConstantHelper, test} from '@umbraco/playwright-testhelpers';
 
 const testUser = ConstantHelper.testUserCredentials;
 let testUserCookieAndToken = {cookie: "", accessToken: "", refreshToken: ""};
@@ -50,7 +50,8 @@ test('can see root media start node and children', async ({umbracoApi, umbracoUi
   await umbracoUi.media.isChildMediaVisible(rootFolderName, childFolderTwoName);
 });
 
-test('can see parent of start node but not access it', async ({umbracoApi, umbracoUi}) => {
+// Skip this test due to this issue: https://github.com/umbraco/Umbraco-CMS/issues/20505
+test.skip('can see parent of start node but not access it', async ({umbracoApi, umbracoUi}) => {
   // Arrange
   await umbracoApi.user.setUserPermissions(testUser.name, testUser.email, testUser.password, userGroupId, [], false, [childFolderOneId]);
   testUserCookieAndToken = await umbracoApi.user.loginToUser(testUser.name, testUser.email, testUser.password);
@@ -62,6 +63,7 @@ test('can see parent of start node but not access it', async ({umbracoApi, umbra
   // Assert
   await umbracoUi.media.isMediaTreeItemVisible(rootFolderName);
   await umbracoUi.media.goToMediaWithName(rootFolderName);
+  await umbracoUi.waitForTimeout(500); // Wait for workspace to load
   await umbracoUi.media.doesMediaWorkspaceHaveText('Access denied');
   await umbracoUi.media.openMediaCaretButtonForName(rootFolderName);
   await umbracoUi.media.isChildMediaVisible(rootFolderName, childFolderOneName);
diff --git a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Users/Permissions/UserGroup/ContentStartNodes.spec.ts b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Users/Permissions/UserGroup/ContentStartNodes.spec.ts
index 82178e73fce0..aa896ed49362 100644
--- a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Users/Permissions/UserGroup/ContentStartNodes.spec.ts
+++ b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Users/Permissions/UserGroup/ContentStartNodes.spec.ts
@@ -58,7 +58,8 @@ test('can see root start node and children', async ({umbracoApi, umbracoUi}) =>
   await umbracoUi.content.isChildContentInTreeVisible(rootDocumentName, childDocumentTwoName);
 });
 
-test('can see parent of start node but not access it', async ({umbracoApi, umbracoUi}) => {
+// Skip this test due to this issue: https://github.com/umbraco/Umbraco-CMS/issues/20505
+test.skip('can see parent of start node but not access it', async ({umbracoApi, umbracoUi}) => {
   // Arrange
   userGroupId = await umbracoApi.userGroup.createUserGroupWithDocumentStartNode(userGroupName, childDocumentOneId);
   await umbracoApi.user.setUserPermissions(testUser.name, testUser.email, testUser.password, userGroupId);
diff --git a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Users/Permissions/UserGroup/DefaultPermissionsInContent.spec.ts b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Users/Permissions/UserGroup/DefaultPermissionsInContent.spec.ts
index 32837242d172..32a36e0e343c 100644
--- a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Users/Permissions/UserGroup/DefaultPermissionsInContent.spec.ts
+++ b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Users/Permissions/UserGroup/DefaultPermissionsInContent.spec.ts
@@ -71,7 +71,8 @@ test('can read content node with permission enabled', {tag: '@release'}, async (
   await umbracoUi.content.doesDocumentHaveName(rootDocumentName);
 });
 
-test('can not read content node with permission disabled', async ({umbracoApi, umbracoUi}) => {
+// Skip this test due to this issue: https://github.com/umbraco/Umbraco-CMS/issues/20505
+test.skip('can not read content node with permission disabled', async ({umbracoApi, umbracoUi}) => {
   // Arrange
   userGroupId = await umbracoApi.userGroup.createUserGroupWithReadPermission(userGroupName, false);
   await umbracoApi.user.setUserPermissions(testUser.name, testUser.email, testUser.password, userGroupId);
@@ -161,6 +162,7 @@ test('can empty recycle bin with delete permission enabled', {tag: '@release'},
 
   // Act
   await umbracoUi.content.clickRecycleBinButton();
+  await umbracoUi.waitForTimeout(700);
   await umbracoUi.content.clickEmptyRecycleBinButton();
   await umbracoUi.content.clickConfirmEmptyRecycleBinButton();
 
diff --git a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Users/Permissions/UserGroup/DocumentPropertyValueGranularPermission.spec.ts b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Users/Permissions/UserGroup/DocumentPropertyValueGranularPermission.spec.ts
index c4795947503b..9cc0085c4c9f 100644
--- a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Users/Permissions/UserGroup/DocumentPropertyValueGranularPermission.spec.ts
+++ b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Users/Permissions/UserGroup/DocumentPropertyValueGranularPermission.spec.ts
@@ -1,5 +1,5 @@
 import {expect} from '@playwright/test';
-import {AliasHelper, ConstantHelper, NotificationConstantHelper, test} from '@umbraco/playwright-testhelpers';
+import {AliasHelper, ConstantHelper, test} from '@umbraco/playwright-testhelpers';
 
 const testUser = ConstantHelper.testUserCredentials;
 let testUserCookieAndToken = {cookie: "", accessToken: "", refreshToken: ""};
@@ -35,7 +35,8 @@ test.afterEach(async ({umbracoApi}) => {
   await umbracoApi.userGroup.ensureNameNotExists(userGroupName);
 });
 
-test('can only see property values for specific document with read UI enabled', {tag: '@release'}, async ({umbracoApi, umbracoUi}) => {
+// Skip this test due to this issue: https://github.com/umbraco/Umbraco-CMS/issues/20505
+test.skip('can only see property values for specific document with read UI enabled', {tag: '@release'}, async ({umbracoApi, umbracoUi}) => {
   // Arrange
   userGroupId = await umbracoApi.userGroup.createUserGroupWithPermissionsForSpecificDocumentAndTwoPropertyValues(userGroupName, firstDocumentId, documentTypeId, firstPropertyName[0], true, false, secondPropertyName[0], true, false);
   await umbracoApi.user.setUserPermissions(testUser.name, testUser.email, testUser.password, userGroupId);
diff --git a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Users/Permissions/UserGroup/DocumentPropertyValuePermission.spec.ts b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Users/Permissions/UserGroup/DocumentPropertyValuePermission.spec.ts
index 2e84a852d2a7..b8ba9b7c3ff4 100644
--- a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Users/Permissions/UserGroup/DocumentPropertyValuePermission.spec.ts
+++ b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Users/Permissions/UserGroup/DocumentPropertyValuePermission.spec.ts
@@ -58,7 +58,8 @@ test('can see property values with UI read but not UI write permission', {tag: '
   await umbracoUi.content.isPropertyEditorUiWithNameReadOnly('text-box');
 });
 
-test('cannot open content without document read permission even with UI read permission', {tag: '@release'}, async ({umbracoApi, umbracoUi}) => {
+// Skip this test due to this issue: https://github.com/umbraco/Umbraco-CMS/issues/20505
+test.skip('cannot open content without document read permission even with UI read permission', {tag: '@release'}, async ({umbracoApi, umbracoUi}) => {
   // Arrange
   userGroupId = await umbracoApi.userGroup.createUserGroupWithReadPermissionAndReadPropertyValuePermission(userGroupName, false, true);
   await umbracoApi.user.setUserPermissions(testUser.name, testUser.email, testUser.password, userGroupId);
diff --git a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Users/Permissions/UserGroup/GranularPermissionsInContent.spec.ts b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Users/Permissions/UserGroup/GranularPermissionsInContent.spec.ts
index bd5b2f94d1db..cf67544d8849 100644
--- a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Users/Permissions/UserGroup/GranularPermissionsInContent.spec.ts
+++ b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Users/Permissions/UserGroup/GranularPermissionsInContent.spec.ts
@@ -43,6 +43,7 @@ test.beforeEach(async ({umbracoApi}) => {
   documentTypeId = await umbracoApi.documentType.createDocumentTypeWithAllowedChildNodeAndDataType(documentTypeName, childDocumentTypeId, dataTypeName, dataTypeId);
   firstDocumentId = await umbracoApi.document.createDocumentWithTextContent(firstDocumentName, documentTypeId, documentText, dataTypeName);
   secondDocumentId = await umbracoApi.document.createDocumentWithTextContent(secondDocumentName, documentTypeId, documentText, dataTypeName);
+  await umbracoApi.language.createDanishLanguage();
 });
 
 test.afterEach(async ({umbracoApi}) => {
@@ -54,9 +55,11 @@ test.afterEach(async ({umbracoApi}) => {
   await umbracoApi.documentType.ensureNameNotExists(childDocumentTypeName);
   await umbracoApi.documentBlueprint.ensureNameNotExists(documentBlueprintName);
   await umbracoApi.userGroup.ensureNameNotExists(userGroupName);
+  await umbracoApi.language.ensureIsoCodeNotExists('da');
 });
 
-test('can read a specific document with read permission enabled', async ({umbracoApi, umbracoUi}) => {
+// Skip this test due to this issue: https://github.com/umbraco/Umbraco-CMS/issues/20505
+test.skip('can read a specific document with read permission enabled', async ({umbracoApi, umbracoUi}) => {
   // Arrange
   userGroupId = await umbracoApi.userGroup.createUserGroupWithReadPermissionForSpecificDocument(userGroupName, firstDocumentId);
   await umbracoApi.user.setUserPermissions(testUser.name, testUser.email, testUser.password, userGroupId);
@@ -254,6 +257,7 @@ test('can sort children with sort children permission enabled', async ({umbracoA
 test('can set culture and hostnames for a specific content with culture and hostnames permission enabled', async ({umbracoApi, umbracoUi}) => {
   // Arrange
   const domainName = '/domain';
+  const languageName = 'Danish';
   userGroupId = await umbracoApi.userGroup.createUserGroupWithCultureAndHostnamesPermissionForSpecificDocument(userGroupName, firstDocumentId);
   await umbracoApi.user.setUserPermissions(testUser.name, testUser.email, testUser.password, userGroupId);
   testUserCookieAndToken = await umbracoApi.user.loginToUser(testUser.name, testUser.email, testUser.password);
@@ -264,16 +268,17 @@ test('can set culture and hostnames for a specific content with culture and host
   await umbracoUi.content.clickActionsMenuForContent(firstDocumentName);
   await umbracoUi.content.clickCultureAndHostnamesActionMenuOption();
   await umbracoUi.content.clickAddNewDomainButton();
-  await umbracoUi.content.enterDomain(domainName);
+  await umbracoUi.content.enterDomain(domainName, 0);
+  await umbracoUi.content.selectDomainLanguageOption(languageName, 0);
   await umbracoUi.content.clickSaveModalButton();
 
   // Assert
   await umbracoUi.content.waitForDomainToBeCreated();
-  await umbracoUi.waitForTimeout(500); // Wait for the domain to be set
+  await umbracoUi.waitForTimeout(1000); // Wait for the domain to be set
   const document = await umbracoApi.document.getByName(firstDocumentName);
   const domains = await umbracoApi.document.getDomains(document.id);
   expect(domains.domains[0].domainName).toEqual(domainName);
-  expect(domains.domains[0].isoCode).toEqual('en-US');
+  expect(domains.domains[0].isoCode).toEqual('da');
   await umbracoUi.content.isActionsMenuForNameVisible(secondDocumentName, false);
 });
 
@@ -322,6 +327,7 @@ test('can rollback a specific content with rollback permission enabled', async (
   await umbracoUi.content.clickRollbackContainerButton();
 
   // Assert
+  await umbracoUi.content.isSuccessNotificationVisible();
   await umbracoUi.content.goToContentWithName(firstDocumentName);
   await umbracoUi.content.doesDocumentPropertyHaveValue(dataTypeName, documentText);
   await umbracoUi.content.isActionsMenuForNameVisible(secondDocumentName, false);
diff --git a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Users/Permissions/UserGroup/MediaStartNodes.spec.ts b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Users/Permissions/UserGroup/MediaStartNodes.spec.ts
index be8b531d44b5..b747e3ece20d 100644
--- a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Users/Permissions/UserGroup/MediaStartNodes.spec.ts
+++ b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Users/Permissions/UserGroup/MediaStartNodes.spec.ts
@@ -1,4 +1,4 @@
-import {ConstantHelper, NotificationConstantHelper, test} from '@umbraco/playwright-testhelpers';
+import {ConstantHelper, test} from '@umbraco/playwright-testhelpers';
 
 const testUser = ConstantHelper.testUserCredentials;
 let testUserCookieAndToken = {cookie: "", accessToken: "", refreshToken: ""};
@@ -50,7 +50,8 @@ test('can see root media start node and children', {tag: '@release'}, async ({um
   await umbracoUi.media.isChildMediaVisible(rootFolderName, childFolderTwoName);
 });
 
-test('can see parent of start node but not access it', async ({umbracoApi, umbracoUi}) => {
+// Skip this test due to this issue: https://github.com/umbraco/Umbraco-CMS/issues/20505
+test.skip('can see parent of start node but not access it', async ({umbracoApi, umbracoUi}) => {
   // Arrange
   userGroupId = await umbracoApi.userGroup.createUserGroupWithMediaStartNode(userGroupName, childFolderOneId);
   await umbracoApi.user.setUserPermissions(testUser.name, testUser.email, testUser.password, userGroupId);
@@ -63,6 +64,7 @@ test('can see parent of start node but not access it', async ({umbracoApi, umbra
   // Assert
   await umbracoUi.media.isMediaTreeItemVisible(rootFolderName);
   await umbracoUi.media.goToMediaWithName(rootFolderName);
+  await umbracoUi.waitForTimeout(500); // Wait for workspace to load
   await umbracoUi.media.doesMediaWorkspaceHaveText('Access denied');
   await umbracoUi.media.openMediaCaretButtonForName(rootFolderName);
   await umbracoUi.media.isChildMediaVisible(rootFolderName, childFolderOneName);

From 297c5d3824f359698ae4260257df0c4afdfebcbe Mon Sep 17 00:00:00 2001
From: Mathias Helsengren <mhe@umbraco.dk>
Date: Wed, 5 Nov 2025 12:04:59 +0100
Subject: [PATCH 112/155] Header: Adjusted button focus border color contrast
 (#20562)

Made use of the uui-button outline overwrite to change the focus border color to be the contrast color of the header.
---
 .../src/apps/backoffice/components/backoffice-header.element.ts  | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/Umbraco.Web.UI.Client/src/apps/backoffice/components/backoffice-header.element.ts b/src/Umbraco.Web.UI.Client/src/apps/backoffice/components/backoffice-header.element.ts
index 91cd28e05632..e0321b193cd4 100644
--- a/src/Umbraco.Web.UI.Client/src/apps/backoffice/components/backoffice-header.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/apps/backoffice/components/backoffice-header.element.ts
@@ -20,6 +20,7 @@ export class UmbBackofficeHeaderElement extends UmbLitElement {
 			}
 
 			#appHeader {
+				--uui-focus-outline-color: var(--uui-color-header-contrast-emphasis);
 				background-color: var(--umb-header-background-color, var(--uui-color-header-surface));
 				display: flex;
 				align-items: center;

From 72d7ed438f2fdbc5670a58e87ab866f783ac2e63 Mon Sep 17 00:00:00 2001
From: NguyenThuyLan <116753400+NguyenThuyLan@users.noreply.github.com>
Date: Wed, 5 Nov 2025 19:12:04 +0700
Subject: [PATCH 113/155] Property Editors: Hide "add button" when maximum
 configuration is 1 (fixes #20407) (#20738)

Hide add button when max 1

Co-authored-by: Lan Nguyen Thuy <lnt@umbraco.dk>
---
 .../block-grid-entries/block-grid-entries.element.ts       | 5 +++++
 .../property-editor-ui-block-list.element.ts               | 7 ++-----
 .../input-multiple-text-string.element.ts                  | 1 +
 .../components/input-document/input-document.element.ts    | 2 +-
 .../input-rich-media/input-rich-media.element.ts           | 1 +
 5 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/packages/block/block-grid/components/block-grid-entries/block-grid-entries.element.ts b/src/Umbraco.Web.UI.Client/src/packages/block/block-grid/components/block-grid-entries/block-grid-entries.element.ts
index 5392d3e63f3d..da0777759959 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/block/block-grid/components/block-grid-entries/block-grid-entries.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/block/block-grid/components/block-grid-entries/block-grid-entries.element.ts
@@ -198,6 +198,9 @@ export class UmbBlockGridEntriesElement extends UmbFormControlMixin(UmbLitElemen
 	@state()
 	private _isReadOnly: boolean = false;
 
+	@state()
+	private _limitMax?: number;
+
 	constructor() {
 		super();
 
@@ -294,6 +297,7 @@ export class UmbBlockGridEntriesElement extends UmbFormControlMixin(UmbLitElemen
 	}
 
 	async #setupRangeValidation(rangeLimit: UmbNumberRangeValueType | undefined) {
+		this._limitMax = rangeLimit?.max;
 		if (this.#rangeUnderflowValidator) {
 			this.removeValidator(this.#rangeUnderflowValidator);
 			this.#rangeUnderflowValidator = undefined;
@@ -408,6 +412,7 @@ export class UmbBlockGridEntriesElement extends UmbFormControlMixin(UmbLitElemen
 	}
 
 	#renderCreateButtonGroup() {
+		if (this._limitMax === 1 && this._layoutEntries.length > 0) return nothing;
 		if (this._areaKey === null || this._layoutEntries.length === 0) {
 			return html` <uui-button-group id="createButton">
 				${this.#renderCreateButton()} ${this.#renderPasteButton()}
diff --git a/src/Umbraco.Web.UI.Client/src/packages/block/block-list/property-editors/block-list-editor/property-editor-ui-block-list.element.ts b/src/Umbraco.Web.UI.Client/src/packages/block/block-list/property-editors/block-list-editor/property-editor-ui-block-list.element.ts
index 76b7e263ba75..8b48ca9d82bd 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/block/block-list/property-editors/block-list-editor/property-editor-ui-block-list.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/block/block-list/property-editors/block-list-editor/property-editor-ui-block-list.element.ts
@@ -394,11 +394,8 @@ export class UmbPropertyEditorUIBlockListElement
 	}
 
 	#renderCreateButtonGroup() {
-		if (this.readonly && this._layouts.length > 0) {
-			return nothing;
-		} else {
-			return html`<uui-button-group>${this.#renderCreateButton()}${this.#renderPasteButton()}</uui-button-group>`;
-		}
+		if (this._layouts.length > 0 && (this._limitMax === 1 || this.readonly)) return nothing;
+		return html`<uui-button-group>${this.#renderCreateButton()}${this.#renderPasteButton()}</uui-button-group>`;
 	}
 
 	#renderInlineCreateButton(index: number) {
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/components/multiple-text-string-input/input-multiple-text-string.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/components/multiple-text-string-input/input-multiple-text-string.element.ts
index 667db17c2c93..56307964e6e3 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/components/multiple-text-string-input/input-multiple-text-string.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/components/multiple-text-string-input/input-multiple-text-string.element.ts
@@ -221,6 +221,7 @@ export class UmbInputMultipleTextStringElement extends UmbFormControlMixin<undef
 
 	#renderAddButton() {
 		if (this.disabled || this.readonly) return nothing;
+		if (this.max === 1 && this._items.length > 0) return nothing;
 		return html`
 			<uui-button
 				color="default"
diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/components/input-document/input-document.element.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/components/input-document/input-document.element.ts
index 52161c7974b1..516251a4b5b9 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/components/input-document/input-document.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/components/input-document/input-document.element.ts
@@ -214,7 +214,7 @@ export class UmbInputDocumentElement extends UmbFormControlMixin<string | undefi
 	}
 
 	#renderAddButton() {
-		if (this.selection.length >= this.max) return nothing;
+		if (this.selection.length > 0 && this.max === 1) return nothing;
 		if (this.readonly && this.selection.length > 0) {
 			return nothing;
 		} else {
diff --git a/src/Umbraco.Web.UI.Client/src/packages/media/media/components/input-rich-media/input-rich-media.element.ts b/src/Umbraco.Web.UI.Client/src/packages/media/media/components/input-rich-media/input-rich-media.element.ts
index eddfd3d93006..bab80c11764b 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/media/media/components/input-rich-media/input-rich-media.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/media/media/components/input-rich-media/input-rich-media.element.ts
@@ -388,6 +388,7 @@ export class UmbInputRichMediaElement extends UmbFormControlMixin<
 
 	#renderAddButton() {
 		if (this.readonly) return nothing;
+		if (this.max === 1 && this._cards.length > 0) return nothing;
 		return html`
 			<uui-button
 				id="btn-add"

From 594c3f4eacae7ff0ff13e02f4a237ee215cc0aaa Mon Sep 17 00:00:00 2001
From: Jacob Overgaard <752371+iOvergaard@users.noreply.github.com>
Date: Wed, 5 Nov 2025 15:51:16 +0100
Subject: [PATCH 114/155] Rich Text Editor: The media picker skips the "edit
 media" dialog when editing an image (closes #20066) (#20740)

* fix: Tiptap Media Picker: Skip media picker modal when editing existing images

Fixes the media picker workflow to match v13 behavior where clicking
an existing image directly opens the alt text/caption editor instead
of forcing users to re-select the same image from the media library.

Also fixes caption text extraction to properly read from the figcaption
node using Tiptap's NodeSelection API instead of unreliable attribute-based
approach.

Changes:
- Skip media picker when currentMediaUdi exists (lines 77-92)
- Extract caption from NodeSelection.node using descendants() (lines 55-73)
- Add NodeSelection export to tiptap externals for proper typing

* Refactor: Extract nested logic from media picker execute method

Reduces cyclomatic complexity from 15 to 1 by extracting conditional
logic into focused private helper methods. Addresses CodeScene warnings
for complex method and nested conditionals (bumpy road smell).

Created helper methods:
- #extractMediaUdi, #extractCaption, #findFigcaptionText
- #getMediaGuid, #updateImageWithMetadata

No functional changes - improves maintainability and testability.
---
 .../media-picker.tiptap-toolbar-api.ts        | 76 +++++++++++++------
 .../src/packages/tiptap/externals.ts          |  4 +
 2 files changed, 58 insertions(+), 22 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/packages/tiptap/extensions/media-picker/media-picker.tiptap-toolbar-api.ts b/src/Umbraco.Web.UI.Client/src/packages/tiptap/extensions/media-picker/media-picker.tiptap-toolbar-api.ts
index f07fd645308e..2de61bc23933 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/tiptap/extensions/media-picker/media-picker.tiptap-toolbar-api.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/tiptap/extensions/media-picker/media-picker.tiptap-toolbar-api.ts
@@ -1,4 +1,5 @@
-import type { Editor } from '../../externals.js';
+import type { Editor, ProseMirrorNode } from '../../externals.js';
+import { NodeSelection } from '../../externals.js';
 import { UmbTiptapToolbarElementApiBase } from '../tiptap-toolbar-element-api-base.js';
 import { getGuidFromUdi, imageSize } from '@umbraco-cms/backoffice/utils';
 import { ImageCropModeModel } from '@umbraco-cms/backoffice/external/backend-api';
@@ -41,36 +42,67 @@ export default class UmbTiptapToolbarMediaPickerToolbarExtensionApi extends UmbT
 
 	override async execute(editor: Editor) {
 		const currentTarget = editor.getAttributes('image');
-		const figure = editor.getAttributes('figure');
+		const currentMediaUdi = this.#extractMediaUdi(currentTarget);
+		const currentAltText = currentTarget?.alt;
+		const currentCaption = this.#extractCaption(editor.state.selection);
 
-		let currentMediaUdi: string | undefined = undefined;
-		if (currentTarget?.['data-udi']) {
-			currentMediaUdi = getGuidFromUdi(currentTarget['data-udi']);
-		}
+		await this.#updateImageWithMetadata(editor, currentMediaUdi, currentAltText, currentCaption);
+	}
 
-		let currentAltText: string | undefined = undefined;
-		if (currentTarget?.alt) {
-			currentAltText = currentTarget.alt;
-		}
+	async #updateImageWithMetadata(
+		editor: Editor,
+		currentMediaUdi: string | undefined,
+		currentAltText: string | undefined,
+		currentCaption: string | undefined,
+	) {
+		const mediaGuid = await this.#getMediaGuid(currentMediaUdi);
+		if (!mediaGuid) return;
 
-		let currentCaption: string | undefined = undefined;
-		if (figure?.figcaption) {
-			currentCaption = figure.figcaption;
-		}
+		const media = await this.#showMediaCaptionAltText(mediaGuid, currentAltText, currentCaption);
+		if (!media) return;
 
-		const selection = await this.#openMediaPicker(currentMediaUdi);
-		if (!selection?.length) return;
+		this.#insertInEditor(editor, mediaGuid, media);
+	}
 
-		const mediaGuid = selection[0];
+	#extractMediaUdi(imageAttributes: Record<string, unknown>): string | undefined {
+		return imageAttributes?.['data-udi'] ? getGuidFromUdi(imageAttributes['data-udi'] as string) : undefined;
+	}
 
-		if (!mediaGuid) {
-			throw new Error('No media selected');
+	#extractCaption(selection: unknown): string | undefined {
+		if (!(selection instanceof NodeSelection)) return undefined;
+		if (selection.node.type.name !== 'figure') return undefined;
+
+		return this.#findFigcaptionText(selection.node);
+	}
+
+	#findFigcaptionText(figureNode: ProseMirrorNode): string | undefined {
+		let caption: string | undefined;
+		figureNode.descendants((child) => {
+			if (child.type.name === 'figcaption') {
+				caption = child.textContent || undefined;
+				return false; // Stop searching
+			}
+			return true; // Continue searching
+		});
+		return caption;
+	}
+
+	async #getMediaGuid(currentMediaUdi?: string): Promise<string | undefined> {
+		if (currentMediaUdi) {
+			// Image already exists, go directly to edit alt text/caption
+			return currentMediaUdi;
 		}
 
-		const media = await this.#showMediaCaptionAltText(mediaGuid, currentAltText, currentCaption);
-		if (!media) return;
+		// No image selected, open media picker
+		const selection = await this.#openMediaPicker();
+		if (!selection?.length) return undefined;
 
-		this.#insertInEditor(editor, mediaGuid, media);
+		const selectedGuid = selection[0];
+		if (!selectedGuid) {
+			throw new Error('No media selected');
+		}
+
+		return selectedGuid;
 	}
 
 	async #openMediaPicker(currentMediaUdi?: string) {
diff --git a/src/Umbraco.Web.UI.Client/src/packages/tiptap/externals.ts b/src/Umbraco.Web.UI.Client/src/packages/tiptap/externals.ts
index a34560b3f83a..e848d669d116 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/tiptap/externals.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/tiptap/externals.ts
@@ -14,6 +14,10 @@ export { HardBreak } from '@tiptap/extension-hard-break';
 export { Paragraph } from '@tiptap/extension-paragraph';
 export { Text } from '@tiptap/extension-text';
 
+// PROSEMIRROR TYPES
+export { NodeSelection } from '@tiptap/pm/state';
+export type { Node as ProseMirrorNode } from '@tiptap/pm/model';
+
 // OPTIONAL EXTENSIONS
 export { Blockquote } from '@tiptap/extension-blockquote';
 export { Bold } from '@tiptap/extension-bold';

From 7502a38033eccdbafedf362ebf0ebb8eb74c6468 Mon Sep 17 00:00:00 2001
From: Andy Butland <abutland73@gmail.com>
Date: Wed, 5 Nov 2025 20:02:11 +0100
Subject: [PATCH 115/155] Dependencies: Update dotnet sdk and node development
 dependency to latest secure version of current major (16) (#20734)

* Update dotnet sdk and node development dependency to latest secure version of current major.

* Update package-lock.json.
---
 global.json                                 | 2 +-
 src/Umbraco.Web.UI.Client/package-lock.json | 4 ++--
 src/Umbraco.Web.UI.Client/package.json      | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/global.json b/global.json
index 41c9ad2ed8a4..214a6386b079 100644
--- a/global.json
+++ b/global.json
@@ -1,6 +1,6 @@
 {
   "sdk": {
-    "version": "9.0.100",
+    "version": "9.0.306",
     "rollForward": "latestFeature",
     "allowPrerelease": false
   }
diff --git a/src/Umbraco.Web.UI.Client/package-lock.json b/src/Umbraco.Web.UI.Client/package-lock.json
index c0ca19212fc2..d0cb95df42dc 100644
--- a/src/Umbraco.Web.UI.Client/package-lock.json
+++ b/src/Umbraco.Web.UI.Client/package-lock.json
@@ -64,8 +64,8 @@
 				"web-component-analyzer": "^2.0.0"
 			},
 			"engines": {
-				"node": ">=22",
-				"npm": ">=10.9"
+				"node": ">=22.17.1",
+				"npm": ">=10.9.2"
 			}
 		},
 		"node_modules/@adobe/css-tools": {
diff --git a/src/Umbraco.Web.UI.Client/package.json b/src/Umbraco.Web.UI.Client/package.json
index f9ce4923ea42..afeacbe636ee 100644
--- a/src/Umbraco.Web.UI.Client/package.json
+++ b/src/Umbraco.Web.UI.Client/package.json
@@ -212,8 +212,8 @@
 		"generate:ui-api-docs": "npm run generate:check-const-test && typedoc --options typedoc.config.js"
 	},
 	"engines": {
-		"node": ">=22",
-		"npm": ">=10.9"
+		"node": ">=22.17.1",
+		"npm": ">=10.9.2"
 	},
 	"dependencies": {
 		"element-internals-polyfill": "^3.0.2"

From e155fdff58757fc27d062a9dc0941fc07d9b6abd Mon Sep 17 00:00:00 2001
From: NguyenThuyLan <116753400+NguyenThuyLan@users.noreply.github.com>
Date: Thu, 6 Nov 2025 15:57:55 +0700
Subject: [PATCH 116/155] Block Custom View: Add tests for create and using
 block custom view (#20472)

* add test for block custom view

* update format code

* Update tests/Umbraco.Tests.AcceptanceTest/tests/ExtensionRegistry/BlockCustomView.spec.ts

Co-authored-by: Nhu Dinh <150406148+nhudinh0309@users.noreply.github.com>

* Update tests/Umbraco.Tests.AcceptanceTest/tests/ExtensionRegistry/BlockCustomView.spec.ts

Co-authored-by: Nhu Dinh <150406148+nhudinh0309@users.noreply.github.com>

* Update tests/Umbraco.Tests.AcceptanceTest/tests/ExtensionRegistry/BlockCustomView.spec.ts

Co-authored-by: Nhu Dinh <150406148+nhudinh0309@users.noreply.github.com>

* Update tests/Umbraco.Tests.AcceptanceTest/tests/ExtensionRegistry/BlockCustomView.spec.ts

Co-authored-by: Nhu Dinh <150406148+nhudinh0309@users.noreply.github.com>

* fix some name test

* add new test for block custom view

---------

Co-authored-by: Lan Nguyen Thuy <lnt@umbraco.dk>
Co-authored-by: Nhu Dinh <150406148+nhudinh0309@users.noreply.github.com>
---
 .../block-custom-view/block-custom-view.js    |  43 +++++
 .../block-custom-view.js.map                  |   1 +
 .../block-grid-custom-view.js                 |  23 +++
 .../block-grid-custom-view.js.map             |   1 +
 .../block-custom-view/umbraco-package.json    |  21 +++
 .../ExtensionRegistry/BlockCustomView.spec.ts | 168 ++++++++++++++++++
 6 files changed, 257 insertions(+)
 create mode 100644 tests/Umbraco.Tests.AcceptanceTest/tests/ExtensionRegistry/AdditionalSetup/App_Plugins/block-custom-view/block-custom-view.js
 create mode 100644 tests/Umbraco.Tests.AcceptanceTest/tests/ExtensionRegistry/AdditionalSetup/App_Plugins/block-custom-view/block-custom-view.js.map
 create mode 100644 tests/Umbraco.Tests.AcceptanceTest/tests/ExtensionRegistry/AdditionalSetup/App_Plugins/block-custom-view/block-grid-custom-view.js
 create mode 100644 tests/Umbraco.Tests.AcceptanceTest/tests/ExtensionRegistry/AdditionalSetup/App_Plugins/block-custom-view/block-grid-custom-view.js.map
 create mode 100644 tests/Umbraco.Tests.AcceptanceTest/tests/ExtensionRegistry/AdditionalSetup/App_Plugins/block-custom-view/umbraco-package.json
 create mode 100644 tests/Umbraco.Tests.AcceptanceTest/tests/ExtensionRegistry/BlockCustomView.spec.ts

diff --git a/tests/Umbraco.Tests.AcceptanceTest/tests/ExtensionRegistry/AdditionalSetup/App_Plugins/block-custom-view/block-custom-view.js b/tests/Umbraco.Tests.AcceptanceTest/tests/ExtensionRegistry/AdditionalSetup/App_Plugins/block-custom-view/block-custom-view.js
new file mode 100644
index 000000000000..f275d6e50251
--- /dev/null
+++ b/tests/Umbraco.Tests.AcceptanceTest/tests/ExtensionRegistry/AdditionalSetup/App_Plugins/block-custom-view/block-custom-view.js
@@ -0,0 +1,43 @@
+import { LitElement as c, html as m, css as h, property as a, customElement as u } from "@umbraco-cms/backoffice/external/lit";
+import { UmbElementMixin as b } from "@umbraco-cms/backoffice/element-api";
+var d = Object.defineProperty, f = Object.getOwnPropertyDescriptor, l = (p, o, s, r) => {
+  for (var e = r > 1 ? void 0 : r ? f(o, s) : o, i = p.length - 1, n; i >= 0; i--)
+    (n = p[i]) && (e = (r ? n(o, s, e) : n(e)) || e);
+  return r && e && d(o, s, e), e;
+};
+let t = class extends b(c) {
+  render() {
+    return m`
+			<h5>My Custom View</h5>
+			<p>Heading and Theme: ${this.content?.heading} - ${this.settings?.theme}</p>
+		`;
+  }
+};
+t.styles = [
+  h`
+			:host {
+				display: block;
+				height: 100%;
+				box-sizing: border-box;
+				background-color: darkgreen;
+				color: white;
+				border-radius: 9px;
+				padding: 12px;
+			}
+		`
+];
+l([
+  a({ attribute: !1 })
+], t.prototype, "content", 2);
+l([
+  a({ attribute: !1 })
+], t.prototype, "settings", 2);
+t = l([
+  u("block-custom-view")
+], t);
+const w = t;
+export {
+  t as BlockCustomView,
+  w as default
+};
+//# sourceMappingURL=block-custom-view.js.map
diff --git a/tests/Umbraco.Tests.AcceptanceTest/tests/ExtensionRegistry/AdditionalSetup/App_Plugins/block-custom-view/block-custom-view.js.map b/tests/Umbraco.Tests.AcceptanceTest/tests/ExtensionRegistry/AdditionalSetup/App_Plugins/block-custom-view/block-custom-view.js.map
new file mode 100644
index 000000000000..48adaed1164a
--- /dev/null
+++ b/tests/Umbraco.Tests.AcceptanceTest/tests/ExtensionRegistry/AdditionalSetup/App_Plugins/block-custom-view/block-custom-view.js.map
@@ -0,0 +1 @@
+{"version":3,"file":"block-custom-view.js","sources":["../../block-custom-view/src/block-custom-view.ts"],"sourcesContent":["import { html, customElement, LitElement, property, css } from '@umbraco-cms/backoffice/external/lit';\nimport { UmbElementMixin } from '@umbraco-cms/backoffice/element-api';\nimport type { UmbBlockDataType } from '@umbraco-cms/backoffice/block';\nimport type { UmbBlockEditorCustomViewElement } from '@umbraco-cms/backoffice/block-custom-view';\n\n@customElement('block-custom-view')\nexport class BlockCustomView extends UmbElementMixin(LitElement) implements UmbBlockEditorCustomViewElement {\n\t\n\t@property({ attribute: false })\n\tcontent?: UmbBlockDataType;\n\n\t@property({ attribute: false })\n\tsettings?: UmbBlockDataType;\n\n\trender() {\n\t\treturn html`\n\t\t\t<h5>My Custom View</h5>\n\t\t\t<p>Heading and Theme: ${this.content?.heading} - ${this.settings?.theme}</p>\n\t\t`;\n\t}\n\n\tstatic styles = [\n\t\tcss`\n\t\t\t:host {\n\t\t\t\tdisplay: block;\n\t\t\t\theight: 100%;\n\t\t\t\tbox-sizing: border-box;\n\t\t\t\tbackground-color: darkgreen;\n\t\t\t\tcolor: white;\n\t\t\t\tborder-radius: 9px;\n\t\t\t\tpadding: 12px;\n\t\t\t}\n\t\t`,\n\t];\n\t\n}\nexport default BlockCustomView;\n\ndeclare global {\n\tinterface HTMLElementTagNameMap {\n\t\t'block-custom-view': BlockCustomView;\n\t}\n}\n"],"names":["BlockCustomView","UmbElementMixin","LitElement","html","css","__decorateClass","property","customElement","BlockCustomView$1"],"mappings":";;;;;;;AAMO,IAAMA,IAAN,cAA8BC,EAAgBC,CAAU,EAA6C;AAAA,EAQ3G,SAAS;AACR,WAAOC;AAAA;AAAA,2BAEkB,KAAK,SAAS,OAAO,MAAM,KAAK,UAAU,KAAK;AAAA;AAAA,EAEzE;AAgBD;AA7BaH,EAeL,SAAS;AAAA,EACfI;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAWD;AAxBAC,EAAA;AAAA,EADCC,EAAS,EAAE,WAAW,GAAA,CAAO;AAAA,GAFlBN,EAGZ,WAAA,WAAA,CAAA;AAGAK,EAAA;AAAA,EADCC,EAAS,EAAE,WAAW,GAAA,CAAO;AAAA,GALlBN,EAMZ,WAAA,YAAA,CAAA;AANYA,IAANK,EAAA;AAAA,EADNE,EAAc,mBAAmB;AAAA,GACrBP,CAAA;AA8Bb,MAAAQ,IAAeR;"}
\ No newline at end of file
diff --git a/tests/Umbraco.Tests.AcceptanceTest/tests/ExtensionRegistry/AdditionalSetup/App_Plugins/block-custom-view/block-grid-custom-view.js b/tests/Umbraco.Tests.AcceptanceTest/tests/ExtensionRegistry/AdditionalSetup/App_Plugins/block-custom-view/block-grid-custom-view.js
new file mode 100644
index 000000000000..30af1b6993b6
--- /dev/null
+++ b/tests/Umbraco.Tests.AcceptanceTest/tests/ExtensionRegistry/AdditionalSetup/App_Plugins/block-custom-view/block-grid-custom-view.js
@@ -0,0 +1,23 @@
+import { LitElement as n, html as c, customElement as u } from "@umbraco-cms/backoffice/external/lit";
+import { UmbElementMixin as a } from "@umbraco-cms/backoffice/element-api";
+var d = Object.getOwnPropertyDescriptor, p = (o, l, i, m) => {
+  for (var e = m > 1 ? void 0 : m ? d(l, i) : l, t = o.length - 1, s; t >= 0; t--)
+    (s = o[t]) && (e = s(e) || e);
+  return e;
+};
+let r = class extends a(n) {
+  render() {
+    return c`
+            <h5> Block Grid Custom View</h5>
+		`;
+  }
+};
+r = p([
+  u("block-grid-custom-view")
+], r);
+const f = r;
+export {
+  r as BlockGridCustomView,
+  f as default
+};
+//# sourceMappingURL=block-grid-custom-view.js.map
diff --git a/tests/Umbraco.Tests.AcceptanceTest/tests/ExtensionRegistry/AdditionalSetup/App_Plugins/block-custom-view/block-grid-custom-view.js.map b/tests/Umbraco.Tests.AcceptanceTest/tests/ExtensionRegistry/AdditionalSetup/App_Plugins/block-custom-view/block-grid-custom-view.js.map
new file mode 100644
index 000000000000..d918c3052096
--- /dev/null
+++ b/tests/Umbraco.Tests.AcceptanceTest/tests/ExtensionRegistry/AdditionalSetup/App_Plugins/block-custom-view/block-grid-custom-view.js.map
@@ -0,0 +1 @@
+{"version":3,"file":"block-grid-custom-view.js","sources":["../../block-custom-view/src/block-grid-custom-view.ts"],"sourcesContent":["import { html, customElement, LitElement } from '@umbraco-cms/backoffice/external/lit';\nimport { UmbElementMixin } from '@umbraco-cms/backoffice/element-api';\nimport type { UmbBlockEditorCustomViewElement }\r\nfrom '@umbraco-cms/backoffice/block-custom-view';\n\n@customElement('block-grid-custom-view')\nexport class BlockGridCustomView extends UmbElementMixin(LitElement) implements UmbBlockEditorCustomViewElement\r\n{\r\n    render() {\r\n        return html`\n            <h5> Block Grid Custom View</h5>\n\t\t`;\r\n    }\n\t\n}\nexport default BlockGridCustomView;\n\ndeclare global\r\n{\n\r\n    interface HTMLElementTagNameMap\r\n{\n\t\t'block-grid-custom-view': BlockGridCustomView;\n\t}\n}\n"],"names":["BlockGridCustomView","UmbElementMixin","LitElement","html","__decorateClass","customElement","BlockGridCustomView$1"],"mappings":";;;;;;;AAMO,IAAMA,IAAN,cAAkCC,EAAgBC,CAAU,EACnE;AAAA,EACI,SAAS;AACL,WAAOC;AAAA;AAAA;AAAA,EAGX;AAEJ;AARaH,IAANI,EAAA;AAAA,EADNC,EAAc,wBAAwB;AAAA,GAC1BL,CAAA;AASb,MAAAM,IAAeN;"}
\ No newline at end of file
diff --git a/tests/Umbraco.Tests.AcceptanceTest/tests/ExtensionRegistry/AdditionalSetup/App_Plugins/block-custom-view/umbraco-package.json b/tests/Umbraco.Tests.AcceptanceTest/tests/ExtensionRegistry/AdditionalSetup/App_Plugins/block-custom-view/umbraco-package.json
new file mode 100644
index 000000000000..d332f18297ab
--- /dev/null
+++ b/tests/Umbraco.Tests.AcceptanceTest/tests/ExtensionRegistry/AdditionalSetup/App_Plugins/block-custom-view/umbraco-package.json
@@ -0,0 +1,21 @@
+{
+  "$schema": "../../umbraco-package-schema.json",
+  "name": "My.CustomViewPackage",
+  "version": "0.1.0",
+  "extensions": [
+    {
+      "type": "blockEditorCustomView",
+      "alias": "my.blockEditorCustomView.Example",
+      "name": "My Example Custom View",
+      "element": "/App_Plugins/block-custom-view/block-custom-view.js",
+      "forContentTypeAlias": "elementTypeForCustomBlockView"
+    },
+    {
+      "type": "blockEditorCustomView",
+      "alias": "my.blockGridCustomView.Example",
+      "name": "My Block Grid Custom View",
+      "element": "/App_Plugins/block-custom-view/block-grid-custom-view.js",
+      "forBlockEditor": "block-grid"
+    }
+  ]
+}
diff --git a/tests/Umbraco.Tests.AcceptanceTest/tests/ExtensionRegistry/BlockCustomView.spec.ts b/tests/Umbraco.Tests.AcceptanceTest/tests/ExtensionRegistry/BlockCustomView.spec.ts
new file mode 100644
index 000000000000..8ef280fdbaa9
--- /dev/null
+++ b/tests/Umbraco.Tests.AcceptanceTest/tests/ExtensionRegistry/BlockCustomView.spec.ts
@@ -0,0 +1,168 @@
+import {ConstantHelper, test} from '@umbraco/playwright-testhelpers';
+
+// Content
+const contentName = 'TestContent';
+const contentGroupName = 'TestContentGroup';
+// DocumentType
+const documentTypeName = 'TestDocumentTypeForContent';
+// DataType
+const dataTypeName = 'Textstring';
+const textAreaDataTypeName = 'Textarea';
+// BlockType
+const blockGridName = 'TestBlockGridForContent';
+const blockListName = 'TestBlockListForContent';
+// ElementType
+const elementGroupName = 'TestElementGroupForContent';
+const firstElementTypeName = 'TestElementTypeForContent';
+const secondElementTypeName = 'Element Type For Custom Block View';
+// Setting Model
+const settingModelName = 'Test Setting Model';
+const groupName = 'Test Group';
+// Block Custom View
+const blockGridCustomViewLocator = 'block-grid-custom-view';
+const blockCustomViewLocator = 'block-custom-view';
+// Property Editor
+const propertyEditorName = 'Heading';
+const propertyEditorSettingName = 'Theme';
+
+test.afterEach(async ({ umbracoApi }) => {
+	await umbracoApi.document.ensureNameNotExists(contentName);
+	await umbracoApi.documentType.ensureNameNotExists(documentTypeName);
+	await umbracoApi.dataType.ensureNameNotExists(blockGridName);
+	await umbracoApi.dataType.ensureNameNotExists(blockListName);
+	await umbracoApi.documentType.ensureNameNotExists(firstElementTypeName);
+	await umbracoApi.documentType.ensureNameNotExists(secondElementTypeName);
+	await umbracoApi.dataType.ensureNameNotExists(dataTypeName);
+});
+
+test('block custom view appears in a specific block type', async ({umbracoApi, umbracoUi}) => {
+	// Arrange 
+	const textStringDataType = await umbracoApi.dataType.getByName(dataTypeName);
+	const elementTypeId = await umbracoApi.documentType.createDefaultElementType(firstElementTypeName, elementGroupName, dataTypeName, textStringDataType.id);
+	const blockGridId = await umbracoApi.dataType.createBlockGridWithABlock(blockGridName, elementTypeId);
+	const documentTypeId = await umbracoApi.documentType.createDocumentTypeWithPropertyEditor(documentTypeName, blockGridName, blockGridId, contentGroupName);
+	await umbracoApi.document.createDefaultDocument(contentName, documentTypeId);
+
+	// Act
+	await umbracoUi.goToBackOffice();
+	await umbracoUi.content.goToSection(ConstantHelper.sections.content);
+	await umbracoUi.content.goToContentWithName(contentName);
+	await umbracoUi.content.clickAddBlockElementButton();
+	await umbracoUi.content.clickBlockElementWithName(firstElementTypeName);
+	await umbracoUi.content.clickCreateModalButton();
+
+	// Assert
+	await umbracoUi.content.isBlockCustomViewVisible(blockGridCustomViewLocator);
+	await umbracoUi.content.isSingleBlockElementVisible(false);
+});
+
+test('block custom view does not appear in block list editor when configured for block grid only', async ({umbracoApi, umbracoUi}) => {
+	// Arrange 
+	const textStringDataType = await umbracoApi.dataType.getByName(dataTypeName);
+	const elementTypeId = await umbracoApi.documentType.createDefaultElementType(firstElementTypeName, elementGroupName, dataTypeName, textStringDataType.id);
+	const blockListId = await umbracoApi.dataType.createBlockListDataTypeWithABlock(blockListName, elementTypeId);
+	const documentTypeId = await umbracoApi.documentType.createDocumentTypeWithPropertyEditor(documentTypeName, blockListName, blockListId, contentGroupName);
+	await umbracoApi.document.createDefaultDocument(contentName, documentTypeId);
+
+	// Act
+	await umbracoUi.goToBackOffice();
+	await umbracoUi.content.goToSection(ConstantHelper.sections.content);
+	await umbracoUi.content.goToContentWithName(contentName);
+	await umbracoUi.content.clickAddBlockElementButton();
+	await umbracoUi.content.clickBlockElementWithName(firstElementTypeName);
+	await umbracoUi.content.clickCreateModalButton();
+
+	// Assert
+	await umbracoUi.content.isBlockCustomViewVisible(blockGridCustomViewLocator, false);
+	await umbracoUi.content.isSingleBlockElementVisible();
+});
+
+test('block custom view applies to correct content type', async ({umbracoApi, umbracoUi}) => {
+	// Arrange 
+	const textStringDataType = await umbracoApi.dataType.getByName(dataTypeName);
+	const firstElementTypeId = await umbracoApi.documentType.createDefaultElementType(firstElementTypeName, elementGroupName, dataTypeName, textStringDataType.id);
+	const secondElementTypeId = await umbracoApi.documentType.createDefaultElementType(secondElementTypeName, elementGroupName, dataTypeName, textStringDataType.id);
+	const blockListId = await umbracoApi.dataType.createBlockListDataTypeWithTwoBlocks(blockListName, firstElementTypeId, secondElementTypeId);
+	const documentTypeId = await umbracoApi.documentType.createDocumentTypeWithPropertyEditor(documentTypeName, blockListName, blockListId, contentGroupName);
+	await umbracoApi.document.createDefaultDocument(contentName, documentTypeId);
+
+	// Act
+	await umbracoUi.goToBackOffice();
+	await umbracoUi.content.goToSection(ConstantHelper.sections.content);
+	await umbracoUi.content.goToContentWithName(contentName);
+	await umbracoUi.content.clickAddBlockElementButton();
+	await umbracoUi.content.clickBlockCardWithName(secondElementTypeName);
+	await umbracoUi.content.clickCreateModalButton();
+	await umbracoUi.content.clickAddBlockElementButton();
+	await umbracoUi.content.clickBlockCardWithName(firstElementTypeName);
+	await umbracoUi.content.clickCreateModalButton();
+
+	// Assert
+	await umbracoUi.content.isBlockCustomViewVisible(blockCustomViewLocator);
+	await umbracoUi.content.isSingleBlockElementVisible();
+});
+
+test('block custom view can display values from the content and settings parts', async ({umbracoApi, umbracoUi}) => {
+	// Arrange
+	const contentValue = 'This is block test';
+	const settingValue = 'This is setting test';
+	const valueText = `Heading and Theme: ${contentValue} - ${settingValue}`;
+	const textStringDataType = await umbracoApi.dataType.getByName(dataTypeName);
+	const textAreaDataType = await umbracoApi.dataType.getByName(textAreaDataTypeName);
+	const elementTypeId = await umbracoApi.documentType.createDefaultElementType(secondElementTypeName, elementGroupName, propertyEditorName, textStringDataType.id);
+	const settingsElementTypeId = await umbracoApi.documentType.createDefaultElementType(settingModelName, groupName, propertyEditorSettingName, textAreaDataType.id);
+	const blockListId = await umbracoApi.dataType.createBlockListDataTypeWithContentAndSettingsElementType(blockListName, elementTypeId, settingsElementTypeId);
+	const documentTypeId = await umbracoApi.documentType.createDocumentTypeWithPropertyEditor(documentTypeName, blockListName, blockListId, contentGroupName);
+	await umbracoApi.document.createDefaultDocument(contentName, documentTypeId);
+
+	// Act
+	await umbracoUi.goToBackOffice();
+	await umbracoUi.content.goToSection(ConstantHelper.sections.content);
+	await umbracoUi.content.goToContentWithName(contentName);
+	await umbracoUi.content.clickAddBlockElementButton();
+	await umbracoUi.content.clickBlockCardWithName(secondElementTypeName);
+	await umbracoUi.content.enterTextstring(contentValue);
+	await umbracoUi.content.clickAddBlockSettingsTabButton();
+	await umbracoUi.content.enterTextArea(settingValue);
+	await umbracoUi.content.clickCreateModalButton();
+
+	// Assert
+	await umbracoUi.content.isBlockCustomViewVisible(blockCustomViewLocator);
+	await umbracoUi.content.doesBlockCustomViewHaveValue(blockCustomViewLocator, valueText);
+});
+
+test('block custom view can display values from the content and settings parts after update', async ({umbracoApi, umbracoUi}) => {
+	// Arrange
+	const contentValue = 'This is block test';
+	const settingValue = 'This is setting test';
+	const updatedContentValue = 'This is updated block test';
+	const updatedSettingValue = 'This is updated setting test';
+	const updatedValueText = `Heading and Theme: ${updatedContentValue} - ${updatedSettingValue}`;
+	const textStringDataType = await umbracoApi.dataType.getByName(dataTypeName);
+	const textAreaDataType = await umbracoApi.dataType.getByName(textAreaDataTypeName);
+	const elementTypeId = await umbracoApi.documentType.createDefaultElementType(secondElementTypeName, elementGroupName, propertyEditorName, textStringDataType.id);
+	const settingsElementTypeId = await umbracoApi.documentType.createDefaultElementType(settingModelName, groupName, propertyEditorSettingName, textAreaDataType.id);
+	const blockListId = await umbracoApi.dataType.createBlockListDataTypeWithContentAndSettingsElementType(blockListName, elementTypeId, settingsElementTypeId);
+	const documentTypeId = await umbracoApi.documentType.createDocumentTypeWithPropertyEditor(documentTypeName, blockListName, blockListId, contentGroupName);
+	await umbracoApi.document.createDefaultDocument(contentName, documentTypeId);
+
+	// Act
+	await umbracoUi.goToBackOffice();
+	await umbracoUi.content.goToSection(ConstantHelper.sections.content);
+	await umbracoUi.content.goToContentWithName(contentName);
+	await umbracoUi.content.clickAddBlockElementButton();
+	await umbracoUi.content.clickBlockCardWithName(secondElementTypeName);
+	await umbracoUi.content.enterTextstring(contentValue);
+	await umbracoUi.content.clickAddBlockSettingsTabButton();
+	await umbracoUi.content.enterTextArea(settingValue);
+	await umbracoUi.content.clickCreateModalButton();
+	await umbracoUi.content.clickEditBlockListBlockButton();
+	await umbracoUi.content.enterTextstring(updatedContentValue);
+	await umbracoUi.content.clickAddBlockSettingsTabButton();
+	await umbracoUi.content.enterTextArea(updatedSettingValue);
+	await umbracoUi.content.clickUpdateButton();
+
+	// Assert
+	await umbracoUi.content.isBlockCustomViewVisible(blockCustomViewLocator);
+	await umbracoUi.content.doesBlockCustomViewHaveValue(blockCustomViewLocator, updatedValueText);
+});
\ No newline at end of file

From f11b8ffae913e8de781d752b9b8900f8c41d426f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= <nsl@umbraco.dk>
Date: Thu, 6 Nov 2025 10:01:51 +0100
Subject: [PATCH 117/155] User Workspace: localize password mismatch feedback
 (#20747)

localize
---
 .../member/views/member/member-workspace-view-member.element.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Umbraco.Web.UI.Client/src/packages/members/member/workspace/member/views/member/member-workspace-view-member.element.ts b/src/Umbraco.Web.UI.Client/src/packages/members/member/workspace/member/views/member/member-workspace-view-member.element.ts
index 8deea0f5ec64..084337e39478 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/members/member/workspace/member/views/member/member-workspace-view-member.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/members/member/workspace/member/views/member/member-workspace-view-member.element.ts
@@ -65,7 +65,7 @@ export class UmbMemberWorkspaceViewMemberElement extends UmbLitElement implement
 		)?.value;
 
 		if (newPassword !== confirmPassword) {
-			this._newPasswordError = 'Passwords do not match';
+			this._newPasswordError = this.localize.term('user_passwordMismatch');
 			return;
 		}
 

From 3ab12e9b59e6a6f2c597d479f41b0c9a3e796544 Mon Sep 17 00:00:00 2001
From: Nicklas Kramer <kramernicklas@gmail.com>
Date: Thu, 6 Nov 2025 10:40:29 +0100
Subject: [PATCH 118/155] Migrations: Fixes migrations from 13 to 17. Media
 Folder without Collection & Last Synced Table not existing. (#20743)

* Creating and adding new migration. And fixing another small bug.

* Adding XML Header and renaming to a more clearly defined name
---
 .../Migrations/Upgrade/UmbracoPlan.cs         |  1 +
 .../Upgrade/UmbracoPremigrationPlan.cs        |  1 +
 ...eDefaultMediaFolderHasDefaultCollection.cs | 45 +++++++++++++++++++
 3 files changed, 47 insertions(+)
 create mode 100644 src/Umbraco.Infrastructure/Migrations/Upgrade/V_17_0_0/EnsureDefaultMediaFolderHasDefaultCollection.cs

diff --git a/src/Umbraco.Infrastructure/Migrations/Upgrade/UmbracoPlan.cs b/src/Umbraco.Infrastructure/Migrations/Upgrade/UmbracoPlan.cs
index 9a3f5dc8eba1..7a781b889a46 100644
--- a/src/Umbraco.Infrastructure/Migrations/Upgrade/UmbracoPlan.cs
+++ b/src/Umbraco.Infrastructure/Migrations/Upgrade/UmbracoPlan.cs
@@ -138,5 +138,6 @@ protected virtual void DefinePlan()
         To<V_17_0_0.MigrateSystemDatesToUtc>("{7208B20D-6BFC-472E-9374-85EEA817B27D}");
         To<V_17_0_0.AddDistributedJobLock>("{263075BF-F18A-480D-92B4-4947D2EAB772}");
         To<V_17_0_0.AddLastSyncedTable>("26179D88-58CE-4C92-B4A4-3CBA6E7188AC");
+        To<V_17_0_0.EnsureDefaultMediaFolderHasDefaultCollection>("{8B2C830A-4FFB-4433-8337-8649B0BF52C8}");
     }
 }
diff --git a/src/Umbraco.Infrastructure/Migrations/Upgrade/UmbracoPremigrationPlan.cs b/src/Umbraco.Infrastructure/Migrations/Upgrade/UmbracoPremigrationPlan.cs
index f9334ae68d9d..85c141baa3d8 100644
--- a/src/Umbraco.Infrastructure/Migrations/Upgrade/UmbracoPremigrationPlan.cs
+++ b/src/Umbraco.Infrastructure/Migrations/Upgrade/UmbracoPremigrationPlan.cs
@@ -80,5 +80,6 @@ protected virtual void DefinePlan()
         // When logging in, we save the user to the cache so these need to have run.
         To<V_17_0_0.AddCacheVersionDatabaseLock>("{1DC39DC7-A88A-4912-8E60-4FD36246E8D1}");
         To<V_17_0_0.AddRepositoryCacheVersionTable>("{A1B3F5D6-4C8B-4E7A-9F8C-1D2B3E4F5A6B}");
+        To<V_17_0_0.AddLastSyncedTable>("{72894BCA-9FAD-4CC3-B0D0-D6CDA2FFA636}");
     }
 }
diff --git a/src/Umbraco.Infrastructure/Migrations/Upgrade/V_17_0_0/EnsureDefaultMediaFolderHasDefaultCollection.cs b/src/Umbraco.Infrastructure/Migrations/Upgrade/V_17_0_0/EnsureDefaultMediaFolderHasDefaultCollection.cs
new file mode 100644
index 000000000000..ca7db02e922f
--- /dev/null
+++ b/src/Umbraco.Infrastructure/Migrations/Upgrade/V_17_0_0/EnsureDefaultMediaFolderHasDefaultCollection.cs
@@ -0,0 +1,45 @@
+using Umbraco.Cms.Core.Models;
+using Umbraco.Cms.Core.Services;
+using Constants = Umbraco.Cms.Core.Constants;
+
+namespace Umbraco.Cms.Infrastructure.Migrations.Upgrade.V_17_0_0;
+
+/// <summary>
+/// Ensures that the Media Document Type called "Folder" gets a collection added to it.
+/// </summary>
+public class EnsureDefaultMediaFolderHasDefaultCollection : AsyncMigrationBase
+{
+    private readonly IMediaTypeService _mediaTypeService;
+    private readonly IDataTypeService _dataTypeService;
+
+    public EnsureDefaultMediaFolderHasDefaultCollection(
+        IMigrationContext context,
+        IMediaTypeService mediaTypeService,
+        IDataTypeService dataTypeService)
+        : base(context)
+    {
+        _mediaTypeService = mediaTypeService;
+        _dataTypeService = dataTypeService;
+    }
+
+    protected override async Task MigrateAsync()
+    {
+        IMediaType? folderMediaType = _mediaTypeService
+            .Get(Guid.Parse("f38bd2d7-65d0-48e6-95dc-87ce06ec2d3d")); // Folder media type default key.
+
+        if (folderMediaType is null || folderMediaType.ListView is not null)
+        {
+            return;
+        }
+
+        IDataType? dataType = await _dataTypeService.GetAsync(Guid.Parse("3a0156c4-3b8c-4803-bdc1-6871faa83fff")); // Media Collection default key.
+
+        if (dataType is null)
+        {
+            return;
+        }
+
+        folderMediaType.ListView = dataType.Key;
+        await _mediaTypeService.UpdateAsync(folderMediaType, Constants.Security.SuperUserKey);
+    }
+}

From f4a7a2d9be33922a43cf5edf749cb5abcda0b707 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= <nsl@umbraco.dk>
Date: Thu, 6 Nov 2025 11:43:46 +0100
Subject: [PATCH 119/155] Reset password localization + format (#20750)

localizations + format
---
 .../src/assets/lang/en.ts                     |  15 ++-
 .../src/localization/lang/en.ts               | 102 +++++++++---------
 2 files changed, 63 insertions(+), 54 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/assets/lang/en.ts b/src/Umbraco.Web.UI.Client/src/assets/lang/en.ts
index ef9d2d080460..6331f883356f 100644
--- a/src/Umbraco.Web.UI.Client/src/assets/lang/en.ts
+++ b/src/Umbraco.Web.UI.Client/src/assets/lang/en.ts
@@ -2567,16 +2567,21 @@ export default {
 	},
 	welcomeDashboard: {
 		umbracoForumHeadline: 'The Umbraco community forum',
-		umbracoForumDescription: 'The forum is the central hub for the Umbraco developer community. This is where developers, integrators, and contributors come together to ask questions, share knowledge, and collaborate on all things Umbraco.',
+		umbracoForumDescription:
+			'The forum is the central hub for the Umbraco developer community. This is where developers, integrators, and contributors come together to ask questions, share knowledge, and collaborate on all things Umbraco.',
 		umbracoForumButton: 'Visit the Umbraco community forum',
 		umbracoCommunityHeadline: 'The Umbraco community site',
-		umbracoCommunityDescription: 'The gathering place for all things Umbraco. Whether you write, teach, test, give feedback, or want to connect with others, there’s a way for you to be part of the Friendly Umbraco community.',
+		umbracoCommunityDescription:
+			'The gathering place for all things Umbraco. Whether you write, teach, test, give feedback, or want to connect with others, there’s a way for you to be part of the Friendly Umbraco community.',
 		documentationHeadline: 'Documentation',
-		documentationDescription: 'Your guide to everything Umbraco. Learn how to get started, explore new features, and discover best practices through clear examples and explanations.',
+		documentationDescription:
+			'Your guide to everything Umbraco. Learn how to get started, explore new features, and discover best practices through clear examples and explanations.',
 		resourcesHeadline: 'Resources',
-		resourcesDescription: 'Explore Umbraco resources to learn, build, and grow your skills. Find blogs, tutorials, demos, documentation, and videos to help you make the most of Umbraco.',
+		resourcesDescription:
+			'Explore Umbraco resources to learn, build, and grow your skills. Find blogs, tutorials, demos, documentation, and videos to help you make the most of Umbraco.',
 		trainingHeadline: 'Training',
-		trainingDescription: 'Master Umbraco with official training. Get practical experience through instructor-led courses and earn certifications that help you grow your skills and career.',
+		trainingDescription:
+			'Master Umbraco with official training. Get practical experience through instructor-led courses and earn certifications that help you grow your skills and career.',
 	},
 	blockEditor: {
 		headlineCreateBlock: 'Pick Element Type',
diff --git a/src/Umbraco.Web.UI.Login/src/localization/lang/en.ts b/src/Umbraco.Web.UI.Login/src/localization/lang/en.ts
index 0ee9e4c57aaf..2d33fcabe302 100644
--- a/src/Umbraco.Web.UI.Login/src/localization/lang/en.ts
+++ b/src/Umbraco.Web.UI.Login/src/localization/lang/en.ts
@@ -1,53 +1,57 @@
 import type { UmbLocalizationDictionary } from '@umbraco-cms/backoffice/localization-api';
 
 export default {
-  auth: {
-    continue: 'Continue',
-    validate: 'Validate',
-    login: 'Login',
-    email: 'E-mail',
-    username: 'Username',
-    password: 'Password',
-    submit: 'Submit',
-    required: 'Required',
-    success: 'Success',
-    forgottenPassword: 'Forgotten password?',
-    forgottenPasswordInstruction: 'An email will be sent to the address specified with a link to reset your password',
-    requestPasswordResetConfirmation: 'An email with password reset instructions will be sent to the specified address if it matched our records',
-    setPasswordConfirmation: 'Your password has been updated',
-    rememberMe: 'Remember me',
-    error: 'Error',
-    defaultError: 'An error occurred while processing your request.',
-    errorInPasswordFormat: 'The password must be at least {0} characters long and contain at least {1} special characters.',
-    passwordMismatch: 'The confirmed password does not match the new password!',
-    passwordMinLength: 'The password must be at least {0} characters long.',
-    passwordIsBlank: 'The password cannot be blank.',
-    userFailedLogin: 'Oops! We couldn\'t log you in. Please check your credentials and try again.',
-    userLockedOut: 'Your account has been locked out. Please try again later.',
-    receivedErrorFromServer: 'Received an error from the server',
-    resetCodeExpired: 'The link you have clicked on is invalid or has expired',
-    userInviteWelcomeMessage: 'Hello there and welcome to Umbraco! In just 1 minute you’ll be good to go, we just need you to setup a password.',
-    userInviteExpiredMessage: 'Welcome to Umbraco! Unfortunately your invite has expired. Please contact your administrator and ask them to resend it.',
-    newPassword: 'New password',
-    confirmNewPassword: 'Confirm password',
-    greeting0: 'Welcome',
-    greeting1: 'Welcome',
-    greeting2: 'Welcome',
-    greeting3: 'Welcome',
-    greeting4: 'Welcome',
-    greeting5: 'Welcome',
-    greeting6: 'Welcome',
-    mfaTitle: 'One last step',
-    mfaCodeInputHelp: 'Enter the code from your authenticator app',
-    mfaText: 'You have enabled 2-factor authentication and must verify your identity.',
-    mfaMultipleText: 'Please choose a 2-factor provider',
-    mfaCodeInput: 'Verification code',
-    mfaInvalidCode: 'Invalid code entered',
-    signInWith: 'Sign in with {0}',
-    returnToLogin: 'Return to login',
-    localLoginDisabled: 'Unfortunately, direct login is not possible. It has been disabled by a provider.',
-    friendlyGreeting: 'Hello',
-    showPassword: 'Show password',
-    hidePassword: 'Hide password',
-  },
+	auth: {
+		continue: 'Continue',
+		validate: 'Validate',
+		login: 'Login',
+		email: 'E-mail',
+		username: 'Username',
+		password: 'Password',
+		submit: 'Submit',
+		required: 'Required',
+		success: 'Success',
+		forgottenPassword: 'Forgotten password?',
+		forgottenPasswordInstruction: 'An email will be sent with a link to reset your password',
+		requestPasswordResetConfirmation:
+			'We sent an email with password reset instructions, if the email address matches a registered user.',
+		setPasswordConfirmation: 'Your password has been updated',
+		rememberMe: 'Remember me',
+		error: 'Error',
+		defaultError: 'An error occurred while processing your request.',
+		errorInPasswordFormat:
+			'The password must be at least {0} characters long and contain at least {1} special characters.',
+		passwordMismatch: 'The confirmed password does not match the new password!',
+		passwordMinLength: 'The password must be at least {0} characters long.',
+		passwordIsBlank: 'The password cannot be blank.',
+		userFailedLogin: "Oops! We couldn't log you in. Please check your credentials and try again.",
+		userLockedOut: 'Your account has been locked out. Please try again later.',
+		receivedErrorFromServer: 'Received an error from the server',
+		resetCodeExpired: 'The link you have clicked on is invalid or has expired',
+		userInviteWelcomeMessage:
+			'Hello there and welcome to Umbraco! In just 1 minute you’ll be good to go, we just need you to setup a password.',
+		userInviteExpiredMessage:
+			'Welcome to Umbraco! Unfortunately your invite has expired. Please contact your administrator and ask them to resend it.',
+		newPassword: 'New password',
+		confirmNewPassword: 'Confirm password',
+		greeting0: 'Welcome',
+		greeting1: 'Welcome',
+		greeting2: 'Welcome',
+		greeting3: 'Welcome',
+		greeting4: 'Welcome',
+		greeting5: 'Welcome',
+		greeting6: 'Welcome',
+		mfaTitle: 'One last step',
+		mfaCodeInputHelp: 'Enter the code from your authenticator app',
+		mfaText: 'You have enabled 2-factor authentication and must verify your identity.',
+		mfaMultipleText: 'Please choose a 2-factor provider',
+		mfaCodeInput: 'Verification code',
+		mfaInvalidCode: 'Invalid code entered',
+		signInWith: 'Sign in with {0}',
+		returnToLogin: 'Return to login',
+		localLoginDisabled: 'Unfortunately, direct login is not possible. It has been disabled by a provider.',
+		friendlyGreeting: 'Hello',
+		showPassword: 'Show password',
+		hidePassword: 'Hide password',
+	},
 } satisfies UmbLocalizationDictionary;

From 7162c458b1c4814999ee5df9fa90fb334f720a1d Mon Sep 17 00:00:00 2001
From: Andy Butland <abutland73@gmail.com>
Date: Thu, 6 Nov 2025 17:16:01 +0100
Subject: [PATCH 120/155] Fix memory leak with `IOptionsMonitor.OnChange` and
 non-singleton registered components (closes #20709 for 16/17) (#20723)

* Fix memory leak with IOptionsMonitor.OnChange and non-singleton registered components.

* Dispose disposable data editors in ValueEditorCache.

* Removed unnecessary refactoring and clarified code comments.
---
 .../Controllers/Help/GetHelpController.cs     |  5 +----
 .../BuildModelsBuilderController.cs           |  8 +-------
 .../ModelsBuilderPresentationFactory.cs       | 10 ++--------
 src/Umbraco.Core/Cache/ValueEditorCache.cs    | 10 +++++++++-
 .../DeliveryApi/ApiPublishedContentCache.cs   |  3 ---
 .../FileUploadPropertyValueEditor.cs          | 19 +++++++++++++++----
 .../ImageCropperPropertyEditor.cs             | 17 ++++++++---------
 .../ImageCropperPropertyValueEditor.cs        | 18 ++++++++++++++----
 .../RteBlockRenderingValueConverter.cs        |  9 +++++++--
 ...IndexingNotificationHandler.DeliveryApi.cs |  5 ++---
 .../Security/EmailUserForgotPasswordSender.cs |  7 ++-----
 11 files changed, 61 insertions(+), 50 deletions(-)

diff --git a/src/Umbraco.Cms.Api.Management/Controllers/Help/GetHelpController.cs b/src/Umbraco.Cms.Api.Management/Controllers/Help/GetHelpController.cs
index 9c8b4a8c4374..f40339b78fbe 100644
--- a/src/Umbraco.Cms.Api.Management/Controllers/Help/GetHelpController.cs
+++ b/src/Umbraco.Cms.Api.Management/Controllers/Help/GetHelpController.cs
@@ -17,7 +17,7 @@ public class GetHelpController : HelpControllerBase
 {
     private readonly ILogger<GetHelpController> _logger;
     private readonly IJsonSerializer _jsonSerializer;
-    private HelpPageSettings _helpPageSettings;
+    private readonly HelpPageSettings _helpPageSettings;
 
     public GetHelpController(
         IOptionsMonitor<HelpPageSettings> helpPageSettings,
@@ -27,11 +27,8 @@ public GetHelpController(
         _logger = logger;
         _jsonSerializer = jsonSerializer;
         _helpPageSettings = helpPageSettings.CurrentValue;
-        helpPageSettings.OnChange(UpdateHelpPageSettings);
     }
 
-    private void UpdateHelpPageSettings(HelpPageSettings settings) => _helpPageSettings = settings;
-
     [HttpGet]
     [MapToApiVersion("1.0")]
     [ProducesResponseType(typeof(ProblemDetails), StatusCodes.Status400BadRequest)]
diff --git a/src/Umbraco.Cms.Api.Management/Controllers/ModelsBuilder/BuildModelsBuilderController.cs b/src/Umbraco.Cms.Api.Management/Controllers/ModelsBuilder/BuildModelsBuilderController.cs
index 4282de369790..e2aed78b5376 100644
--- a/src/Umbraco.Cms.Api.Management/Controllers/ModelsBuilder/BuildModelsBuilderController.cs
+++ b/src/Umbraco.Cms.Api.Management/Controllers/ModelsBuilder/BuildModelsBuilderController.cs
@@ -1,22 +1,18 @@
-using System;
-using System.Threading.Tasks;
 using Asp.Versioning;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
-using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Options;
 using Umbraco.Cms.Core;
 using Umbraco.Cms.Core.Configuration.Models;
 using Umbraco.Cms.Infrastructure.ModelsBuilder;
 using Umbraco.Cms.Infrastructure.ModelsBuilder.Building;
-using Umbraco.Extensions;
 
 namespace Umbraco.Cms.Api.Management.Controllers.ModelsBuilder;
 
 [ApiVersion("1.0")]
 public class BuildModelsBuilderController : ModelsBuilderControllerBase
 {
-    private ModelsBuilderSettings _modelsBuilderSettings;
+    private readonly ModelsBuilderSettings _modelsBuilderSettings;
     private readonly ModelsGenerationError _mbErrors;
     private readonly IModelsGenerator _modelGenerator;
 
@@ -28,8 +24,6 @@ public BuildModelsBuilderController(
         _mbErrors = mbErrors;
         _modelGenerator = modelGenerator;
         _modelsBuilderSettings = modelsBuilderSettings.CurrentValue;
-
-        modelsBuilderSettings.OnChange(x => _modelsBuilderSettings = x);
     }
 
     [HttpPost("build")]
diff --git a/src/Umbraco.Cms.Api.Management/Factories/ModelsBuilderPresentationFactory.cs b/src/Umbraco.Cms.Api.Management/Factories/ModelsBuilderPresentationFactory.cs
index b021e0b6ce37..4a90d700c1d8 100644
--- a/src/Umbraco.Cms.Api.Management/Factories/ModelsBuilderPresentationFactory.cs
+++ b/src/Umbraco.Cms.Api.Management/Factories/ModelsBuilderPresentationFactory.cs
@@ -1,30 +1,24 @@
-using System.Text;
 using Microsoft.Extensions.Options;
+using Umbraco.Cms.Api.Management.ViewModels.ModelsBuilderDashboard;
 using Umbraco.Cms.Core;
-using Umbraco.Cms.Core.Configuration;
 using Umbraco.Cms.Core.Configuration.Models;
 using Umbraco.Cms.Infrastructure.ModelsBuilder;
-using Umbraco.Cms.Api.Management.ViewModels.ModelsBuilderDashboard;
-using Umbraco.Extensions;
 
 namespace Umbraco.Cms.Api.Management.Factories;
 
 public class ModelsBuilderPresentationFactory : IModelsBuilderPresentationFactory
 {
-    private ModelsBuilderSettings _modelsBuilderSettings;
     private readonly ModelsGenerationError _mbErrors;
     private readonly OutOfDateModelsStatus _outOfDateModels;
+    private readonly ModelsBuilderSettings _modelsBuilderSettings;
 
     public ModelsBuilderPresentationFactory(IOptionsMonitor<ModelsBuilderSettings> modelsBuilderSettings, ModelsGenerationError mbErrors, OutOfDateModelsStatus outOfDateModels)
     {
         _mbErrors = mbErrors;
         _outOfDateModels = outOfDateModels;
         _modelsBuilderSettings = modelsBuilderSettings.CurrentValue;
-
-        modelsBuilderSettings.OnChange(x => _modelsBuilderSettings = x);
     }
 
-
     public ModelsBuilderResponseModel Create() =>
         new()
         {
diff --git a/src/Umbraco.Core/Cache/ValueEditorCache.cs b/src/Umbraco.Core/Cache/ValueEditorCache.cs
index 85623d30fca1..e1ec12e5ef08 100644
--- a/src/Umbraco.Core/Cache/ValueEditorCache.cs
+++ b/src/Umbraco.Core/Cache/ValueEditorCache.cs
@@ -51,7 +51,15 @@ public void ClearCache(IEnumerable<int> dataTypeIds)
             {
                 foreach (Dictionary<int, IDataValueEditor> editors in _valueEditorCache.Values)
                 {
-                    editors.Remove(id);
+                    if (editors.TryGetValue(id, out IDataValueEditor? editor))
+                    {
+                        if (editor is IDisposable disposable)
+                        {
+                            disposable.Dispose();
+                        }
+
+                        editors.Remove(id);
+                    }
                 }
             }
         }
diff --git a/src/Umbraco.Core/DeliveryApi/ApiPublishedContentCache.cs b/src/Umbraco.Core/DeliveryApi/ApiPublishedContentCache.cs
index 3bf450a9ec8d..dd91b4ced111 100644
--- a/src/Umbraco.Core/DeliveryApi/ApiPublishedContentCache.cs
+++ b/src/Umbraco.Core/DeliveryApi/ApiPublishedContentCache.cs
@@ -1,10 +1,7 @@
-using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Options;
 using Umbraco.Cms.Core.Configuration.Models;
-using Umbraco.Cms.Core.DependencyInjection;
 using Umbraco.Cms.Core.Models.PublishedContent;
 using Umbraco.Cms.Core.PublishedCache;
-using Umbraco.Cms.Core.Services;
 using Umbraco.Extensions;
 
 namespace Umbraco.Cms.Core.DeliveryApi;
diff --git a/src/Umbraco.Infrastructure/PropertyEditors/FileUploadPropertyValueEditor.cs b/src/Umbraco.Infrastructure/PropertyEditors/FileUploadPropertyValueEditor.cs
index 84419673760d..6de52fd1af8b 100644
--- a/src/Umbraco.Infrastructure/PropertyEditors/FileUploadPropertyValueEditor.cs
+++ b/src/Umbraco.Infrastructure/PropertyEditors/FileUploadPropertyValueEditor.cs
@@ -2,6 +2,7 @@
 // See LICENSE for more details.
 
 using Microsoft.Extensions.Options;
+using Umbraco.Cms.Core.Cache;
 using Umbraco.Cms.Core.Configuration.Models;
 using Umbraco.Cms.Core.IO;
 using Umbraco.Cms.Core.Models;
@@ -22,14 +23,22 @@ namespace Umbraco.Cms.Core.PropertyEditors;
 /// <summary>
 ///     The value editor for the file upload property editor.
 /// </summary>
-internal sealed class FileUploadPropertyValueEditor : DataValueEditor
+/// <remarks>
+///     As this class is loaded into <see cref="ValueEditorCache"/> which can be cleared, it needs
+///     to be disposable in order to properly clean up resources such as
+///     the settings change subscription and avoid a memory leak.
+/// </remarks>
+internal sealed class FileUploadPropertyValueEditor : DataValueEditor, IDisposable
 {
     private readonly MediaFileManager _mediaFileManager;
     private readonly ITemporaryFileService _temporaryFileService;
     private readonly IScopeProvider _scopeProvider;
     private readonly IFileStreamSecurityValidator _fileStreamSecurityValidator;
     private readonly FileUploadValueParser _valueParser;
+
     private ContentSettings _contentSettings;
+    private readonly IDisposable? _contentSettingsChangeSubscription;
+
 
     /// <summary>
     /// Initializes a new instance of the <see cref="FileUploadPropertyValueEditor"/> class.
@@ -46,14 +55,14 @@ public FileUploadPropertyValueEditor(
         IFileStreamSecurityValidator fileStreamSecurityValidator)
         : base(shortStringHelper, jsonSerializer, ioHelper, attribute)
     {
-        _mediaFileManager = mediaFileManager ?? throw new ArgumentNullException(nameof(mediaFileManager));
+        _mediaFileManager = mediaFileManager;
         _temporaryFileService = temporaryFileService;
         _scopeProvider = scopeProvider;
         _fileStreamSecurityValidator = fileStreamSecurityValidator;
         _valueParser = new FileUploadValueParser(jsonSerializer);
 
-        _contentSettings = contentSettings.CurrentValue ?? throw new ArgumentNullException(nameof(contentSettings));
-        contentSettings.OnChange(x => _contentSettings = x);
+        _contentSettings = contentSettings.CurrentValue;
+        _contentSettingsChangeSubscription = contentSettings.OnChange(x => _contentSettings = x);
 
         Validators.Add(new TemporaryFileUploadValidator(
             () => _contentSettings,
@@ -216,4 +225,6 @@ private string GetMediaPath(TemporaryFileModel file, object? dataTypeConfigurati
         // in case we are using the old path scheme, try to re-use numbers (bah...)
         return _mediaFileManager.GetMediaPath(file.FileName, contentKey, propertyTypeKey);
     }
+
+    public void Dispose() => _contentSettingsChangeSubscription?.Dispose();
 }
diff --git a/src/Umbraco.Infrastructure/PropertyEditors/ImageCropperPropertyEditor.cs b/src/Umbraco.Infrastructure/PropertyEditors/ImageCropperPropertyEditor.cs
index 1af39f76851b..a0cc832bb943 100644
--- a/src/Umbraco.Infrastructure/PropertyEditors/ImageCropperPropertyEditor.cs
+++ b/src/Umbraco.Infrastructure/PropertyEditors/ImageCropperPropertyEditor.cs
@@ -1,11 +1,9 @@
 // Copyright (c) Umbraco.
 // See LICENSE for more details.
 
-using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
 using Umbraco.Cms.Core.Configuration.Models;
-using Umbraco.Cms.Core.DependencyInjection;
 using Umbraco.Cms.Core.Events;
 using Umbraco.Cms.Core.IO;
 using Umbraco.Cms.Core.Media;
@@ -26,7 +24,8 @@ namespace Umbraco.Cms.Core.PropertyEditors;
     Constants.PropertyEditors.Aliases.ImageCropper,
     ValueType = ValueTypes.Json,
     ValueEditorIsReusable = true)]
-public class ImageCropperPropertyEditor : DataEditor, IMediaUrlGenerator,
+public class ImageCropperPropertyEditor : DataEditor,
+    IMediaUrlGenerator,
     INotificationHandler<ContentCopiedNotification>,
     INotificationHandler<ContentDeletedNotification>,
     INotificationHandler<MediaDeletedNotification>,
@@ -40,9 +39,10 @@ public class ImageCropperPropertyEditor : DataEditor, IMediaUrlGenerator,
     private readonly IIOHelper _ioHelper;
     private readonly ILogger<ImageCropperPropertyEditor> _logger;
     private readonly MediaFileManager _mediaFileManager;
-    private ContentSettings _contentSettings;
     private readonly IJsonSerializer _jsonSerializer;
 
+    private ContentSettings _contentSettings;
+
     /// <summary>
     ///     Initializes a new instance of the <see cref="ImageCropperPropertyEditor" /> class.
     /// </summary>
@@ -57,15 +57,14 @@ public ImageCropperPropertyEditor(
         IJsonSerializer jsonSerializer)
         : base(dataValueEditorFactory)
     {
-        _mediaFileManager = mediaFileManager ?? throw new ArgumentNullException(nameof(mediaFileManager));
-        _contentSettings = contentSettings.CurrentValue ?? throw new ArgumentNullException(nameof(contentSettings));
-        _ioHelper = ioHelper ?? throw new ArgumentNullException(nameof(ioHelper));
-        _autoFillProperties =
-            uploadAutoFillProperties ?? throw new ArgumentNullException(nameof(uploadAutoFillProperties));
+        _mediaFileManager = mediaFileManager;
+        _ioHelper = ioHelper;
+        _autoFillProperties = uploadAutoFillProperties;
         _contentService = contentService;
         _jsonSerializer = jsonSerializer;
         _logger = loggerFactory.CreateLogger<ImageCropperPropertyEditor>();
 
+        _contentSettings = contentSettings.CurrentValue;
         contentSettings.OnChange(x => _contentSettings = x);
 
         SupportsReadOnly = true;
diff --git a/src/Umbraco.Infrastructure/PropertyEditors/ImageCropperPropertyValueEditor.cs b/src/Umbraco.Infrastructure/PropertyEditors/ImageCropperPropertyValueEditor.cs
index 869f10eac7fd..17d6d00d513b 100644
--- a/src/Umbraco.Infrastructure/PropertyEditors/ImageCropperPropertyValueEditor.cs
+++ b/src/Umbraco.Infrastructure/PropertyEditors/ImageCropperPropertyValueEditor.cs
@@ -22,17 +22,24 @@ namespace Umbraco.Cms.Core.PropertyEditors;
 /// <summary>
 ///     The value editor for the image cropper property editor.
 /// </summary>
-internal sealed class ImageCropperPropertyValueEditor : DataValueEditor // TODO: core vs web?
+/// <remarks>
+///     As this class is loaded into <see cref="ValueEditorCache"/> which can be cleared, it needs
+///     to be disposable in order to properly clean up resources such as
+///     the settings change subscription and avoid a memory leak.
+/// </remarks>
+internal sealed class ImageCropperPropertyValueEditor : DataValueEditor, IDisposable
 {
     private readonly IDataTypeConfigurationCache _dataTypeConfigurationCache;
     private readonly IFileStreamSecurityValidator _fileStreamSecurityValidator;
     private readonly ILogger<ImageCropperPropertyValueEditor> _logger;
     private readonly MediaFileManager _mediaFileManager;
     private readonly IJsonSerializer _jsonSerializer;
-    private ContentSettings _contentSettings;
     private readonly ITemporaryFileService _temporaryFileService;
     private readonly IScopeProvider _scopeProvider;
 
+    private ContentSettings _contentSettings;
+    private readonly IDisposable? _contentSettingsChangeSubscription;
+
     public ImageCropperPropertyValueEditor(
         DataEditorAttribute attribute,
         ILogger<ImageCropperPropertyValueEditor> logger,
@@ -50,12 +57,13 @@ public ImageCropperPropertyValueEditor(
         _logger = logger ?? throw new ArgumentNullException(nameof(logger));
         _mediaFileManager = mediaFileSystem ?? throw new ArgumentNullException(nameof(mediaFileSystem));
         _jsonSerializer = jsonSerializer;
-        _contentSettings = contentSettings.CurrentValue;
         _temporaryFileService = temporaryFileService;
         _scopeProvider = scopeProvider;
         _fileStreamSecurityValidator = fileStreamSecurityValidator;
         _dataTypeConfigurationCache = dataTypeConfigurationCache;
-        contentSettings.OnChange(x => _contentSettings = x);
+
+        _contentSettings = contentSettings.CurrentValue;
+        _contentSettingsChangeSubscription = contentSettings.OnChange(x => _contentSettings = x);
 
         Validators.Add(new TemporaryFileUploadValidator(() => _contentSettings, TryParseTemporaryFileKey, TryGetTemporaryFile));
     }
@@ -267,4 +275,6 @@ public override string ConvertDbToString(IPropertyType propertyType, object? val
 
         return filepath;
     }
+
+    public void Dispose() => _contentSettingsChangeSubscription?.Dispose();
 }
diff --git a/src/Umbraco.Infrastructure/PropertyEditors/ValueConverters/RteBlockRenderingValueConverter.cs b/src/Umbraco.Infrastructure/PropertyEditors/ValueConverters/RteBlockRenderingValueConverter.cs
index 65c6835f6b6c..9e3c719f5e7e 100644
--- a/src/Umbraco.Infrastructure/PropertyEditors/ValueConverters/RteBlockRenderingValueConverter.cs
+++ b/src/Umbraco.Infrastructure/PropertyEditors/ValueConverters/RteBlockRenderingValueConverter.cs
@@ -26,7 +26,7 @@ namespace Umbraco.Cms.Core.PropertyEditors.ValueConverters;
 ///     used dynamically.
 /// </summary>
 [DefaultPropertyValueConverter]
-public class RteBlockRenderingValueConverter : SimpleRichTextValueConverter, IDeliveryApiPropertyValueConverter
+public class RteBlockRenderingValueConverter : SimpleRichTextValueConverter, IDeliveryApiPropertyValueConverter, IDisposable
 {
     private readonly HtmlImageSourceParser _imageSourceParser;
     private readonly HtmlLocalLinkParser _linkParser;
@@ -41,7 +41,9 @@ public class RteBlockRenderingValueConverter : SimpleRichTextValueConverter, IDe
     private readonly RichTextBlockPropertyValueConstructorCache _constructorCache;
     private readonly IVariationContextAccessor _variationContextAccessor;
     private readonly BlockEditorVarianceHandler _blockEditorVarianceHandler;
+
     private DeliveryApiSettings _deliveryApiSettings;
+    private readonly IDisposable? _deliveryApiSettingsChangeSubscription;
 
     public RteBlockRenderingValueConverter(HtmlLocalLinkParser linkParser, HtmlUrlParser urlParser, HtmlImageSourceParser imageSourceParser,
         IApiRichTextElementParser apiRichTextElementParser, IApiRichTextMarkupParser apiRichTextMarkupParser,
@@ -62,8 +64,9 @@ public RteBlockRenderingValueConverter(HtmlLocalLinkParser linkParser, HtmlUrlPa
         _logger = logger;
         _variationContextAccessor = variationContextAccessor;
         _blockEditorVarianceHandler = blockEditorVarianceHandler;
+
         _deliveryApiSettings = deliveryApiSettingsMonitor.CurrentValue;
-        deliveryApiSettingsMonitor.OnChange(settings => _deliveryApiSettings = settings);
+        _deliveryApiSettingsChangeSubscription = deliveryApiSettingsMonitor.OnChange(settings => _deliveryApiSettings = settings);
     }
 
     public override PropertyCacheLevel GetPropertyCacheLevel(IPublishedPropertyType propertyType) =>
@@ -250,4 +253,6 @@ private sealed class RichTextEditorIntermediateValue : IRichTextEditorIntermedia
 
         public required RichTextBlockModel? RichTextBlockModel { get; set; }
     }
+
+    public void Dispose() => _deliveryApiSettingsChangeSubscription?.Dispose();
 }
diff --git a/src/Umbraco.Infrastructure/Search/IndexingNotificationHandler.DeliveryApi.cs b/src/Umbraco.Infrastructure/Search/IndexingNotificationHandler.DeliveryApi.cs
index 1750310e7159..40c671513749 100644
--- a/src/Umbraco.Infrastructure/Search/IndexingNotificationHandler.DeliveryApi.cs
+++ b/src/Umbraco.Infrastructure/Search/IndexingNotificationHandler.DeliveryApi.cs
@@ -1,4 +1,4 @@
-using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
 using Umbraco.Cms.Core.Cache;
 using Umbraco.Cms.Core.Configuration.Models;
@@ -17,7 +17,7 @@ internal sealed class DeliveryApiContentIndexingNotificationHandler :
 {
     private readonly IDeliveryApiIndexingHandler _deliveryApiIndexingHandler;
     private readonly ILogger<DeliveryApiContentIndexingNotificationHandler> _logger;
-    private DeliveryApiSettings _deliveryApiSettings;
+    private readonly DeliveryApiSettings _deliveryApiSettings;
 
     public DeliveryApiContentIndexingNotificationHandler(
         IDeliveryApiIndexingHandler deliveryApiIndexingHandler,
@@ -27,7 +27,6 @@ public DeliveryApiContentIndexingNotificationHandler(
         _deliveryApiIndexingHandler = deliveryApiIndexingHandler;
         _logger = logger;
         _deliveryApiSettings = deliveryApiSettings.CurrentValue;
-        deliveryApiSettings.OnChange(settings => _deliveryApiSettings = settings);
     }
 
     public void Handle(ContentCacheRefresherNotification notification)
diff --git a/src/Umbraco.Infrastructure/Security/EmailUserForgotPasswordSender.cs b/src/Umbraco.Infrastructure/Security/EmailUserForgotPasswordSender.cs
index 784b14af7660..72c9b16d77ad 100644
--- a/src/Umbraco.Infrastructure/Security/EmailUserForgotPasswordSender.cs
+++ b/src/Umbraco.Infrastructure/Security/EmailUserForgotPasswordSender.cs
@@ -16,8 +16,8 @@ public class EmailUserForgotPasswordSender : IUserForgotPasswordSender
 {
     private readonly IEmailSender _emailSender;
     private readonly ILocalizedTextService _localizedTextService;
-    private GlobalSettings _globalSettings;
-    private SecuritySettings _securitySettings;
+    private readonly GlobalSettings _globalSettings;
+    private readonly SecuritySettings _securitySettings;
 
     public EmailUserForgotPasswordSender(
         IEmailSender emailSender,
@@ -29,9 +29,6 @@ public EmailUserForgotPasswordSender(
         _localizedTextService = localizedTextService;
         _globalSettings = globalSettings.CurrentValue;
         _securitySettings = securitySettings.CurrentValue;
-
-        globalSettings.OnChange(settings => _globalSettings = settings);
-        securitySettings.OnChange(settings => _securitySettings = settings);
     }
 
     public async Task SendForgotPassword(UserForgotPasswordMessage messageModel)

From b866c311056a6f7e3d696415b3c2de13ca2e1625 Mon Sep 17 00:00:00 2001
From: NguyenThuyLan <116753400+NguyenThuyLan@users.noreply.github.com>
Date: Fri, 7 Nov 2025 15:02:21 +0700
Subject: [PATCH 121/155] Property action: Add tests for create and using
 Property Action UI Extension (#20291)

* add property action tests

* add extension property action code

* remove extension registry config

* update helper version

* Update tests/Umbraco.Tests.AcceptanceTest/tests/ExtensionRegistry/PropertyAction.spec.ts

Co-authored-by: Nhu Dinh <150406148+nhudinh0309@users.noreply.github.com>

* Update tests/Umbraco.Tests.AcceptanceTest/tests/ExtensionRegistry/PropertyAction.spec.ts

Co-authored-by: Nhu Dinh <150406148+nhudinh0309@users.noreply.github.com>

* Update tests/Umbraco.Tests.AcceptanceTest/tests/ExtensionRegistry/AdditionalSetup/App_Plugins/my-property-action/write-property-action.api.js

Co-authored-by: Nhu Dinh <150406148+nhudinh0309@users.noreply.github.com>

* Update tests/Umbraco.Tests.AcceptanceTest/tests/ExtensionRegistry/AdditionalSetup/App_Plugins/my-property-action/read-property-action.api.js

Co-authored-by: Nhu Dinh <150406148+nhudinh0309@users.noreply.github.com>

* change tab space size

---------

Co-authored-by: Lan Nguyen Thuy <lnt@umbraco.dk>
Co-authored-by: Nhu Dinh <150406148+nhudinh0309@users.noreply.github.com>
---
 .../my-property-action.manifests.js           | 28 +++++++++
 .../read-property-action.api.js               | 20 +++++++
 .../my-property-action/umbraco-package.json   | 12 ++++
 .../write-property-action.api.js              | 13 ++++
 .../ExtensionRegistry/PropertyAction.spec.ts  | 59 +++++++++++++++++++
 5 files changed, 132 insertions(+)
 create mode 100644 tests/Umbraco.Tests.AcceptanceTest/tests/ExtensionRegistry/AdditionalSetup/App_Plugins/my-property-action/my-property-action.manifests.js
 create mode 100644 tests/Umbraco.Tests.AcceptanceTest/tests/ExtensionRegistry/AdditionalSetup/App_Plugins/my-property-action/read-property-action.api.js
 create mode 100644 tests/Umbraco.Tests.AcceptanceTest/tests/ExtensionRegistry/AdditionalSetup/App_Plugins/my-property-action/umbraco-package.json
 create mode 100644 tests/Umbraco.Tests.AcceptanceTest/tests/ExtensionRegistry/AdditionalSetup/App_Plugins/my-property-action/write-property-action.api.js
 create mode 100644 tests/Umbraco.Tests.AcceptanceTest/tests/ExtensionRegistry/PropertyAction.spec.ts

diff --git a/tests/Umbraco.Tests.AcceptanceTest/tests/ExtensionRegistry/AdditionalSetup/App_Plugins/my-property-action/my-property-action.manifests.js b/tests/Umbraco.Tests.AcceptanceTest/tests/ExtensionRegistry/AdditionalSetup/App_Plugins/my-property-action/my-property-action.manifests.js
new file mode 100644
index 000000000000..c381dc8ce6f6
--- /dev/null
+++ b/tests/Umbraco.Tests.AcceptanceTest/tests/ExtensionRegistry/AdditionalSetup/App_Plugins/my-property-action/my-property-action.manifests.js
@@ -0,0 +1,28 @@
+export const manifests = [
+  {
+    type: 'propertyAction',
+    kind: 'default',
+    alias: 'My.propertyAction.Write',
+    name: 'Write Property Action ',
+    forPropertyEditorUis: ["Umb.PropertyEditorUi.TextBox"],
+    api: () => import('./write-property-action.api.js'),
+    weight: 200,
+    meta: {
+      icon: 'icon-brush',
+      label: 'Write text',
+    }
+  },
+  {
+    type: 'propertyAction',
+    kind: 'default',
+    alias: 'My.propertyAction.Read',
+    name: 'Read Property Action ',
+    forPropertyEditorUis: ["Umb.PropertyEditorUi.TextBox"],
+    api: () => import('./read-property-action.api.js'),
+    weight: 200,
+    meta: {
+      icon: 'icon-eye',
+      label: 'Read text',
+    }
+  }
+]
diff --git a/tests/Umbraco.Tests.AcceptanceTest/tests/ExtensionRegistry/AdditionalSetup/App_Plugins/my-property-action/read-property-action.api.js b/tests/Umbraco.Tests.AcceptanceTest/tests/ExtensionRegistry/AdditionalSetup/App_Plugins/my-property-action/read-property-action.api.js
new file mode 100644
index 000000000000..6d093f3cdbca
--- /dev/null
+++ b/tests/Umbraco.Tests.AcceptanceTest/tests/ExtensionRegistry/AdditionalSetup/App_Plugins/my-property-action/read-property-action.api.js
@@ -0,0 +1,20 @@
+import { UmbPropertyActionBase } from '@umbraco-cms/backoffice/property-action';
+import { UMB_PROPERTY_CONTEXT } from '@umbraco-cms/backoffice/property';
+import { UMB_NOTIFICATION_CONTEXT } from '@umbraco-cms/backoffice/notification';
+export class ReadPropertyAction extends UmbPropertyActionBase {
+  async execute() {
+    const propertyContext = await this.getContext(UMB_PROPERTY_CONTEXT);
+    if (!propertyContext) {
+      return;
+    }
+    const value = propertyContext.getValue();
+    const notificationContext = await this.getContext(UMB_NOTIFICATION_CONTEXT);
+    notificationContext?.peek('positive', {
+      data: {
+        headline: '',
+        message: value,
+      },
+    });
+  }
+}
+export { ReadPropertyAction as api };
diff --git a/tests/Umbraco.Tests.AcceptanceTest/tests/ExtensionRegistry/AdditionalSetup/App_Plugins/my-property-action/umbraco-package.json b/tests/Umbraco.Tests.AcceptanceTest/tests/ExtensionRegistry/AdditionalSetup/App_Plugins/my-property-action/umbraco-package.json
new file mode 100644
index 000000000000..b5bc3e6849ae
--- /dev/null
+++ b/tests/Umbraco.Tests.AcceptanceTest/tests/ExtensionRegistry/AdditionalSetup/App_Plugins/my-property-action/umbraco-package.json
@@ -0,0 +1,12 @@
+{
+  "name": "E2E Test Package",
+  "version": "1.0.0",
+  "extensions": [
+    {
+      "type": "bundle",
+      "alias": "My.PropertyAction.Bundle",
+      "name": "My property action bundle",
+      "js": "/App_Plugins/my-property-action/my-property-action.manifests.js"
+    }
+  ]
+}
diff --git a/tests/Umbraco.Tests.AcceptanceTest/tests/ExtensionRegistry/AdditionalSetup/App_Plugins/my-property-action/write-property-action.api.js b/tests/Umbraco.Tests.AcceptanceTest/tests/ExtensionRegistry/AdditionalSetup/App_Plugins/my-property-action/write-property-action.api.js
new file mode 100644
index 000000000000..e6f0c9a64a65
--- /dev/null
+++ b/tests/Umbraco.Tests.AcceptanceTest/tests/ExtensionRegistry/AdditionalSetup/App_Plugins/my-property-action/write-property-action.api.js
@@ -0,0 +1,13 @@
+import { UmbPropertyActionBase } from '@umbraco-cms/backoffice/property-action';
+import { UMB_PROPERTY_CONTEXT } from '@umbraco-cms/backoffice/property';
+export class WritePropertyAction extends UmbPropertyActionBase {
+  async execute() {
+    const propertyContext = await this.getContext(UMB_PROPERTY_CONTEXT);
+    if (!propertyContext) {
+      return;
+    }
+    propertyContext.setValue('Hello world');
+    
+  }
+}
+export { WritePropertyAction as api };
diff --git a/tests/Umbraco.Tests.AcceptanceTest/tests/ExtensionRegistry/PropertyAction.spec.ts b/tests/Umbraco.Tests.AcceptanceTest/tests/ExtensionRegistry/PropertyAction.spec.ts
new file mode 100644
index 000000000000..20422343b520
--- /dev/null
+++ b/tests/Umbraco.Tests.AcceptanceTest/tests/ExtensionRegistry/PropertyAction.spec.ts
@@ -0,0 +1,59 @@
+import {ConstantHelper, test} from '@umbraco/playwright-testhelpers';
+import { expect } from '@playwright/test';
+
+// Content
+const contentName = 'TestContent';
+// DocumentType
+const documentTypeName = 'TestDocumentTypeForContent';
+// GroupName
+const groupName = 'Content';
+// DataType
+const dataTypeName = 'Textstring';
+// Property actions name
+const writeActionName = 'Write text';
+const readActionName = 'Read text';
+// Test values
+const readTextValue = 'Test text value';
+const writeTextValue = 'Hello world';
+
+test.afterEach(async ({umbracoApi}) => {
+	await umbracoApi.document.ensureNameNotExists(contentName);
+	await umbracoApi.documentType.ensureNameNotExists(documentTypeName);
+});
+
+test('can read value from textstring editor using read property action', async ({umbracoApi, umbracoUi}) => {
+  // Arrange 
+  const dataTypeData = await umbracoApi.dataType.getByName(dataTypeName);
+  const documentTypeId = await umbracoApi.documentType.createDocumentTypeWithPropertyEditor(documentTypeName, dataTypeName, dataTypeData.id, groupName);
+  await umbracoApi.document.createDocumentWithTextContent(contentName, documentTypeId, readTextValue, dataTypeName);
+  await umbracoUi.goToBackOffice();
+  await umbracoUi.content.goToSection(ConstantHelper.sections.content);
+
+  // Act
+  await umbracoUi.content.goToContentWithName(contentName);
+  await umbracoUi.content.clickActionsMenuForProperty(groupName, dataTypeName);
+  await umbracoUi.content.clickPropertyActionWithName(readActionName);
+
+  // Assert
+  await umbracoUi.content.doesSuccessNotificationHaveText(readTextValue);
+});
+
+test('can write value to textstring editor using write property action', async ({umbracoApi, umbracoUi}) => {
+  // Arrange 
+  const dataTypeData = await umbracoApi.dataType.getByName(dataTypeName);
+  const documentTypeId = await umbracoApi.documentType.createDocumentTypeWithPropertyEditor(documentTypeName, dataTypeName, dataTypeData.id, groupName);
+  const contentId = await umbracoApi.document.createDocumentWithTextContent(contentName, documentTypeId, '', dataTypeName);
+  await umbracoUi.goToBackOffice();
+  await umbracoUi.content.goToSection(ConstantHelper.sections.content);
+
+  // Act
+  await umbracoUi.content.goToContentWithName(contentName);
+  await umbracoUi.content.clickActionsMenuForProperty(groupName, dataTypeName);
+  await umbracoUi.content.clickPropertyActionWithName(writeActionName);
+  await umbracoUi.content.clickSaveButton();
+
+  // Assert
+  await umbracoUi.content.isSuccessStateVisibleForSaveButton();
+  const updatedContentData = await umbracoApi.document.get(contentId);
+  expect(updatedContentData.values[0].value).toBe(writeTextValue);
+});
\ No newline at end of file

From ca08652a60601834065852e71dd9b90e840fc14f Mon Sep 17 00:00:00 2001
From: Andy Butland <abutland73@gmail.com>
Date: Fri, 7 Nov 2025 14:34:26 +0100
Subject: [PATCH 122/155] Installer: Fix issues with newsletter signup (#20705)

* Add setter to allow handling of requests to subscribe to newsletter on install.

* Correct serialization of newsletter subscription request.

* Fix serialization and use the Umbraco.EmailMarketing service for newsletter signup.

* Remove logging of user when setting telemetry level.

* Applied suggestions from code review.
---
 .../Installer/UserInstallRequestModel.cs      |   4 +-
 .../Services/MetricsConsentService.cs         |   7 +-
 .../Installer/Steps/CreateUserStep.cs         | 152 +++++++++++++-----
 3 files changed, 113 insertions(+), 50 deletions(-)

diff --git a/src/Umbraco.Cms.Api.Management/ViewModels/Installer/UserInstallRequestModel.cs b/src/Umbraco.Cms.Api.Management/ViewModels/Installer/UserInstallRequestModel.cs
index b14a67e72654..2dd608178e61 100644
--- a/src/Umbraco.Cms.Api.Management/ViewModels/Installer/UserInstallRequestModel.cs
+++ b/src/Umbraco.Cms.Api.Management/ViewModels/Installer/UserInstallRequestModel.cs
@@ -1,4 +1,4 @@
-using System.ComponentModel;
+using System.ComponentModel;
 using System.ComponentModel.DataAnnotations;
 
 namespace Umbraco.Cms.Api.Management.ViewModels.Installer;
@@ -17,5 +17,5 @@ public class UserInstallRequestModel
     [PasswordPropertyText]
     public string Password { get; set; } = string.Empty;
 
-    public bool SubscribeToNewsletter { get; }
+    public bool SubscribeToNewsletter { get; set; }
 }
diff --git a/src/Umbraco.Core/Services/MetricsConsentService.cs b/src/Umbraco.Core/Services/MetricsConsentService.cs
index 3a0cc46a0d85..143d3ca3aa49 100644
--- a/src/Umbraco.Core/Services/MetricsConsentService.cs
+++ b/src/Umbraco.Core/Services/MetricsConsentService.cs
@@ -39,11 +39,10 @@ public TelemetryLevel GetConsentLevel()
         return analyticsLevel;
     }
 
-    public async Task SetConsentLevelAsync(TelemetryLevel telemetryLevel)
+    public Task SetConsentLevelAsync(TelemetryLevel telemetryLevel)
     {
-        IUser? currentUser = _backOfficeSecurityAccessor.BackOfficeSecurity?.CurrentUser ?? await _userService.GetAsync(Constants.Security.SuperUserKey);
-
-        _logger.LogInformation("Telemetry level set to {telemetryLevel} by {username}", telemetryLevel, currentUser?.Username);
+        _logger.LogInformation("Telemetry level set to {telemetryLevel}", telemetryLevel);
         _keyValueService.SetValue(Key, telemetryLevel.ToString());
+        return Task.CompletedTask;
     }
 }
diff --git a/src/Umbraco.Infrastructure/Installer/Steps/CreateUserStep.cs b/src/Umbraco.Infrastructure/Installer/Steps/CreateUserStep.cs
index b4fe7b23b9b8..c2d5b6dd6f6e 100644
--- a/src/Umbraco.Infrastructure/Installer/Steps/CreateUserStep.cs
+++ b/src/Umbraco.Infrastructure/Installer/Steps/CreateUserStep.cs
@@ -1,10 +1,11 @@
-using System.Collections.Specialized;
 using System.Data.Common;
-using System.Text;
 using Microsoft.AspNetCore.Identity;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
 using Umbraco.Cms.Core;
 using Umbraco.Cms.Core.Configuration.Models;
+using Umbraco.Cms.Core.DependencyInjection;
 using Umbraco.Cms.Core.Installer;
 using Umbraco.Cms.Core.Models.Installer;
 using Umbraco.Cms.Core.Models.Membership;
@@ -32,7 +33,9 @@ public class CreateUserStep : StepBase, IInstallStep
     private readonly IDbProviderFactoryCreator _dbProviderFactoryCreator;
     private readonly IMetricsConsentService _metricsConsentService;
     private readonly IJsonSerializer _jsonSerializer;
+    private readonly ILogger<CreateUserStep> _logger;
 
+    [Obsolete("Please use the constructor that takes all parameters. Scheduled for removal in Umbraco 19.")]
     public CreateUserStep(
         IUserService userService,
         DatabaseBuilder databaseBuilder,
@@ -44,71 +47,132 @@ public CreateUserStep(
         IDbProviderFactoryCreator dbProviderFactoryCreator,
         IMetricsConsentService metricsConsentService,
         IJsonSerializer jsonSerializer)
+        : this(
+            userService,
+            databaseBuilder,
+            httpClientFactory,
+            securitySettings,
+            connectionStrings,
+            cookieManager,
+            userManager,
+            dbProviderFactoryCreator,
+            metricsConsentService,
+            jsonSerializer,
+            StaticServiceProvider.Instance.GetRequiredService<ILogger<CreateUserStep>>())
     {
-        _userService = userService ?? throw new ArgumentNullException(nameof(userService));
-        _databaseBuilder = databaseBuilder ?? throw new ArgumentNullException(nameof(databaseBuilder));
+    }
+
+    public CreateUserStep(
+        IUserService userService,
+        DatabaseBuilder databaseBuilder,
+        IHttpClientFactory httpClientFactory,
+        IOptions<SecuritySettings> securitySettings,
+        IOptionsMonitor<ConnectionStrings> connectionStrings,
+        ICookieManager cookieManager,
+        IBackOfficeUserManager userManager,
+        IDbProviderFactoryCreator dbProviderFactoryCreator,
+        IMetricsConsentService metricsConsentService,
+        IJsonSerializer jsonSerializer,
+        ILogger<CreateUserStep> logger)
+    {
+        _userService = userService;
+        _databaseBuilder = databaseBuilder;
         _httpClientFactory = httpClientFactory;
-        _securitySettings = securitySettings.Value ?? throw new ArgumentNullException(nameof(securitySettings));
+        _securitySettings = securitySettings.Value;
         _connectionStrings = connectionStrings;
         _cookieManager = cookieManager;
-        _userManager = userManager ?? throw new ArgumentNullException(nameof(userManager));
-        _dbProviderFactoryCreator = dbProviderFactoryCreator ?? throw new ArgumentNullException(nameof(dbProviderFactoryCreator));
+        _userManager = userManager;
+        _dbProviderFactoryCreator = dbProviderFactoryCreator;
         _metricsConsentService = metricsConsentService;
         _jsonSerializer = jsonSerializer;
+        _logger = logger;
     }
 
     public async Task<Attempt<InstallationResult>> ExecuteAsync(InstallData model)
     {
-            IUser? admin = _userService.GetAsync(Constants.Security.SuperUserKey).GetAwaiter().GetResult();
-            if (admin is null)
-            {
-                return FailWithMessage("Could not find the super user");
-            }
+        IUser? admin = await _userService.GetAsync(Constants.Security.SuperUserKey);
+        if (admin is null)
+        {
+            return FailWithMessage("Could not find the super user");
+        }
 
-            UserInstallData user = model.User;
-            admin.Email = user.Email.Trim();
-            admin.Name = user.Name.Trim();
-            admin.Username = user.Email.Trim();
+        UserInstallData user = model.User;
+        admin.Email = user.Email.Trim();
+        admin.Name = user.Name.Trim();
+        admin.Username = user.Email.Trim();
 
-            _userService.Save(admin);
+        _userService.Save(admin);
 
-            BackOfficeIdentityUser? membershipUser = await _userManager.FindByIdAsync(Constants.Security.SuperUserIdAsString);
-            if (membershipUser == null)
-            {
-                return FailWithMessage(
-                    $"No user found in membership provider with id of {Constants.Security.SuperUserIdAsString}.");
-            }
+        BackOfficeIdentityUser? membershipUser = await _userManager.FindByIdAsync(Constants.Security.SuperUserIdAsString);
+        if (membershipUser == null)
+        {
+            return FailWithMessage(
+                $"No user found in membership provider with id of {Constants.Security.SuperUserIdAsString}.");
+        }
 
-            // To change the password here we actually need to reset it since we don't have an old one to use to change
-            var resetToken = await _userManager.GeneratePasswordResetTokenAsync(membershipUser);
-            if (string.IsNullOrWhiteSpace(resetToken))
+        // To change the password here we actually need to reset it since we don't have an old one to use to change
+        var resetToken = await _userManager.GeneratePasswordResetTokenAsync(membershipUser);
+        if (string.IsNullOrWhiteSpace(resetToken))
+        {
+            return FailWithMessage("Could not reset password: unable to generate internal reset token");
+        }
+
+        IdentityResult resetResult = await _userManager.ChangePasswordWithResetAsync(membershipUser.Id, resetToken, user.Password.Trim());
+        if (!resetResult.Succeeded)
+        {
+            return FailWithMessage("Could not reset password: " + string.Join(", ", resetResult.Errors.ToErrorMessage()));
+        }
+
+        await _metricsConsentService.SetConsentLevelAsync(model.TelemetryLevel);
+
+        if (model.User.SubscribeToNewsletter)
+        {
+            const string EmailCollectorUrl = "https://emailcollector.umbraco.io/api/EmailProxy";
+
+            var emailModel = new EmailModel
+            {
+                Name = admin.Name,
+                Email = admin.Email,
+                UserGroup = [Constants.Security.AdminGroupAlias],
+            };
+
+            HttpClient httpClient = _httpClientFactory.CreateClient();
+            using var content = new StringContent(_jsonSerializer.Serialize(emailModel), System.Text.Encoding.UTF8, "application/json");
+            try
             {
-                return FailWithMessage("Could not reset password: unable to generate internal reset token");
+                // Set a reasonable timeout of 5 seconds for web request to save subscriber.
+                using var cts = new CancellationTokenSource(TimeSpan.FromSeconds(5));
+                HttpResponseMessage response = await httpClient.PostAsync(EmailCollectorUrl, content, cts.Token);
+                if (response.IsSuccessStatusCode)
+                {
+                    _logger.LogInformation("Successfully subscribed the user created on installation to the Umbraco newsletter.");
+                }
+                else
+                {
+                    _logger.LogWarning("Failed to subscribe the user created on installation to the Umbraco newsletter. Status code: {StatusCode}", response.StatusCode);
+                }
             }
-
-            IdentityResult resetResult = await _userManager.ChangePasswordWithResetAsync(membershipUser.Id, resetToken, user.Password.Trim());
-            if (!resetResult.Succeeded)
+            catch (Exception ex)
             {
-                return FailWithMessage("Could not reset password: " + string.Join(", ", resetResult.Errors.ToErrorMessage()));
+                // Log and move on if a failure occurs, we don't want to block installation for this.
+                _logger.LogError(ex, "Exception occurred while trying to subscribe the user created on installation to the Umbraco newsletter.");
             }
 
-            await _metricsConsentService.SetConsentLevelAsync(model.TelemetryLevel);
+        }
 
-            if (model.User.SubscribeToNewsletter)
-            {
-                var values = new NameValueCollection { { "name", admin.Name }, { "email", admin.Email } };
-                var content = new StringContent(_jsonSerializer.Serialize(values), Encoding.UTF8, "application/json");
+        return Success();
+    }
 
-                HttpClient httpClient = _httpClientFactory.CreateClient();
+    /// <summary>
+    /// Model used to subscribe to the newsletter. Aligns with EmailModel defined in Umbraco.EmailMarketing.
+    /// </summary>
+    private class EmailModel
+    {
+        public required string Name { get; init; }
 
-                try
-                {
-                    HttpResponseMessage response = httpClient.PostAsync("https://shop.umbraco.com/base/Ecom/SubmitEmail/installer.aspx", content).Result;
-                }
-                catch { /* fail in silence */ }
-            }
+        public required string Email { get; init; }
 
-            return Success();
+        public required List<string> UserGroup { get; init; }
     }
 
     /// <inheritdoc/>

From aae316e17e3f7e9dc48fbb792d722d6d7b1c5be5 Mon Sep 17 00:00:00 2001
From: Warren Buckley <warren@hackmakedo.com>
Date: Sun, 9 Nov 2025 12:41:41 +0000
Subject: [PATCH 123/155] Localization: Supply the display name to the
 localization key for the `alt` and `title` attributes of the 2FA QR code
 image (#20770)

Simple fix to supply the display name to the localization key for the 2FA QR Code Image
---
 .../current-user/components/mfa-provider-default.element.ts   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/current-user/components/mfa-provider-default.element.ts b/src/Umbraco.Web.UI.Client/src/packages/user/current-user/components/mfa-provider-default.element.ts
index 97bb775d0463..2ccb8ac8c2ec 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/user/current-user/components/mfa-provider-default.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/user/current-user/components/mfa-provider-default.element.ts
@@ -101,8 +101,8 @@ export class UmbMfaProviderDefaultElement extends UmbLitElement implements UmbMf
 									<img
 										id="qrCode"
 										.src=${this._qrCodeSetupImageUrl}
-										alt=${this.localize.term('user_2faQrCodeAlt')}
-										title=${this.localize.term('user_2faQrCodeTitle')}
+										alt=${this.localize.term('user_2faQrCodeAlt', this.displayName)}
+										title=${this.localize.term('user_2faQrCodeTitle', this.displayName)}
 										loading="eager" />
 								</div>
 								<uui-form-layout-item class="text-center">

From 04918ec3d27bba9a38b900b4d10df2060588241e Mon Sep 17 00:00:00 2001
From: Luuk Peters <Luuk1983@users.noreply.github.com>
Date: Sun, 9 Nov 2025 22:38:16 +0100
Subject: [PATCH 124/155] Slider property editor: Fix for preset value handling
 of `enableRange` (#20772)

Fix config value access in UmbSliderPropertyValuePreset

Updated the `UmbSliderPropertyValuePreset` class to ensure the `.value` property is accessed for configuration items. This change improves the accuracy of retrieving `enableRange`, `min`, `max`, and `step` values, addressing potential bugs in value processing.

Co-authored-by: Luuk Peters <Luuk.Peters@proudnerds.com>
---
 .../slider/slider-property-value-preset.ts                | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/packages/property-editors/slider/slider-property-value-preset.ts b/src/Umbraco.Web.UI.Client/src/packages/property-editors/slider/slider-property-value-preset.ts
index 8c27b41147d3..acbec3f810ad 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/property-editors/slider/slider-property-value-preset.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/property-editors/slider/slider-property-value-preset.ts
@@ -6,16 +6,16 @@ export class UmbSliderPropertyValuePreset
 	implements UmbPropertyValuePreset<UmbSliderPropertyEditorUiValue, UmbPropertyEditorConfig>
 {
 	async processValue(value: undefined | UmbSliderPropertyEditorUiValue, config: UmbPropertyEditorConfig) {
-		const enableRange = Boolean(config.find((x) => x.alias === 'enableRange') ?? false);
+		const enableRange = Boolean(config.find((x) => x.alias === 'enableRange')?.value ?? false);
 
 		/*
-		const min = Number(config.find((x) => x.alias === 'minVal') ?? 0);
-		const max = Number(config.find((x) => x.alias === 'maxVal') ?? 100);
+		const min = Number(config.find((x) => x.alias === 'minVal')?.value ?? 0);
+		const max = Number(config.find((x) => x.alias === 'maxVal')?.value ?? 100);
 		const minVerified = isNaN(min) ? undefined : min;
 		const maxVerified = isNaN(max) ? undefined : max;
 		*/
 
-		const step = (config.find((x) => x.alias === 'step') as number | undefined) ?? 0;
+		const step = Number(config.find((x) => x.alias === 'step')?.value ?? 0);
 		const stepVerified = step > 0 ? step : 1;
 
 		const initValueMin = Number(config.find((x) => x.alias === 'initVal1')?.value) || 0;

From fcfaff9daab89f9a90075bc74c206811c3fecb05 Mon Sep 17 00:00:00 2001
From: Andy Butland <abutland73@gmail.com>
Date: Mon, 10 Nov 2025 03:02:10 +0100
Subject: [PATCH 125/155] Querying: Restore ability to retrieve all children
 published in any culture (closes #20760) (#20766)

* Restore ability to retrieve all children published in any culture.

* Fixed typo in test name.
---
 .../PublishStatus/PublishStatusService.cs     |  4 +-
 .../PublishedContentStatusFilteringService.cs |  9 +--
 ...ishedContentStatusFilteringServiceTests.cs | 72 ++++++++++++++-----
 3 files changed, 62 insertions(+), 23 deletions(-)

diff --git a/src/Umbraco.Core/Services/PublishStatus/PublishStatusService.cs b/src/Umbraco.Core/Services/PublishStatus/PublishStatusService.cs
index 63d6d657fc80..43b954a7f7b5 100644
--- a/src/Umbraco.Core/Services/PublishStatus/PublishStatusService.cs
+++ b/src/Umbraco.Core/Services/PublishStatus/PublishStatusService.cs
@@ -69,7 +69,9 @@ public bool IsDocumentPublished(Guid documentKey, string culture)
 
         if (_publishedCultures.TryGetValue(documentKey, out ISet<string>? publishedCultures))
         {
-            return publishedCultures.Contains(culture, StringComparer.InvariantCultureIgnoreCase);
+            // If "*" is provided as the culture, we consider this as "published in any culture". This aligns
+            // with behaviour in Umbraco 13.
+            return culture == Constants.System.InvariantCulture || publishedCultures.Contains(culture, StringComparer.InvariantCultureIgnoreCase);
         }
 
         _logger.LogDebug("Document {DocumentKey} not found in the publish status cache", documentKey);
diff --git a/src/Umbraco.Core/Services/PublishStatus/PublishedContentStatusFilteringService.cs b/src/Umbraco.Core/Services/PublishStatus/PublishedContentStatusFilteringService.cs
index 860b4cb2f3e2..fce1eb949c75 100644
--- a/src/Umbraco.Core/Services/PublishStatus/PublishedContentStatusFilteringService.cs
+++ b/src/Umbraco.Core/Services/PublishStatus/PublishedContentStatusFilteringService.cs
@@ -1,4 +1,4 @@
-using Umbraco.Cms.Core.Models.PublishedContent;
+using Umbraco.Cms.Core.Models.PublishedContent;
 using Umbraco.Cms.Core.PublishedCache;
 using Umbraco.Extensions;
 
@@ -40,13 +40,14 @@ public IEnumerable<IPublishedContent> FilterAvailable(IEnumerable<Guid> candidat
                 _publishStatusQueryService.IsDocumentPublished(key, culture)
                 && _publishStatusQueryService.HasPublishedAncestorPath(key));
 
-        return WhereIsInvariantOrHasCulture(candidateKeys, culture, preview).ToArray();
+        return WhereIsInvariantOrHasCultureOrRequestedAllCultures(candidateKeys, culture, preview).ToArray();
     }
 
-    private IEnumerable<IPublishedContent> WhereIsInvariantOrHasCulture(IEnumerable<Guid> keys, string culture, bool preview)
+    private IEnumerable<IPublishedContent> WhereIsInvariantOrHasCultureOrRequestedAllCultures(IEnumerable<Guid> keys, string culture, bool preview)
         => keys
             .Select(key => _publishedContentCache.GetById(preview, key))
             .WhereNotNull()
-            .Where(content => content.ContentType.VariesByCulture() is false
+            .Where(content => culture == Constants.System.InvariantCulture
+                              || content.ContentType.VariesByCulture() is false
                               || content.Cultures.ContainsKey(culture));
 }
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Services/PublishStatus/PublishedContentStatusFilteringServiceTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Services/PublishStatus/PublishedContentStatusFilteringServiceTests.cs
index 6949d47c8883..d73fff433b74 100644
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Services/PublishStatus/PublishedContentStatusFilteringServiceTests.cs
+++ b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Services/PublishStatus/PublishedContentStatusFilteringServiceTests.cs
@@ -1,5 +1,6 @@
-using Moq;
+using Moq;
 using NUnit.Framework;
+using Umbraco.Cms.Core;
 using Umbraco.Cms.Core.Models;
 using Umbraco.Cms.Core.Models.PublishedContent;
 using Umbraco.Cms.Core.PublishedCache;
@@ -44,9 +45,10 @@ public void FilterAvailable_Invariant_ForPreview_YieldsUnpublishedItems()
 
     [TestCase("da-DK", 3)]
     [TestCase("en-US", 4)]
+    [TestCase("*", 5)]
     public void FilterAvailable_Variant_ForNonPreview_YieldsPublishedItemsInCulture(string culture, int expectedNumberOfChildren)
     {
-        var (sut, items) = SetupVariant(false, culture);
+        var (sut, items) = SetupVariant(false, culture == Constants.System.InvariantCulture ? "en-US" : culture);
 
         var children = sut.FilterAvailable(items.Keys, culture).ToArray();
         Assert.AreEqual(expectedNumberOfChildren, children.Length);
@@ -70,16 +72,24 @@ public void FilterAvailable_Variant_ForNonPreview_YieldsPublishedItemsInCulture(
         {
             Assert.AreEqual(8, children[2].Id);
         }
+
+        if (culture == Constants.System.InvariantCulture)
+        {
+            Assert.AreEqual(4, children[2].Id);
+            Assert.AreEqual(6, children[3].Id);
+            Assert.AreEqual(8, children[4].Id);
+        }
     }
 
-    [TestCase("da-DK")]
-    [TestCase("en-US")]
-    public void FilterAvailable_Variant_ForPreview_YieldsUnpublishedItemsInCulture(string culture)
+    [TestCase("da-DK", 7)]
+    [TestCase("en-US", 7)]
+    [TestCase("*", 10)]
+    public void FilterAvailable_Variant_ForPreview_YieldsUnpublishedItemsInCulture(string culture, int expectedNumberOfChildren)
     {
-        var (sut, items) = SetupVariant(true, culture);
+        var (sut, items) = SetupVariant(true, culture == Constants.System.InvariantCulture ? "en-US" : culture);
 
         var children = sut.FilterAvailable(items.Keys, culture).ToArray();
-        Assert.AreEqual(7, children.Length);
+        Assert.AreEqual(expectedNumberOfChildren, children.Length);
 
         // IDs 0 through 3 exist in both en-US and da-DK
         Assert.Multiple(() =>
@@ -105,16 +115,27 @@ public void FilterAvailable_Variant_ForPreview_YieldsUnpublishedItemsInCulture(s
             Assert.AreEqual(8, children[5].Id);
             Assert.AreEqual(9, children[6].Id);
         }
+
+        if (culture == Constants.System.InvariantCulture)
+        {
+            Assert.AreEqual(4, children[4].Id);
+            Assert.AreEqual(5, children[5].Id);
+            Assert.AreEqual(6, children[6].Id);
+            Assert.AreEqual(7, children[7].Id);
+            Assert.AreEqual(8, children[8].Id);
+            Assert.AreEqual(9, children[9].Id);
+        }
     }
 
-    [TestCase("da-DK")]
-    [TestCase("en-US")]
-    public void FilterAvailable_MixedVariance_ForNonPreview_YieldsPublishedItemsInCultureOrInvariant(string culture)
+    [TestCase("da-DK", 4)]
+    [TestCase("en-US", 4)]
+    [TestCase("*", 5)]
+    public void FilterAvailable_MixedVariance_ForNonPreview_YieldsPublishedItemsInCultureOrInvariant(string culture, int expectedNumberOfChildren)
     {
-        var (sut, items) = SetupMixedVariance(false, culture);
+        var (sut, items) = SetupMixedVariance(false, culture == Constants.System.InvariantCulture ? "en-US" : culture);
 
         var children = sut.FilterAvailable(items.Keys, culture).ToArray();
-        Assert.AreEqual(4, children.Length);
+        Assert.AreEqual(expectedNumberOfChildren, children.Length);
 
         // IDs 0 through 2 are invariant - only even IDs are published
         Assert.Multiple(() =>
@@ -140,16 +161,23 @@ public void FilterAvailable_MixedVariance_ForNonPreview_YieldsPublishedItemsInCu
         {
             Assert.AreEqual(8, children[3].Id);
         }
+
+        if (culture == Constants.System.InvariantCulture)
+        {
+            Assert.AreEqual(6, children[3].Id);
+            Assert.AreEqual(8, children[4].Id);
+        }
     }
 
-    [TestCase("da-DK")]
-    [TestCase("en-US")]
-    public void FilterAvailable_MixedVariance_FoPreview_YieldsPublishedItemsInCultureOrInvariant(string culture)
+    [TestCase("da-DK", 8)]
+    [TestCase("en-US", 8)]
+    [TestCase("*", 10)]
+    public void FilterAvailable_MixedVariance_ForPreview_YieldsPublishedItemsInCultureOrInvariant(string culture, int expectedNumberOfChildren)
     {
-        var (sut, items) = SetupMixedVariance(true, culture);
+        var (sut, items) = SetupMixedVariance(true, culture == Constants.System.InvariantCulture ? "en-US" : culture);
 
         var children = sut.FilterAvailable(items.Keys, culture).ToArray();
-        Assert.AreEqual(8, children.Length);
+        Assert.AreEqual(expectedNumberOfChildren, children.Length);
 
         // IDs 0 through 2 are invariant
         Assert.Multiple(() =>
@@ -180,6 +208,14 @@ public void FilterAvailable_MixedVariance_FoPreview_YieldsPublishedItemsInCultur
             Assert.AreEqual(8, children[6].Id);
             Assert.AreEqual(9, children[7].Id);
         }
+
+        if (culture == Constants.System.InvariantCulture)
+        {
+            Assert.AreEqual(6, children[6].Id);
+            Assert.AreEqual(7, children[7].Id);
+            Assert.AreEqual(8, children[8].Id);
+            Assert.AreEqual(9, children[9].Id);
+        }
     }
 
     // sets up invariant test data:
@@ -328,7 +364,7 @@ private IPublishStatusQueryService SetupPublishStatusQueryService(Dictionary<Gui
             .Returns((Guid key, string culture) => items
                                                        .TryGetValue(key, out var item)
                                                    && idIsPublished(item.Id)
-                                                   && (item.ContentType.VariesByCulture() is false || item.Cultures.ContainsKey(culture)));
+                                                   && (culture == Constants.System.InvariantCulture || item.ContentType.VariesByCulture() is false || item.Cultures.ContainsKey(culture)));
         publishStatusQueryService
             .Setup(s => s.HasPublishedAncestorPath(It.IsAny<Guid>()))
             .Returns(true);

From bce85e1e88d95497f04dd2cb382f8f7c127a8dca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= <nsl@umbraco.dk>
Date: Mon, 10 Nov 2025 10:38:53 +0100
Subject: [PATCH 126/155] Package section: use command icon for migrations,
 remove prop (#20775)

change icon and remove ability to customize
---
 .../installed-packages-section-view-item.element.ts          | 5 +----
 .../installed/installed-packages-section-view.element.ts     | 1 -
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/packages/packages/package-section/views/installed/installed-packages-section-view-item.element.ts b/src/Umbraco.Web.UI.Client/src/packages/packages/package-section/views/installed/installed-packages-section-view-item.element.ts
index ad05d682abd1..9d213a2f7230 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/packages/package-section/views/installed/installed-packages-section-view-item.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/packages/package-section/views/installed/installed-packages-section-view-item.element.ts
@@ -31,9 +31,6 @@ export class UmbInstalledPackagesSectionViewItemElement extends UmbLitElement {
 	@property({ type: Boolean, attribute: false })
 	hasPendingMigrations = false;
 
-	@property({ attribute: 'custom-icon' })
-	customIcon?: string;
-
 	@state()
 	private _migrationButtonState?: UUIButtonState;
 
@@ -123,7 +120,7 @@ export class UmbInstalledPackagesSectionViewItemElement extends UmbLitElement {
 						version="${ifDefined(this.version ?? undefined)}"
 						@open=${this.#onConfigure}
 						?readonly="${!this._packageView}">
-						${this.customIcon ? html`<umb-icon slot="icon" name=${this.customIcon}></umb-icon>` : nothing}
+						<umb-icon slot="icon" name="icon-command"></umb-icon>
 						<div slot="tag">
 							${this.hasPendingMigrations
 								? html`<uui-button
diff --git a/src/Umbraco.Web.UI.Client/src/packages/packages/package-section/views/installed/installed-packages-section-view.element.ts b/src/Umbraco.Web.UI.Client/src/packages/packages/package-section/views/installed/installed-packages-section-view.element.ts
index 699300d35cc0..b9117c1954d1 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/packages/package-section/views/installed/installed-packages-section-view.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/packages/package-section/views/installed/installed-packages-section-view.element.ts
@@ -98,7 +98,6 @@ export class UmbInstalledPackagesSectionViewElement extends UmbLitElement implem
 						(item) => item.name,
 						(item) => html`
 							<umb-installed-packages-section-view-item
-								custom-icon="icon-sync"
 								.name=${item.name}
 								.version=${item.version}
 								.hasPendingMigrations=${item.hasPendingMigrations}>

From 73fd52aeeac614af2a53416fba505c328fae194d Mon Sep 17 00:00:00 2001
From: Mathias Helsengren <mhe@umbraco.dk>
Date: Mon, 10 Nov 2025 11:21:33 +0100
Subject: [PATCH 127/155] Login: Added custom validation for missing password
 and user/email on the login form (#20233)

* Added custom validation for missing password and user/email

* Changed some of the logic behind custom validation, so it now uses aria-errormessage

* fix: imports from src folder instead

* build(deps-dev): bump vite to 7.2.0

* formatting

* fix: moves the form into the login.page.element.ts component to better control submission

* fix: creates elements globally

* fix: adds id back to form

* fix: no need to store references to all form elements

* fix: errormessage should show with password field in a span as well

* fix: checks validity of form

* fix: constructs form in auth.element.ts anyway and append localization to validation and add oninput and onblur

* chore: fixes import paths

* fix: fixes special case where ?status was not reset

* fix: changes wording in english

* fix: removes duplicate en-us keys

* feat: adds ariaLive and role attributes

* fix: always clears the text

* fix: username required validation should switch between username and email

* package-lock.json updated on (re)install

* Renamed SVG eye icon filenames

to be conventional and kebab-cased.

---------

Co-authored-by: Jacob Overgaard <752371+iOvergaard@users.noreply.github.com>
Co-authored-by: leekelleher <leekelleher@gmail.com>
---
 src/Umbraco.Web.UI.Login/package-lock.json    | 178 ++++++-
 src/Umbraco.Web.UI.Login/package.json         |  52 +-
 .../assets/eye-closed.svg}                    |   0
 .../openEye.svg => src/assets/eye-open.svg}   |   0
 src/Umbraco.Web.UI.Login/src/auth-styles.css  |  40 +-
 src/Umbraco.Web.UI.Login/src/auth.element.ts  | 163 +++---
 .../back-to-login-button.element.ts           |   4 +-
 .../components/pages/login.page.element.ts    | 489 +++++++++---------
 .../src/localization/lang/da.ts               | 106 ++--
 .../src/localization/lang/en-us.ts            |  48 --
 .../src/localization/lang/en.ts               |   5 +-
 11 files changed, 621 insertions(+), 464 deletions(-)
 rename src/Umbraco.Web.UI.Login/{public/closedEye.svg => src/assets/eye-closed.svg} (100%)
 rename src/Umbraco.Web.UI.Login/{public/openEye.svg => src/assets/eye-open.svg} (100%)

diff --git a/src/Umbraco.Web.UI.Login/package-lock.json b/src/Umbraco.Web.UI.Login/package-lock.json
index 6c509232c623..3b59e7e12450 100644
--- a/src/Umbraco.Web.UI.Login/package-lock.json
+++ b/src/Umbraco.Web.UI.Login/package-lock.json
@@ -10,7 +10,7 @@
         "@umbraco-cms/backoffice": "^16.2.0",
         "msw": "^2.11.3",
         "typescript": "^5.9.3",
-        "vite": "^7.1.11"
+        "vite": "^7.2.0"
       },
       "engines": {
         "node": ">=22",
@@ -529,7 +529,6 @@
       "integrity": "sha512-LSBHP2/wTF1BnaccHGX1t+0Ss+2VJQxotrLz/0+LK2z8ocuyVZXOYhfBSd7FP8sK78MDJVDBYrPCsBUvNSlH1g==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@hey-api/codegen-core": "^0.2.0",
         "@hey-api/json-schema-ref-parser": "1.2.0",
@@ -644,7 +643,8 @@
       "resolved": "https://registry.npmjs.org/@lit-labs/ssr-dom-shim/-/ssr-dom-shim-1.4.0.tgz",
       "integrity": "sha512-ficsEARKnmmW5njugNYKipTm4SFnbik7CXtoencDZzmzo/dQ+2Q0bgkzJuoJP20Aj0F+izzJjOqsnkd6F/o1bw==",
       "dev": true,
-      "license": "BSD-3-Clause"
+      "license": "BSD-3-Clause",
+      "peer": true
     },
     "node_modules/@lit/reactive-element": {
       "version": "2.1.1",
@@ -652,6 +652,7 @@
       "integrity": "sha512-N+dm5PAYdQ8e6UlywyyrgI2t++wFGXfHx+dSJ1oBrg6FAxUj40jId++EaRm80MKX5JnlH1sBsyZ5h0bcZKemCg==",
       "dev": true,
       "license": "BSD-3-Clause",
+      "peer": true,
       "dependencies": {
         "@lit-labs/ssr-dom-shim": "^1.4.0"
       }
@@ -704,7 +705,8 @@
       "resolved": "https://registry.npmjs.org/@remirror/core-constants/-/core-constants-3.0.0.tgz",
       "integrity": "sha512-42aWfPrimMfDKDi4YegyS7x+/0tlzaqwPQCULLanv3DMIlu96KTJR0fM5isWX2UViOqlGnX6YFgqWepcX+XMNg==",
       "dev": true,
-      "license": "MIT"
+      "license": "MIT",
+      "peer": true
     },
     "node_modules/@rollup/rollup-android-arm-eabi": {
       "version": "4.47.1",
@@ -1007,6 +1009,7 @@
       "integrity": "sha512-viQ6AHRhjCYYipKK6ZepBzwZpkuMvO9yhRHeUZDvlSOAh8rvsUTSre0y74nu8QRYUt4a44lJJ6BpphJK7bEgYA==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "funding": {
         "type": "github",
         "url": "https://github.com/sponsors/ueberdosis"
@@ -1021,6 +1024,7 @@
       "integrity": "sha512-zCce9PRuTNhadFir71luLo99HERDpGJ0EEflGm7RN8I1SnNi9gD5ooK42BOIQtejGCJqg3hTPZiYDJC2hXvckQ==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "funding": {
         "type": "github",
         "url": "https://github.com/sponsors/ueberdosis"
@@ -1035,6 +1039,7 @@
       "integrity": "sha512-HHakuV4ckYCDOnBbne088FvCEP4YICw+wgPBz/V2dfpiFYQ4WzT0LPK9s7OFMCN+ROraoug+1ryN1Z1KdIgujQ==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "funding": {
         "type": "github",
         "url": "https://github.com/sponsors/ueberdosis"
@@ -1065,6 +1070,7 @@
       "integrity": "sha512-GU9deB1A/Tr4FMPu71CvlcjGKwRhGYz60wQ8m4aM+ELZcVIcZRa1ebR8bExRIEWnvRztQuyRiCQzw2N0xQJ1QQ==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "funding": {
         "type": "github",
         "url": "https://github.com/sponsors/ueberdosis"
@@ -1079,6 +1085,7 @@
       "integrity": "sha512-/TDDOwONl0qEUc4+B6V9NnWtSjz95eg7/8uCb8Y8iRbGvI9vT4/znRKofFxstvKmW4URu/H74/g0ywV57h0B+A==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "funding": {
         "type": "github",
         "url": "https://github.com/sponsors/ueberdosis"
@@ -1094,6 +1101,7 @@
       "integrity": "sha512-2P2IZp1NRAE+21mRuFBiP3X2WKfZ6kUC23NJKpn8bcOamY3obYqCt0ltGPhE4eR8n8QAl2fI/3jIgjR07dC8ow==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "funding": {
         "type": "github",
         "url": "https://github.com/sponsors/ueberdosis"
@@ -1108,6 +1116,7 @@
       "integrity": "sha512-JkDQU2ZYFOuT5mNYb8OiWGwD1HcjbtmX8tLNugQbToECmz9WvVPqJmn7V/q8VGpP81iEECz/IsyRmuf2kSD4uA==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "funding": {
         "type": "github",
         "url": "https://github.com/sponsors/ueberdosis"
@@ -1123,6 +1132,7 @@
       "integrity": "sha512-KOiMZc3PwJS3hR0nSq5d0TJi2jkNZkLZElcT6pCEnhRHzPH6dRMu9GM5Jj798ZRUy0T9UFcKJalFZaDxnmRnpg==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "funding": {
         "type": "github",
         "url": "https://github.com/sponsors/ueberdosis"
@@ -1138,6 +1148,7 @@
       "integrity": "sha512-d6uStdNKi8kjPlHAyO59M6KGWATNwhLCD7dng0NXfwGndc22fthzIk/6j9F6ltQx30huy5qQram6j3JXwNACoA==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "funding": {
         "type": "github",
         "url": "https://github.com/sponsors/ueberdosis"
@@ -1152,6 +1163,7 @@
       "integrity": "sha512-KSzL8WZV3pjJG9ke4RaU70+B5UlYR2S6olNt5UCAawM+fi11mobVztiBoC19xtpSVqIXC1AmXOqUgnuSvmE4ZA==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "funding": {
         "type": "github",
         "url": "https://github.com/sponsors/ueberdosis"
@@ -1166,6 +1178,7 @@
       "integrity": "sha512-m6YR1gkkauIDo3PRl0gP+7Oc4n5OqDzcjVh6LvWREmZP8nmi94hfseYbqOXUb6RPHIc0JKF02eiRifT4MSd2nw==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "funding": {
         "type": "github",
         "url": "https://github.com/sponsors/ueberdosis"
@@ -1181,6 +1194,7 @@
       "integrity": "sha512-mT6baqOhs/NakgrAeDeed194E/ZJFGL692H0C7f1N7WDRaWxUu2oR0LrnRqSH5OyPjELkzu6nQnNy0+0tFGHHg==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "funding": {
         "type": "github",
         "url": "https://github.com/sponsors/ueberdosis"
@@ -1211,6 +1225,7 @@
       "integrity": "sha512-pOs6oU4LyGO89IrYE4jbE8ZYsPwMMIiKkYfXcfeD9NtpGNBnjeVXXF5I9ndY2ANrCAgC8k58C3/powDRf0T2yA==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "funding": {
         "type": "github",
         "url": "https://github.com/sponsors/ueberdosis"
@@ -1244,6 +1259,7 @@
       "integrity": "sha512-quOXckC73Luc3x+Dcm88YAEBW+Crh3x5uvtQOQtn2GEG91AshrvbnhGRiYnfvEN7UhWIS+FYI5liHFcRKSUKrQ==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "funding": {
         "type": "github",
         "url": "https://github.com/sponsors/ueberdosis"
@@ -1258,6 +1274,7 @@
       "integrity": "sha512-UHKNRxq6TBnXMGFSq91knD6QaHsyyOwLOsXMzupmKM5Su0s+CRXEjfav3qKlbb9e4m7D7S/a0aPm8nC9KIXNhQ==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "funding": {
         "type": "github",
         "url": "https://github.com/sponsors/ueberdosis"
@@ -1272,6 +1289,7 @@
       "integrity": "sha512-UezvM9VDRAVJlX1tykgHWSD1g3MKfVMWWZ+Tg+PE4+kizOwoYkRWznVPgCAxjmyHajxpCKRXgqTZkOxjJ9Kjzg==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "funding": {
         "type": "github",
         "url": "https://github.com/sponsors/ueberdosis"
@@ -1302,6 +1320,7 @@
       "integrity": "sha512-CkoRH+pAi6MgdCh7K0cVZl4N2uR4pZdabXAnFSoLZRSg6imLvEUmWHfSi1dl3Z7JOvd3a4yZ4NxerQn5MWbJ7g==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "funding": {
         "type": "github",
         "url": "https://github.com/sponsors/ueberdosis"
@@ -1407,6 +1426,7 @@
       "integrity": "sha512-p2n8WVMd/2vckdJlol24acaTDIZAhI7qle5cM75bn01sOEZoFlSw6SwINOULrUCzNJsYb43qrLEibZb4j2LeQw==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "funding": {
         "type": "github",
         "url": "https://github.com/sponsors/ueberdosis"
@@ -1436,6 +1456,7 @@
       "integrity": "sha512-t9Nc/UkrbCfnSHEUi1gvUQ2ZPzvfdYFT5TExoV2DTiUCkhG6+mecT5bTVFGW3QkPmbToL+nFhGn4ZRMDD0SP3Q==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "funding": {
         "type": "github",
         "url": "https://github.com/sponsors/ueberdosis"
@@ -1560,7 +1581,8 @@
       "resolved": "https://registry.npmjs.org/@types/linkify-it/-/linkify-it-5.0.0.tgz",
       "integrity": "sha512-sVDA58zAw4eWAffKOaQH5/5j3XeayukzDk+ewSsnv3p4yJEZHCCzMDiZM8e0OUrRvmpGZ85jf4yDHkHsgBNr9Q==",
       "dev": true,
-      "license": "MIT"
+      "license": "MIT",
+      "peer": true
     },
     "node_modules/@types/markdown-it": {
       "version": "14.1.2",
@@ -1568,6 +1590,7 @@
       "integrity": "sha512-promo4eFwuiW+TfGxhi+0x3czqTYJkG8qB17ZUJiVF10Xm7NLVRSLUsfRTU/6h1e24VvRnXCx+hG7li58lkzog==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@types/linkify-it": "^5",
         "@types/mdurl": "^2"
@@ -1578,7 +1601,8 @@
       "resolved": "https://registry.npmjs.org/@types/mdurl/-/mdurl-2.0.0.tgz",
       "integrity": "sha512-RGdgjQUZba5p6QEFAVx2OGb8rQDL/cPRG7GiedRzMcJ1tYnUANBncjbSB1NRGwbvjcPeikRABz2nshyPk1bhWg==",
       "dev": true,
-      "license": "MIT"
+      "license": "MIT",
+      "peer": true
     },
     "node_modules/@types/statuses": {
       "version": "2.0.5",
@@ -1592,7 +1616,8 @@
       "resolved": "https://registry.npmjs.org/@types/trusted-types/-/trusted-types-2.0.7.tgz",
       "integrity": "sha512-ScaPdn1dQczgbl0QFTeTOmVHFULt394XJgOQNoyVhZ6r2vLnMLJfBPd53SB52T/3G36VI1/g2MZaX0cwDuXsfw==",
       "dev": true,
-      "license": "MIT"
+      "license": "MIT",
+      "peer": true
     },
     "node_modules/@umbraco-cms/backoffice": {
       "version": "16.2.0",
@@ -1734,6 +1759,7 @@
       "integrity": "sha512-O0807+bWVWV/rsFihFVKSOkg9wBtLXKCszE5+eZk2KmONm93BFhIAE35rp7eD6X2SuJMHwYzInIxMIMjHzdpUQ==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@umbraco-ui/uui-base": "1.15.0",
         "@umbraco-ui/uui-button-group": "1.15.0"
@@ -1745,6 +1771,7 @@
       "integrity": "sha512-eEX83zwRN3tCiHScKcmkROWAfLu3TgFI9SntlbyxiuSSYfhJxWSZXOf6lVvQ/1CyvKq8XqSbBnN3VKXgcaKOpg==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@umbraco-ui/uui-base": "1.15.0"
       }
@@ -1755,6 +1782,7 @@
       "integrity": "sha512-CGYAFAHgNoQK2UTupP7pO0mwP6t9/Ms6WZ0gIC40a+kPjrGtaDWU52hiPsuXrUcR6WjJwZ5WRrJHOboRpdmM0g==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@umbraco-ui/uui-avatar": "1.15.0",
         "@umbraco-ui/uui-base": "1.15.0"
@@ -1766,6 +1794,7 @@
       "integrity": "sha512-9aGmhRvey98kcR7wfsnno0BNftIRwJ0r2lCH6cNK2lhe69enYm0MWjp+4uutnlEWWskTLEI344BOqmqOHH1NPA==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@umbraco-ui/uui-base": "1.15.0"
       }
@@ -1776,6 +1805,7 @@
       "integrity": "sha512-0vtKmjzUOn/tIUHNrsx7aZpy3eq9aRKqV9kkJTrhH92S4WcMy+cOB1iw9t3Fe3xlBPuL3JpszwuxMTIuIqJTgQ==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "peerDependencies": {
         "lit": ">=2.8.0"
       }
@@ -1786,6 +1816,7 @@
       "integrity": "sha512-LkYX+p44mFVdvlZSliP5ClMcyHoOIVLWI3WVkaMLQdNi2LO9bbfaTneLzu4ruW6v0iF+kLsznr3bl73VHk7oEg==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@umbraco-ui/uui-base": "1.15.0"
       }
@@ -1796,6 +1827,7 @@
       "integrity": "sha512-MhSNcKsVNymD/yt3NFXujuaQmAqMqj5S+CBoDHEk88H7Id9NMw9RStZFJ37mI2CxHWkeHDotNVgOhSBiHJNJnw==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@umbraco-ui/uui-base": "1.15.0",
         "@umbraco-ui/uui-css": "1.15.0"
@@ -1807,6 +1839,7 @@
       "integrity": "sha512-TaUY+hNB0VIwv9SBi9fDjIFRtrmmkcT7hlhLCJLUVfQ7jJlGLPISAAdypSplNeCPthYvP1cJQ9m28OzscXHZxQ==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@umbraco-ui/uui-base": "1.15.0"
       }
@@ -1817,6 +1850,7 @@
       "integrity": "sha512-3Oaqj6Yta/Q/Ndme20YA1XbHdBBL71iNhpqREfTHli2YV4TEcgIiNy0s2op2oPhKjIEQPEfitU2BrruYEEWa7Q==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@umbraco-ui/uui-base": "1.15.0",
         "@umbraco-ui/uui-icon-registry-essential": "1.15.0"
@@ -1828,6 +1862,7 @@
       "integrity": "sha512-MAaJzpwVnlyGJNvLv6qIwrYsI5SaXXiVKgVi47I8+x//QmnArmetCN04766gGzmAb0m2uuC3ht0BXMDv05pxvw==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@umbraco-ui/uui-base": "1.15.0",
         "@umbraco-ui/uui-button": "1.15.0"
@@ -1839,6 +1874,7 @@
       "integrity": "sha512-YPEnubKNbKmw04eWRH24/3Uxu+zhtLPeJoaT6ykPCyjr/EKc82rSTvn8fwQuP41UokQrXOac2pKn7SncyoST1Q==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@umbraco-ui/uui-base": "1.15.0"
       }
@@ -1849,6 +1885,7 @@
       "integrity": "sha512-nLJZ6P5eK1rYgqjP5zCxbZp8g4WJ23RnUZQ49o7QpU/7zoPOK72/fuM3Ky00Iapixm/kAD6dYHO/P+GtNz8/CA==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@umbraco-ui/uui-base": "1.15.0"
       }
@@ -1859,6 +1896,7 @@
       "integrity": "sha512-pNjpk2iIdSsmTtDdBsWaEr8JX0RcWbl8yKGaqLvo/S7d3bly5z+FjcsgGnX1i1GHo7dqmgVJfbdvN9V1jgn+FA==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@umbraco-ui/uui-base": "1.15.0",
         "@umbraco-ui/uui-checkbox": "1.15.0"
@@ -1870,6 +1908,7 @@
       "integrity": "sha512-cWag+D0XrogYZesAN8NMPQCCuU7L7uZ4Xz8dmirKQk1gjMrFDC4vYPZRQ/5O3ETTFupfDipVKimgRDsmarbLSQ==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@umbraco-ui/uui-base": "1.15.0",
         "@umbraco-ui/uui-card": "1.15.0"
@@ -1881,6 +1920,7 @@
       "integrity": "sha512-DZ6JYNvGb5wVkhhLShENMm+Y6kTpz37YrApQTJVUUgPXhIABO2CDCnqgpH5tkQX73s9jjVB3Ca7SeivuYv8G9A==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@umbraco-ui/uui-base": "1.15.0",
         "@umbraco-ui/uui-card": "1.15.0",
@@ -1893,6 +1933,7 @@
       "integrity": "sha512-EzYebWCzR0wHY902NmAcTRSVSscYac3QntCz+xwSulrhzfy4copeOd1qE+Lz7FjHs+ho0IBPZol8sF4W6rK8FQ==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@umbraco-ui/uui-base": "1.15.0",
         "@umbraco-ui/uui-card": "1.15.0",
@@ -1906,6 +1947,7 @@
       "integrity": "sha512-oo7gCs3RGJ4ujFs+LpG9I1DS/XSNkz9gaqvp4BkaR0kBXzw5f2SLLGhA9S3M6M+OPlsXuuJNKlTV1tn2+LF6Ng==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@umbraco-ui/uui-avatar": "1.15.0",
         "@umbraco-ui/uui-base": "1.15.0",
@@ -1918,6 +1960,7 @@
       "integrity": "sha512-cnKP5GeaI028hGabVCki1kPqAVSekFeP7QEwu7lncA+dcX8uvg+ffV6kW9FV0emOhI5Tmxvh8o+UDKlLs28q3A==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@umbraco-ui/uui-base": "1.15.0"
       }
@@ -1928,6 +1971,7 @@
       "integrity": "sha512-vPkgrFAPDMvJdJTADIWNj48D8gJWD3dBotucUghg/wHhvJv8h/2MvnwMUNnnSB1REHbanl7hJBVvKcNkoil0gA==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@umbraco-ui/uui-base": "1.15.0",
         "@umbraco-ui/uui-boolean-input": "1.15.0",
@@ -1940,6 +1984,7 @@
       "integrity": "sha512-k6u//b+s6UYmzKYMizIf2MRGD4kFy1qWdSk1GnIeDdiQxABJuBZEtkACIe66j+lxnonFvZ/assbLbhRiu15ZCw==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@umbraco-ui/uui-base": "1.15.0",
         "colord": "^2.9.3"
@@ -1951,6 +1996,7 @@
       "integrity": "sha512-I4KGyzZZazjeifcavHp7qnMbP0Jh0dM+gzZhV+YtdPR2JT0o7y6stkbY0f+dOln0K6Bu6BQLV0HLHl/1f/1NDg==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@umbraco-ui/uui-base": "1.15.0",
         "@umbraco-ui/uui-popover-container": "1.15.0",
@@ -1963,6 +2009,7 @@
       "integrity": "sha512-lpT9kapypGkTelG9COSk169VKs0MSiKweX8menDDn0p6I4RfKQBy0N27HecCcf1RqPsCnTbP3lPr5DJy00KdzA==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@umbraco-ui/uui-base": "1.15.0"
       }
@@ -1973,6 +2020,7 @@
       "integrity": "sha512-1AI0QMr046fKc8xZ4aBO7FDwvggsS9plIpY0W4AGrqQxqGUR2u/mTU49+8xMtboaFOen5RQpJ65DN9hAgeNZ+w==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@umbraco-ui/uui-base": "1.15.0",
         "@umbraco-ui/uui-icon-registry-essential": "1.15.0",
@@ -1985,6 +2033,7 @@
       "integrity": "sha512-UzlgWdsVHyCM/znFThrfA4A/S/K/R9Nc2KyRYiyy2xgBoP7x2vJ5Rn4mnR02W4bhI3gNgCJ2fqhmyiW4dxyk0Q==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@umbraco-ui/uui-base": "1.15.0",
         "@umbraco-ui/uui-color-swatch": "1.15.0"
@@ -1996,6 +2045,7 @@
       "integrity": "sha512-CKslvVRCKCReMr/ZZh4wc3TKJNvFjKVm/hSIvFqCIoJuSKfC4XuLU9SK9FL1s42NUAUmccSD3hATZJZ9VXqY+Q==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@umbraco-ui/uui-base": "1.15.0",
         "@umbraco-ui/uui-button": "1.15.0",
@@ -2012,6 +2062,7 @@
       "integrity": "sha512-e8IhqU9AC5pOqXuzPzI+BDsW97Ac0u1GU/5MIJqRcBZ+ZttPcH4fsm4u8siCHbK1khCG0Vzo7HiKPZ0IuuOslg==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@umbraco-ui/uui-base": "1.15.0"
       }
@@ -2033,6 +2084,7 @@
       "integrity": "sha512-iVsrVVnvBrCCT9uJhyBE7b1kXwWUUKDmimhs/TyF1SFjxWP/U0Z99QqqI1pawdad+BuK3oVCmxYOdaReWDQXkQ==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@umbraco-ui/uui-base": "1.15.0",
         "@umbraco-ui/uui-css": "1.15.0"
@@ -2044,6 +2096,7 @@
       "integrity": "sha512-JdDRIzSGGDnvVqXSIhc+5rDXMdYMO+Hd7s2hqLp+iRSn8IHISN/qT1nfFVO9LMbLdcApanl3JJ4Rru9LN4Q3HA==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@umbraco-ui/uui-base": "1.15.0"
       }
@@ -2054,6 +2107,7 @@
       "integrity": "sha512-MhJRkVdDQWKEBvemNRD4bZCuIS0JUll1nNoPK7scA+e6vDmbv25vqPHNXGE/sIpVkChY/L+v+twokzlHn57XMw==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@umbraco-ui/uui-base": "1.15.0",
         "@umbraco-ui/uui-symbol-file-dropzone": "1.15.0"
@@ -2065,6 +2119,7 @@
       "integrity": "sha512-AHKIdYLC0ga4Wgr68xtW/gG3NDqn+QhD2aus0l2n4lBoq6OAQ5aZiPwD9i1fCD7dgyjKQ6Ov9PJSaqRYQkOlNA==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@umbraco-ui/uui-base": "1.15.0",
         "@umbraco-ui/uui-symbol-file": "1.15.0",
@@ -2078,6 +2133,7 @@
       "integrity": "sha512-4u9ZryfVBunpb0IL0+TevytrISA6S1+AajiK/PUk0JMJfqMuQMjmpnNPdtYRNVgFFIcQFQKipjT/mrHbDVawxw==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@umbraco-ui/uui-base": "1.15.0"
       }
@@ -2088,6 +2144,7 @@
       "integrity": "sha512-fiWGeQpREnl6k+6VNHz9ixNdEmOoFNm7qsgdIYJ1jCDXBGME1mjxJOr2Eq7UWJuzQM8BeyQEcXq5SVIOv21PRw==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@umbraco-ui/uui-base": "1.15.0",
         "@umbraco-ui/uui-form-validation-message": "1.15.0"
@@ -2099,6 +2156,7 @@
       "integrity": "sha512-RYfwmjPkY0KumjaalLW8gkasW25Mj87YFAzJn7mAYiZigURape9RqGpvrBfwcMmGj3W2/uVuHxpAHrvweQOt4A==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@umbraco-ui/uui-base": "1.15.0"
       }
@@ -2109,6 +2167,7 @@
       "integrity": "sha512-e8/W6gu6kwrodH0f0U70LR5rHQhiZGq3NqLqikAQ1rvmwitXUqtkVXIhkGxSf7M6yPhpmoi2qEEZDQH9cvCE5A==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@umbraco-ui/uui-base": "1.15.0"
       }
@@ -2119,6 +2178,7 @@
       "integrity": "sha512-nIdzCqoABeRVG6jW045ok649MiAhm5zPdfuMKc1a+TNw9xkKj+vnA1YcjaBN502+AekMhhwnqgj9mLL+mC2VPQ==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@umbraco-ui/uui-base": "1.15.0",
         "@umbraco-ui/uui-icon": "1.15.0"
@@ -2130,6 +2190,7 @@
       "integrity": "sha512-llHFVMlV3Uyg2fHiNt1qfDgRhLthD37uQD2FzlQb0GEYjp+4dE8Jyc/eZW2mqABPweUJACVwbrwBUVrCeQJ1OQ==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@umbraco-ui/uui-base": "1.15.0",
         "@umbraco-ui/uui-icon-registry": "1.15.0"
@@ -2141,6 +2202,7 @@
       "integrity": "sha512-vPc4I/kkQM9RWfHI0F/OQhoTu+KefplbQp0JEQ4gfr6MwxIm6bBTEuw8T5K9t1DQs8EZ7yeLEsSh65FDPepRtg==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@umbraco-ui/uui-base": "1.15.0"
       }
@@ -2151,6 +2213,7 @@
       "integrity": "sha512-VVn2FMsflvEWd6fOX0HQ3JaUh7haznqSqCLTSTOduh/H3jE+dVYCW6YC5uTsxArmOwsSBYSfBQNetW23eJim3Q==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@umbraco-ui/uui-action-bar": "1.15.0",
         "@umbraco-ui/uui-base": "1.15.0",
@@ -2166,6 +2229,7 @@
       "integrity": "sha512-AFyVYNeExHXe10b3/5/BLZOmMKyMxzftsO0HKbaQQuxrxL2SCHsQJRUpxSY+/0vAl2JbNdmrk0HTsP1O4Y9zig==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@umbraco-ui/uui-base": "1.15.0",
         "@umbraco-ui/uui-button": "1.15.0",
@@ -2179,6 +2243,7 @@
       "integrity": "sha512-Pe8lNdHz/6IfbQyWEi0o+pKJ6/zunQ2b8HARCU0a9HFXRDk+XsAuBsn79zQXZl5MvseAUQrnouLwPHpdtMbeMg==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@umbraco-ui/uui-base": "1.15.0",
         "@umbraco-ui/uui-icon-registry-essential": "1.15.0",
@@ -2191,6 +2256,7 @@
       "integrity": "sha512-8Q/G5Lg6949BbMHQ1BhZ9UpoJjOQ19w1tl2y0d/rP3w/mKnTQaBSf+MQmA/6kQ/Unb2wHXJANr4pAGpUklOg6A==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@umbraco-ui/uui-base": "1.15.0"
       }
@@ -2201,6 +2267,7 @@
       "integrity": "sha512-fnmRl+RGUROERvt+Jw0WiW3Btlddg0Xka6F+gR95gy5gr/v8s34uf1/bbPD3hWUXZPukLmxeMjbzyuqMrO8rpQ==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@umbraco-ui/uui-base": "1.15.0"
       }
@@ -2211,6 +2278,7 @@
       "integrity": "sha512-HQ2zCp2kz45GWQ3wV153ytuYD2KcdeAA5RRUVrN0Zn3GQB3wfG7xMkQQNRAOWMUdnfqmdQHeK+COO7NaET3VBA==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@umbraco-ui/uui-base": "1.15.0"
       }
@@ -2221,6 +2289,7 @@
       "integrity": "sha512-4eMeerunFc5yZsJIwpHADn8oGcu0Nn36oyKbSd0qC0mNmmN2i8UOF9w4O+lndd2L0Mhv23FGvBRo7mb5EAvWlg==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@umbraco-ui/uui-base": "1.15.0"
       }
@@ -2231,6 +2300,7 @@
       "integrity": "sha512-4rG8UHvyS2qvsjQYEmYjKX01SRwfk60oH8SSSx8r3z2BM62dCOa+4SBhLxqiBciC/u8FtN8X20MIGE0+eMdtoA==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@umbraco-ui/uui-base": "1.15.0"
       }
@@ -2241,6 +2311,7 @@
       "integrity": "sha512-BOebCMB/p4TaK4kJYrYgimC6SSGBHN4y1MytK3tyvObbuj3gVqkbwHW5CZrhK4jMaywRgGq96OsuaGfc52HFog==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@umbraco-ui/uui-base": "1.15.0",
         "@umbraco-ui/uui-loader-bar": "1.15.0",
@@ -2253,6 +2324,7 @@
       "integrity": "sha512-EDz1Qx+mTXNvOu565IculPCyuuFHwBon2wYnfWDBMoHJ5+P54jBHzg2U/8fUVse7xKPvU21hF4JneAvycNIiGQ==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@umbraco-ui/uui-base": "1.15.0"
       }
@@ -2263,6 +2335,7 @@
       "integrity": "sha512-sPVs1bApKupNd2JcSMwFS1060Y++Fti1ybJrafcLh1+h4IjmLDIRTHTTL8C+kei5G2Oi3+Z7vGpLu7lrTAmRlw==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@umbraco-ui/uui-base": "1.15.0",
         "@umbraco-ui/uui-button": "1.15.0",
@@ -2275,6 +2348,7 @@
       "integrity": "sha512-VCHVvO0fd5eL5UvB/RPL/K68UhOgsIpuyr+aXLblaYT/6at2LNosUxR4eRW2r0WOQzOiyE+Nu69pExBKyfT8bw==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@umbraco-ui/uui-base": "1.15.0"
       }
@@ -2285,6 +2359,7 @@
       "integrity": "sha512-54M4G0ru8j5ltPAdDGIxogdmos33hxeQeusI/uMFxo2yqHHyMHRi95vvCdcwFmGlEdFd2rsnxZKfNMUKM99GKQ==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@umbraco-ui/uui-base": "1.15.0"
       }
@@ -2295,6 +2370,7 @@
       "integrity": "sha512-vtGUwHaG4EDLQERkwym51OasoWLj30LQLhcCCYXDJtTL1dG2nIKScEtlSUiVh5qRsI+V+kaBYPGD4TFD5o43tQ==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@umbraco-ui/uui-base": "1.15.0"
       }
@@ -2305,6 +2381,7 @@
       "integrity": "sha512-5TUF/iWUzbVXvBs9Z273q6s9yLbns8itTiFHCITw5w5fZzDn8R6O5hrOW7tV79kCxAnBSOAVP8v1JhGTwXw19Q==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@umbraco-ui/uui-base": "1.15.0"
       }
@@ -2315,6 +2392,7 @@
       "integrity": "sha512-HMHVdBoB1O39rojofezee2aXGv6CMn7dUFvNefdF9HxmNrIcpFBYXSL8aBt5QJeziFQMwbCtqyY21aUag0nzfw==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@umbraco-ui/uui-base": "1.15.0"
       }
@@ -2325,6 +2403,7 @@
       "integrity": "sha512-w7FZIe5mtsgvsf6hOH5mHKDBzg9Rd/+viyk/xNVs1NeZBn1nWEIHZs0R7YMpv+QxulklhAOpBcbGoUTB8xE+vA==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@umbraco-ui/uui-base": "1.15.0"
       }
@@ -2335,6 +2414,7 @@
       "integrity": "sha512-UT65bpUmRlEgVuvn2RlTZ5l2WDF82jH1t8g+6HV6OJctpqTKlOfPkQmd6AluESPhHFEwwTydS/M7x+X3Adkdtw==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@umbraco-ui/uui-base": "1.15.0"
       }
@@ -2345,6 +2425,7 @@
       "integrity": "sha512-ybDqIt1cXd7AiZLZsDrSHCMp2zM8I+0lmN599b3NROjm59SZXIvpbY1TS1gJ45htgsc18x2y+S4laInYu2dGUg==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@umbraco-ui/uui-base": "1.15.0",
         "@umbraco-ui/uui-icon": "1.15.0",
@@ -2357,6 +2438,7 @@
       "integrity": "sha512-59s16558ySCX7b9IT/Sorq0fdFeCRENSTa7DIkQUrvVPaFWqKFz9jCYFEqDnH11jZHGsNiYh5YCmWlF/VNbwJQ==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@umbraco-ui/uui-base": "1.15.0",
         "@umbraco-ui/uui-ref-node": "1.15.0"
@@ -2368,6 +2450,7 @@
       "integrity": "sha512-AWPZPkFGcAkRx4j6JnOi2r3EJxnvZUXfhOWNyWB2/dFRckatPH56+lVkqV+fRC+81emKBSQWkx2NphFzLEMr0A==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@umbraco-ui/uui-base": "1.15.0",
         "@umbraco-ui/uui-ref-node": "1.15.0"
@@ -2379,6 +2462,7 @@
       "integrity": "sha512-knIIbbfoWtepOvyC54dCo3xF0Vuap6i5uMQPd+wITCmg56a+yiJFuke+dyzatOIeXzgspLgFUngwQZEj5mJnWA==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@umbraco-ui/uui-base": "1.15.0",
         "@umbraco-ui/uui-ref-node": "1.15.0"
@@ -2390,6 +2474,7 @@
       "integrity": "sha512-pXvL523m2JR3P8OO+E1AE4YAaYhJLc519CtjNXSuctNIk1yWvwxBu8VozLIQV+xrOXGz+SiXwDkoaRPwjTQKtg==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@umbraco-ui/uui-base": "1.15.0",
         "@umbraco-ui/uui-ref-node": "1.15.0"
@@ -2401,6 +2486,7 @@
       "integrity": "sha512-bQWfZPKJyAf2O/YvOD6fVSSpKaYZMBsrEGT+ydLPv3BNJroYHS8+NEbulZxExWztNApTcs6Vo5T19AUz+vsnLQ==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@umbraco-ui/uui-base": "1.15.0",
         "@umbraco-ui/uui-ref-node": "1.15.0"
@@ -2412,6 +2498,7 @@
       "integrity": "sha512-4GpRzhGedMwjqW1Wk7AvgakNCc6S1edYpHWeO6cfmryIm0hvnCfkU132lzLmB+Ag2QIOI8p4Ak0OQHYWd+XZHw==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@umbraco-ui/uui-base": "1.15.0",
         "@umbraco-ui/uui-ref-node": "1.15.0"
@@ -2423,6 +2510,7 @@
       "integrity": "sha512-L4qM6GPDqu0/9B2OVb3EljZT3zYxbwp6uOz1nfVYpGAWBxd6INOtNbn8WYdZLq6qqa8NR6qK+su2554nInvQGA==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@umbraco-ui/uui-base": "1.15.0"
       }
@@ -2433,6 +2521,7 @@
       "integrity": "sha512-yRx+TlXBB05jM8ShThRooFgCS5nSN7eAAnpttZgBWqY3sccIVy2Knbkz3kXLJE6ld+bO5nUXhsZBZ34MEHkiog==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@umbraco-ui/uui-base": "1.15.0"
       }
@@ -2443,6 +2532,7 @@
       "integrity": "sha512-+OAzOutyUB2WCI+e5aFRoUNsFFuc/hUXnpIjx4P1moOYiggc/NxjaTHz5mxbmkC11yyS+0vpl8lVSZglkLCH5w==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@umbraco-ui/uui-base": "1.15.0"
       }
@@ -2453,6 +2543,7 @@
       "integrity": "sha512-6y9rpFfhtuWMnaAamlzrB5Q12dsZ8dprmQaGtKr+g97PTNRPC3/dc5sdROam8VMDAhL9MkfBAZBoS6yAoJsPcQ==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@umbraco-ui/uui-base": "1.15.0"
       }
@@ -2463,6 +2554,7 @@
       "integrity": "sha512-F0BueWxu6J5P7xyzkp1c/eFZJjStsw65hB3bNEmWBOqkm/jbBKg9+Xs99tov+VwCHYOt8T+DuEDkkKmdxVAxyQ==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@umbraco-ui/uui-base": "1.15.0"
       }
@@ -2473,6 +2565,7 @@
       "integrity": "sha512-D5DottbukIFxL+YTVEMujHPdqB8Hhw02TKpegfDQb8UGSPC5pCQw4O212TSuyTalKb598niNmCzcjEG5TWNqww==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@umbraco-ui/uui-base": "1.15.0"
       }
@@ -2483,6 +2576,7 @@
       "integrity": "sha512-JLcEVnJqv2LL8VtscPCtPKda9ywWzV4vd0XODHLE3iI1cgHeNwMBhxqgkah0ULuw5w2Hrq8gwQ7/DuPHMSIFxw==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@umbraco-ui/uui-base": "1.15.0"
       }
@@ -2493,6 +2587,7 @@
       "integrity": "sha512-CPsr1K5IkdxBgID+xoIcgbumm/z0q+Z/1NPxTO40EL7kx3KOLQ8vwLdOTSW1cTj90JFA9+XuRtOpmMEY0XjICg==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@umbraco-ui/uui-base": "1.15.0"
       }
@@ -2503,6 +2598,7 @@
       "integrity": "sha512-5QyDNFjiBeuPgalT9zwPMP220zJUHPpbPvCohWCFLn/2JJsa6IjSMtsAcqxI154ZJ9vYX7vYiYUn8tJTY8CHpA==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@umbraco-ui/uui-base": "1.15.0"
       }
@@ -2513,6 +2609,7 @@
       "integrity": "sha512-BQq7BwZ7nCcgKE5tMhG6OVYTrrMEIXpx8kQKec/ULgVfs0/Ws6qeH9u4rGVK/yHU8gecd6DSeUczjjq2iS4djA==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@umbraco-ui/uui-base": "1.15.0"
       }
@@ -2523,6 +2620,7 @@
       "integrity": "sha512-5Akw8T0SV2OrwvPk1JSeFr1clvHE4N0DwceSU9bn9f6gLIGGRxvniJAclQDRI/Woe3hm8waMy6cC2fXfSdc6lg==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@umbraco-ui/uui-base": "1.15.0"
       }
@@ -2533,6 +2631,7 @@
       "integrity": "sha512-AnPp0QJeI70ucX8ludr3qaFmlxjKZUarX10DI8ieIB8VJiQZo0TjoPcPdSGmZupaPBLiszlpb3rKzGkZhXEIHg==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@umbraco-ui/uui-base": "1.15.0"
       }
@@ -2543,6 +2642,7 @@
       "integrity": "sha512-oS0eA5Z8+s+5o2ks3WCED5VGP8AunRLyuB2y7kVdRUfhCfck7B9v83zNfxPVoGoVsTDLtAQM1S4P8SHwNRmk7g==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@umbraco-ui/uui-base": "1.15.0",
         "@umbraco-ui/uui-button": "1.15.0",
@@ -2556,6 +2656,7 @@
       "integrity": "sha512-PgyZvAiOZmXmiRW4UhfD6Tybx3ft755aKAVqT8ELpskLSvVr1oz4uTI6+QxoeQ1AkrHovenvIdBX+Iwi91SheQ==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@umbraco-ui/uui-base": "1.15.0"
       }
@@ -2566,6 +2667,7 @@
       "integrity": "sha512-tk/RVzCxs+KPSJ+qH2Xlr9RYxcdrSNulDKk5sBCQR0A9nwOffa15SGreSMKWgq+gYOVYChHBg/WxLWLq3d7Rlg==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@umbraco-ui/uui-base": "1.15.0"
       }
@@ -2576,6 +2678,7 @@
       "integrity": "sha512-nz+snpjPFE+ftH5R/ekgZYy9ofGAf51yQYjWCtBwkrQ6D1dIBYA6kynZFdqIefrRwJJ5zHpe25BcS/AyRPc/9Q==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@umbraco-ui/uui-base": "1.15.0",
         "@umbraco-ui/uui-button": "1.15.0",
@@ -2590,6 +2693,7 @@
       "integrity": "sha512-fd5d0DU/x2+u15rP0wrjw29M0oqsDFmnAfbPEdgQoPV+hvq9/SLhxJtzx10ZSNXoyuO9sTK50Q7nYsqOvGCzqg==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@umbraco-ui/uui-base": "1.15.0",
         "@umbraco-ui/uui-toast-notification": "1.15.0"
@@ -2601,6 +2705,7 @@
       "integrity": "sha512-uf/e/dVN6kqX76vcawiQM3w1nMHa8A+ZTtNwxtmAZi8bNPwjXLNaqKfeSp2thTByCIzFz7imnft56QtYLbksOA==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@umbraco-ui/uui-base": "1.15.0",
         "@umbraco-ui/uui-css": "1.15.0"
@@ -2612,6 +2717,7 @@
       "integrity": "sha512-WLooENcxuAobbXxN1W2uKGh/cN9k0f3cRmDDtCZdgjeheGlBYWatkc5HQte7zchXHUi0xTrsvBCBa9CsLKN/3Q==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@umbraco-ui/uui-base": "1.15.0",
         "@umbraco-ui/uui-boolean-input": "1.15.0"
@@ -2623,6 +2729,7 @@
       "integrity": "sha512-vn3dbpYGekAqG944Vkwd0ILQRtTaZtL1BVdsge2UsU8sOsEKwv5YzQal4b+o8yu8nb4vZbWHZ2zRmnpnPgPmjg==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@umbraco-ui/uui-base": "1.15.0"
       }
@@ -2848,7 +2955,8 @@
       "resolved": "https://registry.npmjs.org/colord/-/colord-2.9.3.tgz",
       "integrity": "sha512-jeC1axXpnb0/2nn/Y1LPuLdgXBLH7aDcHu4KEKfqw3CUhX7ZpfBSlPKyqXE6btIgEzfWtrX3/tyBCaCvXvMkOw==",
       "dev": true,
-      "license": "MIT"
+      "license": "MIT",
+      "peer": true
     },
     "node_modules/commander": {
       "version": "13.0.0",
@@ -2892,7 +3000,8 @@
       "resolved": "https://registry.npmjs.org/crelt/-/crelt-1.0.6.tgz",
       "integrity": "sha512-VQ2MBenTq1fWZUH9DJNGti7kKv6EeAuYr3cLwxUWhIu1baTaXh4Ib5W2CqHVqib4/MqbYGJqiL3Zb8GJZr3l4g==",
       "dev": true,
-      "license": "MIT"
+      "license": "MIT",
+      "peer": true
     },
     "node_modules/default-browser": {
       "version": "5.2.1",
@@ -3007,6 +3116,7 @@
       "integrity": "sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw==",
       "dev": true,
       "license": "BSD-2-Clause",
+      "peer": true,
       "engines": {
         "node": ">=0.12"
       },
@@ -3071,6 +3181,7 @@
       "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "engines": {
         "node": ">=10"
       },
@@ -3282,6 +3393,7 @@
       "integrity": "sha512-5aHCbzQRADcdP+ATqnDuhhJ/MRIqDkZX5pyjFHRRysS8vZ5AbqGEoFIb6pYHPZ+L/OC2Lc+xT8uHVVR5CAK/wQ==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "uc.micro": "^2.0.0"
       }
@@ -3291,7 +3403,8 @@
       "resolved": "https://registry.npmjs.org/linkifyjs/-/linkifyjs-4.3.2.tgz",
       "integrity": "sha512-NT1CJtq3hHIreOianA8aSXn6Cw0JzYOuDQbOrSPe7gqFnCpKP++MQe3ODgO3oh2GJFORkAAdqredOa60z63GbA==",
       "dev": true,
-      "license": "MIT"
+      "license": "MIT",
+      "peer": true
     },
     "node_modules/lit": {
       "version": "3.3.1",
@@ -3312,6 +3425,7 @@
       "integrity": "sha512-WGAWRGzirAgyphK2urmYOV72tlvnxw7YfyLDgQ+OZnM9vQQBQnumQ7jUJe6unEzwGU3ahFOjuz1iz1jjrpCPuw==",
       "dev": true,
       "license": "BSD-3-Clause",
+      "peer": true,
       "dependencies": {
         "@lit-labs/ssr-dom-shim": "^1.4.0",
         "@lit/reactive-element": "^2.1.0",
@@ -3324,6 +3438,7 @@
       "integrity": "sha512-S9hbyDu/vs1qNrithiNyeyv64c9yqiW9l+DBgI18fL+MTvOtWoFR0FWiyq1TxaYef5wNlpEmzlXoBlZEO+WjoA==",
       "dev": true,
       "license": "BSD-3-Clause",
+      "peer": true,
       "dependencies": {
         "@types/trusted-types": "^2.0.2"
       }
@@ -3341,6 +3456,7 @@
       "integrity": "sha512-a54IwgWPaeBCAAsv13YgmALOF1elABB08FxO9i+r4VFk5Vl4pKokRPeX8u5TCgSsPi6ec1otfLjdOpVcgbpshg==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "argparse": "^2.0.1",
         "entities": "^4.4.0",
@@ -3372,7 +3488,8 @@
       "resolved": "https://registry.npmjs.org/mdurl/-/mdurl-2.0.0.tgz",
       "integrity": "sha512-Lf+9+2r+Tdp5wXDXC4PcIBjTDtq4UKjCPMQhKIuzpJNW0b96kVqSwW0bT7FhRSfmAiFYgP+SCRvdrDozfh0U5w==",
       "dev": true,
-      "license": "MIT"
+      "license": "MIT",
+      "peer": true
     },
     "node_modules/minimist": {
       "version": "1.2.8",
@@ -3532,7 +3649,8 @@
       "resolved": "https://registry.npmjs.org/orderedmap/-/orderedmap-2.1.1.tgz",
       "integrity": "sha512-TvAWxi0nDe1j/rtMcWcIj94+Ffe6n7zhow33h40SKxmsmozs6dz/e+EajymfoFcHd7sxNn8yHM8839uixMOV6g==",
       "dev": true,
-      "license": "MIT"
+      "license": "MIT",
+      "peer": true
     },
     "node_modules/outvariant": {
       "version": "1.4.3",
@@ -3575,7 +3693,6 @@
       "integrity": "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "engines": {
         "node": ">=12"
       },
@@ -3630,6 +3747,7 @@
       "integrity": "sha512-j0kORIBm8ayJNl3zQvD1TTPHJX3g042et6y/KQhZhnPrruO8exkTgG8X+NRpj7kIyMMEx74Xb3DyMIBtO0IKkQ==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "prosemirror-transform": "^1.0.0"
       }
@@ -3640,6 +3758,7 @@
       "integrity": "sha512-4SnynYR9TTYaQVXd/ieUvsVV4PDMBzrq2xPUWutHivDuOshZXqQ5rGbZM84HEaXKbLdItse7weMGOUdDVcLKEQ==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "prosemirror-state": "^1.0.0"
       }
@@ -3650,6 +3769,7 @@
       "integrity": "sha512-rT7qZnQtx5c0/y/KlYaGvtG411S97UaL6gdp6RIZ23DLHanMYLyfGBV5DtSnZdthQql7W+lEVbpSfwtO8T+L2w==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "prosemirror-model": "^1.0.0",
         "prosemirror-state": "^1.0.0",
@@ -3662,6 +3782,7 @@
       "integrity": "sha512-CCk6Gyx9+Tt2sbYk5NK0nB1ukHi2ryaRgadV/LvyNuO3ena1payM2z6Cg0vO1ebK8cxbzo41ku2DE5Axj1Zuiw==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "prosemirror-state": "^1.0.0",
         "prosemirror-transform": "^1.1.0",
@@ -3674,6 +3795,7 @@
       "integrity": "sha512-wtjswVBd2vaQRrnYZaBCbyDqr232Ed4p2QPtRIUK5FuqHYKGWkEwl08oQM4Tw7DOR0FsasARV5uJFvMZWxdNxQ==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "prosemirror-keymap": "^1.0.0",
         "prosemirror-model": "^1.0.0",
@@ -3687,6 +3809,7 @@
       "integrity": "sha512-2JZD8z2JviJrboD9cPuX/Sv/1ChFng+xh2tChQ2X4bB2HeK+rra/bmJ3xGntCcjhOqIzSDG6Id7e8RJ9QPXLEQ==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "prosemirror-state": "^1.2.2",
         "prosemirror-transform": "^1.0.0",
@@ -3700,6 +3823,7 @@
       "integrity": "sha512-K0xJRCmt+uSw7xesnHmcn72yBGTbY45vm8gXI4LZXbx2Z0jwh5aF9xrGQgrVPu0WbyFVFF3E/o9VhJYz6SQWnA==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "prosemirror-state": "^1.0.0",
         "prosemirror-transform": "^1.0.0"
@@ -3711,6 +3835,7 @@
       "integrity": "sha512-4HucRlpiLd1IPQQXNqeo81BGtkY8Ai5smHhKW9jjPKRc2wQIxksg7Hl1tTI2IfT2B/LgX6bfYvXxEpJl7aKYKw==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "prosemirror-state": "^1.0.0",
         "w3c-keyname": "^2.2.0"
@@ -3722,6 +3847,7 @@
       "integrity": "sha512-FPD9rHPdA9fqzNmIIDhhnYQ6WgNoSWX9StUZ8LEKapaXU9i6XgykaHKhp6XMyXlOWetmaFgGDS/nu/w9/vUc5g==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@types/markdown-it": "^14.0.0",
         "markdown-it": "^14.0.0",
@@ -3734,6 +3860,7 @@
       "integrity": "sha512-qwXzynnpBIeg1D7BAtjOusR+81xCp53j7iWu/IargiRZqRjGIlQuu1f3jFi+ehrHhWMLoyOQTSRx/IWZJqOYtQ==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "crelt": "^1.0.0",
         "prosemirror-commands": "^1.0.0",
@@ -3758,6 +3885,7 @@
       "integrity": "sha512-ELxP4TlX3yr2v5rM7Sb70SqStq5NvI15c0j9j/gjsrO5vaw+fnnpovCLEGIcpeGfifkuqJwl4fon6b+KdrODYQ==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "prosemirror-model": "^1.25.0"
       }
@@ -3768,6 +3896,7 @@
       "integrity": "sha512-927lFx/uwyQaGwJxLWCZRkjXG0p48KpMj6ueoYiu4JX05GGuGcgzAy62dfiV8eFZftgyBUvLx76RsMe20fJl+Q==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "prosemirror-model": "^1.0.0",
         "prosemirror-state": "^1.0.0",
@@ -3793,6 +3922,7 @@
       "integrity": "sha512-eRQ97Bf+i9Eby99QbyAiyov43iOKgWa7QCGly+lrDt7efZ1v8NWolhXiB43hSDGIXT1UXgbs4KJN3a06FGpr1Q==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "prosemirror-keymap": "^1.2.2",
         "prosemirror-model": "^1.25.0",
@@ -3807,6 +3937,7 @@
       "integrity": "sha512-xiun5/3q0w5eRnGYfNlW1uU9W6x5MoFKWwq/0TIRgt09lv7Hcser2QYV8t4muXbEr+Fwo0geYn79Xs4GKywrRQ==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@remirror/core-constants": "3.0.0",
         "escape-string-regexp": "^4.0.0"
@@ -3823,6 +3954,7 @@
       "integrity": "sha512-pwDy22nAnGqNR1feOQKHxoFkkUtepoFAd3r2hbEDsnf4wp57kKA36hXsB3njA9FtONBEwSDnDeCiJe+ItD+ykw==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "prosemirror-model": "^1.21.0"
       }
@@ -3846,6 +3978,7 @@
       "integrity": "sha512-uxFIHU0YlHYhDQtV4R9J6a52SLx28BCjT+4ieh7IGbgwVJWO+km431c4yRlREUAsAmt/uMjQUyQHNEPf0M39CA==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "engines": {
         "node": ">=6"
       }
@@ -3937,7 +4070,8 @@
       "resolved": "https://registry.npmjs.org/rope-sequence/-/rope-sequence-1.3.4.tgz",
       "integrity": "sha512-UT5EDe2cu2E/6O4igUr5PSFs23nvvukicWHx6GnOPlHAiiYbzNuCRQCuiUdHJQcqKalLKlrYJnjY0ySGsXNQXQ==",
       "dev": true,
-      "license": "MIT"
+      "license": "MIT",
+      "peer": true
     },
     "node_modules/run-applescript": {
       "version": "7.0.0",
@@ -4116,7 +4250,8 @@
       "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz",
       "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==",
       "dev": true,
-      "license": "0BSD"
+      "license": "0BSD",
+      "peer": true
     },
     "node_modules/type-fest": {
       "version": "4.34.1",
@@ -4137,7 +4272,6 @@
       "integrity": "sha512-jl1vZzPDinLr9eUt3J/t7V6FgNEw9QjvBPdysz9KfQDD41fQrC2Y4vKQdiaUpFT4bXlb1RHhLpp8wtm6M5TgSw==",
       "dev": true,
       "license": "Apache-2.0",
-      "peer": true,
       "bin": {
         "tsc": "bin/tsc",
         "tsserver": "bin/tsserver"
@@ -4151,7 +4285,8 @@
       "resolved": "https://registry.npmjs.org/uc.micro/-/uc.micro-2.1.0.tgz",
       "integrity": "sha512-ARDJmphmdvUk6Glw7y9DQ2bFkKBHwQHLi2lsaH6PPmz/Ka9sFOBsBluozhDltWmnv9u/cF6Rt87znRTPV+yp/A==",
       "dev": true,
-      "license": "MIT"
+      "license": "MIT",
+      "peer": true
     },
     "node_modules/uglify-js": {
       "version": "3.19.3",
@@ -4193,9 +4328,9 @@
       }
     },
     "node_modules/vite": {
-      "version": "7.1.11",
-      "resolved": "https://registry.npmjs.org/vite/-/vite-7.1.11.tgz",
-      "integrity": "sha512-uzcxnSDVjAopEUjljkWh8EIrg6tlzrjFUfMcR1EVsRDGwf/ccef0qQPRyOrROwhrTDaApueq+ja+KLPlzR/zdg==",
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/vite/-/vite-7.2.0.tgz",
+      "integrity": "sha512-C/Naxf8H0pBx1PA4BdpT+c/5wdqI9ILMdwjSMILw7tVIh3JsxzZqdeTLmmdaoh5MYUEOyBnM9K3o0DzoZ/fe+w==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -4272,7 +4407,8 @@
       "resolved": "https://registry.npmjs.org/w3c-keyname/-/w3c-keyname-2.2.8.tgz",
       "integrity": "sha512-dpojBhNsCNN7T82Tm7k26A6G9ML3NkhDsnw9n/eoxSRlVBB4CEtIQ/KTCLI2Fwf3ataSXRhYFkQi3SlnFwPvPQ==",
       "dev": true,
-      "license": "MIT"
+      "license": "MIT",
+      "peer": true
     },
     "node_modules/wordwrap": {
       "version": "1.0.0",
diff --git a/src/Umbraco.Web.UI.Login/package.json b/src/Umbraco.Web.UI.Login/package.json
index c0f863dc50f8..47809d0d1496 100644
--- a/src/Umbraco.Web.UI.Login/package.json
+++ b/src/Umbraco.Web.UI.Login/package.json
@@ -1,28 +1,28 @@
 {
-  "name": "login",
-  "private": true,
-  "type": "module",
-  "scripts": {
-    "dev": "vite",
-    "build": "tsc && vite build",
-    "watch": "tsc && vite build --watch",
-    "preview": "vite preview",
-    "generate:server-api": "openapi-ts"
-  },
-  "engines": {
-    "node": ">=22",
-    "npm": ">=10.9"
-  },
-  "devDependencies": {
-    "@hey-api/openapi-ts": "^0.85.0",
-    "@umbraco-cms/backoffice": "^16.2.0",
-    "msw": "^2.11.3",
-    "typescript": "^5.9.3",
-    "vite": "^7.1.11"
-  },
-  "msw": {
-    "workerDirectory": [
-      "public"
-    ]
-  }
+	"name": "login",
+	"private": true,
+	"type": "module",
+	"scripts": {
+		"dev": "vite",
+		"build": "tsc && vite build",
+		"watch": "tsc && vite build --watch",
+		"preview": "vite preview",
+		"generate:server-api": "openapi-ts"
+	},
+	"engines": {
+		"node": ">=22",
+		"npm": ">=10.9"
+	},
+	"devDependencies": {
+		"@hey-api/openapi-ts": "^0.85.0",
+		"@umbraco-cms/backoffice": "^16.2.0",
+		"msw": "^2.11.3",
+		"typescript": "^5.9.3",
+		"vite": "^7.2.0"
+	},
+	"msw": {
+		"workerDirectory": [
+			"public"
+		]
+	}
 }
diff --git a/src/Umbraco.Web.UI.Login/public/closedEye.svg b/src/Umbraco.Web.UI.Login/src/assets/eye-closed.svg
similarity index 100%
rename from src/Umbraco.Web.UI.Login/public/closedEye.svg
rename to src/Umbraco.Web.UI.Login/src/assets/eye-closed.svg
diff --git a/src/Umbraco.Web.UI.Login/public/openEye.svg b/src/Umbraco.Web.UI.Login/src/assets/eye-open.svg
similarity index 100%
rename from src/Umbraco.Web.UI.Login/public/openEye.svg
rename to src/Umbraco.Web.UI.Login/src/assets/eye-open.svg
diff --git a/src/Umbraco.Web.UI.Login/src/auth-styles.css b/src/Umbraco.Web.UI.Login/src/auth-styles.css
index 9ea9111fc88a..76c38bc09112 100644
--- a/src/Umbraco.Web.UI.Login/src/auth-styles.css
+++ b/src/Umbraco.Web.UI.Login/src/auth-styles.css
@@ -1,4 +1,19 @@
-#umb-login-form #username-input {
+.errormessage {
+	color: var(--uui-color-invalid-standalone);
+	display: none;
+	margin-top: var(--uui-size-1);
+}
+
+.errormessage.active {
+	display: block;
+}
+
+uui-form-layout-item {
+	margin-top: var(--uui-size-space-4);
+	margin-bottom: var(--uui-size-space-4);
+}
+
+#username-input {
 	width: 100%;
 	height: var(--input-height);
 	box-sizing: border-box;
@@ -9,21 +24,16 @@
 	padding: var(--uui-size-1, 3px) var(--uui-size-space-4, 9px);
 }
 
-#umb-login-form uui-form-layout-item {
-	margin-top: var(--uui-size-space-4);
-	margin-bottom: var(--uui-size-space-4);
-}
-
-#umb-login-form #username-input:focus-within {
+#username-input:focus-within {
 	border-color: var(--uui-input-border-color-focus, var(--uui-color-border-emphasis, #a1a1a1));
 	outline: calc(2px * var(--uui-show-focus-outline, 1)) solid var(--uui-color-focus);
 }
 
-#umb-login-form #username-input:hover:not(:focus-within) {
+#username-input:hover:not(:focus-within) {
 	border-color: var(--uui-input-border-color-hover, var(--uui-color-border-standalone, #c2c2c2));
 }
 
-#umb-login-form #password-input-span button {
+#password-show-toggle {
 	color: var(--uui-color-default-standalone);
 	display: inline-flex;
 	justify-content: center;
@@ -39,12 +49,12 @@
 	transition-timing-function: linear;
 }
 
-#umb-login-form #password-input-span button:hover {
+#password-show-toggle:hover {
 	color: var(--uui-color-default-emphasis);
 	cursor: pointer;
 }
 
-#umb-login-form #password-input-span {
+#password-input-span {
 	display: inline-flex;
 	width: 100%;
 	align-items: center;
@@ -60,7 +70,7 @@
 	padding: var(--uui-size-1, 3px) var(--uui-size-space-4, 9px);
 }
 
-#umb-login-form #password-input-span input {
+#password-input {
 	flex-grow: 1;
 	align-self: stretch;
 	min-width: 0;
@@ -70,15 +80,15 @@
 	outline-style: none;
 }
 
-#umb-login-form #password-input-span:focus-within {
+#password-input-span:focus-within {
 	border-color: var(--uui-input-border-color-focus, var(--uui-color-border-emphasis, #a1a1a1));
 	outline: calc(2px * var(--uui-show-focus-outline, 1)) solid var(--uui-color-focus);
 }
 
-#umb-login-form #password-input-span:hover:not(:focus-within) {
+#password-input-span:hover:not(:focus-within) {
 	border-color: var(--uui-input-border-color-hover, var(--uui-color-border-standalone, #c2c2c2));
 }
 
-#umb-login-form input::-ms-reveal {
+#password-input::-ms-reveal {
 	display: none;
 }
diff --git a/src/Umbraco.Web.UI.Login/src/auth.element.ts b/src/Umbraco.Web.UI.Login/src/auth.element.ts
index d574ef460186..a3ba757cb025 100644
--- a/src/Umbraco.Web.UI.Login/src/auth.element.ts
+++ b/src/Umbraco.Web.UI.Login/src/auth.element.ts
@@ -3,15 +3,15 @@ import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element';
 import type { InputType, UUIFormLayoutItemElement } from '@umbraco-cms/backoffice/external/uui';
 import { umbExtensionsRegistry } from '@umbraco-cms/backoffice/extension-registry';
 
-import { UMB_AUTH_CONTEXT, UmbAuthContext } from './contexts';
-import { UmbSlimBackofficeController } from './controllers';
+import { UMB_AUTH_CONTEXT, UmbAuthContext } from './contexts/index.js';
+import { UmbSlimBackofficeController } from './controllers/index.js';
 
 // We import the authStyles here so that we can inline it in the shadow DOM that is created outside of the UmbAuthElement.
 import authStyles from './auth-styles.css?inline';
 
 // Import the SVG files
-import openEyeSVG from '../public/openEye.svg?raw';
-import closedEyeSVG from '../public/closedEye.svg?raw';
+import svgEyeOpen from './assets/eye-open.svg?raw';
+import svgEyeClosed from './assets/eye-closed.svg?raw';
 
 // Import the main bundle
 import { extensions } from './umbraco-package.js';
@@ -21,6 +21,7 @@ const createInput = (opts: {
 	type: InputType;
 	name: string;
 	autocomplete: AutoFill;
+	errorId: string;
 	inputmode: string;
 	autofocus?: boolean;
 }) => {
@@ -31,7 +32,10 @@ const createInput = (opts: {
 	input.id = opts.id;
 	input.required = true;
 	input.inputMode = opts.inputmode;
+	input.setAttribute('aria-errormessage', opts.errorId);
 	input.autofocus = opts.autofocus || false;
+	input.className = 'input';
+
 	return input;
 };
 
@@ -46,6 +50,14 @@ const createLabel = (opts: { forId: string; localizeAlias: string; localizeFallb
 	return label;
 };
 
+const createValidationMessage = (errorId: string) => {
+	const validationElement = document.createElement('div');
+	validationElement.className = 'errormessage';
+	validationElement.id = errorId;
+	validationElement.role = 'alert';
+	return validationElement;
+};
+
 const createShowPasswordToggleButton = (opts: {
 	id: string;
 	name: string;
@@ -58,7 +70,7 @@ const createShowPasswordToggleButton = (opts: {
 	button.name = opts.name;
 	button.type = 'button';
 
-	button.innerHTML = openEyeSVG;
+	button.innerHTML = svgEyeOpen;
 
 	button.onclick = () => {
 		const passwordInput = document.getElementById('password-input') as HTMLInputElement;
@@ -66,11 +78,11 @@ const createShowPasswordToggleButton = (opts: {
 		if (passwordInput.type === 'password') {
 			passwordInput.type = 'text';
 			button.ariaLabel = opts.ariaLabelHidePassword;
-			button.innerHTML = closedEyeSVG;
+			button.innerHTML = svgEyeClosed;
 		} else {
 			passwordInput.type = 'password';
 			button.ariaLabel = opts.ariaLabelShowPassword;
-			button.innerHTML = openEyeSVG;
+			button.innerHTML = svgEyeOpen;
 		}
 
 		passwordInput.focus();
@@ -87,44 +99,67 @@ const createShowPasswordToggleItem = (button: HTMLButtonElement) => {
 	return span;
 };
 
-const createFormLayoutItem = (label: HTMLLabelElement, input: HTMLInputElement) => {
+const createFormLayoutItem = (label: HTMLLabelElement, input: HTMLInputElement, localizationKey: string) => {
 	const formLayoutItem = document.createElement('uui-form-layout-item') as UUIFormLayoutItemElement;
+	const errorId = input.getAttribute('aria-errormessage') || input.id + '-error';
 
 	formLayoutItem.appendChild(label);
 	formLayoutItem.appendChild(input);
 
+	const validationMessage = createValidationMessage(errorId);
+	formLayoutItem.appendChild(validationMessage);
+
+	// Bind validation
+	input.oninput = () => validateInput(input, validationMessage, localizationKey);
+	input.onblur = () => validateInput(input, validationMessage, localizationKey);
+
 	return formLayoutItem;
 };
 
 const createFormLayoutPasswordItem = (
 	label: HTMLLabelElement,
 	input: HTMLInputElement,
-	showPasswordToggle: HTMLSpanElement
+	showPasswordToggle: HTMLSpanElement,
+	requiredMessageKey: string
 ) => {
 	const formLayoutItem = document.createElement('uui-form-layout-item') as UUIFormLayoutItemElement;
+	const errorId = input.getAttribute('aria-errormessage') || input.id + '-error';
 
 	formLayoutItem.appendChild(label);
+
 	const span = document.createElement('span');
 	span.id = 'password-input-span';
 	span.appendChild(input);
 	span.appendChild(showPasswordToggle);
 	formLayoutItem.appendChild(span);
 
-	return formLayoutItem;
-};
+	const validationMessage = createValidationMessage(errorId);
+	formLayoutItem.appendChild(validationMessage);
 
-const createForm = (elements: HTMLElement[]) => {
-	const styles = document.createElement('style');
-	styles.innerHTML = authStyles;
-	const form = document.createElement('form');
-	form.id = 'umb-login-form';
-	form.name = 'login-form';
-	form.spellcheck = false;
+	// Bind validation
+	input.oninput = () => validateInput(input, validationMessage, requiredMessageKey);
+	input.onblur = () => validateInput(input, validationMessage, requiredMessageKey);
 
-	elements.push(styles);
-	elements.forEach((element) => form.appendChild(element));
+	return formLayoutItem;
+};
 
-	return form;
+const validateInput = (input: HTMLInputElement, validationElement: HTMLElement, requiredMessage = '') => {
+	validationElement.innerHTML = '';
+	if (input.validity.valid) {
+		input.removeAttribute('aria-invalid');
+		validationElement.classList.remove('active');
+		validationElement.ariaLive = 'off';
+	} else {
+		input.setAttribute('aria-invalid', 'true');
+
+		const localizeElement = document.createElement('umb-localize');
+		localizeElement.innerHTML = input.validationMessage;
+		localizeElement.key = requiredMessage;
+		validationElement.appendChild(localizeElement);
+
+		validationElement.classList.add('active');
+		validationElement.ariaLive = 'assertive';
+	}
 };
 
 @customElement('umb-auth')
@@ -168,16 +203,6 @@ export default class UmbAuthElement extends UmbLitElement {
 	 */
 	protected flow?: 'mfa' | 'reset-password' | 'invite-user';
 
-	_form?: HTMLFormElement;
-	_usernameLayoutItem?: UUIFormLayoutItemElement;
-	_passwordLayoutItem?: UUIFormLayoutItemElement;
-	_usernameInput?: HTMLInputElement;
-	_passwordInput?: HTMLInputElement;
-	_usernameLabel?: HTMLLabelElement;
-	_passwordLabel?: HTMLLabelElement;
-	_passwordShowPasswordToggleItem?: HTMLSpanElement;
-	_passwordShowPasswordToggleButton?: HTMLButtonElement;
-
 	#authContext = new UmbAuthContext(this, UMB_AUTH_CONTEXT);
 
 	constructor() {
@@ -186,6 +211,16 @@ export default class UmbAuthElement extends UmbLitElement {
 		(this as unknown as EventTarget).addEventListener('umb-login-flow', (e) => {
 			if (e instanceof CustomEvent) {
 				this.flow = e.detail.flow || undefined;
+				if (typeof e.detail.status !== 'undefined') {
+					const searchParams = new URLSearchParams(window.location.search);
+					if (e.detail.status === null) {
+						searchParams.delete('status');
+					} else {
+						searchParams.set('status', e.detail.status);
+					}
+					const newRelativePathQuery = window.location.pathname + '?' + searchParams.toString();
+					window.history.pushState(null, '', newRelativePathQuery);
+				}
 			}
 			this.requestUpdate();
 		});
@@ -229,18 +264,6 @@ export default class UmbAuthElement extends UmbLitElement {
 		});
 	}
 
-	disconnectedCallback() {
-		super.disconnectedCallback();
-		this._usernameLayoutItem?.remove();
-		this._passwordLayoutItem?.remove();
-		this._usernameLabel?.remove();
-		this._usernameInput?.remove();
-		this._passwordLabel?.remove();
-		this._passwordInput?.remove();
-		this._passwordShowPasswordToggleItem?.remove();
-		this._passwordShowPasswordToggleButton?.remove();
-	}
-
 	/**
 	 * Creates the login form and adds it to the DOM in the default slot.
 	 * This is done to avoid having to deal with the shadow DOM, which is not supported in Google Chrome for autocomplete/autofill.
@@ -249,48 +272,65 @@ export default class UmbAuthElement extends UmbLitElement {
 	 * @private
 	 */
 	#initializeForm() {
-		this._usernameInput = createInput({
+		const usernameInput = createInput({
 			id: 'username-input',
 			type: 'text',
 			name: 'username',
 			autocomplete: 'username',
+			errorId: 'username-input-error',
 			inputmode: this.usernameIsEmail ? 'email' : '',
 			autofocus: true,
 		});
-		this._passwordInput = createInput({
+		const passwordInput = createInput({
 			id: 'password-input',
 			type: 'password',
 			name: 'password',
 			autocomplete: 'current-password',
+			errorId: 'password-input-error',
 			inputmode: '',
 		});
-		this._passwordShowPasswordToggleButton = createShowPasswordToggleButton({
+		const passwordShowPasswordToggleButton = createShowPasswordToggleButton({
 			id: 'password-show-toggle',
 			name: 'password-show-toggle',
 			ariaLabelShowPassword: this.localize.term('auth_showPassword'),
 			ariaLabelHidePassword: this.localize.term('auth_hidePassword'),
 		});
-		this._passwordShowPasswordToggleItem = createShowPasswordToggleItem(this._passwordShowPasswordToggleButton);
-		this._usernameLabel = createLabel({
+		const passwordShowPasswordToggleItem = createShowPasswordToggleItem(passwordShowPasswordToggleButton);
+		const usernameLabel = createLabel({
 			forId: 'username-input',
 			localizeAlias: this.usernameIsEmail ? 'auth_email' : 'auth_username',
 			localizeFallback: this.usernameIsEmail ? 'Email' : 'Username',
 		});
-		this._passwordLabel = createLabel({
+		const passwordLabel = createLabel({
 			forId: 'password-input',
 			localizeAlias: 'auth_password',
 			localizeFallback: 'Password',
 		});
-		this._usernameLayoutItem = createFormLayoutItem(this._usernameLabel, this._usernameInput);
-		this._passwordLayoutItem = createFormLayoutPasswordItem(
-			this._passwordLabel,
-			this._passwordInput,
-			this._passwordShowPasswordToggleItem
+		const usernameLayoutItem = createFormLayoutItem(
+			usernameLabel,
+			usernameInput,
+			this.usernameIsEmail ? 'auth_requiredEmailValidationMessage' : 'auth_requiredUsernameValidationMessage'
 		);
+		const passwordLayoutItem = createFormLayoutPasswordItem(
+			passwordLabel,
+			passwordInput,
+			passwordShowPasswordToggleItem,
+			'auth_requiredPasswordValidationMessage'
+		);
+		const style = document.createElement('style');
+		style.innerHTML = authStyles;
+		document.head.appendChild(style);
+
+		const form = document.createElement('form');
+		form.id = 'umb-login-form';
+		form.name = 'login-form';
+		form.spellcheck = false;
+		form.setAttribute('novalidate', '');
 
-		this._form = createForm([this._usernameLayoutItem, this._passwordLayoutItem]);
+		form.appendChild(usernameLayoutItem);
+		form.appendChild(passwordLayoutItem);
 
-		this.insertAdjacentElement('beforeend', this._form);
+		this.insertAdjacentElement('beforeend', form);
 	}
 
 	render() {
@@ -347,12 +387,11 @@ export default class UmbAuthElement extends UmbLitElement {
 				return html` <umb-invite-page></umb-invite-page>`;
 
 			default:
-				return html` <umb-login-page
-					?allow-password-reset=${this.allowPasswordReset}
-					?username-is-email=${this.usernameIsEmail}>
-					<slot></slot>
-					<slot name="subheadline" slot="subheadline"></slot>
-				</umb-login-page>`;
+				return html`
+					<umb-login-page ?allow-password-reset=${this.allowPasswordReset} ?username-is-email=${this.usernameIsEmail}>
+						<slot></slot>
+					</umb-login-page>
+				`;
 		}
 	}
 }
diff --git a/src/Umbraco.Web.UI.Login/src/components/back-to-login-button.element.ts b/src/Umbraco.Web.UI.Login/src/components/back-to-login-button.element.ts
index 9200baa52d4e..bef64afd1837 100644
--- a/src/Umbraco.Web.UI.Login/src/components/back-to-login-button.element.ts
+++ b/src/Umbraco.Web.UI.Login/src/components/back-to-login-button.element.ts
@@ -17,7 +17,7 @@ export default class UmbBackToLoginButtonElement extends UmbLitElement {
 	}
 
 	#handleClick() {
-		this.dispatchEvent(new CustomEvent('umb-login-flow', { composed: true, detail: { flow: 'login' } }));
+		this.dispatchEvent(new CustomEvent('umb-login-flow', { composed: true, detail: { flow: 'login', status: null } }));
 	}
 
 	static styles: CSSResultGroup = [
@@ -39,7 +39,7 @@ export default class UmbBackToLoginButtonElement extends UmbLitElement {
 				display: inline-flex;
 				line-height: 1;
 				font-size: 14px;
-				font-family: var(--uui-font-family),sans-serif;
+				font-family: var(--uui-font-family), sans-serif;
 			}
 			button svg {
 				width: 1rem;
diff --git a/src/Umbraco.Web.UI.Login/src/components/pages/login.page.element.ts b/src/Umbraco.Web.UI.Login/src/components/pages/login.page.element.ts
index 315bac444895..d89f434a8932 100644
--- a/src/Umbraco.Web.UI.Login/src/components/pages/login.page.element.ts
+++ b/src/Umbraco.Web.UI.Login/src/components/pages/login.page.element.ts
@@ -1,254 +1,263 @@
 import type { UUIButtonState } from '@umbraco-cms/backoffice/external/uui';
 import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element';
-import { css, type CSSResultGroup, html, nothing, when, customElement, property, queryAssignedElements, state } from '@umbraco-cms/backoffice/external/lit';
-
-import { UMB_AUTH_CONTEXT } from '../../contexts';
+import {
+	css,
+	html,
+	nothing,
+	when,
+	customElement,
+	property,
+	queryAssignedElements,
+	state,
+} from '@umbraco-cms/backoffice/external/lit';
+
+import { UMB_AUTH_CONTEXT } from '../../contexts/index.js';
 
 @customElement('umb-login-page')
 export default class UmbLoginPageElement extends UmbLitElement {
-  @property({type: Boolean, attribute: 'username-is-email'})
-  usernameIsEmail = false;
+	@property({ type: Boolean, attribute: 'username-is-email' })
+	usernameIsEmail = false;
+
+	@queryAssignedElements({ flatten: true })
+	protected slottedElements?: HTMLFormElement[];
+
+	@property({ type: Boolean, attribute: 'allow-password-reset' })
+	allowPasswordReset = false;
+
+	@state()
+	private _loginState?: UUIButtonState;
+
+	@state()
+	private _loginError = '';
 
-  @queryAssignedElements({flatten: true})
-  protected slottedElements?: HTMLFormElement[];
+	@state()
+	supportPersistLogin = false;
 
-  @property({type: Boolean, attribute: 'allow-password-reset'})
-  allowPasswordReset = false;
+	#formElement?: HTMLFormElement;
 
-  @state()
-  private _loginState?: UUIButtonState;
-
-  @state()
-  private _loginError = '';
+	#authContext?: typeof UMB_AUTH_CONTEXT.TYPE;
 
-  @state()
-  supportPersistLogin = false;
+	constructor() {
+		super();
 
-  #formElement?: HTMLFormElement;
-
-  #authContext?: typeof UMB_AUTH_CONTEXT.TYPE;
-
-  constructor() {
-    super();
-
-    this.consumeContext(UMB_AUTH_CONTEXT, (authContext) => {
-      this.#authContext = authContext;
-      this.supportPersistLogin = authContext?.supportsPersistLogin ?? false;
-    });
-  }
-
-  async #onSlotChanged() {
-    this.#formElement = this.slottedElements?.find((el) => el.id === 'umb-login-form');
-
-    if (!this.#formElement) return;
-
-    // We need to listen for the enter key to submit the form, because the uui-button does not support the native input fields submit event
-    this.#formElement.addEventListener('keypress', (e) => {
-      if (e.key === 'Enter') {
-        this.#onSubmitClick();
-      }
-    });
-    this.#formElement.onsubmit = this.#handleSubmit;
-  }
-
-  #handleSubmit = async (e: SubmitEvent) => {
-    e.preventDefault();
-
-    if (!this.#authContext) return;
-
-    const form = e.target as HTMLFormElement;
-    if (!form) return;
-
-    const formData = new FormData(form);
-
-    const username = formData.get('username') as string;
-    const password = formData.get('password') as string;
-    const persist = formData.has('persist');
-
-    if (!username || !password) {
-      this._loginError = this.localize.term('auth_userFailedLogin');
-      this._loginState = 'failed';
-      return;
-    }
-
-    this._loginState = 'waiting';
-
-    const response = await this.#authContext.login({
-      username,
-      password,
-      persist,
-    });
-
-    this._loginError = response.error || '';
-    this._loginState = response.error ? 'failed' : 'success';
-
-    // Check for 402 status code indicating that MFA is required
-    if (response.status === 402) {
-      this.#authContext.isMfaEnabled = true;
-      if (response.twoFactorView) {
-        this.#authContext.twoFactorView = response.twoFactorView;
-      }
-      if (response.twoFactorProviders) {
-        this.#authContext.mfaProviders = response.twoFactorProviders;
-      }
-
-      this.dispatchEvent(new CustomEvent('umb-login-flow', {composed: true, detail: {flow: 'mfa'}}));
-      return;
-    }
-
-    if (response.error) {
-      return;
-    }
-
-    const returnPath = this.#authContext.returnPath;
-
-    if (returnPath) {
-      location.href = returnPath;
-    }
-  };
-
-  get #greetingLocalizationKey() {
-    return [
-      'auth_greeting0',
-      'auth_greeting1',
-      'auth_greeting2',
-      'auth_greeting3',
-      'auth_greeting4',
-      'auth_greeting5',
-      'auth_greeting6',
-    ][new Date().getDay()];
-  }
-
-  #onSubmitClick = () => {
-    this.#formElement?.requestSubmit();
-  };
-
-  render() {
-    return html`
-      <header id="header">
-        <h1 id="greeting">
-          <umb-localize .key=${this.#greetingLocalizationKey}></umb-localize>
-        </h1>
-        <slot name="subheadline"></slot>
-      </header>
-      <slot @slotchange=${this.#onSlotChanged}></slot>
-      <div id="secondary-actions">
-        ${when(
-          this.supportPersistLogin,
-          () => html`
-            <uui-form-layout-item>
-              <uui-checkbox
-                name="persist"
-                .label=${this.localize.term('auth_rememberMe')}>
-                <umb-localize key="auth_rememberMe">Remember me</umb-localize>
-              </uui-checkbox>
-            </uui-form-layout-item>`
-        )}
-        ${when(
-          this.allowPasswordReset,
-          () =>
-            html`
-              <button type="button" id="forgot-password" @click=${this.#handleForgottenPassword}>
-                <umb-localize key="auth_forgottenPassword">Forgotten password?</umb-localize>
-              </button>`
-        )}
-      </div>
-      <uui-button
-        type="submit"
-        id="umb-login-button"
-        look="primary"
-        @click=${this.#onSubmitClick}
-        .label=${this.localize.term('auth_login')}
-        color="default"
-        .state=${this._loginState}></uui-button>
-
-      ${this.#renderErrorMessage()}
-    `;
-  }
-
-  #renderErrorMessage() {
-    if (!this._loginError || this._loginState !== 'failed') return nothing;
-
-    return html`<span class="text-error text-danger">${this._loginError}</span>`;
-  }
-
-  #handleForgottenPassword() {
-    this.dispatchEvent(new CustomEvent('umb-login-flow', {composed: true, detail: {flow: 'reset'}}));
-  }
-
-  static styles: CSSResultGroup = [
-    css`
-      :host {
-        display: flex;
-        flex-direction: column;
-      }
-
-      #header {
-        text-align: center;
-        display: flex;
-        flex-direction: column;
-        gap: var(--uui-size-space-5);
-      }
-
-      #header span {
-        color: var(--uui-color-text-alt); /* TODO Change to uui color when uui gets a muted text variable */
-        font-size: 14px;
-      }
-
-      #greeting {
-        color: var(--uui-color-interactive);
-        text-align: center;
-        font-weight: 400;
-        font-size: var(--header-font-size);
-        margin: 0 0 var(--uui-size-layout-1);
-        line-height: 1.2;
-      }
-
-      #umb-login-button {
-        margin-top: var(--uui-size-space-4);
-        width: 100%;
-      }
-
-      #forgot-password {
-        cursor: pointer;
-        background: none;
-        border: 0;
-        height: 1rem;
-        color: var(--uui-color-text-alt); /* TODO Change to uui color when uui gets a muted text variable */
-        gap: var(--uui-size-space-1);
-        align-self: center;
-        text-decoration: none;
-        display: inline-flex;
-        line-height: 1;
-        font-size: 14px;
-        font-family: var(--uui-font-family),sans-serif;
-        margin-left: auto;
-        margin-bottom: var(--uui-size-space-3);
-      }
-
-      #forgot-password:hover {
-        color: var(--uui-color-interactive-emphasis);
-      }
-
-      .text-error {
-        margin-top: var(--uui-size-space-4);
-      }
-
-      .text-danger {
-        color: var(--uui-color-danger-standalone);
-      }
-
-      #secondary-actions {
-        display: flex;
-        align-items: center;
-        justify-content: space-between;
-      }
-    `,
-  ];
+		this.consumeContext(UMB_AUTH_CONTEXT, (authContext) => {
+			this.#authContext = authContext;
+			this.supportPersistLogin = authContext?.supportsPersistLogin ?? false;
+		});
+	}
+
+	async #onSlotChanged() {
+		this.#formElement = this.slottedElements?.find((el) => el.id === 'umb-login-form');
+
+		if (!this.#formElement) return;
+
+		this.#formElement.addEventListener('keypress', (e) => {
+			if (e.key === 'Enter') {
+				this.#onSubmitClick();
+			}
+		});
+
+		this.#formElement.onsubmit = this.#handleSubmit;
+	}
+
+	#handleSubmit = async (e: SubmitEvent) => {
+		e.preventDefault();
+
+		this._loginError = '';
+		this._loginState = undefined;
+		if (!this.#authContext) return;
+
+		const form = e.target as HTMLFormElement;
+		if (!form) return;
+
+		if (!form?.checkValidity()) {
+			return;
+		}
+
+		const formData = new FormData(form);
+
+		const username = formData.get('username') as string;
+		const password = formData.get('password') as string;
+		const persist = formData.has('persist');
+
+		if (!username || !password) {
+			return;
+		}
+
+		this._loginState = 'waiting';
+
+		const response = await this.#authContext.login({
+			username,
+			password,
+			persist,
+		});
+
+		this._loginError = response.error || '';
+		this._loginState = response.error ? 'failed' : 'success';
+
+		// Check for 402 status code indicating that MFA is required
+		if (response.status === 402) {
+			this.#authContext.isMfaEnabled = true;
+			if (response.twoFactorView) {
+				this.#authContext.twoFactorView = response.twoFactorView;
+			}
+			if (response.twoFactorProviders) {
+				this.#authContext.mfaProviders = response.twoFactorProviders;
+			}
+
+			this.dispatchEvent(new CustomEvent('umb-login-flow', { composed: true, detail: { flow: 'mfa' } }));
+			return;
+		}
+
+		if (response.error) {
+			return;
+		}
+
+		const returnPath = this.#authContext.returnPath;
+
+		if (returnPath) {
+			location.href = returnPath;
+		}
+	};
+
+	get #greetingLocalizationKey() {
+		return [
+			'auth_greeting0',
+			'auth_greeting1',
+			'auth_greeting2',
+			'auth_greeting3',
+			'auth_greeting4',
+			'auth_greeting5',
+			'auth_greeting6',
+		][new Date().getDay()];
+	}
+
+	#onSubmitClick = () => {
+		this.#formElement?.requestSubmit();
+	};
+
+	render() {
+		return html`
+			<header id="header">
+				<h1 id="greeting">
+					<umb-localize .key=${this.#greetingLocalizationKey}></umb-localize>
+				</h1>
+				<slot name="subheadline"></slot>
+			</header>
+			<slot @slotchange=${this.#onSlotChanged}></slot>
+			<div id="secondary-actions">
+				${when(
+					this.supportPersistLogin,
+					() => html` <uui-form-layout-item>
+						<uui-checkbox name="persist" .label=${this.localize.term('auth_rememberMe')}>
+							<umb-localize key="auth_rememberMe">Remember me</umb-localize>
+						</uui-checkbox>
+					</uui-form-layout-item>`
+				)}
+				${when(
+					this.allowPasswordReset,
+					() =>
+						html` <button type="button" id="forgot-password" @click=${this.#handleForgottenPassword}>
+							<umb-localize key="auth_forgottenPassword">Forgotten password?</umb-localize>
+						</button>`
+				)}
+			</div>
+			<uui-button
+				@click=${this.#onSubmitClick}
+				type="submit"
+				id="umb-login-button"
+				look="primary"
+				.label=${this.localize.term('auth_login')}
+				color="default"
+				.state=${this._loginState}></uui-button>
+
+			${this.#renderErrorMessage()}
+		`;
+	}
+
+	#renderErrorMessage() {
+		if (!this._loginError || this._loginState !== 'failed') return nothing;
+
+		return html`<span class="text-error text-danger">${this._loginError}</span>`;
+	}
+
+	#handleForgottenPassword() {
+		this.dispatchEvent(new CustomEvent('umb-login-flow', { composed: true, detail: { flow: 'reset' } }));
+	}
+
+	static readonly styles = [
+		css`
+			:host {
+				display: flex;
+				flex-direction: column;
+			}
+
+			#header {
+				text-align: center;
+				display: flex;
+				flex-direction: column;
+				gap: var(--uui-size-space-5);
+			}
+
+			#header span {
+				color: var(--uui-color-text-alt); /* TODO Change to uui color when uui gets a muted text variable */
+				font-size: 14px;
+			}
+
+			#greeting {
+				color: var(--uui-color-interactive);
+				text-align: center;
+				font-weight: 400;
+				font-size: var(--header-font-size);
+				margin: 0 0 var(--uui-size-layout-1);
+				line-height: 1.2;
+			}
+
+			#umb-login-button {
+				margin-top: var(--uui-size-space-4);
+				width: 100%;
+			}
+
+			#forgot-password {
+				cursor: pointer;
+				background: none;
+				border: 0;
+				height: 1rem;
+				color: var(--uui-color-text-alt); /* TODO Change to uui color when uui gets a muted text variable */
+				gap: var(--uui-size-space-1);
+				align-self: center;
+				text-decoration: none;
+				display: inline-flex;
+				line-height: 1;
+				font-size: 14px;
+				font-family: var(--uui-font-family), sans-serif;
+				margin-left: auto;
+				margin-bottom: var(--uui-size-space-3);
+			}
+
+			#forgot-password:hover {
+				color: var(--uui-color-interactive-emphasis);
+			}
+
+			.text-error {
+				margin-top: var(--uui-size-space-4);
+			}
+
+			.text-danger {
+				color: var(--uui-color-danger-standalone);
+			}
+
+			#secondary-actions {
+				display: flex;
+				align-items: center;
+				justify-content: space-between;
+			}
+		`,
+	];
 }
 
 declare global {
-  interface HTMLElementTagNameMap {
-    'umb-login-page': UmbLoginPageElement;
-  }
+	interface HTMLElementTagNameMap {
+		'umb-login-page': UmbLoginPageElement;
+	}
 }
diff --git a/src/Umbraco.Web.UI.Login/src/localization/lang/da.ts b/src/Umbraco.Web.UI.Login/src/localization/lang/da.ts
index dda9767dd638..4bfb57f0c717 100644
--- a/src/Umbraco.Web.UI.Login/src/localization/lang/da.ts
+++ b/src/Umbraco.Web.UI.Login/src/localization/lang/da.ts
@@ -1,53 +1,61 @@
 import type { UmbLocalizationDictionary } from '@umbraco-cms/backoffice/localization-api';
 
 export default {
-  auth: {
-    continue: 'Fortsæt',
-    validate: 'Indsend',
-    login: 'Log ind',
-    email: 'E-mail',
-    username: 'Brugernavn',
-    password: 'Adgangskode',
-    submit: 'Indsend',
-    required: 'Påkrævet',
-    success: 'Succes',
-    forgottenPassword: 'Glemt adgangskode?',
-    forgottenPasswordInstruction: 'En e-mail vil blive sendt til den angivne adresse med et link til at nulstille din adgangskode',
-    requestPasswordResetConfirmation: 'En e-mail med instruktioner for nulstilling af adgangskoden vil blive sendt til den angivne adresse, hvis det matcher vores optegnelser',
-    setPasswordConfirmation: 'Din adgangskode er blevet opdateret',
-    rememberMe: 'Husk mig',
-    error: 'Fejl',
-    defaultError: 'Der er opstået en ukendt fejl.',
-    errorInPasswordFormat: 'Kodeordet skal være på minimum %0% tegn og indeholde mindst %1% alfanumeriske tegn.',
-    passwordMismatch: 'Adgangskoderne er ikke ens.',
-    passwordMinLength: 'Adgangskoden skal være mindst {0} tegn lang.',
-    passwordIsBlank: 'Din nye adgangskode kan ikke være tom.',
-    userFailedLogin: 'Ups! Vi kunne ikke logge dig ind. Tjek at dit brugernavn og adgangskode er korrekt og prøv igen.',
-    userLockedOut: 'Din konto er blevet låst. Prøv igen senere.',
-    receivedErrorFromServer: 'Der skete en fejl på serveren',
-    resetCodeExpired: 'Det link, du har klikket på, er ugyldigt eller udløbet',
-    userInviteWelcomeMessage: 'Hej og velkommen til Umbraco! På bare 1 minut vil du være klar til at komme i gang, vi skal bare have dig til at oprette en adgangskode.',
-    userInviteExpiredMessage: 'Velkommen til Umbraco! Desværre er din invitation udløbet. Kontakt din administrator og bed om at gensende invitationen.',
-    newPassword: 'Ny adgangskode',
-    confirmNewPassword: 'Bekræft adgangskode',
-    greeting0: 'Velkommen',
-    greeting1: 'Velkommen',
-    greeting2: 'Velkommen',
-    greeting3: 'Velkommen',
-    greeting4: 'Velkommen',
-    greeting5: 'Velkommen',
-    greeting6: 'Velkommen',
-    mfaTitle: 'Sidste skridt!',
-    mfaCodeInputHelp: 'Indtast venligst bekræftelseskoden',
-    mfaText: 'Du har aktiveret multi-faktor godkendelse. Du skal nu bekræfte din identitet.',
-    mfaMultipleText: 'Vælg venligst en godkendelsesmetode',
-    mfaCodeInput: 'Kode',
-    mfaInvalidCode: 'Forkert kode indtastet',
-    signInWith: 'Log ind med {0}',
-    returnToLogin: 'Tilbage til log ind',
-    localLoginDisabled: 'Desværre er det ikke muligt at logge ind direkte. Det er blevet deaktiveret af en login-udbyder.',
-    friendlyGreeting: 'Hej!',
-    showPassword: 'Vis adgangskode',
-    hidePassword: 'Skjul adgangskode',
-  },
+	auth: {
+		continue: 'Fortsæt',
+		validate: 'Indsend',
+		login: 'Log ind',
+		email: 'E-mail',
+		username: 'Brugernavn',
+		password: 'Adgangskode',
+		submit: 'Indsend',
+		required: 'Påkrævet',
+		success: 'Succes',
+		forgottenPassword: 'Glemt adgangskode?',
+		forgottenPasswordInstruction:
+			'En e-mail vil blive sendt til den angivne adresse med et link til at nulstille din adgangskode',
+		requestPasswordResetConfirmation:
+			'En e-mail med instruktioner for nulstilling af adgangskoden vil blive sendt til den angivne adresse, hvis det matcher vores optegnelser',
+		setPasswordConfirmation: 'Din adgangskode er blevet opdateret',
+		rememberMe: 'Husk mig',
+		error: 'Fejl',
+		defaultError: 'Der er opstået en ukendt fejl.',
+		errorInPasswordFormat: 'Kodeordet skal være på minimum %0% tegn og indeholde mindst %1% alfanumeriske tegn.',
+		passwordMismatch: 'Adgangskoderne er ikke ens.',
+		passwordMinLength: 'Adgangskoden skal være mindst {0} tegn lang.',
+		passwordIsBlank: 'Din nye adgangskode kan ikke være tom.',
+		userFailedLogin: 'Ups! Vi kunne ikke logge dig ind. Tjek at dit brugernavn og adgangskode er korrekt og prøv igen.',
+		userLockedOut: 'Din konto er blevet låst. Prøv igen senere.',
+		receivedErrorFromServer: 'Der skete en fejl på serveren',
+		resetCodeExpired: 'Det link, du har klikket på, er ugyldigt eller udløbet',
+		userInviteWelcomeMessage:
+			'Hej og velkommen til Umbraco! På bare 1 minut vil du være klar til at komme i gang, vi skal bare have dig til at oprette en adgangskode.',
+		userInviteExpiredMessage:
+			'Velkommen til Umbraco! Desværre er din invitation udløbet. Kontakt din administrator og bed om at gensende invitationen.',
+		newPassword: 'Ny adgangskode',
+		confirmNewPassword: 'Bekræft adgangskode',
+		greeting0: 'Velkommen',
+		greeting1: 'Velkommen',
+		greeting2: 'Velkommen',
+		greeting3: 'Velkommen',
+		greeting4: 'Velkommen',
+		greeting5: 'Velkommen',
+		greeting6: 'Velkommen',
+		mfaTitle: 'Sidste skridt!',
+		mfaCodeInputHelp: 'Indtast venligst bekræftelseskoden',
+		mfaText: 'Du har aktiveret multi-faktor godkendelse. Du skal nu bekræfte din identitet.',
+		mfaMultipleText: 'Vælg venligst en godkendelsesmetode',
+		mfaCodeInput: 'Kode',
+		mfaInvalidCode: 'Forkert kode indtastet',
+		signInWith: 'Log ind med {0}',
+		returnToLogin: 'Tilbage til log ind',
+		localLoginDisabled:
+			'Desværre er det ikke muligt at logge ind direkte. Det er blevet deaktiveret af en login-udbyder.',
+		friendlyGreeting: 'Hej!',
+		requiredEmailValidationMessage: 'Udfyld venligst en e-mail',
+		requiredUsernameValidationMessage: 'Udfyld venligst et brugernavn',
+		requiredPasswordValidationMessage: 'Udfyld venligst en adgangskode',
+		showPassword: 'Vis adgangskode',
+		hidePassword: 'Skjul adgangskode',
+	},
 } satisfies UmbLocalizationDictionary;
diff --git a/src/Umbraco.Web.UI.Login/src/localization/lang/en-us.ts b/src/Umbraco.Web.UI.Login/src/localization/lang/en-us.ts
index e5fab358c3c5..40895f2513f3 100644
--- a/src/Umbraco.Web.UI.Login/src/localization/lang/en-us.ts
+++ b/src/Umbraco.Web.UI.Login/src/localization/lang/en-us.ts
@@ -2,54 +2,6 @@ import type { UmbLocalizationDictionary } from '@umbraco-cms/backoffice/localiza
 
 export default {
 	auth: {
-		continue: 'Continue',
-		validate: 'Validate',
-		login: 'Login',
-		email: 'E-mail',
-		username: 'Username',
-		password: 'Password',
-		submit: 'Submit',
-		required: 'Required',
-		success: 'Success',
-		forgottenPassword: 'Forgotten password?',
-		forgottenPasswordInstruction: 'An email will be sent to the address specified with a link to reset your password',
-		requestPasswordResetConfirmation:
-			'An email with password reset instructions will be sent to the specified address if it matched our records',
-		setPasswordConfirmation: 'Your password has been updated',
-		rememberMe: 'Remember me',
-		error: 'Error',
-		defaultError: 'An error occurred while processing your request.',
-		errorInPasswordFormat:
-			'The password must be at least {0} characters long and contain at least {1} special characters.',
-		passwordMismatch: 'The confirmed password does not match the new password!',
-		passwordMinLength: 'The password must be at least {0} characters long.',
-		passwordIsBlank: 'The password cannot be blank.',
-		userFailedLogin: "Oops! We couldn't log you in. Please check your credentials and try again.",
-		userLockedOut: 'Your account has been locked out. Please try again later.',
-		receivedErrorFromServer: 'Received an error from the server',
-		resetCodeExpired: 'The link you have clicked on is invalid or has expired',
-		userInviteWelcomeMessage:
-			'Hello there and welcome to Umbraco! In just 1 minute you’ll be good to go, we just need you to setup a password.',
-		userInviteExpiredMessage:
-			'Welcome to Umbraco! Unfortunately your invite has expired. Please contact your administrator and ask them to resend it.',
-		newPassword: 'New password',
-		confirmNewPassword: 'Confirm password',
-		greeting0: 'Welcome',
-		greeting1: 'Welcome',
-		greeting2: 'Welcome',
-		greeting3: 'Welcome',
-		greeting4: 'Welcome',
-		greeting5: 'Welcome',
-		greeting6: 'Welcome',
-		mfaTitle: 'One last step',
-		mfaCodeInputHelp: 'Enter the code from your authenticator app',
-		mfaText: 'You have enabled 2-factor authentication and must verify your identity.',
-		mfaMultipleText: 'Please choose a 2-factor provider',
-		mfaCodeInput: 'Verification code',
-		mfaInvalidCode: 'Invalid code entered',
-		signInWith: 'Sign in with {0}',
-		returnToLogin: 'Return to login',
-		localLoginDisabled: 'Unfortunately, direct login is not possible. It has been disabled by a provider.',
 		friendlyGreeting: 'Hi there',
 	},
 } satisfies UmbLocalizationDictionary;
diff --git a/src/Umbraco.Web.UI.Login/src/localization/lang/en.ts b/src/Umbraco.Web.UI.Login/src/localization/lang/en.ts
index 2d33fcabe302..f487ff739c49 100644
--- a/src/Umbraco.Web.UI.Login/src/localization/lang/en.ts
+++ b/src/Umbraco.Web.UI.Login/src/localization/lang/en.ts
@@ -29,7 +29,7 @@ export default {
 		receivedErrorFromServer: 'Received an error from the server',
 		resetCodeExpired: 'The link you have clicked on is invalid or has expired',
 		userInviteWelcomeMessage:
-			'Hello there and welcome to Umbraco! In just 1 minute you’ll be good to go, we just need you to setup a password.',
+			"Hello there and welcome to Umbraco! In just 1 minute you'll be good to go, we just need you to setup a password.",
 		userInviteExpiredMessage:
 			'Welcome to Umbraco! Unfortunately your invite has expired. Please contact your administrator and ask them to resend it.',
 		newPassword: 'New password',
@@ -51,6 +51,9 @@ export default {
 		returnToLogin: 'Return to login',
 		localLoginDisabled: 'Unfortunately, direct login is not possible. It has been disabled by a provider.',
 		friendlyGreeting: 'Hello',
+		requiredEmailValidationMessage: 'Please fill in an email',
+		requiredUsernameValidationMessage: 'Please fill in a username',
+		requiredPasswordValidationMessage: 'Please fill in a password',
 		showPassword: 'Show password',
 		hidePassword: 'Hide password',
 	},

From 89989d60ce9fd1f4f49714ea823d025a61695254 Mon Sep 17 00:00:00 2001
From: Jacob Overgaard <752371+iOvergaard@users.noreply.github.com>
Date: Mon, 10 Nov 2025 12:00:43 +0100
Subject: [PATCH 128/155] Templates: Fix "Discard changes?" dialog after
 creating template with master template (fixes #20262) (#20749)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Moves the _data.updateCurrent() call inside the updateLayoutBlock conditional
in setMasterTemplate(). This prevents spurious change detection when loading
templates from the server, while maintaining proper change tracking when users
actually modify the master template via the UI.

This completes the fix started in PR #20529 which added the updateLayoutBlock
parameter but inadvertently left the data model update outside the conditional.

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-authored-by: Claude <noreply@anthropic.com>
---
 .../templates/workspace/template-workspace.context.ts          | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/packages/templating/templates/workspace/template-workspace.context.ts b/src/Umbraco.Web.UI.Client/src/packages/templating/templates/workspace/template-workspace.context.ts
index 0ea8f97d8cdd..0951d51f308b 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/templating/templates/workspace/template-workspace.context.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/templating/templates/workspace/template-workspace.context.ts
@@ -123,10 +123,9 @@ export class UmbTemplateWorkspaceContext
 
 		if (updateLayoutBlock) {
 			this.#updateMasterTemplateLayoutBlock();
+			this._data.updateCurrent({ masterTemplate: unique ? { unique } : null });
 		}
 
-		this._data.updateCurrent({ masterTemplate: unique ? { unique } : null });
-
 		return unique;
 	}
 

From ab51aac5c64250ab785dde233af322d95f8669e4 Mon Sep 17 00:00:00 2001
From: Jacob Overgaard <752371+iOvergaard@users.noreply.github.com>
Date: Mon, 10 Nov 2025 13:57:24 +0100
Subject: [PATCH 129/155] Backoffice Item Pickers: Show error for missing items
 in 10 picker types (closes #19329, #20270, #20367) (#20762)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Add errorDetail property to umb-entity-item-ref

Add optional errorDetail property to display additional context
(such as file paths or IDs) in error states. This enhances the
error display to show both the error message and relevant details.

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude <noreply@anthropic.com>

* Make _removeItem protected in UmbPickerInputContext

Change #removeItem from private to protected to allow subclasses
to reuse the removal logic while customizing the confirmation dialog.
This enables better extensibility for specialized picker contexts.

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude <noreply@anthropic.com>

* Fix static file picker to show error state for missing files

Update umb-input-static-file to observe statuses and render based
on item state (loading, error, success). When a static file is
missing (API returns empty array), displays error state with alert
icon and file path detail using umb-entity-item-ref.

Also adds standalone property support for proper single-item styling.

Fixes #19329

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude <noreply@anthropic.com>

* Show file path in static file remove confirmation dialog

Override requestRemoveItem in UmbStaticFilePickerInputContext to
display the file path instead of "Not found" in the confirmation
dialog when removing missing static files.

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude <noreply@anthropic.com>

* Show GUID in document picker error state

Display the document GUID as errorDetail when a document is
not found (deleted/gone). This provides useful context for
editors to identify which document was referenced.

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude <noreply@anthropic.com>

* Show GUID in document picker remove confirmation dialog

Display the document GUID instead of "Not found" in the remove
confirmation dialog when the document no longer exists. This
provides useful context for editors.

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude <noreply@anthropic.com>

* fix: apply the temp model which the context uses

* Refactor: Move requestRemoveItem logic to base UmbPickerInputContext

Eliminated duplicate code across three picker contexts by:
- Adding protected getItemDisplayName() method to base class
- Moving requestRemoveItem implementation to base class
- Removing duplicate implementations from document, member, and static file pickers
- Static file picker overrides getItemDisplayName() to show file path

Net reduction: 19 lines of code (69 removed, 50 added)

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude <noreply@anthropic.com>

* Document Type Picker: Show error state for missing items (fixes #20367)

Apply the same error state handling to the document type picker that was
implemented for static files, documents, and members. When a referenced
document type is missing or deleted:

- Show error state with the GUID as errorDetail
- Allow removal with proper confirmation dialog
- Use umb-entity-item-ref for error display
- Use uui-ref-node-document-type for successful items

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude <noreply@anthropic.com>

* Additional pickers: Show error states for missing items in user, language, media-type, member-type, member-group, and user-group pickers

Apply the same error state handling pattern to six additional picker types:
- user-input: Users
- input-language: Languages
- input-media-type: Media types
- input-member-type: Member types
- input-member-group: Member groups
- user-group-input: User groups

All pickers now:
- Observe statuses from UmbRepositoryItemsManager
- Show error state with GUID when referenced item is missing/deleted
- Use umb-entity-item-ref for error display
- Use specialized components (uui-ref-node, umb-user-group-ref, etc.) for successful items
- Allow removal with proper confirmation dialog showing GUID

Maintains code reusability by using the base class requestRemoveItem method
with getItemDisplayName() for consistent error handling across all pickers.

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude <noreply@anthropic.com>

* Lint: Remove unused 'when' imports from input-media-type and user-group-input

* Refactor: Add #renderItem helper method to all pickers for consistency

- Add #renderItem to user-input (extracted from inline repeat callback)
- Change _renderItem to #renderItem in user-group-input for consistency
- Change _renderItem to #renderItem in input-static-file for consistency

All 10 pickers now use consistent #renderItem helper method pattern,
improving code readability and maintainability as suggested by @nielslyngsoe

* `import` sorting

* Corrected (old) JSDoc typos

* Markup tidy-up

* exported `UmbPropertyEditorUIStaticFilePickerElement` as `element`

---------

Co-authored-by: Claude <noreply@anthropic.com>
Co-authored-by: leekelleher <leekelleher@gmail.com>
---
 .../entity-item-ref.element.ts                | 53 ++++++-----
 .../core/picker-input/picker-input.context.ts | 25 +++--
 .../input-document-type.element.ts            | 95 +++++++++++++------
 .../input-document/input-document.element.ts  | 40 ++++----
 .../input-language/input-language.element.ts  | 60 +++++++-----
 .../input-media-type.element.ts               | 71 ++++++++++----
 .../input-member-group.element.ts             | 95 +++++++++++++------
 .../input-member-type.element.ts              | 48 ++++++++--
 .../input-member/input-member.element.ts      | 60 +++++++-----
 .../input-static-file.context.ts              | 10 +-
 .../input-static-file.element.ts              | 37 +++++---
 .../static-file-picker/manifests.ts           |  2 +-
 ...ty-editor-ui-static-file-picker.element.ts |  2 +
 .../user-group-input.element.ts               | 60 ++++++++++--
 .../user-input/user-input.element.ts          | 35 +++++--
 15 files changed, 479 insertions(+), 214 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/entity-item/entity-item-ref/entity-item-ref.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/entity-item/entity-item-ref/entity-item-ref.element.ts
index 97b469d8a5dc..836007d29cd2 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/entity-item/entity-item-ref/entity-item-ref.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/entity-item/entity-item-ref/entity-item-ref.element.ts
@@ -1,15 +1,16 @@
 import type { ManifestEntityItemRef } from './entity-item-ref.extension.js';
-import { customElement, property, type PropertyValueMap, state, css, html } from '@umbraco-cms/backoffice/external/lit';
+import { css, customElement, html, property, state } from '@umbraco-cms/backoffice/external/lit';
 import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element';
 import { UmbExtensionsElementInitializer } from '@umbraco-cms/backoffice/extension-api';
-import { UMB_MARK_ATTRIBUTE_NAME } from '@umbraco-cms/backoffice/const';
 import { umbExtensionsRegistry } from '@umbraco-cms/backoffice/extension-registry';
+import { UmbDeselectedEvent, UmbSelectedEvent } from '@umbraco-cms/backoffice/event';
 import { UmbRoutePathAddendumContext } from '@umbraco-cms/backoffice/router';
-import type { UmbEntityModel } from '@umbraco-cms/backoffice/entity';
+import { UMB_MARK_ATTRIBUTE_NAME } from '@umbraco-cms/backoffice/const';
 import { UUIBlinkAnimationValue } from '@umbraco-cms/backoffice/external/uui';
+import type { PropertyValueMap } from '@umbraco-cms/backoffice/external/lit';
+import type { UmbEntityModel } from '@umbraco-cms/backoffice/entity';
 
 import './default-item-ref.element.js';
-import { UmbDeselectedEvent, UmbSelectedEvent } from '@umbraco-cms/backoffice/event';
 
 @customElement('umb-entity-item-ref')
 export class UmbEntityItemRefElement extends UmbLitElement {
@@ -20,9 +21,6 @@ export class UmbEntityItemRefElement extends UmbLitElement {
 	private _component?: any; // TODO: Add type
 
 	@property({ type: Object, attribute: false })
-	public get item(): UmbEntityModel | undefined {
-		return this.#item;
-	}
 	public set item(value: UmbEntityModel | undefined) {
 		const oldValue = this.#item;
 		this.#item = value;
@@ -41,6 +39,9 @@ export class UmbEntityItemRefElement extends UmbLitElement {
 		// If the component is already created, but the entity type is different, we need to destroy the component.
 		this.#createController(value.entityType);
 	}
+	public get item(): UmbEntityModel | undefined {
+		return this.#item;
+	}
 
 	#readonly = false;
 	@property({ type: Boolean, reflect: true })
@@ -124,20 +125,23 @@ export class UmbEntityItemRefElement extends UmbLitElement {
 	error?: boolean;
 
 	@property({ type: String, attribute: 'error-message', reflect: false })
-	errorMessage?: string;
+	errorMessage?: string | null;
+
+	@property({ type: String, attribute: 'error-detail', reflect: false })
+	errorDetail?: string | null;
 
 	#pathAddendum = new UmbRoutePathAddendumContext(this);
 
 	#onSelected(event: UmbSelectedEvent) {
 		event.stopPropagation();
-		const unique = this.#item?.unique;
+		const unique = this.item?.unique;
 		if (!unique) throw new Error('No unique id found for item');
 		this.dispatchEvent(new UmbSelectedEvent(unique));
 	}
 
 	#onDeselected(event: UmbDeselectedEvent) {
 		event.stopPropagation();
-		const unique = this.#item?.unique;
+		const unique = this.item?.unique;
 		if (!unique) throw new Error('No unique id found for item');
 		this.dispatchEvent(new UmbDeselectedEvent(unique));
 	}
@@ -163,7 +167,7 @@ export class UmbEntityItemRefElement extends UmbLitElement {
 
 				// TODO: I would say this code can use feature of the UmbExtensionsElementInitializer, to set properties and get a fallback element. [NL]
 				// assign the properties to the component
-				component.item = this.#item;
+				component.item = this.item;
 				component.readonly = this.readonly;
 				component.standalone = this.standalone;
 				component.selectOnly = this.selectOnly;
@@ -192,20 +196,25 @@ export class UmbEntityItemRefElement extends UmbLitElement {
 		if (this._component) {
 			return html`${this._component}`;
 		}
+
 		// Error:
 		if (this.error) {
-			return html`<uui-ref-node
-				style="color: var(--uui-color-danger);"
-				.name=${this.localize.string(this.errorMessage ?? '#general_notFound')}
-				.readonly=${this.readonly}
-				.standalone=${this.standalone}
-				.selectOnly=${this.selectOnly}
-				.selected=${this.selected}
-				.disabled=${this.disabled}>
-				<uui-icon slot="icon" name="icon-alert" style="color: var(--uui-color-danger);"></uui-icon>
-				<slot name="actions"></slot>
-			</uui-ref-node>`;
+			return html`
+				<uui-ref-node
+					style="color: var(--uui-color-danger);"
+					.name=${this.localize.string(this.errorMessage ?? '#general_notFound')}
+					.detail=${this.errorDetail ?? ''}
+					.readonly=${this.readonly}
+					.standalone=${this.standalone}
+					.selectOnly=${this.selectOnly}
+					.selected=${this.selected}
+					.disabled=${this.disabled}>
+					<uui-icon slot="icon" name="icon-alert" style="color: var(--uui-color-danger);"></uui-icon>
+					<slot name="actions"></slot>
+				</uui-ref-node>
+			`;
 		}
+
 		// Loading:
 		return html`<uui-loader-bar style="margin-top:10px;"></uui-loader-bar>`;
 	}
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/picker-input/picker-input.context.ts b/src/Umbraco.Web.UI.Client/src/packages/core/picker-input/picker-input.context.ts
index 2829e753db6b..9c90d216c05f 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/picker-input/picker-input.context.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/picker-input/picker-input.context.ts
@@ -31,8 +31,8 @@ export class UmbPickerInputContext<
 	public readonly interactionMemory = new UmbInteractionMemoryManager(this);
 
 	/**
-	 * Define a minimum amount of selected items in this input, for this input to be valid.
-	 * @returns {number} The minimum number of items required.
+	 * Define a maximum amount of selected items in this input, for this input to be valid.
+	 * @returns {number} The maximum number of items required.
 	 */
 	public get max() {
 		return this._max;
@@ -43,7 +43,7 @@ export class UmbPickerInputContext<
 	private _max = Infinity;
 
 	/**
-	 * Define a maximum amount of selected items in this input, for this input to be valid.
+	 * Define a minimum amount of selected items in this input, for this input to be valid.
 	 * @returns {number} The minimum number of items required.
 	 */
 	public get min() {
@@ -111,21 +111,32 @@ export class UmbPickerInputContext<
 		this.getHostElement().dispatchEvent(new UmbChangeEvent());
 	}
 
+	/**
+	 * Get the display name for an item to show in the remove confirmation dialog.
+	 * Subclasses can override this to provide custom formatting for missing items.
+	 * @param item - The item to get the display name for, or undefined if not found
+	 * @param unique - The unique identifier of the item
+	 * @returns The display name to show in the dialog
+	 */
+	protected getItemDisplayName(item: PickedItemType | undefined, unique: string): string {
+		return item?.name ?? unique;
+	}
+
 	async requestRemoveItem(unique: string) {
 		const item = this.#itemManager.getItems().find((item) => item.unique === unique);
+		const name = this.getItemDisplayName(item, unique);
 
-		const name = item?.name ?? '#general_notFound';
 		await umbConfirmModal(this, {
 			color: 'danger',
-			headline: `#actions_remove ${name}?`,
+			headline: `#actions_remove?`,
 			content: `#defaultdialogs_confirmremove ${name}?`,
 			confirmLabel: '#actions_remove',
 		});
 
-		this.#removeItem(unique);
+		this._removeItem(unique);
 	}
 
-	#removeItem(unique: string) {
+	protected _removeItem(unique: string) {
 		const newSelection = this.getSelection().filter((value) => value !== unique);
 		this.setSelection(newSelection);
 		this.getHostElement().dispatchEvent(new UmbChangeEvent());
diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/components/input-document-type/input-document-type.element.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/components/input-document-type/input-document-type.element.ts
index 01f74f88bce0..cbff030a4c85 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/components/input-document-type/input-document-type.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/components/input-document-type/input-document-type.element.ts
@@ -2,13 +2,16 @@ import type { UmbDocumentTypeItemModel, UmbDocumentTypeTreeItemModel } from '../
 import { UMB_DOCUMENT_TYPE_WORKSPACE_MODAL } from '../../constants.js';
 import { UMB_EDIT_DOCUMENT_TYPE_WORKSPACE_PATH_PATTERN } from '../../paths.js';
 import { UmbDocumentTypePickerInputContext } from './input-document-type.context.js';
-import { css, html, customElement, property, state, repeat, nothing, when } from '@umbraco-cms/backoffice/external/lit';
+import { css, customElement, html, nothing, property, repeat, state, when } from '@umbraco-cms/backoffice/external/lit';
 import { splitStringToArray } from '@umbraco-cms/backoffice/utils';
 import { UmbChangeEvent } from '@umbraco-cms/backoffice/event';
+import { UmbFormControlMixin } from '@umbraco-cms/backoffice/validation';
 import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element';
 import { UmbModalRouteRegistrationController } from '@umbraco-cms/backoffice/router';
 import { UmbSorterController } from '@umbraco-cms/backoffice/sorter';
-import { UmbFormControlMixin } from '@umbraco-cms/backoffice/validation';
+import type { UmbRepositoryItemsStatus } from '@umbraco-cms/backoffice/repository';
+
+import '@umbraco-cms/backoffice/entity-item';
 
 @customElement('umb-input-document-type')
 export class UmbInputDocumentTypeElement extends UmbFormControlMixin<string | undefined, typeof UmbLitElement>(
@@ -112,6 +115,9 @@ export class UmbInputDocumentTypeElement extends UmbFormControlMixin<string | un
 	@state()
 	private _items?: Array<UmbDocumentTypeItemModel>;
 
+	@state()
+	private _statuses?: Array<UmbRepositoryItemsStatus>;
+
 	@state()
 	private _editPath = '';
 
@@ -143,6 +149,7 @@ export class UmbInputDocumentTypeElement extends UmbFormControlMixin<string | un
 
 		this.observe(this.#pickerContext.selection, (selection) => (this.value = selection.join(',')), '_observeSelection');
 		this.observe(this.#pickerContext.selectedItems, (selectedItems) => (this._items = selectedItems), '_observerItems');
+		this.observe(this.#pickerContext.statuses, (statuses) => (this._statuses = statuses), '_observeStatuses');
 	}
 
 	protected override getFormElement() {
@@ -151,8 +158,8 @@ export class UmbInputDocumentTypeElement extends UmbFormControlMixin<string | un
 
 	#getPickableFilter() {
 		if (this.documentTypesOnly) {
-			/* TODO: We do not have the same model in the tree and during the search, so theoretically, we cannot use the same filter. 
-			The search item model does not include "isFolder," so it checks for falsy intentionally. 
+			/* TODO: We do not have the same model in the tree and during the search, so theoretically, we cannot use the same filter.
+			The search item model does not include "isFolder," so it checks for falsy intentionally.
 			We need to investigate getting this typed correctly. [MR] */
 			return (x: UmbDocumentTypeTreeItemModel) => !x.isFolder && x.isElement === false;
 		}
@@ -184,8 +191,8 @@ export class UmbInputDocumentTypeElement extends UmbFormControlMixin<string | un
 		);
 	}
 
-	#removeItem(item: UmbDocumentTypeItemModel) {
-		this.#pickerContext.requestRemoveItem(item.unique);
+	#removeItem(unique: string) {
+		this.#pickerContext.requestRemoveItem(unique);
 	}
 
 	override render() {
@@ -204,38 +211,66 @@ export class UmbInputDocumentTypeElement extends UmbFormControlMixin<string | un
 	}
 
 	#renderItems() {
-		if (!this._items) return nothing;
+		if (!this._statuses) return nothing;
 		return html`
 			<uui-ref-list>
 				${repeat(
-					this._items,
-					(item) => item.unique,
-					(item) => this.#renderItem(item),
+					this._statuses,
+					(status) => status.unique,
+					(status) => {
+						const unique = status.unique;
+						const item = this._items?.find((x) => x.unique === unique);
+						const isError = status.state.type === 'error';
+
+						// For error state, use umb-entity-item-ref
+						if (isError) {
+							return html`
+								<umb-entity-item-ref
+									id=${unique}
+									.item=${item}
+									?error=${true}
+									.errorMessage=${status.state.error}
+									.errorDetail=${unique}
+									?readonly=${this.readonly}
+									?standalone=${this.max === 1}>
+									${when(
+										!this.readonly,
+										() => html`
+											<uui-action-bar slot="actions">
+												<uui-button
+													label=${this.localize.term('general_remove')}
+													@click=${() => this.#removeItem(unique)}></uui-button>
+											</uui-action-bar>
+										`,
+									)}
+								</umb-entity-item-ref>
+							`;
+						}
+
+						// For successful items, use the document type specific component
+						if (!item) return nothing;
+						const href = this._editPath + UMB_EDIT_DOCUMENT_TYPE_WORKSPACE_PATH_PATTERN.generateLocal({ unique });
+						return html`
+							<uui-ref-node-document-type id=${unique} name=${this.localize.string(item.name)} href=${href}>
+								${this.#renderIcon(item)}
+								<uui-action-bar slot="actions">
+									${when(
+										!this.readonly,
+										() => html`
+											<uui-button
+												label=${this.localize.term('general_remove')}
+												@click=${() => this.#removeItem(unique)}></uui-button>
+										`,
+									)}
+								</uui-action-bar>
+							</uui-ref-node-document-type>
+						`;
+					},
 				)}
 			</uui-ref-list>
 		`;
 	}
 
-	#renderItem(item: UmbDocumentTypeItemModel) {
-		if (!item.unique) return;
-		const href = this._editPath + UMB_EDIT_DOCUMENT_TYPE_WORKSPACE_PATH_PATTERN.generateLocal({ unique: item.unique });
-		return html`
-			<uui-ref-node-document-type id=${item.unique} name=${this.localize.string(item.name)} href=${href}>
-				${this.#renderIcon(item)}
-				<uui-action-bar slot="actions">
-					${when(
-						!this.readonly,
-						() => html`
-							<uui-button
-								label=${this.localize.term('general_remove')}
-								@click=${() => this.#removeItem(item)}></uui-button>
-						`,
-					)}
-				</uui-action-bar>
-			</uui-ref-node-document-type>
-		`;
-	}
-
 	#renderIcon(item: UmbDocumentTypeItemModel) {
 		if (!item.icon) return;
 		return html`<umb-icon slot="icon" name=${item.icon}></umb-icon>`;
diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/components/input-document/input-document.element.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/components/input-document/input-document.element.ts
index 516251a4b5b9..302d9594c7ee 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/components/input-document/input-document.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/components/input-document/input-document.element.ts
@@ -239,24 +239,28 @@ export class UmbInputDocumentElement extends UmbFormControlMixin<string | undefi
 					(status) => {
 						const unique = status.unique;
 						const item = this._items?.find((x) => x.unique === unique);
-						return html`<umb-entity-item-ref
-							id=${unique}
-							.item=${item}
-							?error=${status.state.type === 'error'}
-							.errorMessage=${status.state.error}
-							?readonly=${this.readonly}
-							?standalone=${this.max === 1}>
-							${when(
-								!this.readonly,
-								() => html`
-									<uui-action-bar slot="actions">
-										<uui-button
-											label=${this.localize.term('general_remove')}
-											@click=${() => this.#onRemove(unique)}></uui-button>
-									</uui-action-bar>
-								`,
-							)}
-						</umb-entity-item-ref>`;
+						const isError = status.state.type === 'error';
+						return html`
+							<umb-entity-item-ref
+								id=${unique}
+								.item=${item}
+								?error=${isError}
+								.errorMessage=${status.state.error}
+								.errorDetail=${isError ? unique : undefined}
+								?readonly=${this.readonly}
+								?standalone=${this.max === 1}>
+								${when(
+									!this.readonly,
+									() => html`
+										<uui-action-bar slot="actions">
+											<uui-button
+												label=${this.localize.term('general_remove')}
+												@click=${() => this.#onRemove(unique)}></uui-button>
+										</uui-action-bar>
+									`,
+								)}
+							</umb-entity-item-ref>
+						`;
 					},
 				)}
 			</uui-ref-list>
diff --git a/src/Umbraco.Web.UI.Client/src/packages/language/components/input-language/input-language.element.ts b/src/Umbraco.Web.UI.Client/src/packages/language/components/input-language/input-language.element.ts
index 826bbe0b83d6..9a462669437c 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/language/components/input-language/input-language.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/language/components/input-language/input-language.element.ts
@@ -6,6 +6,7 @@ import { UmbChangeEvent } from '@umbraco-cms/backoffice/event';
 import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element';
 import { UmbSorterController } from '@umbraco-cms/backoffice/sorter';
 import { UUIFormControlMixin } from '@umbraco-cms/backoffice/external/uui';
+import type { UmbRepositoryItemsStatus } from '@umbraco-cms/backoffice/repository';
 
 @customElement('umb-input-language')
 export class UmbInputLanguageElement extends UUIFormControlMixin(UmbLitElement, '') {
@@ -17,7 +18,7 @@ export class UmbInputLanguageElement extends UUIFormControlMixin(UmbLitElement,
 			return modelEntry;
 		},
 		identifier: 'Umb.SorterIdentifier.InputLanguage',
-		itemSelector: 'uui-ref-node',
+		itemSelector: 'umb-entity-item-ref',
 		containerSelector: 'uui-ref-list',
 		onChange: ({ model }) => {
 			this.selection = model;
@@ -115,6 +116,9 @@ export class UmbInputLanguageElement extends UUIFormControlMixin(UmbLitElement,
 	@state()
 	private _items: Array<UmbLanguageItemModel> = [];
 
+	@state()
+	private _statuses?: Array<UmbRepositoryItemsStatus>;
+
 	#pickerContext = new UmbLanguagePickerInputContext(this);
 
 	constructor() {
@@ -134,6 +138,7 @@ export class UmbInputLanguageElement extends UUIFormControlMixin(UmbLitElement,
 
 		this.observe(this.#pickerContext.selection, (selection) => (this.value = selection.join(',')), '_observeSelection');
 		this.observe(this.#pickerContext.selectedItems, (selectedItems) => (this._items = selectedItems), '_observerItems');
+		this.observe(this.#pickerContext.statuses, (statuses) => (this._statuses = statuses), '_observeStatuses');
 	}
 
 	protected override getFormElement() {
@@ -147,8 +152,8 @@ export class UmbInputLanguageElement extends UUIFormControlMixin(UmbLitElement,
 		});
 	}
 
-	#onRemove(item: UmbLanguageItemModel) {
-		this.#pickerContext.requestRemoveItem(item.unique);
+	#onRemove(unique: string) {
+		this.#pickerContext.requestRemoveItem(unique);
 	}
 
 	override render() {
@@ -167,29 +172,38 @@ export class UmbInputLanguageElement extends UUIFormControlMixin(UmbLitElement,
 	}
 
 	#renderItems() {
-		if (!this._items) return;
+		if (!this._statuses) return;
 		return html`
 			<uui-ref-list>
 				${repeat(
-					this._items,
-					(item) => item.unique,
-					(item) =>
-						html`<umb-entity-item-ref
-							id=${item.unique}
-							.item=${item}
-							?readonly=${this.readonly}
-							?standalone=${this.max === 1}>
-							${when(
-								!this.readonly,
-								() => html`
-									<uui-action-bar slot="actions">
-										<uui-button
-											label=${this.localize.term('general_remove')}
-											@click=${() => this.#onRemove(item)}></uui-button>
-									</uui-action-bar>
-								`,
-							)}
-						</umb-entity-item-ref>`,
+					this._statuses,
+					(status) => status.unique,
+					(status) => {
+						const unique = status.unique;
+						const item = this._items?.find((x) => x.unique === unique);
+						const isError = status.state.type === 'error';
+						return html`
+							<umb-entity-item-ref
+								id=${unique}
+								.item=${item}
+								?error=${isError}
+								.errorMessage=${status.state.error}
+								.errorDetail=${isError ? unique : undefined}
+								?readonly=${this.readonly}
+								?standalone=${this.max === 1}>
+								${when(
+									!this.readonly,
+									() => html`
+										<uui-action-bar slot="actions">
+											<uui-button
+												label=${this.localize.term('general_remove')}
+												@click=${() => this.#onRemove(unique)}></uui-button>
+										</uui-action-bar>
+									`,
+								)}
+							</umb-entity-item-ref>
+						`;
+					},
 				)}
 			</uui-ref-list>
 		`;
diff --git a/src/Umbraco.Web.UI.Client/src/packages/media/media-types/components/input-media-type/input-media-type.element.ts b/src/Umbraco.Web.UI.Client/src/packages/media/media-types/components/input-media-type/input-media-type.element.ts
index cd659f441a16..d9e7949db0f0 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/media/media-types/components/input-media-type/input-media-type.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/media/media-types/components/input-media-type/input-media-type.element.ts
@@ -8,6 +8,9 @@ import { UMB_WORKSPACE_MODAL } from '@umbraco-cms/backoffice/workspace';
 import { UmbModalRouteRegistrationController } from '@umbraco-cms/backoffice/router';
 import { UmbSorterController } from '@umbraco-cms/backoffice/sorter';
 import { UmbFormControlMixin } from '@umbraco-cms/backoffice/validation';
+import type { UmbRepositoryItemsStatus } from '@umbraco-cms/backoffice/repository';
+
+import '@umbraco-cms/backoffice/entity-item';
 
 @customElement('umb-input-media-type')
 export class UmbInputMediaTypeElement extends UmbFormControlMixin<string | undefined, typeof UmbLitElement>(
@@ -95,6 +98,9 @@ export class UmbInputMediaTypeElement extends UmbFormControlMixin<string | undef
 	@state()
 	private _items?: Array<UmbMediaTypeItemModel>;
 
+	@state()
+	private _statuses?: Array<UmbRepositoryItemsStatus>;
+
 	@state()
 	private _editPath = '';
 
@@ -126,6 +132,7 @@ export class UmbInputMediaTypeElement extends UmbFormControlMixin<string | undef
 
 		this.observe(this.#pickerContext.selection, (selection) => (this.value = selection.join(',')), '_observeSelection');
 		this.observe(this.#pickerContext.selectedItems, (selectedItems) => (this._items = selectedItems), '_observerItems');
+		this.observe(this.#pickerContext.statuses, (statuses) => (this._statuses = statuses), '_observeStatuses');
 	}
 
 	protected override getFormElement() {
@@ -138,8 +145,8 @@ export class UmbInputMediaTypeElement extends UmbFormControlMixin<string | undef
 		});
 	}
 
-	#removeItem(item: UmbMediaTypeItemModel) {
-		this.#pickerContext.requestRemoveItem(item.unique);
+	#removeItem(unique: string) {
+		this.#pickerContext.requestRemoveItem(unique);
 	}
 
 	override render() {
@@ -158,32 +165,56 @@ export class UmbInputMediaTypeElement extends UmbFormControlMixin<string | undef
 	}
 
 	#renderItems() {
-		if (!this._items) return nothing;
+		if (!this._statuses) return nothing;
 		return html`
 			<uui-ref-list>
 				${repeat(
-					this._items,
-					(item) => item.unique,
-					(item) => this.#renderItem(item),
+					this._statuses,
+					(status) => status.unique,
+					(status) => {
+						const unique = status.unique;
+						const item = this._items?.find((x) => x.unique === unique);
+						const isError = status.state.type === 'error';
+
+						// For error state, use umb-entity-item-ref
+						if (isError) {
+							return html`
+								<umb-entity-item-ref
+									id=${unique}
+									.item=${item}
+									?error=${true}
+									.errorMessage=${status.state.error}
+									.errorDetail=${unique}
+									?standalone=${this.max === 1}>
+									<uui-action-bar slot="actions">
+										<uui-button
+											label=${this.localize.term('general_remove')}
+											@click=${() => this.#removeItem(unique)}></uui-button>
+									</uui-action-bar>
+								</umb-entity-item-ref>
+							`;
+						}
+
+						// For successful items, use the media type specific component
+						if (!item) return nothing;
+						const href = `${this._editPath}edit/${unique}`;
+						return html`
+							<uui-ref-node-document-type name=${this.localize.string(item.name)} id=${unique}>
+								${this.#renderIcon(item)}
+								<uui-action-bar slot="actions">
+									<uui-button href=${href} label=${this.localize.term('general_open')}></uui-button>
+									<uui-button
+										label=${this.localize.term('general_remove')}
+										@click=${() => this.#removeItem(unique)}></uui-button>
+								</uui-action-bar>
+							</uui-ref-node-document-type>
+						`;
+					},
 				)}
 			</uui-ref-list>
 		`;
 	}
 
-	#renderItem(item: UmbMediaTypeItemModel) {
-		if (!item.unique) return;
-		const href = `${this._editPath}edit/${item.unique}`;
-		return html`
-			<uui-ref-node-document-type name=${this.localize.string(item.name)} id=${item.unique}>
-				${this.#renderIcon(item)}
-				<uui-action-bar slot="actions">
-					<uui-button href=${href} label=${this.localize.term('general_open')}></uui-button>
-					<uui-button @click=${() => this.#removeItem(item)} label=${this.localize.term('general_remove')}></uui-button>
-				</uui-action-bar>
-			</uui-ref-node-document-type>
-		`;
-	}
-
 	#renderIcon(item: UmbMediaTypeItemModel) {
 		if (!item.icon) return;
 		return html`<umb-icon slot="icon" name=${item.icon}></umb-icon>`;
diff --git a/src/Umbraco.Web.UI.Client/src/packages/members/member-group/components/input-member-group/input-member-group.element.ts b/src/Umbraco.Web.UI.Client/src/packages/members/member-group/components/input-member-group/input-member-group.element.ts
index bec7d38b13a7..40a8c9e3d5da 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/members/member-group/components/input-member-group/input-member-group.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/members/member-group/components/input-member-group/input-member-group.element.ts
@@ -1,13 +1,16 @@
 import type { UmbMemberGroupItemModel } from '../../types.js';
 import { UmbMemberGroupPickerInputContext } from './input-member-group.context.js';
-import { css, html, customElement, property, state, repeat, nothing } from '@umbraco-cms/backoffice/external/lit';
+import { css, customElement, html, nothing, property, repeat, state, when } from '@umbraco-cms/backoffice/external/lit';
 import { splitStringToArray } from '@umbraco-cms/backoffice/utils';
 import { UmbChangeEvent } from '@umbraco-cms/backoffice/event';
+import { UmbFormControlMixin } from '@umbraco-cms/backoffice/validation';
 import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element';
+import { UmbModalRouteRegistrationController } from '@umbraco-cms/backoffice/router';
 import { UmbSorterController } from '@umbraco-cms/backoffice/sorter';
 import { UMB_WORKSPACE_MODAL } from '@umbraco-cms/backoffice/workspace';
-import { UmbModalRouteRegistrationController } from '@umbraco-cms/backoffice/router';
-import { UmbFormControlMixin } from '@umbraco-cms/backoffice/validation';
+import type { UmbRepositoryItemsStatus } from '@umbraco-cms/backoffice/repository';
+
+import '@umbraco-cms/backoffice/entity-item';
 
 @customElement('umb-input-member-group')
 export class UmbInputMemberGroupElement extends UmbFormControlMixin<string | undefined, typeof UmbLitElement>(
@@ -124,6 +127,9 @@ export class UmbInputMemberGroupElement extends UmbFormControlMixin<string | und
 	@state()
 	private _items?: Array<UmbMemberGroupItemModel>;
 
+	@state()
+	private _statuses?: Array<UmbRepositoryItemsStatus>;
+
 	#pickerContext = new UmbMemberGroupPickerInputContext(this);
 
 	constructor() {
@@ -152,6 +158,7 @@ export class UmbInputMemberGroupElement extends UmbFormControlMixin<string | und
 
 		this.observe(this.#pickerContext.selection, (selection) => (this.value = selection.join(',')), '_observeSelection');
 		this.observe(this.#pickerContext.selectedItems, (selectedItems) => (this._items = selectedItems), '_observeItems');
+		this.observe(this.#pickerContext.statuses, (statuses) => (this._statuses = statuses), '_observeStatuses');
 	}
 
 	protected override getFormElement() {
@@ -164,8 +171,8 @@ export class UmbInputMemberGroupElement extends UmbFormControlMixin<string | und
 		});
 	}
 
-	#removeItem(item: UmbMemberGroupItemModel) {
-		this.#pickerContext.requestRemoveItem(item.unique);
+	#removeItem(unique: string) {
+		this.#pickerContext.requestRemoveItem(unique);
 	}
 
 	override render() {
@@ -173,13 +180,62 @@ export class UmbInputMemberGroupElement extends UmbFormControlMixin<string | und
 	}
 
 	#renderItems() {
-		if (!this._items) return;
+		if (!this._statuses) return;
 		return html`
 			<uui-ref-list>
 				${repeat(
-					this._items,
-					(item) => item.unique,
-					(item) => this.#renderItem(item),
+					this._statuses,
+					(status) => status.unique,
+					(status) => {
+						const unique = status.unique;
+						const item = this._items?.find((x) => x.unique === unique);
+						const isError = status.state.type === 'error';
+
+						// For error state, use umb-entity-item-ref
+						if (isError) {
+							return html`
+								<umb-entity-item-ref
+									id=${unique}
+									?error=${true}
+									.errorMessage=${status.state.error}
+									.errorDetail=${unique}
+									?readonly=${this.readonly}
+									?standalone=${this.max === 1}>
+									${when(
+										!this.readonly,
+										() => html`
+											<uui-action-bar slot="actions">
+												<uui-button
+													label=${this.localize.term('general_remove')}
+													@click=${() => this.#removeItem(unique)}></uui-button>
+											</uui-action-bar>
+										`,
+									)}
+								</umb-entity-item-ref>
+							`;
+						}
+
+						// For successful items, use uui-ref-node
+						if (!item) return nothing;
+						return html`
+							<uui-ref-node
+								name=${item.name}
+								id=${unique}
+								href="${this._editMemberGroupPath}edit/${unique}"
+								?readonly=${this.readonly}>
+								<uui-action-bar slot="actions">
+									${when(
+										!this.readonly,
+										() =>
+											html`<uui-button
+												@click=${() => this.#removeItem(unique)}
+												label=${this.localize.term('general_remove')}></uui-button>`,
+									)}
+								</uui-action-bar>
+								<umb-icon slot="icon" name="icon-users"></umb-icon>
+							</uui-ref-node>
+						`;
+					},
 				)}
 			</uui-ref-list>
 		`;
@@ -199,27 +255,6 @@ export class UmbInputMemberGroupElement extends UmbFormControlMixin<string | und
 		}
 	}
 
-	#renderItem(item: UmbMemberGroupItemModel) {
-		if (!item.unique) return nothing;
-		return html`
-			<uui-ref-node
-				name=${item.name}
-				id=${item.unique}
-				href="${this._editMemberGroupPath}edit/${item.unique}"
-				?readonly=${this.readonly}>
-				<uui-action-bar slot="actions"> ${this.#renderRemoveButton(item)} </uui-action-bar>
-				<umb-icon slot="icon" name="icon-users"></umb-icon>
-			</uui-ref-node>
-		`;
-	}
-
-	#renderRemoveButton(item: UmbMemberGroupItemModel) {
-		if (this.readonly) return nothing;
-		return html`<uui-button
-			@click=${() => this.#removeItem(item)}
-			label=${this.localize.term('general_remove')}></uui-button>`;
-	}
-
 	static override styles = [
 		css`
 			#btn-add {
diff --git a/src/Umbraco.Web.UI.Client/src/packages/members/member-type/components/input-member-type/input-member-type.element.ts b/src/Umbraco.Web.UI.Client/src/packages/members/member-type/components/input-member-type/input-member-type.element.ts
index dd887b2d66ee..6386a906c1de 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/members/member-type/components/input-member-type/input-member-type.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/members/member-type/components/input-member-type/input-member-type.element.ts
@@ -1,9 +1,12 @@
 import { UmbMemberTypePickerInputContext } from './input-member-type.context.js';
-import { css, html, customElement, property, state, repeat, when } from '@umbraco-cms/backoffice/external/lit';
+import { css, customElement, html, nothing, property, repeat, state, when } from '@umbraco-cms/backoffice/external/lit';
 import { splitStringToArray } from '@umbraco-cms/backoffice/utils';
+import { UmbFormControlMixin } from '@umbraco-cms/backoffice/validation';
 import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element';
+import type { UmbRepositoryItemsStatus } from '@umbraco-cms/backoffice/repository';
 import type { UmbUniqueItemModel } from '@umbraco-cms/backoffice/models';
-import { UmbFormControlMixin } from '@umbraco-cms/backoffice/validation';
+
+import '@umbraco-cms/backoffice/entity-item';
 
 @customElement('umb-input-member-type')
 export class UmbInputMemberTypeElement extends UmbFormControlMixin<string | undefined, typeof UmbLitElement>(
@@ -73,6 +76,9 @@ export class UmbInputMemberTypeElement extends UmbFormControlMixin<string | unde
 	@state()
 	private _items?: Array<UmbUniqueItemModel>;
 
+	@state()
+	private _statuses?: Array<UmbRepositoryItemsStatus>;
+
 	#pickerContext = new UmbMemberTypePickerInputContext(this);
 
 	constructor() {
@@ -92,6 +98,7 @@ export class UmbInputMemberTypeElement extends UmbFormControlMixin<string | unde
 
 		this.observe(this.#pickerContext.selection, (selection) => (this.value = selection.join(',')));
 		this.observe(this.#pickerContext.selectedItems, (selectedItems) => (this._items = selectedItems));
+		this.observe(this.#pickerContext.statuses, (statuses) => (this._statuses = statuses), '_observeStatuses');
 	}
 
 	protected override getFormElement() {
@@ -109,13 +116,13 @@ export class UmbInputMemberTypeElement extends UmbFormControlMixin<string | unde
 	}
 
 	#renderItems() {
-		if (!this._items) return;
+		if (!this._statuses) return;
 		return html`
 			<uui-ref-list>
 				${repeat(
-					this._items,
-					(item) => item.unique,
-					(item) => this.#renderItem(item),
+					this._statuses,
+					(status) => status.unique,
+					(status) => this.#renderItem(status),
 				)}
 			</uui-ref-list>
 		`;
@@ -134,14 +141,37 @@ export class UmbInputMemberTypeElement extends UmbFormControlMixin<string | unde
 		`;
 	}
 
-	#renderItem(item: UmbUniqueItemModel) {
-		if (!item.unique) return;
+	#renderItem(status: UmbRepositoryItemsStatus) {
+		const unique = status.unique;
+		const item = this._items?.find((x) => x.unique === unique);
+		const isError = status.state.type === 'error';
+
+		// For error state, use umb-entity-item-ref
+		if (isError) {
+			return html`
+				<umb-entity-item-ref
+					id=${unique}
+					?error=${true}
+					.errorMessage=${status.state.error}
+					.errorDetail=${unique}
+					?standalone=${this.max === 1}>
+					<uui-action-bar slot="actions">
+						<uui-button
+							label=${this.localize.term('general_remove')}
+							@click=${() => this.#pickerContext.requestRemoveItem(unique)}></uui-button>
+					</uui-action-bar>
+				</umb-entity-item-ref>
+			`;
+		}
+
+		// For successful items, use the member type specific component
+		if (!item?.unique) return nothing;
 		return html`
 			<uui-ref-node-document-type name=${this.localize.string(item.name)}>
 				${when(item.icon, () => html`<umb-icon slot="icon" name=${item.icon!}></umb-icon>`)}
 				<uui-action-bar slot="actions">
 					<uui-button
-						@click=${() => this.#pickerContext.requestRemoveItem(item.unique!)}
+						@click=${() => this.#pickerContext.requestRemoveItem(unique)}
 						label="Remove Member Type ${item.name}"
 						>${this.localize.term('general_remove')}</uui-button
 					>
diff --git a/src/Umbraco.Web.UI.Client/src/packages/members/member/components/input-member/input-member.element.ts b/src/Umbraco.Web.UI.Client/src/packages/members/member/components/input-member/input-member.element.ts
index d5b60d9e0488..8ddf6e606824 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/members/member/components/input-member/input-member.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/members/member/components/input-member/input-member.element.ts
@@ -1,12 +1,13 @@
 import type { UmbMemberItemModel } from '../../item/types.js';
 import { UmbMemberPickerInputContext } from './input-member.context.js';
-import { css, customElement, html, nothing, property, repeat, state } from '@umbraco-cms/backoffice/external/lit';
+import { css, customElement, html, nothing, property, repeat, state, when } from '@umbraco-cms/backoffice/external/lit';
 import { splitStringToArray } from '@umbraco-cms/backoffice/utils';
 import { UmbChangeEvent } from '@umbraco-cms/backoffice/event';
 import { UmbFormControlMixin } from '@umbraco-cms/backoffice/validation';
 import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element';
 import { UmbSorterController } from '@umbraco-cms/backoffice/sorter';
 import { UMB_MEMBER_TYPE_ENTITY_TYPE } from '@umbraco-cms/backoffice/member-type';
+import type { UmbRepositoryItemsStatus } from '@umbraco-cms/backoffice/repository';
 
 @customElement('umb-input-member')
 export class UmbInputMemberElement extends UmbFormControlMixin<string | undefined, typeof UmbLitElement>(
@@ -121,6 +122,9 @@ export class UmbInputMemberElement extends UmbFormControlMixin<string | undefine
 	@state()
 	private _items?: Array<UmbMemberItemModel>;
 
+	@state()
+	private _statuses?: Array<UmbRepositoryItemsStatus>;
+
 	#pickerContext = new UmbMemberPickerInputContext(this);
 
 	constructor() {
@@ -140,6 +144,7 @@ export class UmbInputMemberElement extends UmbFormControlMixin<string | undefine
 
 		this.observe(this.#pickerContext.selection, (selection) => (this.value = selection.join(',')), '_observeSelection');
 		this.observe(this.#pickerContext.selectedItems, (selectedItems) => (this._items = selectedItems), '_observeItems');
+		this.observe(this.#pickerContext.statuses, (statuses) => (this._statuses = statuses), '_observeStatuses');
 	}
 
 	#openPicker() {
@@ -156,8 +161,8 @@ export class UmbInputMemberElement extends UmbFormControlMixin<string | undefine
 		);
 	}
 
-	#onRemove(item: UmbMemberItemModel) {
-		this.#pickerContext.requestRemoveItem(item.unique);
+	#onRemove(unique: string) {
+		this.#pickerContext.requestRemoveItem(unique);
 	}
 
 	override render() {
@@ -165,27 +170,43 @@ export class UmbInputMemberElement extends UmbFormControlMixin<string | undefine
 	}
 
 	#renderItems() {
-		if (!this._items) return nothing;
+		if (!this._statuses) return nothing;
 		return html`
 			<uui-ref-list>
 				${repeat(
-					this._items,
-					(item) => item.unique,
-					(item) => this.#renderItem(item),
+					this._statuses,
+					(status) => status.unique,
+					(status) => {
+						const unique = status.unique;
+						const item = this._items?.find((x) => x.unique === unique);
+						const isError = status.state.type === 'error';
+						return html`
+							<umb-entity-item-ref
+								id=${unique}
+								.item=${item}
+								?error=${isError}
+								.errorMessage=${status.state.error}
+								.errorDetail=${isError ? unique : undefined}
+								?readonly=${this.readonly}
+								?standalone=${this.max === 1}>
+								${when(
+									!this.readonly,
+									() => html`
+										<uui-action-bar slot="actions">
+											<uui-button
+												label=${this.localize.term('general_remove')}
+												@click=${() => this.#onRemove(unique)}></uui-button>
+										</uui-action-bar>
+									`,
+								)}
+							</umb-entity-item-ref>
+						`;
+					},
 				)}
 			</uui-ref-list>
 		`;
 	}
 
-	#renderItem(item: UmbMemberItemModel) {
-		if (!item.unique) return nothing;
-		return html`
-			<umb-entity-item-ref id=${item.unique} .item=${item} ?readonly=${this.readonly} ?standalone=${this.max === 1}>
-				<uui-action-bar slot="actions">${this.#renderRemoveButton(item)} </uui-action-bar>
-			</umb-entity-item-ref>
-		`;
-	}
-
 	#renderAddButton() {
 		if (this.selection.length >= this.max) return nothing;
 		if (this.readonly && this.selection.length > 0) {
@@ -202,13 +223,6 @@ export class UmbInputMemberElement extends UmbFormControlMixin<string | undefine
 		}
 	}
 
-	#renderRemoveButton(item: UmbMemberItemModel) {
-		if (this.readonly) return nothing;
-		return html`
-			<uui-button @click=${() => this.#onRemove(item)} label=${this.localize.term('general_remove')}></uui-button>
-		`;
-	}
-
 	static override styles = [
 		css`
 			#btn-add {
diff --git a/src/Umbraco.Web.UI.Client/src/packages/static-file/components/input-static-file/input-static-file.context.ts b/src/Umbraco.Web.UI.Client/src/packages/static-file/components/input-static-file/input-static-file.context.ts
index 7a6bc3826a84..75bbb7e31cfc 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/static-file/components/input-static-file/input-static-file.context.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/static-file/components/input-static-file/input-static-file.context.ts
@@ -1,8 +1,9 @@
 import { UMB_STATIC_FILE_PICKER_MODAL } from '../../modals/index.js';
-import type { UmbStaticFilePickerModalData, UmbStaticFilePickerModalValue } from '../../modals/index.js';
 import { UMB_STATIC_FILE_ITEM_REPOSITORY_ALIAS } from '../../constants.js';
+import type { UmbStaticFilePickerModalData, UmbStaticFilePickerModalValue } from '../../modals/index.js';
 import type { UmbStaticFileItemModel } from '../../types.js';
 import { UmbPickerInputContext } from '@umbraco-cms/backoffice/picker-input';
+import { UmbServerFilePathUniqueSerializer } from '@umbraco-cms/backoffice/server-file-system';
 import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api';
 
 export class UmbStaticFilePickerInputContext extends UmbPickerInputContext<
@@ -11,7 +12,14 @@ export class UmbStaticFilePickerInputContext extends UmbPickerInputContext<
 	UmbStaticFilePickerModalData,
 	UmbStaticFilePickerModalValue
 > {
+	#serializer = new UmbServerFilePathUniqueSerializer();
+
 	constructor(host: UmbControllerHost) {
 		super(host, UMB_STATIC_FILE_ITEM_REPOSITORY_ALIAS, UMB_STATIC_FILE_PICKER_MODAL);
 	}
+
+	protected override getItemDisplayName(item: UmbStaticFileItemModel | undefined, unique: string): string {
+		// If item doesn't exist, use the file path as the name
+		return item?.name ?? this.#serializer.toServerPath(unique) ?? unique;
+	}
 }
diff --git a/src/Umbraco.Web.UI.Client/src/packages/static-file/components/input-static-file/input-static-file.element.ts b/src/Umbraco.Web.UI.Client/src/packages/static-file/components/input-static-file/input-static-file.element.ts
index 9e42a0b6f7b1..e533364de471 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/static-file/components/input-static-file/input-static-file.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/static-file/components/input-static-file/input-static-file.element.ts
@@ -2,9 +2,12 @@ import type { UmbStaticFileItemModel } from '../../repository/item/types.js';
 import { UmbStaticFilePickerInputContext } from './input-static-file.context.js';
 import { css, customElement, html, nothing, property, repeat, state } from '@umbraco-cms/backoffice/external/lit';
 import { splitStringToArray } from '@umbraco-cms/backoffice/utils';
+import { UmbFormControlMixin } from '@umbraco-cms/backoffice/validation';
 import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element';
 import { UmbServerFilePathUniqueSerializer } from '@umbraco-cms/backoffice/server-file-system';
-import { UmbFormControlMixin } from '@umbraco-cms/backoffice/validation';
+import type { UmbRepositoryItemsStatus } from '@umbraco-cms/backoffice/repository';
+
+import '@umbraco-cms/backoffice/entity-item';
 
 @customElement('umb-input-static-file')
 export class UmbInputStaticFileElement extends UmbFormControlMixin<string | undefined, typeof UmbLitElement>(
@@ -79,6 +82,9 @@ export class UmbInputStaticFileElement extends UmbFormControlMixin<string | unde
 	@state()
 	private _items?: Array<UmbStaticFileItemModel>;
 
+	@state()
+	private _statuses?: Array<UmbRepositoryItemsStatus>;
+
 	#pickerContext = new UmbStaticFilePickerInputContext(this);
 
 	constructor() {
@@ -98,6 +104,7 @@ export class UmbInputStaticFileElement extends UmbFormControlMixin<string | unde
 
 		this.observe(this.#pickerContext.selection, (selection) => (this.value = selection.join(',')));
 		this.observe(this.#pickerContext.selectedItems, (selectedItems) => (this._items = selectedItems));
+		this.observe(this.#pickerContext.statuses, (statuses) => (this._statuses = statuses));
 	}
 
 	protected override getFormElement() {
@@ -105,13 +112,13 @@ export class UmbInputStaticFileElement extends UmbFormControlMixin<string | unde
 	}
 
 	override render() {
-		if (!this._items) return nothing;
+		if (!this._statuses) return nothing;
 		return html`
 			<uui-ref-list>
 				${repeat(
-					this._items,
-					(item) => item.unique,
-					(item) => this._renderItem(item),
+					this._statuses,
+					(status) => status.unique,
+					(status) => this.#renderItem(status),
 				)}
 			</uui-ref-list>
 			${this.#renderAddButton()}
@@ -137,17 +144,25 @@ export class UmbInputStaticFileElement extends UmbFormControlMixin<string | unde
 		`;
 	}
 
-	private _renderItem(item: UmbStaticFileItemModel) {
-		if (!item.unique) return;
+	#renderItem(status: UmbRepositoryItemsStatus) {
+		const unique = status.unique;
+		const item = this._items?.find((x) => x.unique === unique);
+		const isError = status.state.type === 'error';
+
 		return html`
-			<uui-ref-node name=${item.name} .detail=${this.#serializer.toServerPath(item.unique) || ''}>
-				<!-- TODO: implement is trashed, if we cant retrieve the item on the server (but only ask the server if we need to anyway...). <uui-tag size="s" slot="tag" color="danger">Trashed</uui-tag> -->
+			<umb-entity-item-ref
+				id=${unique}
+				.item=${item}
+				?error=${isError}
+				.errorMessage=${status.state.error}
+				.errorDetail=${isError ? this.#serializer.toServerPath(unique) : undefined}
+				?standalone=${this.max === 1}>
 				<uui-action-bar slot="actions">
 					<uui-button
 						label=${this.localize.term('general_remove')}
-						@click=${() => this.#pickerContext.requestRemoveItem(item.unique)}></uui-button>
+						@click=${() => this.#pickerContext.requestRemoveItem(unique)}></uui-button>
 				</uui-action-bar>
-			</uui-ref-node>
+			</umb-entity-item-ref>
 		`;
 	}
 
diff --git a/src/Umbraco.Web.UI.Client/src/packages/static-file/property-editors/static-file-picker/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/static-file/property-editors/static-file-picker/manifests.ts
index cd9c2b9c6406..261047fb1598 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/static-file/property-editors/static-file-picker/manifests.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/static-file/property-editors/static-file-picker/manifests.ts
@@ -4,7 +4,7 @@ export const manifest: ManifestPropertyEditorUi = {
 	type: 'propertyEditorUi',
 	alias: 'Umb.PropertyEditorUi.StaticFilePicker',
 	name: 'Static File Picker Property Editor UI',
-	js: () => import('./property-editor-ui-static-file-picker.element.js'),
+	element: () => import('./property-editor-ui-static-file-picker.element.js'),
 	meta: {
 		label: 'Static File Picker',
 		icon: 'icon-document',
diff --git a/src/Umbraco.Web.UI.Client/src/packages/static-file/property-editors/static-file-picker/property-editor-ui-static-file-picker.element.ts b/src/Umbraco.Web.UI.Client/src/packages/static-file/property-editors/static-file-picker/property-editor-ui-static-file-picker.element.ts
index 81cfbda18ddb..d5098b7700bf 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/static-file/property-editors/static-file-picker/property-editor-ui-static-file-picker.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/static-file/property-editors/static-file-picker/property-editor-ui-static-file-picker.element.ts
@@ -73,6 +73,8 @@ export class UmbPropertyEditorUIStaticFilePickerElement extends UmbLitElement im
 	}
 }
 
+export { UmbPropertyEditorUIStaticFilePickerElement as element };
+
 export default UmbPropertyEditorUIStaticFilePickerElement;
 
 declare global {
diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/user-group/components/input-user-group/user-group-input.element.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user-group/components/input-user-group/user-group-input.element.ts
index f509aee05805..d86884dc9007 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/user/user-group/components/input-user-group/user-group-input.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/user/user-group/components/input-user-group/user-group-input.element.ts
@@ -1,12 +1,24 @@
 import { UMB_USER_GROUP_ENTITY_TYPE } from '../../entity.js';
 import type { UmbUserGroupItemModel } from '../../repository/index.js';
 import { UmbUserGroupPickerInputContext } from './user-group-input.context.js';
-import { css, html, customElement, property, state, ifDefined, nothing } from '@umbraco-cms/backoffice/external/lit';
-import { UUIFormControlMixin } from '@umbraco-cms/backoffice/external/uui';
+import {
+	css,
+	customElement,
+	html,
+	ifDefined,
+	nothing,
+	property,
+	repeat,
+	state,
+} from '@umbraco-cms/backoffice/external/lit';
+import { splitStringToArray } from '@umbraco-cms/backoffice/utils';
 import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element';
-import { UMB_WORKSPACE_MODAL } from '@umbraco-cms/backoffice/workspace';
 import { UmbModalRouteRegistrationController } from '@umbraco-cms/backoffice/router';
-import { splitStringToArray } from '@umbraco-cms/backoffice/utils';
+import { UMB_WORKSPACE_MODAL } from '@umbraco-cms/backoffice/workspace';
+import { UUIFormControlMixin } from '@umbraco-cms/backoffice/external/uui';
+import type { UmbRepositoryItemsStatus } from '@umbraco-cms/backoffice/repository';
+
+import '@umbraco-cms/backoffice/entity-item';
 
 @customElement('umb-user-group-input')
 export class UmbUserGroupInputElement extends UUIFormControlMixin(UmbLitElement, '') {
@@ -75,6 +87,9 @@ export class UmbUserGroupInputElement extends UUIFormControlMixin(UmbLitElement,
 	@state()
 	private _items?: Array<UmbUserGroupItemModel>;
 
+	@state()
+	private _statuses?: Array<UmbRepositoryItemsStatus>;
+
 	#pickerContext = new UmbUserGroupPickerInputContext(this);
 
 	@state()
@@ -97,6 +112,7 @@ export class UmbUserGroupInputElement extends UUIFormControlMixin(UmbLitElement,
 
 		this.observe(this.#pickerContext.selection, (selection) => (this.value = selection.join(',')), '_observeSelection');
 		this.observe(this.#pickerContext.selectedItems, (selectedItems) => (this._items = selectedItems), '_observerItems');
+		this.observe(this.#pickerContext.statuses, (statuses) => (this._statuses = statuses), '_observeStatuses');
 
 		new UmbModalRouteRegistrationController(this, UMB_WORKSPACE_MODAL)
 			.addAdditionalPath(UMB_USER_GROUP_ENTITY_TYPE)
@@ -114,7 +130,15 @@ export class UmbUserGroupInputElement extends UUIFormControlMixin(UmbLitElement,
 
 	override render() {
 		return html`
-			<uui-ref-list>${this._items?.map((item) => this._renderItem(item))}</uui-ref-list>
+			<uui-ref-list>
+				${this._statuses
+					? repeat(
+							this._statuses,
+							(status) => status.unique,
+							(status) => this.#renderItem(status),
+						)
+					: nothing}
+			</uui-ref-list>
 			<uui-button
 				id="btn-add"
 				look="placeholder"
@@ -123,15 +147,33 @@ export class UmbUserGroupInputElement extends UUIFormControlMixin(UmbLitElement,
 		`;
 	}
 
-	private _renderItem(item: UmbUserGroupItemModel) {
-		if (!item.unique) return;
-		const href = `${this._editUserGroupPath}edit/${item.unique}`;
+	#renderItem(status: UmbRepositoryItemsStatus) {
+		const unique = status.unique;
+		const item = this._items?.find((x) => x.unique === unique);
+		const isError = status.state.type === 'error';
+
+		// For error state, use umb-entity-item-ref
+		if (isError) {
+			return html`
+				<umb-entity-item-ref id=${unique} ?error=${true} .errorMessage=${status.state.error} .errorDetail=${unique}>
+					<uui-action-bar slot="actions">
+						<uui-button
+							label=${this.localize.term('general_remove')}
+							@click=${() => this.#pickerContext.requestRemoveItem(unique)}></uui-button>
+					</uui-action-bar>
+				</umb-entity-item-ref>
+			`;
+		}
+
+		// For successful items, use umb-user-group-ref
+		if (!item?.unique) return nothing;
+		const href = `${this._editUserGroupPath}edit/${unique}`;
 		return html`
 			<umb-user-group-ref name="${ifDefined(item.name)}" href=${href}>
 				${item.icon ? html`<umb-icon slot="icon" name=${item.icon}></umb-icon>` : nothing}
 				<uui-action-bar slot="actions">
 					<uui-button
-						@click=${() => this.#pickerContext.requestRemoveItem(item.unique)}
+						@click=${() => this.#pickerContext.requestRemoveItem(unique)}
 						label=${this.localize.term('general_remove')}></uui-button>
 				</uui-action-bar>
 			</umb-user-group-ref>
diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/user/components/user-input/user-input.element.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user/components/user-input/user-input.element.ts
index f5621924100a..a1de877671c4 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/user/user/components/user-input/user-input.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/user/user/components/user-input/user-input.element.ts
@@ -6,6 +6,7 @@ import { UmbChangeEvent } from '@umbraco-cms/backoffice/event';
 import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element';
 import { UmbSorterController } from '@umbraco-cms/backoffice/sorter';
 import { UUIFormControlMixin } from '@umbraco-cms/backoffice/external/uui';
+import type { UmbRepositoryItemsStatus } from '@umbraco-cms/backoffice/repository';
 
 // TODO: Shall we rename to 'umb-input-user'? [LK]
 @customElement('umb-user-input')
@@ -92,6 +93,9 @@ export class UmbUserInputElement extends UUIFormControlMixin(UmbLitElement, '')
 	@state()
 	private _items?: Array<UmbUserItemModel>;
 
+	@state()
+	private _statuses?: Array<UmbRepositoryItemsStatus>;
+
 	#pickerContext = new UmbUserPickerInputContext(this);
 
 	constructor() {
@@ -111,6 +115,7 @@ export class UmbUserInputElement extends UUIFormControlMixin(UmbLitElement, '')
 
 		this.observe(this.#pickerContext.selection, (selection) => (this.value = selection.join(',')), '_observeSelection');
 		this.observe(this.#pickerContext.selectedItems, (selectedItems) => (this._items = selectedItems), '_observerItems');
+		this.observe(this.#pickerContext.statuses, (statuses) => (this._statuses = statuses), '_observeStatuses');
 	}
 
 	protected override getFormElement() {
@@ -121,8 +126,8 @@ export class UmbUserInputElement extends UUIFormControlMixin(UmbLitElement, '')
 		this.#pickerContext.openPicker({});
 	}
 
-	#removeItem(item: UmbUserItemModel) {
-		this.#pickerContext.requestRemoveItem(item.unique);
+	#removeItem(unique: string) {
+		this.#pickerContext.requestRemoveItem(unique);
 	}
 
 	override render() {
@@ -141,24 +146,34 @@ export class UmbUserInputElement extends UUIFormControlMixin(UmbLitElement, '')
 	}
 
 	#renderItems() {
-		if (!this._items) return nothing;
+		if (!this._statuses) return nothing;
 		return html`
 			<uui-ref-list>
 				${repeat(
-					this._items,
-					(item) => item.unique,
-					(item) => this.#renderItem(item),
+					this._statuses,
+					(status) => status.unique,
+					(status) => this.#renderItem(status),
 				)}
 			</uui-ref-list>
 		`;
 	}
 
-	#renderItem(item: UmbUserItemModel) {
-		if (!item.unique) return nothing;
+	#renderItem(status: UmbRepositoryItemsStatus) {
+		const unique = status.unique;
+		const item = this._items?.find((x) => x.unique === unique);
+		const isError = status.state.type === 'error';
 		return html`
-			<umb-entity-item-ref .item=${item} id=${item.unique} ?standalone=${this.max === 1}>
+			<umb-entity-item-ref
+				id=${unique}
+				.item=${item}
+				?error=${isError}
+				.errorMessage=${status.state.error}
+				.errorDetail=${isError ? unique : undefined}
+				?standalone=${this.max === 1}>
 				<uui-action-bar slot="actions">
-					<uui-button label=${this.localize.term('general_remove')} @click=${() => this.#removeItem(item)}></uui-button>
+					<uui-button
+						label=${this.localize.term('general_remove')}
+						@click=${() => this.#removeItem(unique)}></uui-button>
 				</uui-action-bar>
 			</umb-entity-item-ref>
 		`;

From 9fa382e84dd8c6f257db24bdea5e60821fbc4daa Mon Sep 17 00:00:00 2001
From: Andrej Davidovic <ada@solutionlab.net>
Date: Mon, 10 Nov 2025 18:17:30 +0200
Subject: [PATCH 130/155] Fix block list inline mode (#20745)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Fix block list inline mode

https://github.com/umbraco/Umbraco-CMS/issues/20618

* Fixed potential runtime errors

* Code cleanup

* Fixed Code Health Review

* Revert some changes

Commented out unused state properties and related code.

* Remove commented-out state property in block workspace view

* fix localization

* no need for question mark after ids, they should be presented as required

---------

Co-authored-by: Niels Lyngsø <niels.lyngso@gmail.com>
Co-authored-by: Niels Lyngsø <nsl@umbraco.dk>
---
 ...ace-view-edit-content-no-router.element.ts | 40 +++++++++----------
 1 file changed, 18 insertions(+), 22 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/packages/block/block/workspace/views/edit/block-workspace-view-edit-content-no-router.element.ts b/src/Umbraco.Web.UI.Client/src/packages/block/block/workspace/views/edit/block-workspace-view-edit-content-no-router.element.ts
index c1fd3ba23194..303f0f0cd159 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/block/block/workspace/views/edit/block-workspace-view-edit-content-no-router.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/block/block/workspace/views/edit/block-workspace-view-edit-content-no-router.element.ts
@@ -14,7 +14,7 @@ import type { UmbWorkspaceViewElement } from '@umbraco-cms/backoffice/workspace'
  */
 @customElement('umb-block-workspace-view-edit-content-no-router')
 export class UmbBlockWorkspaceViewEditContentNoRouterElement extends UmbLitElement implements UmbWorkspaceViewElement {
-	//private _hasRootProperties = false;
+	// private _hasRootProperties = false;
 
 	@state()
 	private _hasRootGroups = false;
@@ -25,9 +25,6 @@ export class UmbBlockWorkspaceViewEditContentNoRouterElement extends UmbLitEleme
 	@state()
 	private _activeTabKey?: string | null | undefined;
 
-	//@state()
-	//private _activeTabName?: string | null | undefined;
-
 	#blockWorkspace?: typeof UMB_BLOCK_WORKSPACE_CONTEXT.TYPE;
 	#tabsStructureHelper = new UmbContentTypeContainerStructureHelper(this);
 
@@ -67,46 +64,45 @@ export class UmbBlockWorkspaceViewEditContentNoRouterElement extends UmbLitEleme
 	#checkDefaultTabName() {
 		if (!this._tabs || !this.#blockWorkspace) return;
 
-		// Find the default tab to grab:
+		// Find the default tab to grab
 		if (this._activeTabKey === undefined) {
 			if (this._hasRootGroups) {
-				//this._activeTabName = null;
 				this._activeTabKey = null;
 			} else if (this._tabs.length > 0) {
-				//this._activeTabName = this._tabs[0].name;
-				this._activeTabKey = this._tabs[0].key;
+				const tab = this._tabs[0];
+				this._activeTabKey = tab.ownerId ?? tab.ids[0];
 			}
 		}
 	}
 
-	#setTabName(tabName: string | undefined | null, tabKey: string | null | undefined) {
-		//this._activeTabName = tabName;
+	#setTabKey(tabKey: string | null | undefined) {
 		this._activeTabKey = tabKey;
 	}
 
 	override render() {
 		if (!this._tabs) return;
+
 		return html`
 			${this._tabs.length > 1 || (this._tabs.length === 1 && this._hasRootGroups)
-				? html` <uui-tab-group slot="header">
+				? html`<uui-tab-group slot="header">
 						${this._hasRootGroups && this._tabs.length > 0
-							? html`
-									<uui-tab
-										label="Content"
-										.active=${null === this._activeTabKey}
-										@click=${() => this.#setTabName(null, null)}
-										>Content</uui-tab
-									>
-								`
+							? html`<uui-tab
+									label=${this.localize.term('general_generic')}
+									.active=${this._activeTabKey === null}
+									@click=${() => this.#setTabKey(null)}
+									>Content</uui-tab
+								>`
 							: nothing}
 						${repeat(
 							this._tabs,
 							(tab) => tab.name,
 							(tab) => {
+								const tabKey = tab.ownerId ?? tab.ids[0];
+
 								return html`<uui-tab
-									label=${tab.name ?? 'Unnamed'}
-									.active=${tab.key === this._activeTabKey}
-									@click=${() => this.#setTabName(tab.name, tab.key)}
+									label=${this.localize.string(tab.name ?? '#general_unnamed')}
+									.active=${this._activeTabKey === tabKey}
+									@click=${() => this.#setTabKey(tabKey)}
 									>${tab.name}</uui-tab
 								>`;
 							},

From 12b483ff051978616df2fb93b8c0adc5573a15bb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= <niels.lyngso@gmail.com>
Date: Mon, 10 Nov 2025 17:42:16 +0100
Subject: [PATCH 131/155] Fix block list inline mode (#20745)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Fix block list inline mode

https://github.com/umbraco/Umbraco-CMS/issues/20618

* Fixed potential runtime errors

* Code cleanup

* Fixed Code Health Review

* Revert some changes

Commented out unused state properties and related code.

* Remove commented-out state property in block workspace view

* fix localization

* no need for question mark after ids, they should be presented as required

---------

Co-authored-by: Niels Lyngsø <niels.lyngso@gmail.com>
Co-authored-by: Niels Lyngsø <nsl@umbraco.dk>
---
 ...ace-view-edit-content-no-router.element.ts | 40 +++++++++----------
 1 file changed, 18 insertions(+), 22 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/packages/block/block/workspace/views/edit/block-workspace-view-edit-content-no-router.element.ts b/src/Umbraco.Web.UI.Client/src/packages/block/block/workspace/views/edit/block-workspace-view-edit-content-no-router.element.ts
index c1fd3ba23194..303f0f0cd159 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/block/block/workspace/views/edit/block-workspace-view-edit-content-no-router.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/block/block/workspace/views/edit/block-workspace-view-edit-content-no-router.element.ts
@@ -14,7 +14,7 @@ import type { UmbWorkspaceViewElement } from '@umbraco-cms/backoffice/workspace'
  */
 @customElement('umb-block-workspace-view-edit-content-no-router')
 export class UmbBlockWorkspaceViewEditContentNoRouterElement extends UmbLitElement implements UmbWorkspaceViewElement {
-	//private _hasRootProperties = false;
+	// private _hasRootProperties = false;
 
 	@state()
 	private _hasRootGroups = false;
@@ -25,9 +25,6 @@ export class UmbBlockWorkspaceViewEditContentNoRouterElement extends UmbLitEleme
 	@state()
 	private _activeTabKey?: string | null | undefined;
 
-	//@state()
-	//private _activeTabName?: string | null | undefined;
-
 	#blockWorkspace?: typeof UMB_BLOCK_WORKSPACE_CONTEXT.TYPE;
 	#tabsStructureHelper = new UmbContentTypeContainerStructureHelper(this);
 
@@ -67,46 +64,45 @@ export class UmbBlockWorkspaceViewEditContentNoRouterElement extends UmbLitEleme
 	#checkDefaultTabName() {
 		if (!this._tabs || !this.#blockWorkspace) return;
 
-		// Find the default tab to grab:
+		// Find the default tab to grab
 		if (this._activeTabKey === undefined) {
 			if (this._hasRootGroups) {
-				//this._activeTabName = null;
 				this._activeTabKey = null;
 			} else if (this._tabs.length > 0) {
-				//this._activeTabName = this._tabs[0].name;
-				this._activeTabKey = this._tabs[0].key;
+				const tab = this._tabs[0];
+				this._activeTabKey = tab.ownerId ?? tab.ids[0];
 			}
 		}
 	}
 
-	#setTabName(tabName: string | undefined | null, tabKey: string | null | undefined) {
-		//this._activeTabName = tabName;
+	#setTabKey(tabKey: string | null | undefined) {
 		this._activeTabKey = tabKey;
 	}
 
 	override render() {
 		if (!this._tabs) return;
+
 		return html`
 			${this._tabs.length > 1 || (this._tabs.length === 1 && this._hasRootGroups)
-				? html` <uui-tab-group slot="header">
+				? html`<uui-tab-group slot="header">
 						${this._hasRootGroups && this._tabs.length > 0
-							? html`
-									<uui-tab
-										label="Content"
-										.active=${null === this._activeTabKey}
-										@click=${() => this.#setTabName(null, null)}
-										>Content</uui-tab
-									>
-								`
+							? html`<uui-tab
+									label=${this.localize.term('general_generic')}
+									.active=${this._activeTabKey === null}
+									@click=${() => this.#setTabKey(null)}
+									>Content</uui-tab
+								>`
 							: nothing}
 						${repeat(
 							this._tabs,
 							(tab) => tab.name,
 							(tab) => {
+								const tabKey = tab.ownerId ?? tab.ids[0];
+
 								return html`<uui-tab
-									label=${tab.name ?? 'Unnamed'}
-									.active=${tab.key === this._activeTabKey}
-									@click=${() => this.#setTabName(tab.name, tab.key)}
+									label=${this.localize.string(tab.name ?? '#general_unnamed')}
+									.active=${this._activeTabKey === tabKey}
+									@click=${() => this.#setTabKey(tabKey)}
 									>${tab.name}</uui-tab
 								>`;
 							},

From d8198d2f5cf540a33ca90e1d80fc7d02fd0281bb Mon Sep 17 00:00:00 2001
From: Mathias Helsengren <mhe@umbraco.dk>
Date: Tue, 11 Nov 2025 06:33:31 +0100
Subject: [PATCH 132/155] Accessibility: Adding a label attribute for
 `<uui-button>` in news dashboard (#20780)

Added 'label attribute to the uui-button in the umb-news.card.element + Removing the redundant text for uui-button since label attribute is now present
---
 .../umbraco-news/components/umb-news-card.element.ts     | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/packages/umbraco-news/components/umb-news-card.element.ts b/src/Umbraco.Web.UI.Client/src/packages/umbraco-news/components/umb-news-card.element.ts
index 133f5e53c546..9e0055f406bb 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/umbraco-news/components/umb-news-card.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/umbraco-news/components/umb-news-card.element.ts
@@ -36,9 +36,12 @@ export class UmbNewsCardElement extends UmbLitElement {
 				${this.item.body ? html`<div class="card-text">${unsafeHTML(this.item.body)}</div>` : nothing}
 				${!isLastRow && this.item.url
 					? html`<div class="card-actions">
-							<uui-button look="outline" href=${this.item.url} target="_blank" rel="noopener">
-								${this.item.buttonText || 'Open'}
-							</uui-button>
+							<uui-button
+								look="outline"
+								href=${this.item.url}
+								target="_blank"
+								rel="noopener"
+								label=${this.item.buttonText || 'Open'}></uui-button>
 						</div>`
 					: nothing}
 			</div>

From cfa32b265a52510479ee6d97dbf3e8957c733c01 Mon Sep 17 00:00:00 2001
From: Andy Butland <abutland73@gmail.com>
Date: Tue, 11 Nov 2025 06:59:25 +0100
Subject: [PATCH 133/155] Integration Tests: Avoid asserting on errors for
 permission tests (#20643)

* Added integration tests for PropertyTypeUsageService and adjusted assert in management API permissions test.

* Commented or fixed management API integration tests verifying permissions where we were asserting on an error response.
---
 .../IPropertyTypeUsageRepository.cs           | 10 +++++
 .../Services/IPropertyTypeUsageService.cs     |  3 ++
 .../Services/PropertyTypeUsageService.cs      | 10 ++++-
 .../Implement/PropertyTypeUsageRepository.cs  | 38 ++++++++-----------
 ...ExecuteActionHealthCheckControllerTests.cs |  4 +-
 .../LogViewer/AllLogViewerControllerTests.cs  |  2 +-
 ...MessageTemplateLogViewerControllerTests.cs |  2 +-
 .../LogLevelCountLogViewerControllerTests.cs  |  2 +-
 ...dateLogFileSizeLogViewerControllerTests.cs |  2 +-
 .../IsUsedPropertyTypeControllerTests.cs      |  2 +-
 .../User/InviteUserControllerTests.cs         |  2 +-
 .../UmbracoIntegrationTestWithContent.cs      |  5 ++-
 .../Services/PropertyTypeUsageServiceTests.cs | 26 +++++++++++++
 13 files changed, 73 insertions(+), 35 deletions(-)
 create mode 100644 tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/PropertyTypeUsageServiceTests.cs

diff --git a/src/Umbraco.Core/Persistence/Repositories/IPropertyTypeUsageRepository.cs b/src/Umbraco.Core/Persistence/Repositories/IPropertyTypeUsageRepository.cs
index 7aa05fc1ffc0..d0e3eb356c09 100644
--- a/src/Umbraco.Core/Persistence/Repositories/IPropertyTypeUsageRepository.cs
+++ b/src/Umbraco.Core/Persistence/Repositories/IPropertyTypeUsageRepository.cs
@@ -1,7 +1,17 @@
 namespace Umbraco.Cms.Core.Persistence.Repositories;
 
+/// <summary>
+/// Defines repository methods for querying property type usage.
+/// </summary>
 public interface IPropertyTypeUsageRepository
 {
+    /// <summary>
+    /// Determines whether there are any saved property values for the specified content type and property alias.
+    /// </summary>
     Task<bool> HasSavedPropertyValuesAsync(Guid contentTypeKey, string propertyAlias);
+
+    /// <summary>
+    /// Determines whether a content type with the specified unique identifier exists.
+    /// </summary>
     Task<bool> ContentTypeExistAsync(Guid contentTypeKey);
 }
diff --git a/src/Umbraco.Core/Services/IPropertyTypeUsageService.cs b/src/Umbraco.Core/Services/IPropertyTypeUsageService.cs
index df061ca628c4..5497e575c50a 100644
--- a/src/Umbraco.Core/Services/IPropertyTypeUsageService.cs
+++ b/src/Umbraco.Core/Services/IPropertyTypeUsageService.cs
@@ -2,6 +2,9 @@
 
 namespace Umbraco.Cms.Core.Services;
 
+/// <summary>
+/// Defines service methods for querying property type usage.
+/// </summary>
 public interface IPropertyTypeUsageService
 {
     /// <summary>
diff --git a/src/Umbraco.Core/Services/PropertyTypeUsageService.cs b/src/Umbraco.Core/Services/PropertyTypeUsageService.cs
index d22bdeb44048..579a338ecdaa 100644
--- a/src/Umbraco.Core/Services/PropertyTypeUsageService.cs
+++ b/src/Umbraco.Core/Services/PropertyTypeUsageService.cs
@@ -4,19 +4,25 @@
 
 namespace Umbraco.Cms.Core.Services;
 
+/// <inheritdoc/>
 public class PropertyTypeUsageService : IPropertyTypeUsageService
 {
     private readonly IPropertyTypeUsageRepository _propertyTypeUsageRepository;
-    private readonly IContentTypeService _contentTypeService;
     private readonly ICoreScopeProvider _scopeProvider;
 
+    // TODO (V18): Remove IContentTypeService parameter from constructor.
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="PropertyTypeUsageService"/> class.
+    /// </summary>
     public PropertyTypeUsageService(
         IPropertyTypeUsageRepository propertyTypeUsageRepository,
+#pragma warning disable IDE0060 // Remove unused parameter
         IContentTypeService contentTypeService,
+#pragma warning restore IDE0060 // Remove unused parameter
         ICoreScopeProvider scopeProvider)
     {
         _propertyTypeUsageRepository = propertyTypeUsageRepository;
-        _contentTypeService = contentTypeService;
         _scopeProvider = scopeProvider;
     }
 
diff --git a/src/Umbraco.Infrastructure/Persistence/Repositories/Implement/PropertyTypeUsageRepository.cs b/src/Umbraco.Infrastructure/Persistence/Repositories/Implement/PropertyTypeUsageRepository.cs
index ab9a03bcefa1..64917f9af149 100644
--- a/src/Umbraco.Infrastructure/Persistence/Repositories/Implement/PropertyTypeUsageRepository.cs
+++ b/src/Umbraco.Infrastructure/Persistence/Repositories/Implement/PropertyTypeUsageRepository.cs
@@ -1,4 +1,3 @@
-
 using NPoco;
 using Umbraco.Cms.Core;
 using Umbraco.Cms.Core.Persistence.Repositories;
@@ -8,28 +7,26 @@
 
 namespace Umbraco.Cms.Infrastructure.Persistence.Repositories.Implement;
 
+/// <inheritdoc/>
 internal sealed class PropertyTypeUsageRepository : IPropertyTypeUsageRepository
 {
-    private static readonly Guid?[] NodeObjectTypes = new Guid?[]
-    {
+    private static readonly List<Guid> _nodeObjectTypes =
+    [
         Constants.ObjectTypes.DocumentType, Constants.ObjectTypes.MediaType, Constants.ObjectTypes.MemberType,
-    };
+    ];
 
     private readonly IScopeAccessor _scopeAccessor;
 
-    public PropertyTypeUsageRepository(IScopeAccessor scopeAccessor)
-    {
-        _scopeAccessor = scopeAccessor;
-    }
+    /// <summary>
+    /// Initializes a new instance of the <see cref="PropertyTypeUsageRepository"/> class.
+    /// </summary>
+    public PropertyTypeUsageRepository(IScopeAccessor scopeAccessor) => _scopeAccessor = scopeAccessor;
 
+    /// <inheritdoc/>
     public Task<bool> HasSavedPropertyValuesAsync(Guid contentTypeKey, string propertyAlias)
     {
-        IUmbracoDatabase? database = _scopeAccessor.AmbientScope?.Database;
-
-        if (database is null)
-        {
-            throw new InvalidOperationException("A scope is required to query the database");
-        }
+        IUmbracoDatabase? database = _scopeAccessor.AmbientScope?.Database
+            ?? throw new InvalidOperationException("A scope is required to query the database");
 
         Sql<ISqlContext> selectQuery = database.SqlContext.Sql()
             .SelectAll()
@@ -47,26 +44,21 @@ public Task<bool> HasSavedPropertyValuesAsync(Guid contentTypeKey, string proper
         return Task.FromResult(database.ExecuteScalar<bool>(hasValuesQuery));
     }
 
+    /// <inheritdoc/>
     public Task<bool> ContentTypeExistAsync(Guid contentTypeKey)
     {
-        IUmbracoDatabase? database = _scopeAccessor.AmbientScope?.Database;
-
-        if (database is null)
-        {
-            throw new InvalidOperationException("A scope is required to query the database");
-        }
+        IUmbracoDatabase? database = _scopeAccessor.AmbientScope?.Database
+            ?? throw new InvalidOperationException("A scope is required to query the database");
 
         Sql<ISqlContext> selectQuery = database.SqlContext.Sql()
             .SelectAll()
             .From<NodeDto>("n")
             .Where<NodeDto>(n => n.UniqueId == contentTypeKey, "n")
-            .Where<NodeDto>(n => NodeObjectTypes.Contains(n.NodeObjectType), "n");
+            .WhereIn<NodeDto>(n => n.NodeObjectType, _nodeObjectTypes, "n");
 
         Sql<ISqlContext> hasValuesQuery = database.SqlContext.Sql()
             .SelectAnyIfExists(selectQuery);
 
         return Task.FromResult(database.ExecuteScalar<bool>(hasValuesQuery));
     }
-
-
 }
diff --git a/tests/Umbraco.Tests.Integration/ManagementApi/HealthCheck/ExecuteActionHealthCheckControllerTests.cs b/tests/Umbraco.Tests.Integration/ManagementApi/HealthCheck/ExecuteActionHealthCheckControllerTests.cs
index 249710ab1ecb..e4dd67d64dc0 100644
--- a/tests/Umbraco.Tests.Integration/ManagementApi/HealthCheck/ExecuteActionHealthCheckControllerTests.cs
+++ b/tests/Umbraco.Tests.Integration/ManagementApi/HealthCheck/ExecuteActionHealthCheckControllerTests.cs
@@ -27,7 +27,7 @@ public async Task Setup()
 
     protected override UserGroupAssertionModel AdminUserGroupAssertionModel => new()
     {
-        ExpectedStatusCode = HttpStatusCode.InternalServerError
+        ExpectedStatusCode = HttpStatusCode.OK
     };
 
     protected override UserGroupAssertionModel EditorUserGroupAssertionModel => new()
@@ -58,7 +58,7 @@ public async Task Setup()
     protected override async Task<HttpResponseMessage> ClientRequest()
     {
         HealthCheckActionRequestModel healthCheckActionRequest =
-            new() { HealthCheck = new ReferenceByIdModel(_dataIntegrityHealthCheckId), ValueRequired = false };
+            new() { HealthCheck = new ReferenceByIdModel(_dataIntegrityHealthCheckId), ValueRequired = false, Alias = "fixContentPaths" };
         return await Client.PostAsync(Url, JsonContent.Create(healthCheckActionRequest));
     }
 }
diff --git a/tests/Umbraco.Tests.Integration/ManagementApi/LogViewer/AllLogViewerControllerTests.cs b/tests/Umbraco.Tests.Integration/ManagementApi/LogViewer/AllLogViewerControllerTests.cs
index a5e4a2b4ebce..9e8c1844aea2 100644
--- a/tests/Umbraco.Tests.Integration/ManagementApi/LogViewer/AllLogViewerControllerTests.cs
+++ b/tests/Umbraco.Tests.Integration/ManagementApi/LogViewer/AllLogViewerControllerTests.cs
@@ -12,7 +12,7 @@ public class AllLogViewerControllerTests : ManagementApiUserGroupTestBase<AllLog
     // We get the InternalServerError for the admin because it has access, but there is no log file to view
     protected override UserGroupAssertionModel AdminUserGroupAssertionModel => new()
     {
-        ExpectedStatusCode = HttpStatusCode.InternalServerError
+        ExpectedStatusCode = HttpStatusCode.OK
     };
 
     protected override UserGroupAssertionModel EditorUserGroupAssertionModel => new()
diff --git a/tests/Umbraco.Tests.Integration/ManagementApi/LogViewer/AllMessageTemplateLogViewerControllerTests.cs b/tests/Umbraco.Tests.Integration/ManagementApi/LogViewer/AllMessageTemplateLogViewerControllerTests.cs
index 71c5d12ebfe6..71df00279432 100644
--- a/tests/Umbraco.Tests.Integration/ManagementApi/LogViewer/AllMessageTemplateLogViewerControllerTests.cs
+++ b/tests/Umbraco.Tests.Integration/ManagementApi/LogViewer/AllMessageTemplateLogViewerControllerTests.cs
@@ -11,7 +11,7 @@ public class AllMessageTemplateLogViewerControllerTests : ManagementApiUserGroup
     // We get the InternalServerError for the admin because it has access, but there is no log file to view
     protected override UserGroupAssertionModel AdminUserGroupAssertionModel => new()
     {
-        ExpectedStatusCode = HttpStatusCode.InternalServerError
+        ExpectedStatusCode = HttpStatusCode.OK
     };
 
     protected override UserGroupAssertionModel EditorUserGroupAssertionModel => new()
diff --git a/tests/Umbraco.Tests.Integration/ManagementApi/LogViewer/LogLevelCountLogViewerControllerTests.cs b/tests/Umbraco.Tests.Integration/ManagementApi/LogViewer/LogLevelCountLogViewerControllerTests.cs
index 96efcdb4ee98..4fd81272814e 100644
--- a/tests/Umbraco.Tests.Integration/ManagementApi/LogViewer/LogLevelCountLogViewerControllerTests.cs
+++ b/tests/Umbraco.Tests.Integration/ManagementApi/LogViewer/LogLevelCountLogViewerControllerTests.cs
@@ -11,7 +11,7 @@ public class LogLevelCountLogViewerControllerTests : ManagementApiUserGroupTestB
     // We get the InternalServerError for the admin because it has access, but there is no log file to view
     protected override UserGroupAssertionModel AdminUserGroupAssertionModel => new()
     {
-        ExpectedStatusCode = HttpStatusCode.InternalServerError
+        ExpectedStatusCode = HttpStatusCode.OK
     };
 
     protected override UserGroupAssertionModel EditorUserGroupAssertionModel => new()
diff --git a/tests/Umbraco.Tests.Integration/ManagementApi/LogViewer/ValidateLogFileSizeLogViewerControllerTests.cs b/tests/Umbraco.Tests.Integration/ManagementApi/LogViewer/ValidateLogFileSizeLogViewerControllerTests.cs
index fcd26afd5a77..56622b6db678 100644
--- a/tests/Umbraco.Tests.Integration/ManagementApi/LogViewer/ValidateLogFileSizeLogViewerControllerTests.cs
+++ b/tests/Umbraco.Tests.Integration/ManagementApi/LogViewer/ValidateLogFileSizeLogViewerControllerTests.cs
@@ -11,7 +11,7 @@ public class ValidateLogFileSizeLogViewerControllerTests: ManagementApiUserGroup
     // We get the InternalServerError for the admin because it has access, but there is no log file to view
     protected override UserGroupAssertionModel AdminUserGroupAssertionModel => new()
     {
-        ExpectedStatusCode = HttpStatusCode.InternalServerError
+        ExpectedStatusCode = HttpStatusCode.OK
     };
 
     protected override UserGroupAssertionModel EditorUserGroupAssertionModel => new()
diff --git a/tests/Umbraco.Tests.Integration/ManagementApi/PropertyType/IsUsedPropertyTypeControllerTests.cs b/tests/Umbraco.Tests.Integration/ManagementApi/PropertyType/IsUsedPropertyTypeControllerTests.cs
index f9a70160197b..c689ad242e57 100644
--- a/tests/Umbraco.Tests.Integration/ManagementApi/PropertyType/IsUsedPropertyTypeControllerTests.cs
+++ b/tests/Umbraco.Tests.Integration/ManagementApi/PropertyType/IsUsedPropertyTypeControllerTests.cs
@@ -36,7 +36,7 @@ public async Task Setup()
 
     protected override UserGroupAssertionModel AdminUserGroupAssertionModel => new()
     {
-        ExpectedStatusCode = HttpStatusCode.InternalServerError
+        ExpectedStatusCode = HttpStatusCode.OK
     };
 
     protected override UserGroupAssertionModel EditorUserGroupAssertionModel => new()
diff --git a/tests/Umbraco.Tests.Integration/ManagementApi/User/InviteUserControllerTests.cs b/tests/Umbraco.Tests.Integration/ManagementApi/User/InviteUserControllerTests.cs
index de91676ec3b7..827e958349f9 100644
--- a/tests/Umbraco.Tests.Integration/ManagementApi/User/InviteUserControllerTests.cs
+++ b/tests/Umbraco.Tests.Integration/ManagementApi/User/InviteUserControllerTests.cs
@@ -27,7 +27,7 @@ public async Task SetUp()
 
     protected override UserGroupAssertionModel AdminUserGroupAssertionModel => new()
     {
-        ExpectedStatusCode = HttpStatusCode.InternalServerError,
+        ExpectedStatusCode = HttpStatusCode.InternalServerError, // We expect an error here because email sending is not configured in these tests.
     };
 
     protected override UserGroupAssertionModel EditorUserGroupAssertionModel => new()
diff --git a/tests/Umbraco.Tests.Integration/Testing/UmbracoIntegrationTestWithContent.cs b/tests/Umbraco.Tests.Integration/Testing/UmbracoIntegrationTestWithContent.cs
index 42aba90eb2f3..e8101d94140f 100644
--- a/tests/Umbraco.Tests.Integration/Testing/UmbracoIntegrationTestWithContent.cs
+++ b/tests/Umbraco.Tests.Integration/Testing/UmbracoIntegrationTestWithContent.cs
@@ -1,7 +1,6 @@
 // Copyright (c) Umbraco.
 // See LICENSE for more details.
 
-using System;
 using NUnit.Framework;
 using Umbraco.Cms.Core.Models;
 using Umbraco.Cms.Core.Services;
@@ -11,6 +10,8 @@ namespace Umbraco.Cms.Tests.Integration.Testing;
 
 public abstract class UmbracoIntegrationTestWithContent : UmbracoIntegrationTest
 {
+    protected const string TextpageContentTypeKey = "1D3A8E6E-2EA9-4CC1-B229-1AEE19821522";
+
     protected const string TextpageKey = "B58B3AD4-62C2-4E27-B1BE-837BD7C533E0";
     protected const string SubPageKey = "07EABF4A-5C62-4662-9F2A-15BBB488BCA5";
     protected const string SubPage2Key = "0EED78FC-A6A8-4587-AB18-D3AFE212B1C4";
@@ -48,7 +49,7 @@ public virtual void CreateTestData()
         // Create and Save ContentType "umbTextpage" -> 1051 (template), 1052 (content type)
         ContentType =
             ContentTypeBuilder.CreateSimpleContentType("umbTextpage", "Textpage", defaultTemplateId: template.Id);
-        ContentType.Key = new Guid("1D3A8E6E-2EA9-4CC1-B229-1AEE19821522");
+        ContentType.Key = new Guid(TextpageContentTypeKey);
         ContentTypeService.Save(ContentType);
 
         // Create and Save Content "Homepage" based on "umbTextpage" -> 1053
diff --git a/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/PropertyTypeUsageServiceTests.cs b/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/PropertyTypeUsageServiceTests.cs
new file mode 100644
index 000000000000..1905e2391292
--- /dev/null
+++ b/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/PropertyTypeUsageServiceTests.cs
@@ -0,0 +1,26 @@
+using NUnit.Framework;
+using Umbraco.Cms.Core;
+using Umbraco.Cms.Core.Services;
+using Umbraco.Cms.Core.Services.OperationStatus;
+using Umbraco.Cms.Tests.Common.Testing;
+using Umbraco.Cms.Tests.Integration.Testing;
+
+namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Services;
+
+[TestFixture]
+[UmbracoTest(Database = UmbracoTestOptions.Database.NewSchemaPerTest)]
+internal sealed class PropertyTypeUsageServiceTests : UmbracoIntegrationTestWithContent
+{
+    private IPropertyTypeUsageService PropertyTypeUsageService => GetRequiredService<IPropertyTypeUsageService>();
+
+    [TestCase(TextpageContentTypeKey, "title", true, true, PropertyTypeOperationStatus.Success)]
+    [TestCase("1D3A8E6E-2EA9-4CC1-B229-1AEE19821523", "title", false, false, PropertyTypeOperationStatus.ContentTypeNotFound)]
+    [TestCase(TextpageContentTypeKey, "missingProperty", true, false, PropertyTypeOperationStatus.Success)]
+    public async Task Can_Check_For_Saved_Property_Values(Guid contentTypeKey, string propertyAlias, bool expectedSuccess, bool expectedResult, PropertyTypeOperationStatus expectedOperationStatus)
+    {
+        Attempt<bool, PropertyTypeOperationStatus> resultAttempt = await PropertyTypeUsageService.HasSavedPropertyValuesAsync(contentTypeKey, propertyAlias);
+        Assert.AreEqual(expectedSuccess, resultAttempt.Success);
+        Assert.AreEqual(expectedResult, resultAttempt.Result);
+        Assert.AreEqual(expectedOperationStatus, resultAttempt.Status);
+    }
+}

From 41582de9d1f41f832f27e3b0adccf110238b24e4 Mon Sep 17 00:00:00 2001
From: NguyenThuyLan <116753400+NguyenThuyLan@users.noreply.github.com>
Date: Tue, 11 Nov 2025 14:46:54 +0700
Subject: [PATCH 134/155] Collection view: add tests for create and using
 collection view (#20667)

* write test for custom collection view test

* add clean

* Update tests/Umbraco.Tests.AcceptanceTest/tests/ExtensionRegistry/CollectionView.spec.ts

Co-authored-by: Nhu Dinh <150406148+nhudinh0309@users.noreply.github.com>

---------

Co-authored-by: Lan Nguyen Thuy <lnt@umbraco.dk>
Co-authored-by: Nhu Dinh <150406148+nhudinh0309@users.noreply.github.com>
---
 .../my-collection-view/my-collection-view.js  | 217 ++++++++++++++++++
 .../my-collection-view.js.map                 |   1 +
 .../my-collection-view/umbraco-package.json   |  24 ++
 .../ExtensionRegistry/CollectionView.spec.ts  |  71 ++++++
 4 files changed, 313 insertions(+)
 create mode 100644 tests/Umbraco.Tests.AcceptanceTest/tests/ExtensionRegistry/AdditionalSetup/App_Plugins/my-collection-view/my-collection-view.js
 create mode 100644 tests/Umbraco.Tests.AcceptanceTest/tests/ExtensionRegistry/AdditionalSetup/App_Plugins/my-collection-view/my-collection-view.js.map
 create mode 100644 tests/Umbraco.Tests.AcceptanceTest/tests/ExtensionRegistry/AdditionalSetup/App_Plugins/my-collection-view/umbraco-package.json
 create mode 100644 tests/Umbraco.Tests.AcceptanceTest/tests/ExtensionRegistry/CollectionView.spec.ts

diff --git a/tests/Umbraco.Tests.AcceptanceTest/tests/ExtensionRegistry/AdditionalSetup/App_Plugins/my-collection-view/my-collection-view.js b/tests/Umbraco.Tests.AcceptanceTest/tests/ExtensionRegistry/AdditionalSetup/App_Plugins/my-collection-view/my-collection-view.js
new file mode 100644
index 000000000000..38ef5a40de09
--- /dev/null
+++ b/tests/Umbraco.Tests.AcceptanceTest/tests/ExtensionRegistry/AdditionalSetup/App_Plugins/my-collection-view/my-collection-view.js
@@ -0,0 +1,217 @@
+import { UMB_DOCUMENT_COLLECTION_CONTEXT as T, UMB_EDIT_DOCUMENT_WORKSPACE_PATH_PATTERN as P } from "@umbraco-cms/backoffice/document";
+import { css as D, state as d, customElement as x, html as n } from "@umbraco-cms/backoffice/external/lit";
+import { UmbLitElement as E } from "@umbraco-cms/backoffice/lit-element";
+import { UmbTextStyles as A } from "@umbraco-cms/backoffice/style";
+import { fromCamelCase as O } from "@umbraco-cms/backoffice/utils";
+var S = Object.defineProperty, $ = Object.getOwnPropertyDescriptor, y = (e) => {
+  throw TypeError(e);
+}, c = (e, t, a, s) => {
+  for (var r = s > 1 ? void 0 : s ? $(t, a) : t, p = e.length - 1, m; p >= 0; p--)
+    (m = e[p]) && (r = (s ? m(t, a, r) : m(r)) || r);
+  return s && r && S(t, a, r), r;
+}, f = (e, t, a) => t.has(e) || y("Cannot " + a), u = (e, t, a) => (f(e, t, "read from private field"), t.get(e)), _ = (e, t, a) => t.has(e) ? y("Cannot add the same private member more than once") : t instanceof WeakSet ? t.add(e) : t.set(e, a), I = (e, t, a, s) => (f(e, t, "write to private field"), t.set(e, a), a), h = (e, t, a) => (f(e, t, "access private method"), a), b, o, l, w, g, v, C;
+let i = class extends E {
+  constructor() {
+    super(), _(this, l), this._tableColumns = [], _(this, b, [
+      {
+        name: this.localize.term("general_name"),
+        alias: "name",
+        elementName: "umb-document-table-column-name",
+        allowSorting: !0
+      },
+      {
+        name: this.localize.term("content_publishStatus"),
+        alias: "state",
+        elementName: "umb-document-table-column-state",
+        allowSorting: !1
+      }
+    ]), this._tableItems = [], _(this, o), this.consumeContext(T, (e) => {
+      I(this, o, e), e?.setupView(this), this.observe(
+        e?.workspacePathBuilder,
+        (t) => {
+          this._workspacePathBuilder = t, u(this, o) && h(this, l, v).call(this, u(this, o).getItems());
+        },
+        "observePath"
+      ), h(this, l, w).call(this);
+    });
+  }
+  render() {
+    return n`
+		<table class="doc-table">
+				<thead>
+					<tr>
+						${this._tableColumns.map(
+      (e) => n`<th style="text-align:${e.align ?? "left"}">${e.name}</th>`
+    )}
+					</tr>
+				</thead>
+				<tbody>
+					${this._tableItems.map(
+      (e) => n`
+							<tr>
+								${this._tableColumns.map((t) => {
+        const s = e.data.find((r) => r.columnAlias === t.alias)?.value ?? "";
+        return t.alias === "name" && s?.item ? n`<td><a href=${s.editPath || "#"}>${s.item.name}</a></td>` : t.alias === "state" && s?.item ? n`<td>${s.item.state}</td>` : t.alias === "entityActions" ? n`<td style="text-align:right;">⋮</td>` : n`<td>${s}</td>`;
+      })}
+							</tr>
+						`
+    )}
+				</tbody>
+			</table>`;
+  }
+};
+b = /* @__PURE__ */ new WeakMap();
+o = /* @__PURE__ */ new WeakMap();
+l = /* @__PURE__ */ new WeakSet();
+w = function() {
+  u(this, o) && (this.observe(
+    u(this, o).userDefinedProperties,
+    (e) => {
+      this._userDefinedProperties = e, h(this, l, g).call(this);
+    },
+    "_observeUserDefinedProperties"
+  ), this.observe(
+    u(this, o).items,
+    (e) => {
+      this._items = e, h(this, l, v).call(this, this._items);
+    },
+    "_observeItems"
+  ));
+};
+g = function() {
+  if (this._userDefinedProperties && this._userDefinedProperties.length > 0) {
+    const e = this._userDefinedProperties.map((t) => ({
+      name: this.localize.string(t.header),
+      alias: t.alias,
+      elementName: t.elementName,
+      labelTemplate: t.nameTemplate,
+      allowSorting: !0
+    }));
+    this._tableColumns = [
+      ...u(this, b),
+      ...e,
+      { name: "", alias: "entityActions", align: "right" }
+    ];
+  }
+};
+v = function(e) {
+  this._tableItems = e.map((t) => {
+    if (!t.unique) throw new Error("Item id is missing.");
+    const a = this._tableColumns?.map((s) => {
+      if (s.alias === "entityActions")
+        return {
+          columnAlias: "entityActions",
+          value: n`<umb-document-entity-actions-table-column-view
+								.value=${t}></umb-document-entity-actions-table-column-view>`
+        };
+      const r = t.unique && this._workspacePathBuilder ? this._workspacePathBuilder({ entityType: t.entityType }) + P.generateLocal({
+        unique: t.unique
+      }) : "";
+      return {
+        columnAlias: s.alias,
+        value: s.elementName ? { item: t, editPath: r } : h(this, l, C).call(this, t, s.alias)
+      };
+    }) ?? [];
+    return {
+      id: t.unique,
+      icon: t.documentType.icon,
+      entityType: "document",
+      data: a
+    };
+  });
+};
+C = function(e, t) {
+  switch (t) {
+    case "contentTypeAlias":
+      return e.contentTypeAlias;
+    case "createDate":
+      return e.createDate.toLocaleString();
+    case "creator":
+    case "owner":
+      return e.creator;
+    case "name":
+      return e.name;
+    case "state":
+      return O(e.state);
+    case "published":
+      return e.state !== "Draft" ? "True" : "False";
+    case "sortOrder":
+      return e.sortOrder;
+    case "updateDate":
+      return e.updateDate.toLocaleString();
+    case "updater":
+      return e.updater;
+    default:
+      return e.values.find((a) => a.alias === t)?.value ?? "";
+  }
+};
+i.styles = [
+  A,
+  D`
+			:host {
+				display: block;
+				box-sizing: border-box;
+				height: auto;
+				width: 100%;
+				padding: var(--uui-size-space-3) 0;
+			}
+
+			.container {
+				display: flex;
+				justify-content: center;
+				align-items: center;
+			}
+
+			:host {
+			display: block;
+			width: 100%;
+			overflow-x: auto;
+			}
+			table {
+				width: 100%;
+				border-collapse: collapse;
+				font-size: 14px;
+			}
+			th,
+			td {
+				padding: 6px 10px;
+				border: 1px solid #ddd;
+				white-space: nowrap;
+			}
+			th {
+				background: #f8f8f8;
+				font-weight: 600;
+			}
+			a {
+				color: var(--uui-color-interactive, #0366d6);
+				text-decoration: none;
+			}
+			a:hover {
+				text-decoration: underline;
+			}
+			`
+];
+c([
+  d()
+], i.prototype, "_workspacePathBuilder", 2);
+c([
+  d()
+], i.prototype, "_userDefinedProperties", 2);
+c([
+  d()
+], i.prototype, "_items", 2);
+c([
+  d()
+], i.prototype, "_tableColumns", 2);
+c([
+  d()
+], i.prototype, "_tableItems", 2);
+i = c([
+  x("my-document-table-collection-view")
+], i);
+const z = i;
+export {
+  i as MyDocumentTableCollectionViewElement,
+  z as default
+};
+//# sourceMappingURL=my-collection-view.js.map
diff --git a/tests/Umbraco.Tests.AcceptanceTest/tests/ExtensionRegistry/AdditionalSetup/App_Plugins/my-collection-view/my-collection-view.js.map b/tests/Umbraco.Tests.AcceptanceTest/tests/ExtensionRegistry/AdditionalSetup/App_Plugins/my-collection-view/my-collection-view.js.map
new file mode 100644
index 000000000000..b613f3d7c86c
--- /dev/null
+++ b/tests/Umbraco.Tests.AcceptanceTest/tests/ExtensionRegistry/AdditionalSetup/App_Plugins/my-collection-view/my-collection-view.js.map
@@ -0,0 +1 @@
+{"version":3,"file":"my-collection-view.js","sources":["../../my-collection-view/src/my-collection-view.ts"],"sourcesContent":["import { UMB_EDIT_DOCUMENT_WORKSPACE_PATH_PATTERN } from '@umbraco-cms/backoffice/document';\r\nimport type { UmbDocumentCollectionItemModel } from '@umbraco-cms/backoffice/document';\r\nimport { UMB_DOCUMENT_COLLECTION_CONTEXT } from '@umbraco-cms/backoffice/document';\r\nimport type { UmbCollectionColumnConfiguration } from '@umbraco-cms/backoffice/collection';\r\nimport { css, customElement, html, state } from '@umbraco-cms/backoffice/external/lit';\r\nimport { UmbLitElement } from '@umbraco-cms/backoffice/lit-element';\r\nimport { UmbTextStyles } from '@umbraco-cms/backoffice/style';\r\nimport type { UmbModalRouteBuilder } from '@umbraco-cms/backoffice/router';\r\nimport { fromCamelCase } from '@umbraco-cms/backoffice/utils';\r\nimport type {\r\n\tUmbTableColumn,\r\n\tUmbTableItem,\r\n} from '@umbraco-cms/backoffice/components';\r\n\r\n@customElement('my-document-table-collection-view')\r\nexport class MyDocumentTableCollectionViewElement extends UmbLitElement {\r\n\t@state()\r\n\tprivate _workspacePathBuilder?: UmbModalRouteBuilder;\r\n\r\n\t@state()\r\n\tprivate _userDefinedProperties?: Array<UmbCollectionColumnConfiguration>;\r\n\r\n\t@state()\r\n\tprivate _items?: Array<UmbDocumentCollectionItemModel>;\r\n\r\n\t@state()\r\n\tprivate _tableColumns: Array<UmbTableColumn> = [];\r\n\r\n\t#systemColumns: Array<UmbTableColumn> = [\r\n\t\t{\r\n\t\t\tname: this.localize.term('general_name'),\r\n\t\t\talias: 'name',\r\n\t\t\telementName: 'umb-document-table-column-name',\r\n\t\t\tallowSorting: true,\r\n\t\t},\r\n\t\t{\r\n\t\t\tname: this.localize.term('content_publishStatus'),\r\n\t\t\talias: 'state',\r\n\t\t\telementName: 'umb-document-table-column-state',\r\n\t\t\tallowSorting: false,\r\n\t\t},\r\n\t];\r\n\r\n\t@state()\r\n\tprivate _tableItems: Array<UmbTableItem> = [];\r\n\r\n\t#collectionContext?: typeof UMB_DOCUMENT_COLLECTION_CONTEXT.TYPE;\r\n\r\n\tconstructor() {\r\n\t\tsuper();\r\n\r\n\t\tthis.consumeContext(UMB_DOCUMENT_COLLECTION_CONTEXT, (collectionContext) => {\r\n\t\t\tthis.#collectionContext = collectionContext;\r\n\t\t\tcollectionContext?.setupView(this);\r\n\t\t\tthis.observe(\r\n\t\t\t\tcollectionContext?.workspacePathBuilder,\r\n\t\t\t\t(builder) => {\r\n\t\t\t\t\tthis._workspacePathBuilder = builder;\r\n\t\t\t\t\tif (this.#collectionContext) {\r\n\t\t\t\t\t\tthis.#createTableItems(this.#collectionContext.getItems());\r\n\t\t\t\t\t}\r\n\t\t\t\t},\r\n\t\t\t\t'observePath',\r\n\t\t\t);\r\n\t\t\tthis.#observeCollectionContext();\r\n\t\t});\r\n\t}\r\n\r\n\t#observeCollectionContext() {\r\n\t\tif (!this.#collectionContext) return;\r\n\r\n\t\tthis.observe(\r\n\t\t\tthis.#collectionContext.userDefinedProperties,\r\n\t\t\t(userDefinedProperties) => {\r\n\t\t\t\tthis._userDefinedProperties = userDefinedProperties;\r\n\t\t\t\tthis.#createTableHeadings();\r\n\t\t\t},\r\n\t\t\t'_observeUserDefinedProperties',\r\n\t\t);\r\n\r\n\t\tthis.observe(\r\n\t\t\tthis.#collectionContext.items,\r\n\t\t\t(items) => {\r\n\t\t\t\tthis._items = items;\r\n\t\t\t\tthis.#createTableItems(this._items);\r\n\t\t\t},\r\n\t\t\t'_observeItems',\r\n\t\t);\r\n\t}\r\n\r\n\t#createTableHeadings() {\r\n\t\tif (this._userDefinedProperties && this._userDefinedProperties.length > 0) {\r\n\t\t\tconst userColumns: Array<UmbTableColumn> = this._userDefinedProperties.map((item) => {\r\n\t\t\t\treturn {\r\n\t\t\t\t\tname: this.localize.string(item.header),\r\n\t\t\t\t\talias: item.alias,\r\n\t\t\t\t\telementName: item.elementName,\r\n\t\t\t\t\tlabelTemplate: item.nameTemplate,\r\n\t\t\t\t\tallowSorting: true,\r\n\t\t\t\t};\r\n\t\t\t});\r\n\r\n\t\t\tthis._tableColumns = [\r\n\t\t\t\t...this.#systemColumns,\r\n\t\t\t\t...userColumns,\r\n\t\t\t\t{ name: '', alias: 'entityActions', align: 'right' },\r\n\t\t\t];\r\n\t\t}\r\n\t}\r\n\r\n\t#createTableItems(items: Array<UmbDocumentCollectionItemModel>) {\r\n\t\tthis._tableItems = items.map((item) => {\r\n\t\t\tif (!item.unique) throw new Error('Item id is missing.');\r\n\r\n\t\t\tconst data =\r\n\t\t\t\tthis._tableColumns?.map((column) => {\r\n\t\t\t\t\tif (column.alias === 'entityActions') {\r\n\t\t\t\t\t\treturn {\r\n\t\t\t\t\t\t\tcolumnAlias: 'entityActions',\r\n\t\t\t\t\t\t\tvalue: html`<umb-document-entity-actions-table-column-view\r\n\t\t\t\t\t\t\t\t.value=${item}></umb-document-entity-actions-table-column-view>`,\r\n\t\t\t\t\t\t};\r\n\t\t\t\t\t}\r\n\r\n\t\t\t\t\tconst editPath =\r\n\t\t\t\t\t\titem.unique && this._workspacePathBuilder\r\n\t\t\t\t\t\t\t? this._workspacePathBuilder({ entityType: item.entityType }) +\r\n\t\t\t\t\t\t\tUMB_EDIT_DOCUMENT_WORKSPACE_PATH_PATTERN.generateLocal({\r\n\t\t\t\t\t\t\t\tunique: item.unique,\r\n\t\t\t\t\t\t\t})\r\n\t\t\t\t\t\t\t: '';\r\n\r\n\t\t\t\t\treturn {\r\n\t\t\t\t\t\tcolumnAlias: column.alias,\r\n\t\t\t\t\t\tvalue: column.elementName ? { item, editPath } : this.#getPropertyValueByAlias(item, column.alias),\r\n\t\t\t\t\t};\r\n\t\t\t\t}) ?? [];\r\n\r\n\t\t\treturn {\r\n\t\t\t\tid: item.unique,\r\n\t\t\t\ticon: item.documentType.icon,\r\n\t\t\t\tentityType: 'document',\r\n\t\t\t\tdata: data,\r\n\t\t\t};\r\n\t\t});\r\n\t}\r\n\r\n\t#getPropertyValueByAlias(item: UmbDocumentCollectionItemModel, alias: string) {\r\n\tswitch (alias) {\r\n\t\tcase 'contentTypeAlias':\r\n\t\t\treturn item.contentTypeAlias;\r\n\t\tcase 'createDate':\r\n\t\t\treturn item.createDate.toLocaleString();\r\n\t\tcase 'creator':\r\n\t\tcase 'owner':\r\n\t\t\treturn item.creator;\r\n\t\tcase 'name':\r\n\t\t\treturn item.name;\r\n\t\tcase 'state':\r\n\t\t\treturn fromCamelCase(item.state);\r\n\t\tcase 'published':\r\n\t\t\treturn item.state !== 'Draft' ? 'True' : 'False';\r\n\t\tcase 'sortOrder':\r\n\t\t\treturn item.sortOrder;\r\n\t\tcase 'updateDate':\r\n\t\t\treturn item.updateDate.toLocaleString();\r\n\t\tcase 'updater':\r\n\t\t\treturn item.updater;\r\n\t\tdefault:\r\n\t\t\treturn item.values.find((value) => value.alias === alias)?.value ?? '';\r\n\t}\r\n}\r\n\r\n\toverride render() {\r\n\t\treturn html`\r\n\t\t<table class=\"doc-table\">\r\n\t\t\t\t<thead>\r\n\t\t\t\t\t<tr>\r\n\t\t\t\t\t\t${this._tableColumns.map(\r\n\t\t\t\t\t\t\t(col) => html`<th style=\"text-align:${col.align ?? 'left'}\">${col.name}</th>`,\r\n\t\t\t\t\t\t)}\r\n\t\t\t\t\t</tr>\r\n\t\t\t\t</thead>\r\n\t\t\t\t<tbody>\r\n\t\t\t\t\t${this._tableItems.map(\r\n\t\t\t\t\t\t\t(item) => html`\r\n\t\t\t\t\t\t\t<tr>\r\n\t\t\t\t\t\t\t\t${this._tableColumns.map((col) => {\r\n\t\t\t\t\t\t\t\tconst cell = item.data.find((d) => d.columnAlias === col.alias);\r\n\t\t\t\t\t\t\t\tconst val = cell?.value ?? '';\r\n\t\t\t\t\t\t\t\tif (col.alias === 'name' && val?.item) {\r\n\t\t\t\t\t\t\t\t\treturn html`<td><a href=${val.editPath || '#'}>${val.item.name}</a></td>`;\r\n\t\t\t\t\t\t\t\t}\r\n\t\t\t\t\t\t\t\tif (col.alias === 'state' && val?.item) {\r\n\t\t\t\t\t\t\t\t\treturn html`<td>${val.item.state}</td>`;\r\n\t\t\t\t\t\t\t\t}\r\n\t\t\t\t\t\t\t\tif (col.alias === 'entityActions') {\r\n\t\t\t\t\t\t\t\t\treturn html`<td style=\"text-align:right;\">⋮</td>`;\r\n\t\t\t\t\t\t\t\t}\r\n\t\t\t\t\t\t\t\treturn html`<td>${val}</td>`;\r\n\t\t\t\t\t\t\t})}\r\n\t\t\t\t\t\t\t</tr>\r\n\t\t\t\t\t\t`,\r\n\t\t\t\t\t\t)}\r\n\t\t\t\t</tbody>\r\n\t\t\t</table>`;\r\n\t}\r\n\r\n\tstatic override styles = [\r\n\t\tUmbTextStyles,\r\n\t\tcss`\r\n\t\t\t:host {\r\n\t\t\t\tdisplay: block;\r\n\t\t\t\tbox-sizing: border-box;\r\n\t\t\t\theight: auto;\r\n\t\t\t\twidth: 100%;\r\n\t\t\t\tpadding: var(--uui-size-space-3) 0;\r\n\t\t\t}\r\n\r\n\t\t\t.container {\r\n\t\t\t\tdisplay: flex;\r\n\t\t\t\tjustify-content: center;\r\n\t\t\t\talign-items: center;\r\n\t\t\t}\r\n\r\n\t\t\t:host {\r\n\t\t\tdisplay: block;\r\n\t\t\twidth: 100%;\r\n\t\t\toverflow-x: auto;\r\n\t\t\t}\r\n\t\t\ttable {\r\n\t\t\t\twidth: 100%;\r\n\t\t\t\tborder-collapse: collapse;\r\n\t\t\t\tfont-size: 14px;\r\n\t\t\t}\r\n\t\t\tth,\r\n\t\t\ttd {\r\n\t\t\t\tpadding: 6px 10px;\r\n\t\t\t\tborder: 1px solid #ddd;\r\n\t\t\t\twhite-space: nowrap;\r\n\t\t\t}\r\n\t\t\tth {\r\n\t\t\t\tbackground: #f8f8f8;\r\n\t\t\t\tfont-weight: 600;\r\n\t\t\t}\r\n\t\t\ta {\r\n\t\t\t\tcolor: var(--uui-color-interactive, #0366d6);\r\n\t\t\t\ttext-decoration: none;\r\n\t\t\t}\r\n\t\t\ta:hover {\r\n\t\t\t\ttext-decoration: underline;\r\n\t\t\t}\r\n\t\t\t`,\r\n\t];\r\n}\r\n\r\nexport default MyDocumentTableCollectionViewElement;\r\n\r\ndeclare global {\r\n\tinterface HTMLElementTagNameMap {\r\n\t\t'my-document-table-collection-view': MyDocumentTableCollectionViewElement;\r\n\t}\r\n}\r\n"],"names":["_systemColumns","_collectionContext","_MyDocumentTableCollectionViewElement_instances","observeCollectionContext_fn","createTableHeadings_fn","createTableItems_fn","getPropertyValueByAlias_fn","MyDocumentTableCollectionViewElement","UmbLitElement","__privateAdd","UMB_DOCUMENT_COLLECTION_CONTEXT","collectionContext","__privateSet","builder","__privateGet","__privateMethod","html","col","item","val","d","userDefinedProperties","items","userColumns","data","column","editPath","UMB_EDIT_DOCUMENT_WORKSPACE_PATH_PATTERN","alias","fromCamelCase","value","UmbTextStyles","css","__decorateClass","state","customElement","MyDocumentTableCollectionViewElement$1"],"mappings":";;;;;;;;;;;wXAAAA,GAAAC,GAAAC,GAAAC,GAAAC,GAAAC,GAAAC;AAeO,IAAMC,IAAN,cAAmDC,EAAc;AAAA,EAiCvE,cAAc;AACb,UAAA,GAlCKC,EAAA,MAAAP,CAAA,GAWN,KAAQ,gBAAuC,CAAA,GAE/CO,EAAA,MAAAT,GAAwC;AAAA,MACvC;AAAA,QACC,MAAM,KAAK,SAAS,KAAK,cAAc;AAAA,QACvC,OAAO;AAAA,QACP,aAAa;AAAA,QACb,cAAc;AAAA,MAAA;AAAA,MAEf;AAAA,QACC,MAAM,KAAK,SAAS,KAAK,uBAAuB;AAAA,QAChD,OAAO;AAAA,QACP,aAAa;AAAA,QACb,cAAc;AAAA,MAAA;AAAA,IACf,CACD,GAGA,KAAQ,cAAmC,CAAA,GAE3CS,EAAA,MAAAR,CAAA,GAKC,KAAK,eAAeS,GAAiC,CAACC,MAAsB;AAC3E,MAAAC,EAAA,MAAKX,GAAqBU,CAAA,GAC1BA,GAAmB,UAAU,IAAI,GACjC,KAAK;AAAA,QACJA,GAAmB;AAAA,QACnB,CAACE,MAAY;AACZ,eAAK,wBAAwBA,GACzBC,QAAKb,CAAA,KACRc,EAAA,MAAKb,GAAAG,CAAA,EAAL,KAAA,MAAuBS,EAAA,MAAKb,CAAA,EAAmB,SAAA,CAAS;AAAA,QAE1D;AAAA,QACA;AAAA,MAAA,GAEDc,EAAA,MAAKb,GAAAC,CAAA,EAAL,KAAA,IAAA;AAAA,IACD,CAAC;AAAA,EACF;AAAA,EA2GS,SAAS;AACjB,WAAOa;AAAA;AAAA;AAAA;AAAA,QAID,KAAK,cAAc;AAAA,MACpB,CAACC,MAAQD,0BAA6BC,EAAI,SAAS,MAAM,KAAKA,EAAI,IAAI;AAAA,IAAA,CACtE;AAAA;AAAA;AAAA;AAAA,OAIA,KAAK,YAAY;AAAA,MACjB,CAACC,MAASF;AAAA;AAAA,UAEP,KAAK,cAAc,IAAI,CAACC,MAAQ;AAElC,cAAME,IADOD,EAAK,KAAK,KAAK,CAACE,MAAMA,EAAE,gBAAgBH,EAAI,KAAK,GAC5C,SAAS;AAC3B,eAAIA,EAAI,UAAU,UAAUE,GAAK,OACzBH,gBAAmBG,EAAI,YAAY,GAAG,IAAIA,EAAI,KAAK,IAAI,cAE3DF,EAAI,UAAU,WAAWE,GAAK,OAC1BH,QAAWG,EAAI,KAAK,KAAK,UAE7BF,EAAI,UAAU,kBACVD,0CAEDA,QAAWG,CAAG;AAAA,MACtB,CAAC,CAAC;AAAA;AAAA;AAAA,IAAA,CAGF;AAAA;AAAA;AAAA,EAGN;AAgDD;AAlOCnB,IAAA,oBAAA,QAAA;AAkBAC,IAAA,oBAAA,QAAA;AA/BMC,IAAA,oBAAA,QAAA;AAqDNC,IAAyB,WAAG;AAC3B,EAAKW,QAAKb,CAAA,MAEV,KAAK;AAAA,IACJa,QAAKb,CAAA,EAAmB;AAAA,IACxB,CAACoB,MAA0B;AAC1B,WAAK,yBAAyBA,GAC9BN,EAAA,MAAKb,GAAAE,CAAA,EAAL,KAAA,IAAA;AAAA,IACD;AAAA,IACA;AAAA,EAAA,GAGD,KAAK;AAAA,IACJU,QAAKb,CAAA,EAAmB;AAAA,IACxB,CAACqB,MAAU;AACV,WAAK,SAASA,GACdP,EAAA,MAAKb,GAAAG,CAAA,EAAL,WAAuB,KAAK,MAAA;AAAA,IAC7B;AAAA,IACA;AAAA,EAAA;AAEF;AAEAD,IAAoB,WAAG;AACtB,MAAI,KAAK,0BAA0B,KAAK,uBAAuB,SAAS,GAAG;AAC1E,UAAMmB,IAAqC,KAAK,uBAAuB,IAAI,CAACL,OACpE;AAAA,MACN,MAAM,KAAK,SAAS,OAAOA,EAAK,MAAM;AAAA,MACtC,OAAOA,EAAK;AAAA,MACZ,aAAaA,EAAK;AAAA,MAClB,eAAeA,EAAK;AAAA,MACpB,cAAc;AAAA,IAAA,EAEf;AAED,SAAK,gBAAgB;AAAA,MACpB,GAAGJ,EAAA,MAAKd,CAAA;AAAA,MACR,GAAGuB;AAAA,MACH,EAAE,MAAM,IAAI,OAAO,iBAAiB,OAAO,QAAA;AAAA,IAAQ;AAAA,EAErD;AACD;AAEAlB,IAAiB,SAACiB,GAA8C;AAC/D,OAAK,cAAcA,EAAM,IAAI,CAACJ,MAAS;AACtC,QAAI,CAACA,EAAK,OAAQ,OAAM,IAAI,MAAM,qBAAqB;AAEvD,UAAMM,IACL,KAAK,eAAe,IAAI,CAACC,MAAW;AACnC,UAAIA,EAAO,UAAU;AACpB,eAAO;AAAA,UACN,aAAa;AAAA,UACb,OAAOT;AAAA,iBACGE,CAAI;AAAA,QAAA;AAIhB,YAAMQ,IACLR,EAAK,UAAU,KAAK,wBACjB,KAAK,sBAAsB,EAAE,YAAYA,EAAK,WAAA,CAAY,IAC5DS,EAAyC,cAAc;AAAA,QACtD,QAAQT,EAAK;AAAA,MAAA,CACb,IACC;AAEJ,aAAO;AAAA,QACN,aAAaO,EAAO;AAAA,QACpB,OAAOA,EAAO,cAAc,EAAE,MAAAP,GAAM,UAAAQ,EAAA,IAAaX,EAAA,MAAKb,GAAAI,CAAA,EAAL,KAAA,MAA8BY,GAAMO,EAAO,KAAA;AAAA,MAAA;AAAA,IAE9F,CAAC,KAAK,CAAA;AAEP,WAAO;AAAA,MACN,IAAIP,EAAK;AAAA,MACT,MAAMA,EAAK,aAAa;AAAA,MACxB,YAAY;AAAA,MACZ,MAAAM;AAAA,IAAA;AAAA,EAEF,CAAC;AACF;AAEAlB,IAAwB,SAACY,GAAsCU,GAAe;AAC9E,UAAQA,GAAA;AAAA,IACP,KAAK;AACJ,aAAOV,EAAK;AAAA,IACb,KAAK;AACJ,aAAOA,EAAK,WAAW,eAAA;AAAA,IACxB,KAAK;AAAA,IACL,KAAK;AACJ,aAAOA,EAAK;AAAA,IACb,KAAK;AACJ,aAAOA,EAAK;AAAA,IACb,KAAK;AACJ,aAAOW,EAAcX,EAAK,KAAK;AAAA,IAChC,KAAK;AACJ,aAAOA,EAAK,UAAU,UAAU,SAAS;AAAA,IAC1C,KAAK;AACJ,aAAOA,EAAK;AAAA,IACb,KAAK;AACJ,aAAOA,EAAK,WAAW,eAAA;AAAA,IACxB,KAAK;AACJ,aAAOA,EAAK;AAAA,IACb;AACC,aAAOA,EAAK,OAAO,KAAK,CAACY,MAAUA,EAAM,UAAUF,CAAK,GAAG,SAAS;AAAA,EAAA;AAEvE;AA5JarB,EAiMI,SAAS;AAAA,EACxBwB;AAAA,EACAC;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AA2CD;AA5OQC,EAAA;AAAA,EADPC,EAAA;AAAM,GADK3B,EAEJ,WAAA,yBAAA,CAAA;AAGA0B,EAAA;AAAA,EADPC,EAAA;AAAM,GAJK3B,EAKJ,WAAA,0BAAA,CAAA;AAGA0B,EAAA;AAAA,EADPC,EAAA;AAAM,GAPK3B,EAQJ,WAAA,UAAA,CAAA;AAGA0B,EAAA;AAAA,EADPC,EAAA;AAAM,GAVK3B,EAWJ,WAAA,iBAAA,CAAA;AAkBA0B,EAAA;AAAA,EADPC,EAAA;AAAM,GA5BK3B,EA6BJ,WAAA,eAAA,CAAA;AA7BIA,IAAN0B,EAAA;AAAA,EADNE,EAAc,mCAAmC;AAAA,GACrC5B,CAAA;AAiPb,MAAA6B,IAAe7B;"}
\ No newline at end of file
diff --git a/tests/Umbraco.Tests.AcceptanceTest/tests/ExtensionRegistry/AdditionalSetup/App_Plugins/my-collection-view/umbraco-package.json b/tests/Umbraco.Tests.AcceptanceTest/tests/ExtensionRegistry/AdditionalSetup/App_Plugins/my-collection-view/umbraco-package.json
new file mode 100644
index 000000000000..7cbeb21c79e5
--- /dev/null
+++ b/tests/Umbraco.Tests.AcceptanceTest/tests/ExtensionRegistry/AdditionalSetup/App_Plugins/my-collection-view/umbraco-package.json
@@ -0,0 +1,24 @@
+{
+  "$schema": "../../umbraco-package-schema.json",
+  "name": "My Collection View",
+  "version": "0.1.0",
+  "extensions": [
+    {
+      "type": "collectionView",
+      "alias": "My.CollectionView.Document.Table",
+      "name": "My Collection View Table",
+      "element": "/App_Plugins/my-collection-view/my-collection-view.js",
+      "meta": {
+        "label": "Table",
+        "icon": "icon-list",
+        "pathName": "table"
+      },
+      "conditions": [
+        {
+          "alias": "Umb.Condition.CollectionAlias",
+          "match": "Umb.Collection.Document"
+        }
+      ]
+    }
+  ]
+}
diff --git a/tests/Umbraco.Tests.AcceptanceTest/tests/ExtensionRegistry/CollectionView.spec.ts b/tests/Umbraco.Tests.AcceptanceTest/tests/ExtensionRegistry/CollectionView.spec.ts
new file mode 100644
index 000000000000..8ebda107cfef
--- /dev/null
+++ b/tests/Umbraco.Tests.AcceptanceTest/tests/ExtensionRegistry/CollectionView.spec.ts
@@ -0,0 +1,71 @@
+import {ConstantHelper, test} from '@umbraco/playwright-testhelpers';
+import {expect} from "@playwright/test";
+
+// Content
+const parentContentName = 'parentContentName';
+// DocumentType
+const documentTypeParentName = 'ParentDocumentType';
+const documentTypeChildName = 'ChildDocumentType';
+// DataType
+const customDataTypeName = 'Custom List View';
+const layoutName = 'My Collection View Table';
+const layoutCollectionView = 'My.CollectionView.Document.Table';
+
+test.afterEach(async ({umbracoApi}) => {
+  await umbracoApi.document.ensureNameNotExists(parentContentName);
+  await umbracoApi.documentType.ensureNameNotExists(documentTypeParentName);
+  await umbracoApi.documentType.ensureNameNotExists(documentTypeChildName);
+  await umbracoApi.dataType.ensureNameNotExists(customDataTypeName);
+});
+
+test('can see the custom collection view when choosing layout for new collection data type', async ({umbracoApi, umbracoUi}) => {
+  // Arrange
+  await umbracoUi.goToBackOffice();
+  await umbracoUi.dataType.goToSettingsTreeItem('Data Types');
+  await umbracoApi.dataType.createListViewContentDataType(customDataTypeName);
+  await umbracoUi.dataType.goToDataType(customDataTypeName);
+  
+  // Act
+  await umbracoUi.dataType.addLayouts(layoutName);
+  await umbracoUi.dataType.clickSaveButton();
+  
+  // Assert
+  await umbracoUi.dataType.isSuccessStateVisibleForSaveButton();
+  expect(await umbracoApi.dataType.doesListViewHaveLayout(customDataTypeName, layoutName, 'icon-list', layoutCollectionView)).toBeTruthy();
+});
+
+test('can see the pagination works when using custom collection view in content section', async ({umbracoApi, umbracoUi}) => {
+  // Arrange
+  const pageSize = 5;
+  const totalItems = 7;
+  await umbracoUi.goToBackOffice();
+  await umbracoUi.dataType.goToSettingsTreeItem('Data Types');
+  const dataTypeId = await umbracoApi.dataType.createListViewContentDataTypeWithLayoutAndPageSize(customDataTypeName,layoutCollectionView, layoutName, pageSize);
+  const documentTypeChildId = await umbracoApi.documentType.createDefaultDocumentType(documentTypeChildName);
+  const documentTypeParentId = await umbracoApi.documentType.createDocumentTypeWithAllowedChildNodeAndCollectionId(documentTypeParentName, documentTypeChildId, dataTypeId);
+  const documentParentId = await umbracoApi.document.createDefaultDocument(parentContentName, documentTypeParentId);
+  for (let i = 1; i <= totalItems; i++) {
+    await umbracoApi.document.createDefaultDocumentWithParent('Test child ' + i, documentTypeChildId, documentParentId);
+  }
+  await umbracoUi.goToBackOffice();
+  await umbracoUi.content.goToSection(ConstantHelper.sections.content);
+
+  // Act
+  await umbracoUi.content.goToContentWithName(parentContentName);
+
+  // Assert
+  // Page 1
+  await umbracoUi.content.doesListViewItemsHaveCount(pageSize);
+  await umbracoUi.content.isListViewItemWithNameVisible('Test child 1', 0);
+  await umbracoUi.content.isListViewItemWithNameVisible('Test child 5', 4);
+  // Page 2
+  await umbracoUi.content.clickPaginationNextButton();
+  await umbracoUi.content.doesListViewItemsHaveCount(2);
+  await umbracoUi.content.isListViewItemWithNameVisible('Test child 6', 0);
+  await umbracoUi.content.isListViewItemWithNameVisible('Test child 7', 1);
+
+  // Clean
+  for (let i = 1; i <= totalItems; i++) {
+    await umbracoApi.document.ensureNameNotExists('Test child ' + i);
+  }
+});
\ No newline at end of file

From 524912a893a294f3f27317aa00fe02798213b612 Mon Sep 17 00:00:00 2001
From: Andy Butland <abutland73@gmail.com>
Date: Tue, 11 Nov 2025 11:37:00 +0100
Subject: [PATCH 135/155] Fix accidental update to global.json.

---
 global.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/global.json b/global.json
index bfcfa560ae56..33b94ff507e3 100644
--- a/global.json
+++ b/global.json
@@ -1,7 +1,7 @@
 {
   "sdk": {
-    "version": "9.0.306",
+    "version": "10.0.100-rc.2.25502.107",
     "rollForward": "latestFeature",
     "allowPrerelease": true
   }
-}
\ No newline at end of file
+}

From 0858d02172ae5dc5c1f633ff487ec1aab77ba310 Mon Sep 17 00:00:00 2001
From: Sven Geusens <sge@umbraco.dk>
Date: Tue, 11 Nov 2025 12:43:03 +0100
Subject: [PATCH 136/155] Single block migration (#20663)

* WiP blocklist migration

* Mostly working migration

* [WIP] deconstructed the migration to prefetch and process all data that requires the old definitions

* Working singleblock migration

* Abstracted some logic and applied it to settings elements too.

* Align class and file name.

* Minor code warning resolution.

* More and better comments + made classes internal where it made sense

---------

Co-authored-by: Andy Butland <abutland73@gmail.com>
---
 .../BlockEditorElementTypeCache.cs            |  10 +-
 .../IBlockEditorElementTypeCache.cs           |   1 +
 .../Migrations/Upgrade/UmbracoPlan.cs         |   4 +
 .../V_18_0_0/MigrateSingleBlockList.cs        | 436 ++++++++++++++++++
 .../ITypedSingleBlockListProcessor.cs         |  23 +
 .../MigrateSingleBlockListComposer.cs         |  18 +
 .../SingleBlockBlockProcessorBase.cs          |  41 ++
 .../SingleBlockListBlockGridProcessor.cs      |  50 ++
 .../SingleBlockListBlockListProcessor.cs      |  52 +++
 .../SingleBlockListConfigurationCache.cs      |  52 +++
 .../SingleBlockListProcessor.cs               |  51 ++
 .../SingleBlockListRteProcessor.cs            |  58 +++
 12 files changed, 792 insertions(+), 4 deletions(-)
 create mode 100644 src/Umbraco.Infrastructure/Migrations/Upgrade/V_18_0_0/MigrateSingleBlockList.cs
 create mode 100644 src/Umbraco.Infrastructure/Migrations/Upgrade/V_18_0_0/SingleBlockList/ITypedSingleBlockListProcessor.cs
 create mode 100644 src/Umbraco.Infrastructure/Migrations/Upgrade/V_18_0_0/SingleBlockList/MigrateSingleBlockListComposer.cs
 create mode 100644 src/Umbraco.Infrastructure/Migrations/Upgrade/V_18_0_0/SingleBlockList/SingleBlockBlockProcessorBase.cs
 create mode 100644 src/Umbraco.Infrastructure/Migrations/Upgrade/V_18_0_0/SingleBlockList/SingleBlockListBlockGridProcessor.cs
 create mode 100644 src/Umbraco.Infrastructure/Migrations/Upgrade/V_18_0_0/SingleBlockList/SingleBlockListBlockListProcessor.cs
 create mode 100644 src/Umbraco.Infrastructure/Migrations/Upgrade/V_18_0_0/SingleBlockList/SingleBlockListConfigurationCache.cs
 create mode 100644 src/Umbraco.Infrastructure/Migrations/Upgrade/V_18_0_0/SingleBlockList/SingleBlockListProcessor.cs
 create mode 100644 src/Umbraco.Infrastructure/Migrations/Upgrade/V_18_0_0/SingleBlockList/SingleBlockListRteProcessor.cs

diff --git a/src/Umbraco.Infrastructure/Cache/PropertyEditors/BlockEditorElementTypeCache.cs b/src/Umbraco.Infrastructure/Cache/PropertyEditors/BlockEditorElementTypeCache.cs
index 14dc4db63214..f47501c94b1d 100644
--- a/src/Umbraco.Infrastructure/Cache/PropertyEditors/BlockEditorElementTypeCache.cs
+++ b/src/Umbraco.Infrastructure/Cache/PropertyEditors/BlockEditorElementTypeCache.cs
@@ -6,9 +6,11 @@ namespace Umbraco.Cms.Core.Cache.PropertyEditors;
 
 internal sealed class BlockEditorElementTypeCache : IBlockEditorElementTypeCache
 {
+    private const string CacheKey = $"{nameof(BlockEditorElementTypeCache)}_ElementTypes";
     private readonly IContentTypeService _contentTypeService;
     private readonly AppCaches _appCaches;
 
+
     public BlockEditorElementTypeCache(IContentTypeService contentTypeService, AppCaches appCaches)
     {
         _contentTypeService = contentTypeService;
@@ -20,15 +22,15 @@ public BlockEditorElementTypeCache(IContentTypeService contentTypeService, AppCa
     public IEnumerable<IContentType> GetAll()
     {
         // TODO: make this less dumb; don't fetch all elements, only fetch the items that aren't yet in the cache and amend the cache as more elements are loaded
-
-        const string cacheKey = $"{nameof(BlockEditorElementTypeCache)}_ElementTypes";
-        IEnumerable<IContentType>? cachedElements = _appCaches.RequestCache.GetCacheItem<IEnumerable<IContentType>>(cacheKey);
+        IEnumerable<IContentType>? cachedElements = _appCaches.RequestCache.GetCacheItem<IEnumerable<IContentType>>(CacheKey);
         if (cachedElements is null)
         {
             cachedElements = _contentTypeService.GetAllElementTypes();
-            _appCaches.RequestCache.Set(cacheKey, cachedElements);
+            _appCaches.RequestCache.Set(CacheKey, cachedElements);
         }
 
         return cachedElements;
     }
+
+    public void ClearAll() => _appCaches.RequestCache.Remove(CacheKey);
 }
diff --git a/src/Umbraco.Infrastructure/Cache/PropertyEditors/IBlockEditorElementTypeCache.cs b/src/Umbraco.Infrastructure/Cache/PropertyEditors/IBlockEditorElementTypeCache.cs
index f99d2ff8757f..48142de97ffd 100644
--- a/src/Umbraco.Infrastructure/Cache/PropertyEditors/IBlockEditorElementTypeCache.cs
+++ b/src/Umbraco.Infrastructure/Cache/PropertyEditors/IBlockEditorElementTypeCache.cs
@@ -6,4 +6,5 @@ public interface IBlockEditorElementTypeCache
 {
     IEnumerable<IContentType> GetMany(IEnumerable<Guid> keys);
     IEnumerable<IContentType> GetAll();
+    void ClearAll() { }
 }
diff --git a/src/Umbraco.Infrastructure/Migrations/Upgrade/UmbracoPlan.cs b/src/Umbraco.Infrastructure/Migrations/Upgrade/UmbracoPlan.cs
index 7a781b889a46..8bdddc0a55a7 100644
--- a/src/Umbraco.Infrastructure/Migrations/Upgrade/UmbracoPlan.cs
+++ b/src/Umbraco.Infrastructure/Migrations/Upgrade/UmbracoPlan.cs
@@ -139,5 +139,9 @@ protected virtual void DefinePlan()
         To<V_17_0_0.AddDistributedJobLock>("{263075BF-F18A-480D-92B4-4947D2EAB772}");
         To<V_17_0_0.AddLastSyncedTable>("26179D88-58CE-4C92-B4A4-3CBA6E7188AC");
         To<V_17_0_0.EnsureDefaultMediaFolderHasDefaultCollection>("{8B2C830A-4FFB-4433-8337-8649B0BF52C8}");
+
+        // To 18.0.0
+        // TODO (V18): Enable on 18 branch
+        //// To<V_18_0_0.MigrateSingleBlockList>("{74332C49-B279-4945-8943-F8F00B1F5949}");
     }
 }
diff --git a/src/Umbraco.Infrastructure/Migrations/Upgrade/V_18_0_0/MigrateSingleBlockList.cs b/src/Umbraco.Infrastructure/Migrations/Upgrade/V_18_0_0/MigrateSingleBlockList.cs
new file mode 100644
index 000000000000..23d683ee01e7
--- /dev/null
+++ b/src/Umbraco.Infrastructure/Migrations/Upgrade/V_18_0_0/MigrateSingleBlockList.cs
@@ -0,0 +1,436 @@
+using System.Collections.Concurrent;
+using Microsoft.Extensions.Logging;
+using NPoco;
+using Umbraco.Cms.Core;
+using Umbraco.Cms.Core.Cache;
+using Umbraco.Cms.Core.Cache.PropertyEditors;
+using Umbraco.Cms.Core.IO;
+using Umbraco.Cms.Core.Models;
+using Umbraco.Cms.Core.Models.Blocks;
+using Umbraco.Cms.Core.Models.Editors;
+using Umbraco.Cms.Core.PropertyEditors;
+using Umbraco.Cms.Core.Scoping;
+using Umbraco.Cms.Core.Serialization;
+using Umbraco.Cms.Core.Services;
+using Umbraco.Cms.Core.Web;
+using Umbraco.Cms.Infrastructure.Migrations.Upgrade.V_18_0_0.SingleBlockList;
+using Umbraco.Cms.Infrastructure.Persistence;
+using Umbraco.Cms.Infrastructure.Persistence.Dtos;
+using Umbraco.Cms.Infrastructure.PropertyEditors;
+using Umbraco.Extensions;
+
+namespace Umbraco.Cms.Infrastructure.Migrations.Upgrade.V_18_0_0;
+
+public class MigrateSingleBlockList : AsyncMigrationBase
+{
+    private readonly IUmbracoContextFactory _umbracoContextFactory;
+    private readonly ILanguageService _languageService;
+    private readonly IContentTypeService _contentTypeService;
+    private readonly IMediaTypeService _mediaTypeService;
+    private readonly IDataTypeService _dataTypeService;
+    private readonly ICoreScopeProvider _coreScopeProvider;
+    private readonly SingleBlockListProcessor _singleBlockListProcessor;
+    private readonly IJsonSerializer _jsonSerializer;
+    private readonly SingleBlockListConfigurationCache _blockListConfigurationCache;
+    private readonly IBlockEditorElementTypeCache _elementTypeCache;
+    private readonly AppCaches _appCaches;
+    private readonly ILogger<MigrateSingleBlockList> _logger;
+    private readonly IDataValueEditor _dummySingleBlockValueEditor;
+
+    public MigrateSingleBlockList(
+        IMigrationContext context,
+        IUmbracoContextFactory umbracoContextFactory,
+        ILanguageService languageService,
+        IContentTypeService contentTypeService,
+        IMediaTypeService mediaTypeService,
+        IDataTypeService dataTypeService,
+        ILogger<MigrateSingleBlockList> logger,
+        ICoreScopeProvider coreScopeProvider,
+        SingleBlockListProcessor  singleBlockListProcessor,
+        IJsonSerializer  jsonSerializer,
+        SingleBlockListConfigurationCache blockListConfigurationCache,
+        IDataValueEditorFactory dataValueEditorFactory,
+        IIOHelper ioHelper,
+        IBlockValuePropertyIndexValueFactory blockValuePropertyIndexValueFactory,
+        IBlockEditorElementTypeCache elementTypeCache,
+        AppCaches appCaches)
+        : base(context)
+    {
+        _umbracoContextFactory = umbracoContextFactory;
+        _languageService = languageService;
+        _contentTypeService = contentTypeService;
+        _mediaTypeService = mediaTypeService;
+        _dataTypeService = dataTypeService;
+        _logger = logger;
+        _coreScopeProvider = coreScopeProvider;
+        _singleBlockListProcessor = singleBlockListProcessor;
+        _jsonSerializer = jsonSerializer;
+        _blockListConfigurationCache = blockListConfigurationCache;
+        _elementTypeCache = elementTypeCache;
+        _appCaches = appCaches;
+
+        _dummySingleBlockValueEditor = new SingleBlockPropertyEditor(dataValueEditorFactory, jsonSerializer, ioHelper, blockValuePropertyIndexValueFactory).GetValueEditor();
+    }
+
+    protected override async Task MigrateAsync()
+    {
+        // gets filled by all registered ITypedSingleBlockListProcessor
+        IEnumerable<string> propertyEditorAliases = _singleBlockListProcessor.GetSupportedPropertyEditorAliases();
+
+        using UmbracoContextReference umbracoContextReference = _umbracoContextFactory.EnsureUmbracoContext();
+        var languagesById = (await _languageService.GetAllAsync())
+            .ToDictionary(language => language.Id);
+
+        IEnumerable<IContentType> allContentTypes = _contentTypeService.GetAll();
+        IEnumerable<IPropertyType> contentPropertyTypes = allContentTypes
+            .SelectMany(ct => ct.PropertyTypes);
+
+        IMediaType[] allMediaTypes = _mediaTypeService.GetAll().ToArray();
+        IEnumerable<IPropertyType> mediaPropertyTypes = allMediaTypes
+            .SelectMany(ct => ct.PropertyTypes);
+
+        // get all relevantPropertyTypes
+        var relevantPropertyEditors =
+            contentPropertyTypes.Concat(mediaPropertyTypes).DistinctBy(pt => pt.Id)
+                .Where(pt => propertyEditorAliases.Contains(pt.PropertyEditorAlias))
+                .GroupBy(pt => pt.PropertyEditorAlias)
+                .ToDictionary(group => group.Key, group => group.ToArray());
+
+        // populate the cache to limit amount of db locks in recursion logic.
+        var blockListsConfiguredAsSingleCount = await _blockListConfigurationCache.Populate();
+
+        if (blockListsConfiguredAsSingleCount == 0)
+        {
+            _logger.LogInformation(
+                "No blocklist were configured as single, nothing to do.");
+            return;
+        }
+
+        _logger.LogInformation(
+            "Found {blockListsConfiguredAsSingleCount} number of blockListConfigurations with UseSingleBlockMode set to true",
+            blockListsConfiguredAsSingleCount);
+
+        // we want to batch actual update calls to the database, so we are grouping them by propertyEditorAlias
+        // and again by propertyType(dataType).
+        var updateItemsByPropertyEditorAlias = new Dictionary<string, Dictionary<IPropertyType, List<UpdateItem>>>();
+
+        // For each propertyEditor, collect and process all propertyTypes and their propertyData
+        foreach (var propertyEditorAlias in propertyEditorAliases)
+        {
+            if (relevantPropertyEditors.TryGetValue(propertyEditorAlias, out IPropertyType[]? propertyTypes) is false)
+            {
+                continue;
+            }
+
+            _logger.LogInformation(
+                "Migration starting for all properties of type: {propertyEditorAlias}",
+                propertyEditorAlias);
+            Dictionary<IPropertyType, List<UpdateItem>> updateItemsByPropertyType = await ProcessPropertyTypesAsync(propertyTypes, languagesById);
+            if (updateItemsByPropertyType.Count < 1)
+            {
+                _logger.LogInformation(
+                    "No properties have been found to migrate for {propertyEditorAlias}",
+                    propertyEditorAlias);
+                return;
+            }
+
+            updateItemsByPropertyEditorAlias[propertyEditorAlias] = updateItemsByPropertyType;
+        }
+
+        // update the configuration of all propertyTypes
+        var singleBlockListDataTypesIds = _blockListConfigurationCache.CachedDataTypes.ToList().Select(type => type.Id).ToList();
+
+        string updateSql = $@"
+UPDATE umbracoDataType
+SET propertyEditorAlias = '{Constants.PropertyEditors.Aliases.SingleBlock}',
+    propertyEditorUiAlias = 'Umb.PropertyEditorUi.SingleBlock'
+WHERE nodeId IN (@0)";
+        await Database.ExecuteAsync(updateSql, singleBlockListDataTypesIds);
+
+        // we need to clear the elementTypeCache so the second part of the migration can work with the update dataTypes
+        // and also the isolated/runtime Caches as that is what its build from in the default implementation
+        _elementTypeCache.ClearAll();
+        _appCaches.IsolatedCaches.ClearAllCaches();
+        _appCaches.RuntimeCache.Clear();
+        RebuildCache = true;
+
+        // now that we have updated the configuration of all propertyTypes, we can save the updated propertyTypes
+        foreach (string propertyEditorAlias in updateItemsByPropertyEditorAlias.Keys)
+        {
+            if (await SavePropertyTypes(updateItemsByPropertyEditorAlias[propertyEditorAlias]))
+            {
+                _logger.LogInformation(
+                    "Migration succeeded for all properties of type: {propertyEditorAlias}",
+                    propertyEditorAlias);
+            }
+            else
+            {
+                _logger.LogError(
+                    "Migration failed for one or more properties of type: {propertyEditorAlias}",
+                    propertyEditorAlias);
+            }
+        }
+    }
+
+    private async Task<Dictionary<IPropertyType, List<UpdateItem>>> ProcessPropertyTypesAsync(IPropertyType[] propertyTypes, IDictionary<int, ILanguage> languagesById)
+    {
+        var updateItemsByPropertyType = new Dictionary<IPropertyType, List<UpdateItem>>();
+        foreach (IPropertyType propertyType in propertyTypes)
+        {
+            // make sure the passed in data is valid and can be processed
+            IDataType dataType = await _dataTypeService.GetAsync(propertyType.DataTypeKey)
+                                 ?? throw new InvalidOperationException("The data type could not be fetched.");
+            IDataValueEditor valueEditor = dataType.Editor?.GetValueEditor()
+                                           ?? throw new InvalidOperationException(
+                                               "The data type value editor could not be obtained.");
+
+            // fetch all the propertyData for the current propertyType
+            Sql<ISqlContext> sql = Sql()
+                .Select<PropertyDataDto>()
+                .From<PropertyDataDto>()
+                .InnerJoin<ContentVersionDto>()
+                .On<PropertyDataDto, ContentVersionDto>((propertyData, contentVersion) =>
+                    propertyData.VersionId == contentVersion.Id)
+                .LeftJoin<DocumentVersionDto>()
+                .On<ContentVersionDto, DocumentVersionDto>((contentVersion, documentVersion) =>
+                    contentVersion.Id == documentVersion.Id)
+                .Where<PropertyDataDto, ContentVersionDto, DocumentVersionDto>((propertyData, contentVersion, documentVersion) =>
+                    (contentVersion.Current == true || documentVersion.Published == true)
+                    && propertyData.PropertyTypeId == propertyType.Id);
+
+            List<PropertyDataDto> propertyDataDtos = await Database.FetchAsync<PropertyDataDto>(sql);
+            if (propertyDataDtos.Count < 1)
+            {
+                continue;
+            }
+
+            var updateItems = new List<UpdateItem>();
+
+            // process all the propertyData
+            // if none of the processors modify the value, the propertyData is skipped from being saved.
+            foreach (PropertyDataDto propertyDataDto in propertyDataDtos)
+            {
+                if (ProcessPropertyDataDto(propertyDataDto, propertyType, languagesById, valueEditor, out UpdateItem? updateItem) is false)
+                {
+                    continue;
+                }
+
+                updateItems.Add(updateItem!);
+            }
+
+            updateItemsByPropertyType[propertyType] = updateItems;
+        }
+
+        return updateItemsByPropertyType;
+    }
+
+    private async Task<bool> SavePropertyTypes(IDictionary<IPropertyType, List<UpdateItem>> propertyTypes)
+    {
+        foreach (IPropertyType propertyType in propertyTypes.Keys)
+        {
+            // The dataType and valueEditor should be constructed as we have done this before, but we hate null values.
+            IDataType dataType = await _dataTypeService.GetAsync(propertyType.DataTypeKey)
+                                 ?? throw new InvalidOperationException("The data type could not be fetched.");
+            IDataValueEditor updatedValueEditor = dataType.Editor?.GetValueEditor()
+                                           ?? throw new InvalidOperationException(
+                                               "The data type value editor could not be obtained.");
+
+            // batch by datatype
+            var propertyDataDtos = propertyTypes[propertyType].Select(item => item.PropertyDataDto).ToList();
+
+            var updateBatch = propertyDataDtos.Select(propertyDataDto =>
+                UpdateBatch.For(propertyDataDto, Database.StartSnapshot(propertyDataDto))).ToList();
+
+            var updatesToSkip = new ConcurrentBag<UpdateBatch<PropertyDataDto>>();
+
+            var progress = 0;
+
+            void HandleUpdateBatch(UpdateBatch<PropertyDataDto> update)
+            {
+                using UmbracoContextReference umbracoContextReference = _umbracoContextFactory.EnsureUmbracoContext();
+
+                progress++;
+                if (progress % 100 == 0)
+                {
+                    _logger.LogInformation("  - finíshed {progress} of {total} properties", progress, updateBatch.Count);
+                }
+
+                PropertyDataDto propertyDataDto = update.Poco;
+
+                if (FinalizeUpdateItem(propertyTypes[propertyType].First(item => Equals(item.PropertyDataDto, update.Poco)), updatedValueEditor) is false)
+                {
+                    updatesToSkip.Add(update);
+                }
+            }
+
+            if (DatabaseType == DatabaseType.SQLite)
+            {
+                // SQLite locks up if we run the migration in parallel, so... let's not.
+                foreach (UpdateBatch<PropertyDataDto> update in updateBatch)
+                {
+                    HandleUpdateBatch(update);
+                }
+            }
+            else
+            {
+                Parallel.ForEachAsync(updateBatch, async (update, token) =>
+                {
+                    //Foreach here, but we need to suppress the flow before each task, but not the actuall await of the task
+                    Task task;
+                    using (ExecutionContext.SuppressFlow())
+                    {
+                        task = Task.Run(
+                            () =>
+                            {
+                                using ICoreScope scope = _coreScopeProvider.CreateCoreScope();
+                                scope.Complete();
+                                HandleUpdateBatch(update);
+                            },
+                            token);
+                    }
+
+                    await task;
+                }).GetAwaiter().GetResult();
+            }
+
+            updateBatch.RemoveAll(updatesToSkip.Contains);
+
+            if (updateBatch.Any() is false)
+            {
+                _logger.LogDebug("  - no properties to convert, continuing");
+                continue;
+            }
+
+            _logger.LogInformation("  - {totalConverted} properties converted, saving...", updateBatch.Count);
+            var result = Database.UpdateBatch(updateBatch, new BatchOptions { BatchSize = 100 });
+            if (result != updateBatch.Count)
+            {
+                throw new InvalidOperationException(
+                    $"The database batch update was supposed to update {updateBatch.Count} property DTO entries, but it updated {result} entries.");
+            }
+
+            _logger.LogDebug(
+                "Migration completed for property type: {propertyTypeName} (id: {propertyTypeId}, alias: {propertyTypeAlias}, editor alias: {propertyTypeEditorAlias}) - {updateCount} property DTO entries updated.",
+                propertyType.Name,
+                propertyType.Id,
+                propertyType.Alias,
+                propertyType.PropertyEditorAlias,
+                result);
+        }
+
+        return true;
+    }
+
+    private bool ProcessPropertyDataDto(
+        PropertyDataDto propertyDataDto,
+        IPropertyType propertyType,
+        IDictionary<int, ILanguage> languagesById,
+        IDataValueEditor valueEditor,
+        out UpdateItem? updateItem)
+    {
+        // NOTE: some old property data DTOs can have variance defined, even if the property type no longer varies
+        var culture = propertyType.VariesByCulture()
+                      && propertyDataDto.LanguageId.HasValue
+                      && languagesById.TryGetValue(propertyDataDto.LanguageId.Value, out ILanguage? language)
+            ? language.IsoCode
+            : null;
+
+        if (culture is null && propertyType.VariesByCulture())
+        {
+            // if we end up here, the property DTO is bound to a language that no longer exists. this is an error scenario,
+            // and we can't really handle it in any other way than logging; in all likelihood this is an old property version,
+            // and it won't cause any runtime issues
+            _logger.LogWarning(
+                "    - property data with id: {propertyDataId} references a language that does not exist - language id: {languageId} (property type: {propertyTypeName}, id: {propertyTypeId}, alias: {propertyTypeAlias})",
+                propertyDataDto.Id,
+                propertyDataDto.LanguageId,
+                propertyType.Name,
+                propertyType.Id,
+                propertyType.Alias);
+            updateItem = null;
+            return false;
+        }
+
+        // create a fake property to be able to get a typed value and run it trough the processors.
+        var segment = propertyType.VariesBySegment() ? propertyDataDto.Segment : null;
+        var property = new Property(propertyType);
+        property.SetValue(propertyDataDto.Value, culture, segment);
+        var toEditorValue = valueEditor.ToEditor(property, culture, segment);
+
+        if (TryTransformValue(toEditorValue, property, out var updatedValue) is false)
+        {
+            _logger.LogDebug(
+                "    - skipping as no processor modified the data for property data with id: {propertyDataId} (property type: {propertyTypeName}, id: {propertyTypeId}, alias: {propertyTypeAlias})",
+                propertyDataDto.Id,
+                propertyType.Name,
+                propertyType.Id,
+                propertyType.Alias);
+            updateItem = null;
+            return false;
+        }
+
+        updateItem = new UpdateItem(propertyDataDto, propertyType, updatedValue);
+        return true;
+    }
+
+    /// <summary>
+    /// Takes the updated value that was instanced from the db value by the old ValueEditors
+    /// And runs it through the updated ValueEditors and sets it on the PropertyDataDto
+    /// </summary>
+    private bool FinalizeUpdateItem(UpdateItem updateItem, IDataValueEditor updatedValueEditor)
+    {
+        var editorValue = _jsonSerializer.Serialize(updateItem.UpdatedValue);
+        var dbValue = updateItem.UpdatedValue is SingleBlockValue
+            ? _dummySingleBlockValueEditor.FromEditor(new ContentPropertyData(editorValue, null), null)
+            : updatedValueEditor.FromEditor(new ContentPropertyData(editorValue, null), null);
+        if (dbValue is not string stringValue || stringValue.DetectIsJson() is false)
+        {
+            _logger.LogWarning(
+                "    - value editor did not yield a valid JSON string as FromEditor value property data with id: {propertyDataId} (property type: {propertyTypeName}, id: {propertyTypeId}, alias: {propertyTypeAlias})",
+                updateItem.PropertyDataDto.Id,
+                updateItem.PropertyType.Name,
+                updateItem.PropertyType.Id,
+                updateItem.PropertyType.Alias);
+            return false;
+        }
+
+        updateItem.PropertyDataDto.TextValue = stringValue;
+        return true;
+    }
+
+    /// <summary>
+    /// If the value is a BlockListValue, and its datatype is configured as single
+    /// We also need to convert the outer BlockListValue to a SingleBlockValue
+    /// Either way, we need to run the value through the processors to possibly update nested values
+    /// </summary>
+    private bool TryTransformValue(object? toEditorValue, Property property, out object? value)
+    {
+        bool hasChanged = _singleBlockListProcessor.ProcessToEditorValue(toEditorValue);
+
+        if (toEditorValue is BlockListValue blockListValue
+            && _blockListConfigurationCache.IsPropertyEditorBlockListConfiguredAsSingle(property.PropertyType.DataTypeKey))
+        {
+            value = _singleBlockListProcessor.ConvertBlockListToSingleBlock(blockListValue);
+            return true;
+        }
+
+        value = toEditorValue;
+        return hasChanged;
+    }
+
+    private class UpdateItem
+    {
+        public UpdateItem(PropertyDataDto propertyDataDto, IPropertyType propertyType, object? updatedValue)
+        {
+            PropertyDataDto = propertyDataDto;
+            PropertyType = propertyType;
+            UpdatedValue = updatedValue;
+        }
+
+        public object? UpdatedValue { get; set; }
+
+        public PropertyDataDto PropertyDataDto { get; set; }
+
+        public IPropertyType PropertyType { get; set; }
+    }
+}
diff --git a/src/Umbraco.Infrastructure/Migrations/Upgrade/V_18_0_0/SingleBlockList/ITypedSingleBlockListProcessor.cs b/src/Umbraco.Infrastructure/Migrations/Upgrade/V_18_0_0/SingleBlockList/ITypedSingleBlockListProcessor.cs
new file mode 100644
index 000000000000..7ad85505d922
--- /dev/null
+++ b/src/Umbraco.Infrastructure/Migrations/Upgrade/V_18_0_0/SingleBlockList/ITypedSingleBlockListProcessor.cs
@@ -0,0 +1,23 @@
+using Umbraco.Cms.Core.Models.Blocks;
+
+namespace Umbraco.Cms.Infrastructure.Migrations.Upgrade.V_18_0_0.SingleBlockList;
+
+[Obsolete("Will be removed in V22")] // Available in v17, activated in v18. Migration needs to work on LTS to LTS 17=>21
+public interface ITypedSingleBlockListProcessor
+{
+    /// <summary>
+    /// The type of the propertyEditor expects to receive as a value to process
+    /// </summary>
+    public Type PropertyEditorValueType { get; }
+
+    /// <summary>
+    /// The property (data)editor aliases that this processor supports, as defined on their DataEditor attributes
+    /// </summary>
+    public IEnumerable<string> PropertyEditorAliases { get; }
+
+    /// <summary>
+    /// object?: the editorValue being processed
+    /// Func<object?, bool>: the function that will be called when nested content is detected
+    /// </summary>
+    public Func<object?, Func<object?, bool>, Func<BlockListValue, object>, bool> Process { get; }
+}
diff --git a/src/Umbraco.Infrastructure/Migrations/Upgrade/V_18_0_0/SingleBlockList/MigrateSingleBlockListComposer.cs b/src/Umbraco.Infrastructure/Migrations/Upgrade/V_18_0_0/SingleBlockList/MigrateSingleBlockListComposer.cs
new file mode 100644
index 000000000000..367cb3af3d0b
--- /dev/null
+++ b/src/Umbraco.Infrastructure/Migrations/Upgrade/V_18_0_0/SingleBlockList/MigrateSingleBlockListComposer.cs
@@ -0,0 +1,18 @@
+using Microsoft.Extensions.DependencyInjection;
+using Umbraco.Cms.Core.Composing;
+using Umbraco.Cms.Core.DependencyInjection;
+
+namespace Umbraco.Cms.Infrastructure.Migrations.Upgrade.V_18_0_0.SingleBlockList;
+
+[Obsolete("Will be removed in V22")] // Available in v17, activated in v18. Migration needs to work on LTS to LTS 17=>21
+internal class MigrateSingleBlockListComposer : IComposer
+{
+    public void Compose(IUmbracoBuilder builder)
+    {
+        builder.Services.AddSingleton<ITypedSingleBlockListProcessor, SingleBlockListBlockListProcessor>();
+        builder.Services.AddSingleton<ITypedSingleBlockListProcessor, SingleBlockListBlockGridProcessor>();
+        builder.Services.AddSingleton<ITypedSingleBlockListProcessor, SingleBlockListRteProcessor>();
+        builder.Services.AddSingleton<SingleBlockListProcessor>();
+        builder.Services.AddSingleton<SingleBlockListConfigurationCache>();
+    }
+}
diff --git a/src/Umbraco.Infrastructure/Migrations/Upgrade/V_18_0_0/SingleBlockList/SingleBlockBlockProcessorBase.cs b/src/Umbraco.Infrastructure/Migrations/Upgrade/V_18_0_0/SingleBlockList/SingleBlockBlockProcessorBase.cs
new file mode 100644
index 000000000000..ce88ef01e8b1
--- /dev/null
+++ b/src/Umbraco.Infrastructure/Migrations/Upgrade/V_18_0_0/SingleBlockList/SingleBlockBlockProcessorBase.cs
@@ -0,0 +1,41 @@
+using Umbraco.Cms.Core.Models.Blocks;
+
+namespace Umbraco.Cms.Infrastructure.Migrations.Upgrade.V_18_0_0.SingleBlockList;
+
+[Obsolete("Will be removed in V22")] // Available in v17, activated in v18. Migration needs to work on LTS to LTS 17=>21
+internal abstract class SingleBlockBlockProcessorBase
+{
+    private readonly SingleBlockListConfigurationCache _blockListConfigurationCache;
+
+    public SingleBlockBlockProcessorBase(
+        SingleBlockListConfigurationCache blockListConfigurationCache)
+    {
+        _blockListConfigurationCache = blockListConfigurationCache;
+    }
+
+    protected bool ProcessBlockItemDataValues(
+        BlockItemData blockItemData,
+        Func<object?, bool> processNested,
+        Func<BlockListValue, object> processOuterValue)
+    {
+        var hasChanged = false;
+
+        foreach (BlockPropertyValue blockPropertyValue in blockItemData.Values)
+        {
+            if (processNested.Invoke(blockPropertyValue.Value))
+            {
+                hasChanged = true;
+            }
+
+            if (_blockListConfigurationCache.IsPropertyEditorBlockListConfiguredAsSingle(
+                    blockPropertyValue.PropertyType!.DataTypeKey)
+                && blockPropertyValue.Value is BlockListValue blockListValue)
+            {
+                blockPropertyValue.Value = processOuterValue.Invoke(blockListValue);
+                hasChanged = true;
+            }
+        }
+
+        return hasChanged;
+    }
+}
diff --git a/src/Umbraco.Infrastructure/Migrations/Upgrade/V_18_0_0/SingleBlockList/SingleBlockListBlockGridProcessor.cs b/src/Umbraco.Infrastructure/Migrations/Upgrade/V_18_0_0/SingleBlockList/SingleBlockListBlockGridProcessor.cs
new file mode 100644
index 000000000000..f84077a47ef6
--- /dev/null
+++ b/src/Umbraco.Infrastructure/Migrations/Upgrade/V_18_0_0/SingleBlockList/SingleBlockListBlockGridProcessor.cs
@@ -0,0 +1,50 @@
+using Umbraco.Cms.Core;
+using Umbraco.Cms.Core.Models.Blocks;
+
+namespace Umbraco.Cms.Infrastructure.Migrations.Upgrade.V_18_0_0.SingleBlockList;
+
+[Obsolete("Will be removed in V22")] // Available in v17, activated in v18. Migration needs to work on LTS to LTS 17=>21
+internal class SingleBlockListBlockGridProcessor : SingleBlockBlockProcessorBase, ITypedSingleBlockListProcessor
+{
+    public SingleBlockListBlockGridProcessor(SingleBlockListConfigurationCache blockListConfigurationCache)
+        : base(blockListConfigurationCache)
+    {
+    }
+
+    public Type PropertyEditorValueType => typeof(BlockGridValue);
+
+    public IEnumerable<string> PropertyEditorAliases => [Constants.PropertyEditors.Aliases.BlockGrid];
+
+    public Func<object?, Func<object?, bool>,Func<BlockListValue,object>, bool> Process => ProcessBlocks;
+
+    private bool ProcessBlocks(
+        object? value,
+        Func<object?, bool> processNested,
+        Func<BlockListValue, object> processOuterValue)
+    {
+        if (value is not BlockGridValue blockValue)
+        {
+            return false;
+        }
+
+        bool hasChanged = false;
+
+        foreach (BlockItemData contentData in blockValue.ContentData)
+        {
+            if (ProcessBlockItemDataValues(contentData, processNested, processOuterValue))
+            {
+                hasChanged = true;
+            }
+        }
+
+        foreach (BlockItemData settingsData in blockValue.SettingsData)
+        {
+            if (ProcessBlockItemDataValues(settingsData, processNested, processOuterValue))
+            {
+                hasChanged = true;
+            }
+        }
+
+        return hasChanged;
+    }
+}
diff --git a/src/Umbraco.Infrastructure/Migrations/Upgrade/V_18_0_0/SingleBlockList/SingleBlockListBlockListProcessor.cs b/src/Umbraco.Infrastructure/Migrations/Upgrade/V_18_0_0/SingleBlockList/SingleBlockListBlockListProcessor.cs
new file mode 100644
index 000000000000..71c7f65feb75
--- /dev/null
+++ b/src/Umbraco.Infrastructure/Migrations/Upgrade/V_18_0_0/SingleBlockList/SingleBlockListBlockListProcessor.cs
@@ -0,0 +1,52 @@
+using Umbraco.Cms.Core;
+using Umbraco.Cms.Core.Models.Blocks;
+
+namespace Umbraco.Cms.Infrastructure.Migrations.Upgrade.V_18_0_0.SingleBlockList;
+
+[Obsolete("Will be removed in V22")] // Available in v17, activated in v18. Migration needs to work on LTS to LTS 17=>21
+internal class SingleBlockListBlockListProcessor : SingleBlockBlockProcessorBase, ITypedSingleBlockListProcessor
+{
+    public SingleBlockListBlockListProcessor(
+        SingleBlockListConfigurationCache blockListConfigurationCache)
+        : base(blockListConfigurationCache)
+    {
+    }
+
+    public Type PropertyEditorValueType => typeof(BlockListValue);
+
+    public IEnumerable<string> PropertyEditorAliases => [Constants.PropertyEditors.Aliases.BlockList];
+
+    public Func<object?, Func<object?, bool>, Func<BlockListValue, object>, bool> Process => ProcessBlocks;
+
+    private bool ProcessBlocks(
+        object? value,
+        Func<object?, bool> processNested,
+        Func<BlockListValue, object> processOuterValue)
+    {
+        if (value is not BlockListValue blockValue)
+        {
+            return false;
+        }
+
+        bool hasChanged = false;
+
+        // there might be another list inside the single list so more recursion, yeeey!
+        foreach (BlockItemData contentData in blockValue.ContentData)
+        {
+            if (ProcessBlockItemDataValues(contentData, processNested, processOuterValue))
+            {
+                hasChanged = true;
+            }
+        }
+
+        foreach (BlockItemData settingsData in blockValue.SettingsData)
+        {
+            if (ProcessBlockItemDataValues(settingsData, processNested, processOuterValue))
+            {
+                hasChanged = true;
+            }
+        }
+
+        return hasChanged;
+    }
+}
diff --git a/src/Umbraco.Infrastructure/Migrations/Upgrade/V_18_0_0/SingleBlockList/SingleBlockListConfigurationCache.cs b/src/Umbraco.Infrastructure/Migrations/Upgrade/V_18_0_0/SingleBlockList/SingleBlockListConfigurationCache.cs
new file mode 100644
index 000000000000..7e342b3de7a9
--- /dev/null
+++ b/src/Umbraco.Infrastructure/Migrations/Upgrade/V_18_0_0/SingleBlockList/SingleBlockListConfigurationCache.cs
@@ -0,0 +1,52 @@
+using Umbraco.Cms.Core;
+using Umbraco.Cms.Core.Models;
+using Umbraco.Cms.Core.PropertyEditors;
+using Umbraco.Cms.Core.Services;
+
+namespace Umbraco.Cms.Infrastructure.Migrations.Upgrade.V_18_0_0.SingleBlockList;
+
+/// <summary>
+/// Used by the SingleBlockList Migration and its processors to avoid having to fetch (and thus lock)
+/// data from the db multiple times during the migration.
+/// </summary>
+[Obsolete("Will be removed in V22")] // Available in v17, activated in v18. Migration needs to work on LTS to LTS 17=>21
+public class SingleBlockListConfigurationCache
+{
+    private readonly IDataTypeService _dataTypeService;
+    private readonly List<IDataType> _singleBlockListDataTypes = new();
+
+    public SingleBlockListConfigurationCache(IDataTypeService dataTypeService)
+    {
+        _dataTypeService = dataTypeService;
+    }
+
+    /// <summary>
+    /// Populates a cache that holds all the property editor aliases that have a BlockList configuration with UseSingleBlockMode set to true.
+    /// </summary>
+    /// <returns> The number of blocklists with UseSingleBlockMode set to true.</returns>
+    public async Task<int> Populate()
+    {
+        IEnumerable<IDataType> blockListDataTypes =
+            await _dataTypeService.GetByEditorAliasAsync(Constants.PropertyEditors.Aliases.BlockList);
+
+        foreach (IDataType dataType in blockListDataTypes)
+        {
+            if (dataType.ConfigurationObject is BlockListConfiguration
+                {
+                    UseSingleBlockMode: true, ValidationLimit.Max: 1
+                })
+            {
+                _singleBlockListDataTypes.Add(dataType);
+            }
+        }
+
+        return _singleBlockListDataTypes.Count;
+    }
+
+    // returns whether the passed in key belongs to a blocklist with UseSingleBlockMode set to true
+    public bool IsPropertyEditorBlockListConfiguredAsSingle(Guid key) =>
+        _singleBlockListDataTypes.Any(dt => dt.Key == key);
+
+    // The list of all blocklist data types that have UseSingleBlockMode set to true
+    public IEnumerable<IDataType> CachedDataTypes => _singleBlockListDataTypes.AsReadOnly();
+}
diff --git a/src/Umbraco.Infrastructure/Migrations/Upgrade/V_18_0_0/SingleBlockList/SingleBlockListProcessor.cs b/src/Umbraco.Infrastructure/Migrations/Upgrade/V_18_0_0/SingleBlockList/SingleBlockListProcessor.cs
new file mode 100644
index 000000000000..ae13717f8f21
--- /dev/null
+++ b/src/Umbraco.Infrastructure/Migrations/Upgrade/V_18_0_0/SingleBlockList/SingleBlockListProcessor.cs
@@ -0,0 +1,51 @@
+using Umbraco.Cms.Core;
+using Umbraco.Cms.Core.Models.Blocks;
+
+namespace Umbraco.Cms.Infrastructure.Migrations.Upgrade.V_18_0_0.SingleBlockList;
+
+[Obsolete("Will be removed in V22")] // Available in v17, activated in v18. Migration needs to work on LTS to LTS 17=>21
+public class SingleBlockListProcessor
+{
+    private readonly IEnumerable<ITypedSingleBlockListProcessor> _processors;
+
+    public SingleBlockListProcessor(IEnumerable<ITypedSingleBlockListProcessor> processors) => _processors = processors;
+
+    public IEnumerable<string> GetSupportedPropertyEditorAliases() =>
+        _processors.SelectMany(p => p.PropertyEditorAliases);
+    /// <summary>
+    /// The entry point of the recursive conversion
+    /// Find the first processor that can handle the value and call it's Process method
+    /// </summary>
+    /// <returns>Whether the value was changed</returns>
+    public bool ProcessToEditorValue(object? editorValue)
+    {
+        ITypedSingleBlockListProcessor? processor =
+            _processors.FirstOrDefault(p => p.PropertyEditorValueType == editorValue?.GetType());
+
+        return processor is not null && processor.Process.Invoke(editorValue, ProcessToEditorValue, ConvertBlockListToSingleBlock);
+    }
+
+    /// <summary>
+    /// Updates and returns the passed in BlockListValue to a SingleBlockValue
+    /// Should only be called by a core processor once a BlockListValue has been found that is configured in single block mode.
+    /// </summary>
+    public BlockValue ConvertBlockListToSingleBlock(BlockListValue blockListValue)
+    {
+        IBlockLayoutItem blockListLayoutItem = blockListValue.Layout[Constants.PropertyEditors.Aliases.BlockList].First();
+
+        var singleBlockLayoutItem = new SingleBlockLayoutItem
+        {
+            ContentKey = blockListLayoutItem.ContentKey,
+            SettingsKey = blockListLayoutItem.SettingsKey,
+        };
+
+        var singleBlockValue = new SingleBlockValue(singleBlockLayoutItem)
+        {
+            ContentData = blockListValue.ContentData,
+            SettingsData = blockListValue.SettingsData,
+            Expose = blockListValue.Expose,
+        };
+
+        return singleBlockValue;
+    }
+}
diff --git a/src/Umbraco.Infrastructure/Migrations/Upgrade/V_18_0_0/SingleBlockList/SingleBlockListRteProcessor.cs b/src/Umbraco.Infrastructure/Migrations/Upgrade/V_18_0_0/SingleBlockList/SingleBlockListRteProcessor.cs
new file mode 100644
index 000000000000..88de3b839b36
--- /dev/null
+++ b/src/Umbraco.Infrastructure/Migrations/Upgrade/V_18_0_0/SingleBlockList/SingleBlockListRteProcessor.cs
@@ -0,0 +1,58 @@
+using Umbraco.Cms.Core;
+using Umbraco.Cms.Core.Models.Blocks;
+
+namespace Umbraco.Cms.Infrastructure.Migrations.Upgrade.V_18_0_0.SingleBlockList;
+
+[Obsolete("Will be removed in V22")] // available in v17, activated in v18 migration needs to work on LTS to LTS 17=>21
+internal class SingleBlockListRteProcessor : SingleBlockBlockProcessorBase, ITypedSingleBlockListProcessor
+{
+    public SingleBlockListRteProcessor(SingleBlockListConfigurationCache blockListConfigurationCache)
+        : base(blockListConfigurationCache)
+    {
+    }
+
+    public Type PropertyEditorValueType => typeof(RichTextEditorValue);
+
+    public IEnumerable<string> PropertyEditorAliases =>
+    [
+        "Umbraco.TinyMCE", Constants.PropertyEditors.Aliases.RichText
+    ];
+
+    public Func<object?, Func<object?, bool>,Func<BlockListValue,object>, bool> Process => ProcessRichText;
+
+    public bool ProcessRichText(
+        object? value,
+        Func<object?, bool> processNested,
+        Func<BlockListValue, object> processOuterValue)
+    {
+        if (value is not RichTextEditorValue richTextValue)
+        {
+            return false;
+        }
+
+        var hasChanged = false;
+
+        if (richTextValue.Blocks is null)
+        {
+            return hasChanged;
+        }
+
+        foreach (BlockItemData contentData in richTextValue.Blocks.ContentData)
+        {
+            if (ProcessBlockItemDataValues(contentData, processNested, processOuterValue))
+            {
+                hasChanged = true;
+            }
+        }
+
+        foreach (BlockItemData settingsData in richTextValue.Blocks.SettingsData)
+        {
+            if (ProcessBlockItemDataValues(settingsData, processNested, processOuterValue))
+            {
+                hasChanged = true;
+            }
+        }
+
+        return hasChanged;
+    }
+}

From 9ad4a7eeba2472cff192860f7f3064fa6ba0097d Mon Sep 17 00:00:00 2001
From: Warren Buckley <warren@hackmakedo.com>
Date: Tue, 11 Nov 2025 11:50:23 +0000
Subject: [PATCH 137/155] Adds Clear Clipboard button & logic (#20757)

* Adds new dictionary/localization item for the clipboard dialog clear all prompt

* Removes the wrapping uui-box and moved inside the component itself

* Adds Clear Clipboard button and logic

* Adds uui-box from outer components consuimg this into this component
* Adds a header to uui-box
* Adds a conditional uui-button when we have items in clipboard
* Adds confirm dialog/prompt to ask if user wants to clear all items

* Adds in general_clipboard item to use in the UUI-box header

* Removes extra space & moves the requestItems outside the for loop

* Be a better citizen

Make sure the promise for the modal is caught and we return out early if user explictiy cancels modal or presses ESC

* Cleanup my noisy comments for a re-review

---------

Co-authored-by: Jacob Overgaard <752371+iOvergaard@users.noreply.github.com>
---
 .../src/assets/lang/en.ts                     |  2 +
 .../block-catalogue-modal.element.ts          |  8 +--
 .../clipboard-entry-picker-modal.element.ts   | 10 ++-
 .../picker/clipboard-entry-picker.element.ts  | 66 +++++++++++++++----
 4 files changed, 64 insertions(+), 22 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/assets/lang/en.ts b/src/Umbraco.Web.UI.Client/src/assets/lang/en.ts
index 6331f883356f..a04d3fe3cc3c 100644
--- a/src/Umbraco.Web.UI.Client/src/assets/lang/en.ts
+++ b/src/Umbraco.Web.UI.Client/src/assets/lang/en.ts
@@ -1017,6 +1017,7 @@ export default {
 			if (new Date(date).getTime() < new Date(now).getTime()) return `${duration} ago`;
 			return `in ${duration}`;
 		},
+		clipboard: 'Clipboard',
 	},
 	colors: {
 		black: 'Black',
@@ -2508,6 +2509,7 @@ export default {
 		labelForCopyToClipboard: 'Copy to clipboard',
 		confirmDeleteHeadline: 'Delete from clipboard',
 		confirmDeleteDescription: 'Are you sure you want to delete <strong>{0}</strong> from the clipboard?',
+		confirmClearDescription: 'Are you sure you want to clear the clipboard?',
 		copySuccessHeadline: 'Copied to clipboard',
 	},
 	propertyActions: {
diff --git a/src/Umbraco.Web.UI.Client/src/packages/block/block/modals/block-catalogue/block-catalogue-modal.element.ts b/src/Umbraco.Web.UI.Client/src/packages/block/block/modals/block-catalogue/block-catalogue-modal.element.ts
index 08d3760117dd..f6ceed0051c0 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/block/block/modals/block-catalogue/block-catalogue-modal.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/block/block/modals/block-catalogue/block-catalogue-modal.element.ts
@@ -194,11 +194,9 @@ export class UmbBlockCatalogueModalElement extends UmbModalBaseElement<
 
 	#renderClipboard() {
 		return html`
-			<uui-box>
-				<umb-clipboard-entry-picker
-					.config=${{ multiple: true, asyncFilter: this.data?.clipboardFilter }}
-					@selection-change=${this.#onClipboardPickerSelectionChange}></umb-clipboard-entry-picker>
-			</uui-box>
+			<umb-clipboard-entry-picker
+				.config=${{ multiple: true, asyncFilter: this.data?.clipboardFilter }}
+				@selection-change=${this.#onClipboardPickerSelectionChange}></umb-clipboard-entry-picker>
 		`;
 	}
 
diff --git a/src/Umbraco.Web.UI.Client/src/packages/clipboard/clipboard-entry/picker-modal/clipboard-entry-picker-modal.element.ts b/src/Umbraco.Web.UI.Client/src/packages/clipboard/clipboard-entry/picker-modal/clipboard-entry-picker-modal.element.ts
index b3e273cf94e5..cfd5de0ea05c 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/clipboard/clipboard-entry/picker-modal/clipboard-entry-picker-modal.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/clipboard/clipboard-entry/picker-modal/clipboard-entry-picker-modal.element.ts
@@ -27,12 +27,10 @@ export class UmbClipboardEntryPickerModalElement extends UmbModalBaseElement<
 
 	override render() {
 		return html`<umb-body-layout headline="Clipboard">
-			<uui-box>
-				<umb-clipboard-entry-picker
-					.selection=${this.value?.selection}
-					.config=${this.data}
-					@selection-change=${this.#onSelectionChange}></umb-clipboard-entry-picker>
-			</uui-box>
+			<umb-clipboard-entry-picker
+				.selection=${this.value?.selection}
+				.config=${this.data}
+				@selection-change=${this.#onSelectionChange}></umb-clipboard-entry-picker>
 			<div slot="actions">
 				<uui-button label="Close" @click=${this.#close}></uui-button>
 				<uui-button label="Submit" look="primary" color="positive" @click=${this.#submit}></uui-button>
diff --git a/src/Umbraco.Web.UI.Client/src/packages/clipboard/clipboard-entry/picker/clipboard-entry-picker.element.ts b/src/Umbraco.Web.UI.Client/src/packages/clipboard/clipboard-entry/picker/clipboard-entry-picker.element.ts
index fda340058b6c..46e9c393d73e 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/clipboard/clipboard-entry/picker/clipboard-entry-picker.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/clipboard/clipboard-entry/picker/clipboard-entry-picker.element.ts
@@ -1,6 +1,7 @@
 import { UmbClipboardCollectionRepository } from '../../collection/index.js';
 import type { UmbClipboardEntryDetailModel } from '../types.js';
-import { css, customElement, html, property, repeat, state, when } from '@umbraco-cms/backoffice/external/lit';
+import UmbClipboardEntryDetailRepository from '../detail/clipboard-entry-detail.repository.js';
+import { css, customElement, html, nothing, property, repeat, state, when } from '@umbraco-cms/backoffice/external/lit';
 import { UmbEntityContext } from '@umbraco-cms/backoffice/entity';
 import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element';
 import {
@@ -10,6 +11,7 @@ import {
 import { UmbSelectionManager } from '@umbraco-cms/backoffice/utils';
 import { UMB_ACTION_EVENT_CONTEXT } from '@umbraco-cms/backoffice/action';
 import type { UmbEntityUnique } from '@umbraco-cms/backoffice/entity';
+import { umbConfirmModal } from '@umbraco-cms/backoffice/modal';
 
 // TODO: make this into an extension point (Picker) with two kinds of pickers: tree-item-picker and collection-item-picker;
 @customElement('umb-clipboard-entry-picker')
@@ -28,6 +30,8 @@ export class UmbClipboardEntryPickerElement extends UmbLitElement {
 	#entityContext = new UmbEntityContext(this);
 	#actionEventContext?: typeof UMB_ACTION_EVENT_CONTEXT.TYPE;
 
+	#clipboardDetailRepository = new UmbClipboardEntryDetailRepository(this);
+
 	constructor() {
 		super();
 		this.#entityContext.setEntityType('clipboard-entry');
@@ -117,17 +121,57 @@ export class UmbClipboardEntryPickerElement extends UmbLitElement {
 		}
 	};
 
+	async #clearClipboard() {
+		try {
+			await umbConfirmModal(this, {
+				headline: '#clipboard_labelForClearClipboard',
+				content: '#clipboard_confirmClearDescription',
+				color: 'danger',
+				confirmLabel: '#general_clear',
+				cancelLabel: '#general_cancel',
+			});
+		} catch {
+			return;
+		}
+
+		for (const item of this._items) {
+			const { error } = await this.#clipboardDetailRepository.delete(item.unique);
+			if (error) {
+				console.error(`Unable to delete clipboard item with unique ${item.unique}`, error);
+			}
+		}
+
+		this.#requestItems();
+	}
+
 	override render() {
-		return when(
-			this._items.length > 0,
-			() =>
-				repeat(
-					this._items,
-					(item) => item.unique,
-					(item) => this.#renderItem(item),
-				),
-			() => html`<p>There are no items in the clipboard.</p>`,
-		);
+		return html`
+			<uui-box headline=${this.localize.term('general_clipboard')}>
+				<span slot="header-actions">
+					${when(
+						this._items.length > 0,
+						() => html`
+							<uui-button color="default" look="default" @click="${this.#clearClipboard}">
+								<uui-icon name="delete"></uui-icon>
+								<umb-localize key="clipboard_labelForClearClipboard">Clear Clipboard</umb-localize>
+							</uui-button>
+						`,
+						() => nothing,
+					)}
+				</span>
+
+				${when(
+					this._items.length > 0,
+					() =>
+						repeat(
+							this._items,
+							(item) => item.unique,
+							(item) => this.#renderItem(item),
+						),
+					() => html`<p>There are no items in the clipboard.</p>`,
+				)}
+			</uui-box>
+		`;
 	}
 
 	#renderItem(item: UmbClipboardEntryDetailModel) {

From c9fc2f2a198b896fe9346eea5d0d8d8116889c1f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 12 Nov 2025 13:33:21 +0700
Subject: [PATCH 138/155] Bump playwright and @playwright/test in
 /tests/Umbraco.Tests.AcceptanceTest (#20579)

* Bump playwright and @playwright/test

Bumps [playwright](https://github.com/microsoft/playwright) to 1.56.1 and updates ancestor dependency [@playwright/test](https://github.com/microsoft/playwright). These dependencies need to be updated together.


Updates `playwright` from 1.50.0 to 1.56.1
- [Release notes](https://github.com/microsoft/playwright/releases)
- [Commits](https://github.com/microsoft/playwright/compare/v1.50.0...v1.56.1)

Updates `@playwright/test` from 1.50.0 to 1.56.1
- [Release notes](https://github.com/microsoft/playwright/releases)
- [Commits](https://github.com/microsoft/playwright/compare/v1.50.0...v1.56.1)

---
updated-dependencies:
- dependency-name: playwright
  dependency-version: 1.56.1
  dependency-type: indirect
- dependency-name: "@playwright/test"
  dependency-version: 1.56.1
  dependency-type: direct:development
...

Signed-off-by: dependabot[bot] <support@github.com>

* Bumped version of test helper

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Nhu Dinh <hnd@umbraco.dk>
---
 .../package-lock.json                         | 40 +++++++++----------
 .../Umbraco.Tests.AcceptanceTest/package.json |  4 +-
 2 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/tests/Umbraco.Tests.AcceptanceTest/package-lock.json b/tests/Umbraco.Tests.AcceptanceTest/package-lock.json
index 6011fa4e8f65..86ba4e15b17d 100644
--- a/tests/Umbraco.Tests.AcceptanceTest/package-lock.json
+++ b/tests/Umbraco.Tests.AcceptanceTest/package-lock.json
@@ -8,13 +8,13 @@
       "hasInstallScript": true,
       "dependencies": {
         "@umbraco/json-models-builders": "^2.0.41",
-        "@umbraco/playwright-testhelpers": "^17.0.3",
+        "@umbraco/playwright-testhelpers": "^17.0.6",
         "camelize": "^1.0.0",
         "dotenv": "^16.3.1",
         "node-fetch": "^2.6.7"
       },
       "devDependencies": {
-        "@playwright/test": "1.50",
+        "@playwright/test": "1.56",
         "@types/node": "^20.9.0",
         "prompt": "^1.2.0",
         "tslib": "^2.4.0",
@@ -32,13 +32,13 @@
       }
     },
     "node_modules/@playwright/test": {
-      "version": "1.50.1",
-      "resolved": "https://registry.npmjs.org/@playwright/test/-/test-1.50.1.tgz",
-      "integrity": "sha512-Jii3aBg+CEDpgnuDxEp/h7BimHcUTDlpEtce89xEumlJ5ef2hqepZ+PWp1DDpYC/VO9fmWVI1IlEaoI5fK9FXQ==",
+      "version": "1.56.1",
+      "resolved": "https://registry.npmjs.org/@playwright/test/-/test-1.56.1.tgz",
+      "integrity": "sha512-vSMYtL/zOcFpvJCW71Q/OEGQb7KYBPAdKh35WNSkaZA75JlAO8ED8UN6GUNTm3drWomcbcqRPFqQbLae8yBTdg==",
       "dev": true,
       "license": "Apache-2.0",
       "dependencies": {
-        "playwright": "1.50.1"
+        "playwright": "1.56.1"
       },
       "bin": {
         "playwright": "cli.js"
@@ -58,21 +58,21 @@
       }
     },
     "node_modules/@umbraco/json-models-builders": {
-      "version": "2.0.41",
-      "resolved": "https://registry.npmjs.org/@umbraco/json-models-builders/-/json-models-builders-2.0.41.tgz",
-      "integrity": "sha512-rCNUHCOpcuWIj7xUhk0lpcn4jzk9y82jHs9FSb7kxH716AnDyYvwuI+J0Ayd4hhWtXXqNCRqugCNYjG+rvzshQ==",
+      "version": "2.0.42",
+      "resolved": "https://registry.npmjs.org/@umbraco/json-models-builders/-/json-models-builders-2.0.42.tgz",
+      "integrity": "sha512-5Zh/dSBGSKD9s0soemNnd5qT2h4gsKfTmQou/X34kqELSln333XMMfg+rbHfMleDwSBxh4dWAulntQFsfX0VtA==",
       "license": "MIT",
       "dependencies": {
         "camelize": "^1.0.1"
       }
     },
     "node_modules/@umbraco/playwright-testhelpers": {
-      "version": "17.0.3",
-      "resolved": "https://registry.npmjs.org/@umbraco/playwright-testhelpers/-/playwright-testhelpers-17.0.3.tgz",
-      "integrity": "sha512-nlc7c7l/E264De+Z/niPfTT8yfRPauEmwbpX+N85PD30iM0mGLHd80InfM0mia19kL2njUm9ww3X8p7ZwBUM/g==",
+      "version": "17.0.6",
+      "resolved": "https://registry.npmjs.org/@umbraco/playwright-testhelpers/-/playwright-testhelpers-17.0.6.tgz",
+      "integrity": "sha512-M0e5HJCqSTDxORFhebaNNGzBB4v6+77MerK6ctG1f+bU3JHfmbGZr4A4HDkD9eAeU7WGu5q7xoASdI0J1wqb1w==",
       "license": "MIT",
       "dependencies": {
-        "@umbraco/json-models-builders": "2.0.41",
+        "@umbraco/json-models-builders": "2.0.42",
         "node-fetch": "^2.6.7"
       }
     },
@@ -189,13 +189,13 @@
       }
     },
     "node_modules/playwright": {
-      "version": "1.50.1",
-      "resolved": "https://registry.npmjs.org/playwright/-/playwright-1.50.1.tgz",
-      "integrity": "sha512-G8rwsOQJ63XG6BbKj2w5rHeavFjy5zynBA9zsJMMtBoe/Uf757oG12NXz6e6OirF7RCrTVAKFXbLmn1RbL7Qaw==",
+      "version": "1.56.1",
+      "resolved": "https://registry.npmjs.org/playwright/-/playwright-1.56.1.tgz",
+      "integrity": "sha512-aFi5B0WovBHTEvpM3DzXTUaeN6eN0qWnTkKx4NQaH4Wvcmc153PdaY2UBdSYKaGYw+UyWXSVyxDUg5DoPEttjw==",
       "dev": true,
       "license": "Apache-2.0",
       "dependencies": {
-        "playwright-core": "1.50.1"
+        "playwright-core": "1.56.1"
       },
       "bin": {
         "playwright": "cli.js"
@@ -208,9 +208,9 @@
       }
     },
     "node_modules/playwright-core": {
-      "version": "1.50.1",
-      "resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.50.1.tgz",
-      "integrity": "sha512-ra9fsNWayuYumt+NiM069M6OkcRb1FZSK8bgi66AtpFoWkg2+y0bJSNmkFrWhMbEBbVKC/EruAHH3g0zmtwGmQ==",
+      "version": "1.56.1",
+      "resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.56.1.tgz",
+      "integrity": "sha512-hutraynyn31F+Bifme+Ps9Vq59hKuUCz7H1kDOcBs+2oGguKkWTU50bBWrtz34OUWmIwpBTWDxaRPXrIXkgvmQ==",
       "dev": true,
       "license": "Apache-2.0",
       "bin": {
diff --git a/tests/Umbraco.Tests.AcceptanceTest/package.json b/tests/Umbraco.Tests.AcceptanceTest/package.json
index 4697f58b5428..ca7c4b3f6f16 100644
--- a/tests/Umbraco.Tests.AcceptanceTest/package.json
+++ b/tests/Umbraco.Tests.AcceptanceTest/package.json
@@ -15,7 +15,7 @@
     "testWindows": "npx playwright test DefaultConfig --grep-invert \"RelationType\""
   },
   "devDependencies": {
-    "@playwright/test": "1.50",
+    "@playwright/test": "1.56",
     "@types/node": "^20.9.0",
     "prompt": "^1.2.0",
     "tslib": "^2.4.0",
@@ -23,7 +23,7 @@
   },
   "dependencies": {
     "@umbraco/json-models-builders": "^2.0.41",
-    "@umbraco/playwright-testhelpers": "^17.0.3",
+    "@umbraco/playwright-testhelpers": "^17.0.6",
     "camelize": "^1.0.0",
     "dotenv": "^16.3.1",
     "node-fetch": "^2.6.7"

From c60cf90ffe5c2dd005b75a7302e56b750e3e39b0 Mon Sep 17 00:00:00 2001
From: Andreas Zerbst <73799582+andr317c@users.noreply.github.com>
Date: Wed, 12 Nov 2025 10:18:53 +0100
Subject: [PATCH 139/155] E2E: QA added entity picker acceptance tests (#20776)

* Added entity picker settings

* Updated tests

* Updated nightly pipeline

* Updated tests

* Bumped versions

* Fixed indentation

* Added comments

* Cleaned up

* Removed duplicate

* Bumped version

* Updated naming
---
 build/nightly-E2E-test-pipelines.yml          |  17 +++
 .../package-lock.json                         |   2 +-
 .../Umbraco.Tests.AcceptanceTest/package.json |   4 +-
 .../playwright.config.ts                      |  11 ++
 .../picker-data-source/collection-api.js      |  73 ++++++++++
 .../picker-data-source/tree-api.js            | 129 ++++++++++++++++++
 .../picker-data-source/umbraco-package.json   |  30 ++++
 .../AdditionalSetup/appsettings.json          |  58 ++++++++
 .../Content/EntityPickerCollection.spec.ts    | 127 +++++++++++++++++
 .../Content/EntityPickerTree.spec.ts          | 127 +++++++++++++++++
 .../DataType/EntityPickerCollection.spec.ts   |  33 +++++
 .../DataType/EntityPickerTree.spec.ts         |  33 +++++
 .../EntityPickerCollection.spec.ts            |  39 ++++++
 .../RenderedContent/EntityPickerTree.spec.ts  |  39 ++++++
 14 files changed, 719 insertions(+), 3 deletions(-)
 create mode 100644 tests/Umbraco.Tests.AcceptanceTest/tests/EntityDataPicker/AdditionalSetup/App_Plugins/picker-data-source/collection-api.js
 create mode 100644 tests/Umbraco.Tests.AcceptanceTest/tests/EntityDataPicker/AdditionalSetup/App_Plugins/picker-data-source/tree-api.js
 create mode 100644 tests/Umbraco.Tests.AcceptanceTest/tests/EntityDataPicker/AdditionalSetup/App_Plugins/picker-data-source/umbraco-package.json
 create mode 100644 tests/Umbraco.Tests.AcceptanceTest/tests/EntityDataPicker/AdditionalSetup/appsettings.json
 create mode 100644 tests/Umbraco.Tests.AcceptanceTest/tests/EntityDataPicker/Content/EntityPickerCollection.spec.ts
 create mode 100644 tests/Umbraco.Tests.AcceptanceTest/tests/EntityDataPicker/Content/EntityPickerTree.spec.ts
 create mode 100644 tests/Umbraco.Tests.AcceptanceTest/tests/EntityDataPicker/DataType/EntityPickerCollection.spec.ts
 create mode 100644 tests/Umbraco.Tests.AcceptanceTest/tests/EntityDataPicker/DataType/EntityPickerTree.spec.ts
 create mode 100644 tests/Umbraco.Tests.AcceptanceTest/tests/EntityDataPicker/RenderedContent/EntityPickerCollection.spec.ts
 create mode 100644 tests/Umbraco.Tests.AcceptanceTest/tests/EntityDataPicker/RenderedContent/EntityPickerTree.spec.ts

diff --git a/build/nightly-E2E-test-pipelines.yml b/build/nightly-E2E-test-pipelines.yml
index 8ed64d60303d..ba4e3d13e464 100644
--- a/build/nightly-E2E-test-pipelines.yml
+++ b/build/nightly-E2E-test-pipelines.yml
@@ -564,6 +564,23 @@ stages:
               CONNECTIONSTRINGS__UMBRACODBDSN: Server=(local);Database=Umbraco;User Id=sa;Password=$(SA_PASSWORD);Encrypt=True;TrustServerCertificate=True
               CONNECTIONSTRINGS__UMBRACODBDSN_PROVIDERNAME: Microsoft.Data.SqlClient
               additionalEnvironmentVariables: false
+            # EntityDataPicker
+            WindowsEntityDataPicker:
+              vmImage: "windows-latest"
+              testFolder: "EntityDataPicker"
+              port: ''
+              testCommand: "npx playwright test --project=entityDataPicker"
+              CONNECTIONSTRINGS__UMBRACODBDSN: Data Source=(localdb)\MSSQLLocalDB;AttachDbFilename=|DataDirectory|\Umbraco.mdf;Integrated Security=True
+              CONNECTIONSTRINGS__UMBRACODBDSN_PROVIDERNAME: Microsoft.Data.SqlClient
+              additionalEnvironmentVariables: false
+            LinuxEntityDataPicker:
+              vmImage: "ubuntu-latest"
+              testFolder: "EntityDataPicker"
+              port: ''
+              testCommand: "npx playwright test --project=entityDataPicker"
+              CONNECTIONSTRINGS__UMBRACODBDSN: Server=(local);Database=Umbraco;User Id=sa;Password=$(SA_PASSWORD);Encrypt=True;TrustServerCertificate=True
+              CONNECTIONSTRINGS__UMBRACODBDSN_PROVIDERNAME: Microsoft.Data.SqlClient
+              additionalEnvironmentVariables: false
         pool:
           vmImage: $(vmImage)
         steps:
diff --git a/tests/Umbraco.Tests.AcceptanceTest/package-lock.json b/tests/Umbraco.Tests.AcceptanceTest/package-lock.json
index 86ba4e15b17d..509985c5b118 100644
--- a/tests/Umbraco.Tests.AcceptanceTest/package-lock.json
+++ b/tests/Umbraco.Tests.AcceptanceTest/package-lock.json
@@ -7,7 +7,7 @@
       "name": "acceptancetest",
       "hasInstallScript": true,
       "dependencies": {
-        "@umbraco/json-models-builders": "^2.0.41",
+        "@umbraco/json-models-builders": "^2.0.42",
         "@umbraco/playwright-testhelpers": "^17.0.6",
         "camelize": "^1.0.0",
         "dotenv": "^16.3.1",
diff --git a/tests/Umbraco.Tests.AcceptanceTest/package.json b/tests/Umbraco.Tests.AcceptanceTest/package.json
index ca7c4b3f6f16..7528914b7dc9 100644
--- a/tests/Umbraco.Tests.AcceptanceTest/package.json
+++ b/tests/Umbraco.Tests.AcceptanceTest/package.json
@@ -22,10 +22,10 @@
     "typescript": "^4.8.3"
   },
   "dependencies": {
-    "@umbraco/json-models-builders": "^2.0.41",
+    "@umbraco/json-models-builders": "^2.0.42",
     "@umbraco/playwright-testhelpers": "^17.0.6",
     "camelize": "^1.0.0",
     "dotenv": "^16.3.1",
     "node-fetch": "^2.6.7"
   }
-}
\ No newline at end of file
+}
diff --git a/tests/Umbraco.Tests.AcceptanceTest/playwright.config.ts b/tests/Umbraco.Tests.AcceptanceTest/playwright.config.ts
index 72776856bdeb..f31d53bcee3a 100644
--- a/tests/Umbraco.Tests.AcceptanceTest/playwright.config.ts
+++ b/tests/Umbraco.Tests.AcceptanceTest/playwright.config.ts
@@ -65,6 +65,17 @@ export default defineConfig({
         storageState: STORAGE_STATE
       }
     },
+    {
+      name: 'entityDataPicker',
+      testMatch: 'EntityDataPicker/**/*.spec.ts',
+      dependencies: ['setup'],
+      use: {
+        ...devices['Desktop Chrome'],
+        // Use prepared auth state.
+        ignoreHTTPSErrors: true,
+        storageState: STORAGE_STATE
+      }
+    },
     {
       name: 'deliveryApi',
       testMatch: 'DeliveryApi/**',
diff --git a/tests/Umbraco.Tests.AcceptanceTest/tests/EntityDataPicker/AdditionalSetup/App_Plugins/picker-data-source/collection-api.js b/tests/Umbraco.Tests.AcceptanceTest/tests/EntityDataPicker/AdditionalSetup/App_Plugins/picker-data-source/collection-api.js
new file mode 100644
index 000000000000..4a1f014e0da3
--- /dev/null
+++ b/tests/Umbraco.Tests.AcceptanceTest/tests/EntityDataPicker/AdditionalSetup/App_Plugins/picker-data-source/collection-api.js
@@ -0,0 +1,73 @@
+import {UmbControllerBase} from "@umbraco-cms/backoffice/class-api";
+
+export class ExampleCustomPickerCollectionPropertyEditorDataSource extends UmbControllerBase {
+  collectionPickableFilter = (item) => item.isPickable;
+
+  async requestCollection(args) {
+    const data = {
+      items: customItems,
+      total: customItems.length,
+    };
+
+    return {data};
+  }
+
+  async requestItems(uniques) {
+    const items = customItems.filter((x) => uniques.includes(x.unique));
+    return {data: items};
+  }
+
+  async search(args) {
+    const items = customItems.filter((item) =>
+      item.name?.toLowerCase().includes(args.query.toLowerCase())
+    );
+    const total = items.length;
+
+    const data = {
+      items,
+      total,
+    };
+
+    return {data};
+  }
+}
+
+export {ExampleCustomPickerCollectionPropertyEditorDataSource as api};
+
+const customItems = [
+  {
+    unique: "1",
+    entityType: "example",
+    name: "Example 1",
+    icon: "icon-shape-triangle",
+    isPickable: true,
+  },
+  {
+    unique: "2",
+    entityType: "example",
+    name: "Example 2",
+    icon: "icon-shape-triangle",
+    isPickable: true,
+  },
+  {
+    unique: "3",
+    entityType: "example",
+    name: "Example 3",
+    icon: "icon-shape-triangle",
+    isPickable: true,
+  },
+  {
+    unique: "4",
+    entityType: "example",
+    name: "Example 4",
+    icon: "icon-shape-triangle",
+    isPickable: false,
+  },
+  {
+    unique: "5",
+    entityType: "example",
+    name: "Example 5",
+    icon: "icon-shape-triangle",
+    isPickable: true,
+  },
+];
diff --git a/tests/Umbraco.Tests.AcceptanceTest/tests/EntityDataPicker/AdditionalSetup/App_Plugins/picker-data-source/tree-api.js b/tests/Umbraco.Tests.AcceptanceTest/tests/EntityDataPicker/AdditionalSetup/App_Plugins/picker-data-source/tree-api.js
new file mode 100644
index 000000000000..3fc7a208d9b5
--- /dev/null
+++ b/tests/Umbraco.Tests.AcceptanceTest/tests/EntityDataPicker/AdditionalSetup/App_Plugins/picker-data-source/tree-api.js
@@ -0,0 +1,129 @@
+import {UmbControllerBase} from "@umbraco-cms/backoffice/class-api";
+
+export class MyPickerDataSource extends UmbControllerBase {
+  treePickableFilter = (treeItem) =>
+    !!treeItem.unique && treeItem.entityType === "example";
+
+  searchPickableFilter = (searchItem) =>
+    !!searchItem.unique && searchItem.entityType === "example";
+
+  async requestTreeRoot() {
+    const root = {
+      unique: null,
+      name: "Examples",
+      icon: "icon-folder",
+      hasChildren: true,
+      entityType: "example-root",
+      isFolder: true,
+    };
+
+    return {data: root};
+  }
+
+  async requestTreeRootItems() {
+    const rootItems = customItems.filter((item) => item.parent.unique === null);
+
+    const data = {
+      items: rootItems,
+      total: rootItems.length,
+    };
+
+    return {data};
+  }
+
+  async requestTreeItemsOf(args) {
+    const items = customItems.filter(
+      (item) =>
+        item.parent.entityType === args.parent.entityType &&
+        item.parent.unique === args.parent.unique
+    );
+
+    const data = {
+      items: items,
+      total: items.length,
+    };
+
+    return {data};
+  }
+
+  async requestTreeItemAncestors() {
+    // TODO: implement when needed
+    return {data: []};
+  }
+
+  async requestItems(uniques) {
+    const items = customItems.filter((x) => uniques.includes(x.unique));
+    return {data: items};
+  }
+
+  async search(args) {
+    const result = customItems.filter((item) =>
+      item.name.toLowerCase().includes(args.query.toLowerCase())
+    );
+
+    const data = {
+      items: result,
+      total: result.length,
+    };
+
+    return {data};
+  }
+}
+
+export {MyPickerDataSource as api};
+
+const customItems = [
+  {
+    unique: "1",
+    entityType: "example",
+    name: "Example 1",
+    icon: "icon-shape-triangle",
+    parent: {unique: null, entityType: "example-root"},
+    isFolder: false,
+    hasChildren: false,
+  },
+  {
+    unique: "2",
+    entityType: "example",
+    name: "Example 2",
+    icon: "icon-shape-triangle",
+    parent: {unique: null, entityType: "example-root"},
+    isFolder: false,
+    hasChildren: false,
+  },
+  {
+    unique: "3",
+    entityType: "example",
+    name: "Example 3",
+    icon: "icon-shape-triangle",
+    parent: {unique: null, entityType: "example-root"},
+    isFolder: false,
+    hasChildren: false,
+  },
+  {
+    unique: "4",
+    entityType: "example",
+    name: "Example 4",
+    icon: "icon-shape-triangle",
+    parent: {unique: "6", entityType: "example-folder"},
+    isFolder: false,
+    hasChildren: false,
+  },
+  {
+    unique: "5",
+    entityType: "example",
+    name: "Example 5",
+    icon: "icon-shape-triangle",
+    parent: {unique: "6", entityType: "example-folder"},
+    isFolder: false,
+    hasChildren: false,
+  },
+  {
+    unique: "6",
+    entityType: "example-folder",
+    name: "Example Folder 1",
+    parent: {unique: null, entityType: "example-root"},
+    isFolder: true,
+    hasChildren: true,
+  },
+];
diff --git a/tests/Umbraco.Tests.AcceptanceTest/tests/EntityDataPicker/AdditionalSetup/App_Plugins/picker-data-source/umbraco-package.json b/tests/Umbraco.Tests.AcceptanceTest/tests/EntityDataPicker/AdditionalSetup/App_Plugins/picker-data-source/umbraco-package.json
new file mode 100644
index 000000000000..08cbc8163dd6
--- /dev/null
+++ b/tests/Umbraco.Tests.AcceptanceTest/tests/EntityDataPicker/AdditionalSetup/App_Plugins/picker-data-source/umbraco-package.json
@@ -0,0 +1,30 @@
+{
+  "name": "My Picker Data Source",
+  "alias": "My.PickerDataSource",
+  "extensions": [
+    {
+      "type": "propertyEditorDataSource",
+      "dataSourceType": "Umb.DataSourceType.Picker",
+      "alias": "My.PickerDataSource.Tree",
+      "name": "My Picker Tree Data Source",
+      "api": "/App_Plugins/picker-data-source/tree-api.js",
+      "meta": {
+        "icon": "icon-database",
+        "label": "My Picker Tree Data Source",
+        "description": "Some description goes here"
+      }
+    },
+    {
+      "type": "propertyEditorDataSource",
+      "dataSourceType": "Umb.DataSourceType.Picker",
+      "alias": "My.PickerDataSource.Collection",
+      "name": "My Picker Collection Data Source",
+      "api": "/App_Plugins/picker-data-source/collection-api.js",
+      "meta": {
+        "icon": "icon-database",
+        "label": "My Picker Collection Data Source",
+        "description": "Some description goes here"
+      }
+    }
+  ]
+}
diff --git a/tests/Umbraco.Tests.AcceptanceTest/tests/EntityDataPicker/AdditionalSetup/appsettings.json b/tests/Umbraco.Tests.AcceptanceTest/tests/EntityDataPicker/AdditionalSetup/appsettings.json
new file mode 100644
index 000000000000..49d90bb5936e
--- /dev/null
+++ b/tests/Umbraco.Tests.AcceptanceTest/tests/EntityDataPicker/AdditionalSetup/appsettings.json
@@ -0,0 +1,58 @@
+{
+  "$schema": "appsettings-schema.json",
+  "Serilog": {
+    "MinimumLevel": {
+      "Default": "Information",
+      "Override": {
+        "Microsoft": "Warning",
+        "Microsoft.Hosting.Lifetime": "Information",
+        "System": "Warning"
+      }
+    },
+    "WriteTo": [
+      {
+        "Name": "Async",
+        "Args": {
+          "Configure": [
+            {
+              "Name": "Console"
+            }
+          ]
+        }
+      }
+    ]
+  },
+  "Umbraco": {
+    "CMS": {
+      "Unattended": {
+        "InstallUnattended": true,
+        "UnattendedUserName": "Playwright Test",
+        "UnattendedUserEmail": "playwright@umbraco.com",
+        "UnattendedUserPassword": "UmbracoAcceptance123!"
+      },
+      "Content": {
+        "ContentVersionCleanupPolicy": {
+          "EnableCleanup": false
+        }
+      },
+      "Global": {
+        "DisableElectionForSingleServer": true,
+        "InstallMissingDatabase": true,
+        "Id": "00000000-0000-0000-0000-000000000042",
+        "VersionCheckPeriod": 0,
+        "UseHttps": true
+      },
+      "HealthChecks": {
+        "Notification": {
+          "Enabled": false
+        }
+      },
+      "KeepAlive": {
+        "DisableKeepAliveTask": true
+      },
+      "WebRouting": {
+        "UmbracoApplicationUrl": "https://localhost:44331/"
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/tests/Umbraco.Tests.AcceptanceTest/tests/EntityDataPicker/Content/EntityPickerCollection.spec.ts b/tests/Umbraco.Tests.AcceptanceTest/tests/EntityDataPicker/Content/EntityPickerCollection.spec.ts
new file mode 100644
index 000000000000..6e03d37ab225
--- /dev/null
+++ b/tests/Umbraco.Tests.AcceptanceTest/tests/EntityDataPicker/Content/EntityPickerCollection.spec.ts
@@ -0,0 +1,127 @@
+import {ConstantHelper, NotificationConstantHelper, test} from '@umbraco/playwright-testhelpers';
+import {expect} from "@playwright/test";
+
+const contentName = 'TestContent';
+const documentTypeName = 'TestDocumentTypeForContent';
+const dataTypeName = 'EntityPickerWithCollection';
+const collectionDataSourceAlias = 'My.PickerDataSource.Collection';
+
+test.beforeEach(async ({umbracoUi}) => {
+  await umbracoUi.goToBackOffice();
+});
+
+test.afterEach(async ({umbracoApi}) => {
+  await umbracoApi.document.ensureNameNotExists(contentName);
+  await umbracoApi.documentType.ensureNameNotExists(documentTypeName);
+  await umbracoApi.dataType.ensureNameNotExists(dataTypeName);
+});
+
+test('can create empty content with an entity picker using the collection data source', async ({umbracoApi, umbracoUi}) => {
+  // Arrange
+  const expectedState = 'Draft';
+  const dataTypeId = await umbracoApi.dataType.createEntityDataPickerDataType(dataTypeName, collectionDataSourceAlias);
+  await umbracoApi.documentType.createDocumentTypeWithPropertyEditor(documentTypeName, dataTypeName, dataTypeId);
+  await umbracoUi.content.goToSection(ConstantHelper.sections.content);
+
+  // Act
+  await umbracoUi.content.clickActionsMenuAtRoot();
+  await umbracoUi.content.clickCreateActionMenuOption();
+  await umbracoUi.content.chooseDocumentType(documentTypeName);
+  await umbracoUi.content.enterContentName(contentName);
+  await umbracoUi.content.clickSaveButton();
+
+  // Assert
+  await umbracoUi.content.waitForContentToBeCreated();
+  expect(await umbracoApi.document.doesNameExist(contentName)).toBeTruthy();
+  const contentData = await umbracoApi.document.getByName(contentName);
+  expect(contentData.variants[0].state).toBe(expectedState);
+  expect(contentData.values).toEqual([]);
+});
+
+test('can create content with an entity picker using the collection data source that has an item', async ({umbracoApi, umbracoUi}) => {
+  // Arrange
+  const expectedState = 'Draft';
+  const dataTypeId = await umbracoApi.dataType.createEntityDataPickerDataType(dataTypeName, collectionDataSourceAlias);
+  const documentTypeId = await umbracoApi.documentType.createDocumentTypeWithPropertyEditor(documentTypeName, dataTypeName, dataTypeId);
+  await umbracoApi.document.createDefaultDocument(contentName, documentTypeId);
+  await umbracoUi.content.goToSection(ConstantHelper.sections.content);
+
+  // Act
+  await umbracoUi.content.goToContentWithName(contentName);
+  await umbracoUi.content.chooseCollectionMenuItemWithName('Example 1');
+  await umbracoUi.content.clickSaveButton();
+
+  // Assert
+  await umbracoUi.content.waitForContentToBeCreated();
+  expect(await umbracoApi.document.doesNameExist(contentName)).toBeTruthy();
+  const contentData = await umbracoApi.document.getByName(contentName);
+  expect(contentData.variants[0].state).toBe(expectedState);
+  expect(contentData.values[0].value.ids[0]).toEqual('1');
+});
+
+test('can create content with an entity picker using the collection data source that has multiple items', async ({umbracoApi, umbracoUi}) => {
+  // Arrange
+  const expectedState = 'Draft';
+  const dataTypeId = await umbracoApi.dataType.createEntityDataPickerDataType(dataTypeName, collectionDataSourceAlias);
+  const documentTypeId = await umbracoApi.documentType.createDocumentTypeWithPropertyEditor(documentTypeName, dataTypeName, dataTypeId);
+  await umbracoApi.document.createDefaultDocument(contentName, documentTypeId);
+  await umbracoUi.content.goToSection(ConstantHelper.sections.content);
+
+  // Act
+  await umbracoUi.content.goToContentWithName(contentName);
+  await umbracoUi.content.chooseCollectionMenuItemWithName('Example 1');
+  await umbracoUi.content.chooseCollectionMenuItemWithName('Example 3');
+  await umbracoUi.content.chooseCollectionMenuItemWithName('Example 5');
+  await umbracoUi.content.clickSaveButton();
+
+  // Assert
+  await umbracoUi.content.waitForContentToBeCreated();
+  expect(await umbracoApi.document.doesNameExist(contentName)).toBeTruthy();
+  const contentData = await umbracoApi.document.getByName(contentName);
+  expect(contentData.variants[0].state).toBe(expectedState);
+  expect(contentData.values[0].value.ids[0]).toEqual('1');
+  expect(contentData.values[0].value.ids[1]).toEqual('3');
+  expect(contentData.values[0].value.ids[2]).toEqual('5');
+});
+
+test('can not create content with an entity picker using the collection data source that has more items than max amount', async ({umbracoApi, umbracoUi}) => {
+  // Arrange
+  const dataTypeId = await umbracoApi.dataType.createEntityDataPickerDataTypeWithMinAndMaxValues(dataTypeName, collectionDataSourceAlias, 0, 2);
+  const documentTypeId = await umbracoApi.documentType.createDocumentTypeWithPropertyEditor(documentTypeName, dataTypeName, dataTypeId);
+  await umbracoApi.document.createDefaultDocument(contentName, documentTypeId);
+  await umbracoUi.content.goToSection(ConstantHelper.sections.content);
+
+  // Act
+  await umbracoUi.content.goToContentWithName(contentName);
+  await umbracoUi.content.chooseCollectionMenuItemWithName('Example 1');
+  await umbracoUi.content.isChooseButtonVisible(true);
+  await umbracoUi.content.chooseCollectionMenuItemWithName('Example 3');
+
+  // Assert
+  // The choose button should be disabled when the max amount is reached
+  await umbracoUi.content.isChooseButtonVisible(false);
+});
+
+test('can not create content with an entity picker using the collection data source that has less items than min amount', async ({umbracoApi, umbracoUi}) => {
+  // Arrange
+  const expectedState = 'Published';
+  const dataTypeId = await umbracoApi.dataType.createEntityDataPickerDataTypeWithMinAndMaxValues(dataTypeName, collectionDataSourceAlias, 2, 5);
+  const documentTypeId = await umbracoApi.documentType.createDocumentTypeWithPropertyEditor(documentTypeName, dataTypeName, dataTypeId);
+  await umbracoApi.document.createDefaultDocument(contentName, documentTypeId);
+  await umbracoUi.content.goToSection(ConstantHelper.sections.content);
+
+  // Act
+  await umbracoUi.content.goToContentWithName(contentName);
+  await umbracoUi.content.chooseCollectionMenuItemWithName('Example 1');
+  await umbracoUi.content.isTextWithExactNameVisible('This field need more items');
+  await umbracoUi.content.clickSaveAndPublishButton();
+  await umbracoUi.content.doesErrorNotificationHaveText(NotificationConstantHelper.error.documentCouldNotBePublished);
+  await umbracoUi.content.chooseCollectionMenuItemWithName('Example 3');
+
+  // Assert
+  await umbracoUi.content.clickSaveAndPublishButton();
+  await umbracoUi.content.waitForContentToBeCreated();
+  expect(await umbracoApi.document.doesNameExist(contentName)).toBeTruthy();
+  const contentData = await umbracoApi.document.getByName(contentName);
+  expect(contentData.variants[0].state).toBe(expectedState);
+});
diff --git a/tests/Umbraco.Tests.AcceptanceTest/tests/EntityDataPicker/Content/EntityPickerTree.spec.ts b/tests/Umbraco.Tests.AcceptanceTest/tests/EntityDataPicker/Content/EntityPickerTree.spec.ts
new file mode 100644
index 000000000000..494974c511fa
--- /dev/null
+++ b/tests/Umbraco.Tests.AcceptanceTest/tests/EntityDataPicker/Content/EntityPickerTree.spec.ts
@@ -0,0 +1,127 @@
+import {ConstantHelper, NotificationConstantHelper, test} from '@umbraco/playwright-testhelpers';
+import {expect} from "@playwright/test";
+
+const contentName = 'TestContent';
+const documentTypeName = 'TestDocumentTypeForContent';
+const dataTypeName = 'EntityPickerWithTree';
+const treeDataSourceAlias = 'My.PickerDataSource.Tree';
+
+test.beforeEach(async ({umbracoUi}) => {
+  await umbracoUi.goToBackOffice();
+});
+
+test.afterEach(async ({umbracoApi}) => {
+  await umbracoApi.document.ensureNameNotExists(contentName);
+  await umbracoApi.documentType.ensureNameNotExists(documentTypeName);
+  await umbracoApi.dataType.ensureNameNotExists(dataTypeName);
+});
+
+test('can create empty content with an entity picker using the tree data source', async ({umbracoApi, umbracoUi}) => {
+  // Arrange
+  const expectedState = 'Draft';
+  const dataTypeId = await umbracoApi.dataType.createEntityDataPickerDataType(dataTypeName, treeDataSourceAlias);
+  await umbracoApi.documentType.createDocumentTypeWithPropertyEditor(documentTypeName, dataTypeName, dataTypeId);
+  await umbracoUi.content.goToSection(ConstantHelper.sections.content);
+
+  // Act
+  await umbracoUi.content.clickActionsMenuAtRoot();
+  await umbracoUi.content.clickCreateActionMenuOption();
+  await umbracoUi.content.chooseDocumentType(documentTypeName);
+  await umbracoUi.content.enterContentName(contentName);
+  await umbracoUi.content.clickSaveButton();
+
+  // Assert
+  await umbracoUi.content.waitForContentToBeCreated();
+  expect(await umbracoApi.document.doesNameExist(contentName)).toBeTruthy();
+  const contentData = await umbracoApi.document.getByName(contentName);
+  expect(contentData.variants[0].state).toBe(expectedState);
+  expect(contentData.values).toEqual([]);
+});
+
+test('can create content with an entity picker using the tree data source that has an item', async ({umbracoApi, umbracoUi}) => {
+  // Arrange
+  const expectedState = 'Draft';
+  const dataTypeId = await umbracoApi.dataType.createEntityDataPickerDataType(dataTypeName, treeDataSourceAlias);
+  const documentTypeId = await umbracoApi.documentType.createDocumentTypeWithPropertyEditor(documentTypeName, dataTypeName, dataTypeId);
+  await umbracoApi.document.createDefaultDocument(contentName, documentTypeId);
+  await umbracoUi.content.goToSection(ConstantHelper.sections.content);
+
+  // Act
+  await umbracoUi.content.goToContentWithName(contentName);
+  await umbracoUi.content.chooseTreeMenuItemWithName('Example 1');
+  await umbracoUi.content.clickSaveButton();
+
+  // Assert
+  await umbracoUi.content.waitForContentToBeCreated();
+  expect(await umbracoApi.document.doesNameExist(contentName)).toBeTruthy();
+  const contentData = await umbracoApi.document.getByName(contentName);
+  expect(contentData.variants[0].state).toBe(expectedState);
+  expect(contentData.values[0].value.ids[0]).toEqual('1');
+});
+
+test('can create content with an entity picker using the tree data source that has multiple items', async ({umbracoApi, umbracoUi}) => {
+  // Arrange
+  const expectedState = 'Draft';
+  const dataTypeId = await umbracoApi.dataType.createEntityDataPickerDataType(dataTypeName, treeDataSourceAlias);
+  const documentTypeId = await umbracoApi.documentType.createDocumentTypeWithPropertyEditor(documentTypeName, dataTypeName, dataTypeId);
+  await umbracoApi.document.createDefaultDocument(contentName, documentTypeId);
+  await umbracoUi.content.goToSection(ConstantHelper.sections.content);
+
+  // Act
+  await umbracoUi.content.goToContentWithName(contentName);
+  await umbracoUi.content.chooseTreeMenuItemWithName('Example 1');
+  await umbracoUi.content.chooseTreeMenuItemWithName('Example 3');
+  await umbracoUi.content.chooseTreeMenuItemWithName('Example 5', ['Example Folder 1']);
+  await umbracoUi.content.clickSaveButton();
+
+  // Assert
+  await umbracoUi.content.waitForContentToBeCreated();
+  expect(await umbracoApi.document.doesNameExist(contentName)).toBeTruthy();
+  const contentData = await umbracoApi.document.getByName(contentName);
+  expect(contentData.variants[0].state).toBe(expectedState);
+  expect(contentData.values[0].value.ids[0]).toEqual('1');
+  expect(contentData.values[0].value.ids[1]).toEqual('3');
+  expect(contentData.values[0].value.ids[2]).toEqual('5');
+});
+
+test('can not create content with an entity picker using the tree data source that has more items than max amount', async ({umbracoApi, umbracoUi}) => {
+  // Arrange
+  const dataTypeId = await umbracoApi.dataType.createEntityDataPickerDataTypeWithMinAndMaxValues(dataTypeName, treeDataSourceAlias, 0, 2);
+  const documentTypeId = await umbracoApi.documentType.createDocumentTypeWithPropertyEditor(documentTypeName, dataTypeName, dataTypeId);
+  await umbracoApi.document.createDefaultDocument(contentName, documentTypeId);
+  await umbracoUi.content.goToSection(ConstantHelper.sections.content);
+
+  // Act
+  await umbracoUi.content.goToContentWithName(contentName);
+  await umbracoUi.content.chooseTreeMenuItemWithName('Example 1');
+  await umbracoUi.content.isChooseButtonVisible(true);
+  await umbracoUi.content.chooseTreeMenuItemWithName('Example 5', ['Example Folder 1']);
+
+  // Assert
+  // The choose button should be disabled when the max amount is reached
+  await umbracoUi.content.isChooseButtonVisible(false);
+});
+
+test('can not create content with an entity picker using the tree data source that has less items than min amount', async ({umbracoApi, umbracoUi}) => {
+  // Arrange
+  const expectedState = 'Published';
+  const dataTypeId = await umbracoApi.dataType.createEntityDataPickerDataTypeWithMinAndMaxValues(dataTypeName, treeDataSourceAlias, 2, 5);
+  const documentTypeId = await umbracoApi.documentType.createDocumentTypeWithPropertyEditor(documentTypeName, dataTypeName, dataTypeId);
+  await umbracoApi.document.createDefaultDocument(contentName, documentTypeId);
+  await umbracoUi.content.goToSection(ConstantHelper.sections.content);
+
+  // Act
+  await umbracoUi.content.goToContentWithName(contentName);
+  await umbracoUi.content.chooseTreeMenuItemWithName('Example 1');
+  await umbracoUi.content.isTextWithExactNameVisible('This field need more items');
+  await umbracoUi.content.clickSaveAndPublishButton();
+  await umbracoUi.content.doesErrorNotificationHaveText(NotificationConstantHelper.error.documentCouldNotBePublished);
+  await umbracoUi.content.chooseTreeMenuItemWithName('Example 5', ['Example Folder 1']);
+
+  // Assert
+  await umbracoUi.content.clickSaveAndPublishButton();
+  await umbracoUi.content.waitForContentToBeCreated();
+  expect(await umbracoApi.document.doesNameExist(contentName)).toBeTruthy();
+  const contentData = await umbracoApi.document.getByName(contentName);
+  expect(contentData.variants[0].state).toBe(expectedState);
+});
diff --git a/tests/Umbraco.Tests.AcceptanceTest/tests/EntityDataPicker/DataType/EntityPickerCollection.spec.ts b/tests/Umbraco.Tests.AcceptanceTest/tests/EntityDataPicker/DataType/EntityPickerCollection.spec.ts
new file mode 100644
index 000000000000..1096ebdb4f7a
--- /dev/null
+++ b/tests/Umbraco.Tests.AcceptanceTest/tests/EntityDataPicker/DataType/EntityPickerCollection.spec.ts
@@ -0,0 +1,33 @@
+import {ConstantHelper, test} from '@umbraco/playwright-testhelpers';
+import {expect} from "@playwright/test";
+
+const dataTypeName = 'EntityPickerWithCollection';
+
+test.beforeEach(async ({umbracoUi, umbracoApi}) => {
+  await umbracoUi.goToBackOffice();
+  await umbracoUi.dataType.goToSection(ConstantHelper.sections.settings);
+  await umbracoApi.dataType.ensureNameNotExists(dataTypeName);
+});
+
+test.afterEach(async ({umbracoApi}) => {
+  await umbracoApi.dataType.ensureNameNotExists(dataTypeName);
+});
+
+test('can create an entity picker data type with the collection data source', async ({umbracoApi, umbracoUi}) => {
+  // Act
+  await umbracoUi.dataType.clickActionsMenuForName('Data Types');
+  await umbracoUi.dataType.clickCreateActionMenuOption();
+  await umbracoUi.dataType.clickDataTypeButton();
+  await umbracoUi.dataType.enterDataTypeName(dataTypeName);
+  await umbracoUi.dataType.clickSelectAPropertyEditorButton();
+  await umbracoUi.dataType.selectAPropertyEditor('Entity Data Picker');
+  await umbracoUi.dataType.clickChooseDataSourceButton();
+  await umbracoUi.dataType.clickButtonWithName('My Picker Collection Data Source');
+  await umbracoUi.dataType.clickChooseModalButton();
+  await umbracoUi.dataType.clickSaveButton();
+
+  // Assert
+  await umbracoUi.dataType.waitForDataTypeToBeCreated();
+  await umbracoUi.dataType.isDataTypeTreeItemVisible(dataTypeName);
+  expect(await umbracoApi.dataType.doesNameExist(dataTypeName)).toBeTruthy();
+});
diff --git a/tests/Umbraco.Tests.AcceptanceTest/tests/EntityDataPicker/DataType/EntityPickerTree.spec.ts b/tests/Umbraco.Tests.AcceptanceTest/tests/EntityDataPicker/DataType/EntityPickerTree.spec.ts
new file mode 100644
index 000000000000..90c04b5e9505
--- /dev/null
+++ b/tests/Umbraco.Tests.AcceptanceTest/tests/EntityDataPicker/DataType/EntityPickerTree.spec.ts
@@ -0,0 +1,33 @@
+import {ConstantHelper, test} from '@umbraco/playwright-testhelpers';
+import {expect} from "@playwright/test";
+
+const dataTypeName = 'EntityPickerWithTree';
+
+test.beforeEach(async ({umbracoUi, umbracoApi}) => {
+  await umbracoUi.goToBackOffice();
+  await umbracoUi.dataType.goToSection(ConstantHelper.sections.settings);
+  await umbracoApi.dataType.ensureNameNotExists(dataTypeName);
+});
+
+test.afterEach(async ({umbracoApi}) => {
+  await umbracoApi.dataType.ensureNameNotExists(dataTypeName);
+});
+
+test('can create an entity picker data type with tree data source', async ({umbracoApi, umbracoUi}) => {
+  // Act
+  await umbracoUi.dataType.clickActionsMenuForName('Data Types');
+  await umbracoUi.dataType.clickCreateActionMenuOption();
+  await umbracoUi.dataType.clickDataTypeButton();
+  await umbracoUi.dataType.enterDataTypeName(dataTypeName);
+  await umbracoUi.dataType.clickSelectAPropertyEditorButton();
+  await umbracoUi.dataType.selectAPropertyEditor('Entity Data Picker');
+  await umbracoUi.dataType.clickChooseDataSourceButton();
+  await umbracoUi.dataType.clickButtonWithName('My Picker Tree Data Source');
+  await umbracoUi.dataType.clickChooseModalButton();
+  await umbracoUi.dataType.clickSaveButton();
+
+  // Assert
+  await umbracoUi.dataType.waitForDataTypeToBeCreated();
+  await umbracoUi.dataType.isDataTypeTreeItemVisible(dataTypeName);
+  expect(await umbracoApi.dataType.doesNameExist(dataTypeName)).toBeTruthy();
+});
diff --git a/tests/Umbraco.Tests.AcceptanceTest/tests/EntityDataPicker/RenderedContent/EntityPickerCollection.spec.ts b/tests/Umbraco.Tests.AcceptanceTest/tests/EntityDataPicker/RenderedContent/EntityPickerCollection.spec.ts
new file mode 100644
index 000000000000..824d22b1d2ab
--- /dev/null
+++ b/tests/Umbraco.Tests.AcceptanceTest/tests/EntityDataPicker/RenderedContent/EntityPickerCollection.spec.ts
@@ -0,0 +1,39 @@
+import {AliasHelper, test} from '@umbraco/playwright-testhelpers';
+
+const contentName = 'TestContent';
+const documentTypeName = 'TestDocumentTypeForContent';
+const templateName = 'EntityPickerCollectionTemplate';
+const dataTypeName = 'EntityPickerWithCollection';
+const propertyName = 'TestProperty';
+const collectionDataSourceAlias = 'My.PickerDataSource.Collection';
+
+// Ids for Example 4 and Example 2
+const items = {ids: ['4', '2']};
+
+test.beforeEach(async ({umbracoUi}) => {
+  await umbracoUi.goToBackOffice();
+});
+
+test.afterEach(async ({umbracoApi}) => {
+  await umbracoApi.document.ensureNameNotExists(contentName);
+  await umbracoApi.documentType.ensureNameNotExists(documentTypeName);
+  await umbracoApi.template.ensureNameNotExists(templateName);
+  await umbracoApi.dataType.ensureNameNotExists(dataTypeName);
+});
+
+test('can render content with an entity picker using the collection data source', async ({umbracoApi, umbracoUi}) => {
+  // Arrange
+  const dataTypeId = await umbracoApi.dataType.createEntityDataPickerDataType(dataTypeName, collectionDataSourceAlias);
+  const templateId = await umbracoApi.template.createTemplateWithEntityDataPickerValue(templateName, propertyName);
+  const contentKey = await umbracoApi.document.createPublishedDocumentWithValue(contentName, items, dataTypeId, templateId, propertyName, documentTypeName);
+  const contentURL = await umbracoApi.document.getDocumentUrl(contentKey);
+
+  // Act
+  await umbracoUi.contentRender.navigateToRenderedContentPage(contentURL);
+
+  // Assert
+  await umbracoUi.contentRender.doesDataSourceRenderValueHaveText(collectionDataSourceAlias);
+  for (const value of items.ids) {
+    await umbracoUi.contentRender.doesContentRenderValueContainText(value);
+  }
+});
diff --git a/tests/Umbraco.Tests.AcceptanceTest/tests/EntityDataPicker/RenderedContent/EntityPickerTree.spec.ts b/tests/Umbraco.Tests.AcceptanceTest/tests/EntityDataPicker/RenderedContent/EntityPickerTree.spec.ts
new file mode 100644
index 000000000000..192a0f8dd3e9
--- /dev/null
+++ b/tests/Umbraco.Tests.AcceptanceTest/tests/EntityDataPicker/RenderedContent/EntityPickerTree.spec.ts
@@ -0,0 +1,39 @@
+import {AliasHelper, test} from '@umbraco/playwright-testhelpers';
+
+const contentName = 'TestContent';
+const documentTypeName = 'TestDocumentTypeForContent';
+const templateName = 'EntityPickerTreeTemplate';
+const dataTypeName = 'EntityPickerWithTree';
+const propertyName = 'TestProperty';
+const treeDataSourceAlias = 'My.PickerDataSource.Tree';
+
+// Ids for Example 4 and Example 2
+const items = {ids: ['4', '2']};
+
+test.beforeEach(async ({umbracoUi}) => {
+  await umbracoUi.goToBackOffice();
+});
+
+test.afterEach(async ({umbracoApi}) => {
+  await umbracoApi.document.ensureNameNotExists(contentName);
+  await umbracoApi.documentType.ensureNameNotExists(documentTypeName);
+  await umbracoApi.template.ensureNameNotExists(templateName);
+  await umbracoApi.dataType.ensureNameNotExists(dataTypeName);
+});
+
+test('can render content with an entity picker using the tree data source', async ({umbracoApi, umbracoUi}) => {
+  // Arrange
+  const dataTypeId = await umbracoApi.dataType.createEntityDataPickerDataType(dataTypeName, treeDataSourceAlias);
+  const templateId = await umbracoApi.template.createTemplateWithEntityDataPickerValue(templateName, propertyName);
+  const contentKey = await umbracoApi.document.createPublishedDocumentWithValue(contentName, items, dataTypeId, templateId, propertyName, documentTypeName);
+  const contentURL = await umbracoApi.document.getDocumentUrl(contentKey);
+
+  // Act
+  await umbracoUi.contentRender.navigateToRenderedContentPage(contentURL);
+
+  // Assert
+  await umbracoUi.contentRender.doesDataSourceRenderValueHaveText(treeDataSourceAlias);
+  for (const value of items.ids) {
+    await umbracoUi.contentRender.doesContentRenderValueContainText(value);
+  }
+});

From ca15aadf0ea7492ac4d18a2324f81ec233018a26 Mon Sep 17 00:00:00 2001
From: Justin Neville <67802060+justin-nevitech@users.noreply.github.com>
Date: Thu, 13 Nov 2025 00:21:26 +0000
Subject: [PATCH 140/155] =?UTF-8?q?Fix=20for=20partial=20view=20caches=20n?=
 =?UTF-8?q?ot=20being=20cleared=20when=20content=20is=20publish=E2=80=A6?=
 =?UTF-8?q?=20(#20794)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Fix for partial view caches not being cleared when content is published/unpublished

* Update src/Umbraco.Core/Cache/Refreshers/Implement/ContentCacheRefresher.cs

Co-authored-by: Nikolaj Geisle <70372949+Zeegaan@users.noreply.github.com>

* Change logic for clearing partial view cache

* Changed logic to only clear partial cache when content is published/unpublished or trashed

---------

Co-authored-by: Nikolaj Geisle <70372949+Zeegaan@users.noreply.github.com>
---
 .../Implement/ContentCacheRefresher.cs        | 40 +++++++++++++++----
 1 file changed, 33 insertions(+), 7 deletions(-)

diff --git a/src/Umbraco.Core/Cache/Refreshers/Implement/ContentCacheRefresher.cs b/src/Umbraco.Core/Cache/Refreshers/Implement/ContentCacheRefresher.cs
index 7505781ad95a..b1307ef1e8bb 100644
--- a/src/Umbraco.Core/Cache/Refreshers/Implement/ContentCacheRefresher.cs
+++ b/src/Umbraco.Core/Cache/Refreshers/Implement/ContentCacheRefresher.cs
@@ -1,5 +1,3 @@
-using Microsoft.Extensions.DependencyInjection;
-using Umbraco.Cms.Core.DependencyInjection;
 using Umbraco.Cms.Core.Events;
 using Umbraco.Cms.Core.Models;
 using Umbraco.Cms.Core.Notifications;
@@ -151,6 +149,12 @@ public override void Refresh(JsonPayload[] payloads)
 
         }
 
+        // Clear partial view cache when published content changes
+        if (ShouldClearPartialViewCache(payloads))
+        {
+            AppCaches.ClearPartialViewCache();
+        }
+
         if (idsRemoved.Count > 0)
         {
             var assignedDomains = _domainService.GetAll(true)
@@ -175,6 +179,28 @@ public override void Refresh(JsonPayload[] payloads)
         base.Refresh(payloads);
     }
 
+    private static bool ShouldClearPartialViewCache(JsonPayload[] payloads)
+    {
+        return payloads.Any(x =>
+        {
+            // Check for relelvant change type
+            var isRelevantChangeType = x.ChangeTypes.HasType(TreeChangeTypes.RefreshAll) ||
+                x.ChangeTypes.HasType(TreeChangeTypes.Remove) ||
+                x.ChangeTypes.HasType(TreeChangeTypes.RefreshNode) ||
+                x.ChangeTypes.HasType(TreeChangeTypes.RefreshBranch);
+
+            // Check for published/unpublished changes
+            var hasChanges = x.PublishedCultures?.Length > 0 ||
+                   x.UnpublishedCultures?.Length > 0;
+
+            // There's no other way to detect trashed content as the change type is only Remove when deleted permanently
+            var isTrashed = x.ChangeTypes.HasType(TreeChangeTypes.RefreshBranch) && x.PublishedCultures is null && x.UnpublishedCultures is null;
+
+            // Skip blueprints and only clear the partial cache for removals or refreshes with changes
+            return x.Blueprint == false && (isTrashed || (isRelevantChangeType && hasChanges));
+        });
+    }
+
     private void HandleMemoryCache(JsonPayload payload)
     {
         Guid key = payload.Key ?? _idKeyMap.GetKeyForId(payload.Id, UmbracoObjectTypes.Document).Result;
@@ -365,7 +391,7 @@ private async Task HandlePublishedAsync(JsonPayload payload, CancellationToken c
     }
     private void HandleRouting(JsonPayload payload)
     {
-        if(payload.ChangeTypes.HasType(TreeChangeTypes.Remove))
+        if (payload.ChangeTypes.HasType(TreeChangeTypes.Remove))
         {
             var key = payload.Key ?? _idKeyMap.GetKeyForId(payload.Id, UmbracoObjectTypes.Document).Result;
 
@@ -374,24 +400,24 @@ private void HandleRouting(JsonPayload payload)
             {
                 _documentUrlService.DeleteUrlsFromCacheAsync(descendantsOrSelfKeys).GetAwaiter().GetResult();
             }
-            else if(_documentNavigationQueryService.TryGetDescendantsKeysOrSelfKeysInBin(key, out var descendantsOrSelfKeysInBin))
+            else if (_documentNavigationQueryService.TryGetDescendantsKeysOrSelfKeysInBin(key, out var descendantsOrSelfKeysInBin))
             {
                 _documentUrlService.DeleteUrlsFromCacheAsync(descendantsOrSelfKeysInBin).GetAwaiter().GetResult();
             }
 
         }
-        if(payload.ChangeTypes.HasType(TreeChangeTypes.RefreshAll))
+        if (payload.ChangeTypes.HasType(TreeChangeTypes.RefreshAll))
         {
             _documentUrlService.InitAsync(false, CancellationToken.None).GetAwaiter().GetResult(); //TODO make async
         }
 
-        if(payload.ChangeTypes.HasType(TreeChangeTypes.RefreshNode))
+        if (payload.ChangeTypes.HasType(TreeChangeTypes.RefreshNode))
         {
             var key = payload.Key ?? _idKeyMap.GetKeyForId(payload.Id, UmbracoObjectTypes.Document).Result;
             _documentUrlService.CreateOrUpdateUrlSegmentsAsync(key).GetAwaiter().GetResult();
         }
 
-        if(payload.ChangeTypes.HasType(TreeChangeTypes.RefreshBranch))
+        if (payload.ChangeTypes.HasType(TreeChangeTypes.RefreshBranch))
         {
             var key = payload.Key ?? _idKeyMap.GetKeyForId(payload.Id, UmbracoObjectTypes.Document).Result;
             _documentUrlService.CreateOrUpdateUrlSegmentsWithDescendantsAsync(key).GetAwaiter().GetResult();

From 139b528bda622d76130e2c8c5070186dbafd8d75 Mon Sep 17 00:00:00 2001
From: NguyenThuyLan <116753400+NguyenThuyLan@users.noreply.github.com>
Date: Thu, 13 Nov 2025 11:10:51 +0700
Subject: [PATCH 141/155] Database migrations: Support `DateOnly` and
 `TimeOnly` in syntax providers (#20784)

* sql column type map include dateonly and timeonly

* Split Mapper and add check null value

* Minor code tidy resolving a few warnings.

* add spaces

* clean code

---------

Co-authored-by: Lan Nguyen Thuy <lnt@umbraco.dk>
Co-authored-by: Andy Butland <abutland73@gmail.com>
---
 .../SqlitePocoDateAndTimeOnlyMapper.cs        | 64 +++++++++++++++++
 .../Mappers/SqlitePocoDecimalMapper.cs        | 26 +++++++
 .../Mappers/SqlitePocoGuidMapper.cs           | 29 ++------
 .../Services/SqliteSpecificMapperFactory.cs   |  2 +-
 .../Mapping/UmbracoDefaultMapper.cs           | 68 ++++++++++++++++---
 .../SqlSyntax/SqlSyntaxProviderBase.cs        |  8 +++
 .../Testing/SqliteTestDatabase.cs             |  2 +
 7 files changed, 163 insertions(+), 36 deletions(-)
 create mode 100644 src/Umbraco.Cms.Persistence.Sqlite/Mappers/SqlitePocoDateAndTimeOnlyMapper.cs
 create mode 100644 src/Umbraco.Cms.Persistence.Sqlite/Mappers/SqlitePocoDecimalMapper.cs

diff --git a/src/Umbraco.Cms.Persistence.Sqlite/Mappers/SqlitePocoDateAndTimeOnlyMapper.cs b/src/Umbraco.Cms.Persistence.Sqlite/Mappers/SqlitePocoDateAndTimeOnlyMapper.cs
new file mode 100644
index 000000000000..4e3ec6a411f1
--- /dev/null
+++ b/src/Umbraco.Cms.Persistence.Sqlite/Mappers/SqlitePocoDateAndTimeOnlyMapper.cs
@@ -0,0 +1,64 @@
+using NPoco;
+
+namespace Umbraco.Cms.Persistence.Sqlite.Mappers;
+
+/// <summary>
+/// Provides a custom POCO mapper for handling date and time only values when working with SQLite databases.
+/// </summary>
+public class SqlitePocoDateAndTimeOnlyMapper : DefaultMapper
+{
+    /// <inheritdoc/>
+    public override Func<object, object?> GetFromDbConverter(Type destType, Type sourceType)
+    {
+        if (IsDateOnlyType(destType))
+        {
+            return value => ConvertToDateOnly(value, IsNullableType(destType));
+        }
+
+        if (IsTimeOnlyType(destType))
+        {
+            return value => ConvertToTimeOnly(value, IsNullableType(destType));
+        }
+
+        return base.GetFromDbConverter(destType, sourceType);
+    }
+
+    private static bool IsDateOnlyType(Type type) =>
+        type == typeof(DateOnly) || type == typeof(DateOnly?);
+
+    private static bool IsTimeOnlyType(Type type) =>
+        type == typeof(TimeOnly) || type == typeof(TimeOnly?);
+
+    private static bool IsNullableType(Type type) =>
+        Nullable.GetUnderlyingType(type) != null;
+
+    private static object? ConvertToDateOnly(object? value, bool isNullable)
+    {
+        if (value is null)
+        {
+            return isNullable ? null : default(DateOnly);
+        }
+
+        if (value is DateTime dt)
+        {
+            return DateOnly.FromDateTime(dt);
+        }
+
+        return DateOnly.Parse(value.ToString()!);
+    }
+
+    private static object? ConvertToTimeOnly(object? value, bool isNullable)
+    {
+        if (value is null)
+        {
+            return isNullable ? null : default(TimeOnly);
+        }
+
+        if (value is DateTime dt)
+        {
+            return TimeOnly.FromDateTime(dt);
+        }
+
+        return TimeOnly.Parse(value.ToString()!);
+    }
+}
diff --git a/src/Umbraco.Cms.Persistence.Sqlite/Mappers/SqlitePocoDecimalMapper.cs b/src/Umbraco.Cms.Persistence.Sqlite/Mappers/SqlitePocoDecimalMapper.cs
new file mode 100644
index 000000000000..567b1cbcb8f9
--- /dev/null
+++ b/src/Umbraco.Cms.Persistence.Sqlite/Mappers/SqlitePocoDecimalMapper.cs
@@ -0,0 +1,26 @@
+using System.Globalization;
+using NPoco;
+
+namespace Umbraco.Cms.Persistence.Sqlite.Mappers;
+
+/// <summary>
+/// Provides a custom POCO mapper for handling decimal values when working with SQLite databases.
+/// </summary>
+public class SqlitePocoDecimalMapper : DefaultMapper
+{
+    /// <inheritdoc/>
+    public override Func<object, object?> GetFromDbConverter(Type destType, Type sourceType)
+    {
+        if (destType == typeof(decimal))
+        {
+            return value => Convert.ToDecimal(value, CultureInfo.InvariantCulture);
+        }
+
+        if (destType == typeof(decimal?))
+        {
+            return value => Convert.ToDecimal(value, CultureInfo.InvariantCulture);
+        }
+
+        return base.GetFromDbConverter(destType, sourceType);
+    }
+}
diff --git a/src/Umbraco.Cms.Persistence.Sqlite/Mappers/SqlitePocoGuidMapper.cs b/src/Umbraco.Cms.Persistence.Sqlite/Mappers/SqlitePocoGuidMapper.cs
index ab62b4b1d1c6..ffb96a6b2b0e 100644
--- a/src/Umbraco.Cms.Persistence.Sqlite/Mappers/SqlitePocoGuidMapper.cs
+++ b/src/Umbraco.Cms.Persistence.Sqlite/Mappers/SqlitePocoGuidMapper.cs
@@ -1,19 +1,18 @@
-using System.Globalization;
 using NPoco;
 
 namespace Umbraco.Cms.Persistence.Sqlite.Mappers;
 
+/// <summary>
+/// Provides a custom POCO mapper for handling GUID values when working with SQLite databases.
+/// </summary>
 public class SqlitePocoGuidMapper : DefaultMapper
 {
+    /// <inheritdoc/>
     public override Func<object, object?> GetFromDbConverter(Type destType, Type sourceType)
     {
         if (destType == typeof(Guid))
         {
-            return value =>
-            {
-                var result = Guid.Parse($"{value}");
-                return result;
-            };
+            return value => Guid.Parse($"{value}");
         }
 
         if (destType == typeof(Guid?))
@@ -29,24 +28,6 @@ public class SqlitePocoGuidMapper : DefaultMapper
             };
         }
 
-        if (destType == typeof(decimal))
-        {
-            return value =>
-            {
-                var result = Convert.ToDecimal(value, CultureInfo.InvariantCulture);
-                return result;
-            };
-        }
-
-        if (destType == typeof(decimal?))
-        {
-            return value =>
-            {
-                var result = Convert.ToDecimal(value, CultureInfo.InvariantCulture);
-                return result;
-            };
-        }
-
         return base.GetFromDbConverter(destType, sourceType);
     }
 }
diff --git a/src/Umbraco.Cms.Persistence.Sqlite/Services/SqliteSpecificMapperFactory.cs b/src/Umbraco.Cms.Persistence.Sqlite/Services/SqliteSpecificMapperFactory.cs
index 66f542712a3c..9c577d6329dd 100644
--- a/src/Umbraco.Cms.Persistence.Sqlite/Services/SqliteSpecificMapperFactory.cs
+++ b/src/Umbraco.Cms.Persistence.Sqlite/Services/SqliteSpecificMapperFactory.cs
@@ -12,5 +12,5 @@ public class SqliteSpecificMapperFactory : IProviderSpecificMapperFactory
     public string ProviderName => Constants.ProviderName;
 
     /// <inheritdoc />
-    public NPocoMapperCollection Mappers => new(() => new[] { new SqlitePocoGuidMapper() });
+    public NPocoMapperCollection Mappers => new(() => [new SqlitePocoGuidMapper(), new SqlitePocoDecimalMapper(), new SqlitePocoDateAndTimeOnlyMapper()]);
 }
diff --git a/src/Umbraco.Infrastructure/Mapping/UmbracoDefaultMapper.cs b/src/Umbraco.Infrastructure/Mapping/UmbracoDefaultMapper.cs
index 986bb19d39d8..0afb677ee9ab 100644
--- a/src/Umbraco.Infrastructure/Mapping/UmbracoDefaultMapper.cs
+++ b/src/Umbraco.Infrastructure/Mapping/UmbracoDefaultMapper.cs
@@ -1,30 +1,76 @@
-using System.Globalization;
+using System.Globalization;
 using NPoco;
 
 namespace Umbraco.Cms.Core.Mapping;
 
+/// <summary>
+/// Provides default type conversion logic for mapping Umbraco database values to .NET types, extending the base mapping
+/// behavior with support for additional types such as decimal, DateOnly, and TimeOnly.
+/// </summary>
 public class UmbracoDefaultMapper : DefaultMapper
 {
+    /// <inheritdoc/>
     public override Func<object, object?> GetFromDbConverter(Type destType, Type sourceType)
     {
         if (destType == typeof(decimal))
         {
-            return value =>
-            {
-                var result = Convert.ToDecimal(value, CultureInfo.InvariantCulture);
-                return result;
-            };
+            return value => Convert.ToDecimal(value, CultureInfo.InvariantCulture);
         }
 
         if (destType == typeof(decimal?))
         {
-            return value =>
-            {
-                var result = Convert.ToDecimal(value, CultureInfo.InvariantCulture);
-                return result;
-            };
+            return value => Convert.ToDecimal(value, CultureInfo.InvariantCulture);
+        }
+
+        if(IsDateOnlyType(destType))
+        {
+            return value => ConvertToDateOnly(value, IsNullableType(destType));
+        }
+
+        if (IsTimeOnlyType(destType))
+        {
+            return value => ConvertToTimeOnly(value, IsNullableType(destType));
         }
 
         return base.GetFromDbConverter(destType, sourceType);
     }
+
+    private static bool IsDateOnlyType(Type type) =>
+        type == typeof(DateOnly) || type == typeof(DateOnly?);
+
+    private static bool IsTimeOnlyType(Type type) =>
+        type == typeof(TimeOnly) || type == typeof(TimeOnly?);
+
+    private static bool IsNullableType(Type type) =>
+        Nullable.GetUnderlyingType(type) != null;
+
+    private static object? ConvertToDateOnly(object? value, bool isNullable)
+    {
+        if (value is null)
+        {
+            return isNullable ? null : default(DateOnly);
+        }
+
+        if (value is DateTime dt)
+        {
+            return DateOnly.FromDateTime(dt);
+        }
+
+        return DateOnly.Parse(value.ToString()!);
+    }
+
+    private static object? ConvertToTimeOnly(object? value, bool isNullable)
+    {
+        if (value is null)
+        {
+            return isNullable ? null : default(TimeOnly);
+        }
+
+        if (value is DateTime dt)
+        {
+            return TimeOnly.FromDateTime(dt);
+        }
+
+        return TimeOnly.Parse(value.ToString()!);
+    }
 }
diff --git a/src/Umbraco.Infrastructure/Persistence/SqlSyntax/SqlSyntaxProviderBase.cs b/src/Umbraco.Infrastructure/Persistence/SqlSyntax/SqlSyntaxProviderBase.cs
index 9cefd32b5bef..82bbf26f810e 100644
--- a/src/Umbraco.Infrastructure/Persistence/SqlSyntax/SqlSyntaxProviderBase.cs
+++ b/src/Umbraco.Infrastructure/Persistence/SqlSyntax/SqlSyntaxProviderBase.cs
@@ -100,6 +100,10 @@ protected SqlSyntaxProviderBase()
 
     public string TimeColumnDefinition { get; protected set; } = "DATETIME";
 
+    public string DateOnlyColumnDefinition { get; protected set; } = "DATE";
+
+    public string TimeOnlyColumnDefinition { get; protected set; } = "TIME";
+
     protected IList<Func<ColumnDefinition, string>> ClauseOrder { get; }
 
     protected DbTypes DbTypeMap => _dbTypes.Value;
@@ -531,6 +535,10 @@ private DbTypes InitColumnTypeMap()
         dbTypeMap.Set<TimeSpan?>(DbType.Time, TimeColumnDefinition);
         dbTypeMap.Set<DateTimeOffset>(DbType.DateTimeOffset, DateTimeOffsetColumnDefinition);
         dbTypeMap.Set<DateTimeOffset?>(DbType.DateTimeOffset, DateTimeOffsetColumnDefinition);
+        dbTypeMap.Set<DateOnly>(DbType.Date, DateOnlyColumnDefinition);
+        dbTypeMap.Set<DateOnly?>(DbType.Date, DateOnlyColumnDefinition);
+        dbTypeMap.Set<TimeOnly>(DbType.Time, TimeOnlyColumnDefinition);
+        dbTypeMap.Set<TimeOnly?>(DbType.Time, TimeOnlyColumnDefinition);
 
         dbTypeMap.Set<byte>(DbType.Byte, IntColumnDefinition);
         dbTypeMap.Set<byte?>(DbType.Byte, IntColumnDefinition);
diff --git a/tests/Umbraco.Tests.Integration/Testing/SqliteTestDatabase.cs b/tests/Umbraco.Tests.Integration/Testing/SqliteTestDatabase.cs
index a20b00ebe598..73b9c444a7ae 100644
--- a/tests/Umbraco.Tests.Integration/Testing/SqliteTestDatabase.cs
+++ b/tests/Umbraco.Tests.Integration/Testing/SqliteTestDatabase.cs
@@ -96,6 +96,8 @@ protected override void RebuildSchema(IDbCommand command, TestDbMeta meta)
 
         database.Mappers.Add(new NullableDateMapper());
         database.Mappers.Add(new SqlitePocoGuidMapper());
+        database.Mappers.Add(new SqlitePocoDecimalMapper());
+        database.Mappers.Add(new SqlitePocoDateAndTimeOnlyMapper());
 
         foreach (var dbCommand in _cachedDatabaseInitCommands)
         {

From c2952717577b450ed5391e909684609d37045b7d Mon Sep 17 00:00:00 2001
From: Andy Butland <abutland73@gmail.com>
Date: Thu, 13 Nov 2025 06:39:10 +0100
Subject: [PATCH 142/155] Bumped version to 16.4.0-rc2.

---
 src/Umbraco.Web.UI.Client/package.json | 2 +-
 version.json                           | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/package.json b/src/Umbraco.Web.UI.Client/package.json
index afeacbe636ee..b076052b37d2 100644
--- a/src/Umbraco.Web.UI.Client/package.json
+++ b/src/Umbraco.Web.UI.Client/package.json
@@ -1,7 +1,7 @@
 {
 	"name": "@umbraco-cms/backoffice",
 	"license": "MIT",
-	"version": "16.4.0-rc",
+	"version": "16.4.0-rc2",
 	"type": "module",
 	"exports": {
 		".": null,
diff --git a/version.json b/version.json
index d8d415334bcc..cf14b3a81a6f 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": "16.4.0-rc",
+  "version": "16.4.0-rc2",
   "assemblyVersion": {
     "precision": "build"
   },

From 49ba89c22a7d51784cff43a13a3684a47dc47932 Mon Sep 17 00:00:00 2001
From: Kenn Jacobsen <kja@umbraco.dk>
Date: Thu, 13 Nov 2025 08:19:42 +0100
Subject: [PATCH 143/155] Move access/refresh tokens to secure cookies (#20779)

* feat: adds the `credentials: include` header to all manual requests

* feat: adds `credentials: include` as a configurable option to xhr requests (and sets it by default to true)

* feat: configures the auto-generated fetch client from hey-api to include credentials by default

* Add OpenIddict handler to hide tokens from the back-office client

* Make back-office token redaction optional (default false)

* Clear back-office token cookies on logout

* Add configuration for backoffice cookie settings

* Make cookies forcefully secure + move cookie handler enabling to the BackOfficeTokenCookieSettings

* Use the "__Host-" prefix for cookie names

* docs: adds documentation on cookie settings

* build: sets up launch profile for vscode with new cookie recommended settings

* docs: adds extra note around SameSite settings

* docs: adds extra note around SameSite settings

* Respect sites that do not use HTTPS

* Explicitly invalidate potentially valid, old refresh tokens that should no longer be used

* Removed obsolete const

---------

Co-authored-by: Jacob Overgaard <752371+iOvergaard@users.noreply.github.com>
---
 .github/BUILD.md                              |  13 +-
 .github/copilot-instructions.md               |   6 +-
 .vscode/launch.json                           |   5 +-
 .../HideBackOfficeTokensHandler.cs            | 187 ++++++++++++++++++
 .../UmbracoBuilderAuthExtensions.cs           |  38 ++++
 .../Models/BackOfficeTokenCookieSettings.cs   |  31 +++
 src/Umbraco.Core/Constants-Configuration.cs   |   1 +
 .../UmbracoBuilder.Configuration.cs           |   3 +-
 src/Umbraco.Web.UI.Client/.github/README.md   |  12 +-
 .../src/external/openid/src/xhr.ts            |   1 +
 .../src/packages/core/auth/auth-flow.ts       |   2 +
 .../src/packages/core/http-client/index.ts    |  15 +-
 .../try-execute/tryXhrRequest.function.ts     |   1 +
 .../src/packages/core/resources/types.ts      |   1 +
 .../document-permission.server.data.ts        |   1 +
 15 files changed, 309 insertions(+), 8 deletions(-)
 create mode 100644 src/Umbraco.Cms.Api.Common/DependencyInjection/HideBackOfficeTokensHandler.cs
 create mode 100644 src/Umbraco.Core/Configuration/Models/BackOfficeTokenCookieSettings.cs

diff --git a/.github/BUILD.md b/.github/BUILD.md
index 2e081548fee4..424a491ccecd 100644
--- a/.github/BUILD.md
+++ b/.github/BUILD.md
@@ -37,7 +37,7 @@ In order to work with the Umbraco source code locally, first make sure you have
 
 ### Familiarizing yourself with the code
 
-Umbraco is a .NET application using C#. The solution is broken down into multiple projects.  There are several class libraries. The `Umbraco.Web.UI` project is the main project that hosts the back office and login screen. This is the project you will want to run to see your changes.
+Umbraco is a .NET application using C#. The solution is broken down into multiple projects. There are several class libraries. The `Umbraco.Web.UI` project is the main project that hosts the back office and login screen. This is the project you will want to run to see your changes.
 
 There are two web projects in the solution with client-side assets based on TypeScript, `Umbraco.Web.UI.Client` and `Umbraco.Web.UI.Login`.
 
@@ -73,13 +73,20 @@ Just be careful not to include this change in your PR.
 
 Conversely, if you are working on front-end only, you want to build the back-end once and then run it. Before you do so, update the configuration in `appSettings.json` to add the following under `Umbraco:Cms:Security`:
 
-```
+```json
 "BackOfficeHost": "http://localhost:5173",
 "AuthorizeCallbackPathName": "/oauth_complete",
 "AuthorizeCallbackLogoutPathName": "/logout",
-"AuthorizeCallbackErrorPathName": "/error"
+"AuthorizeCallbackErrorPathName": "/error",
+"BackOfficeTokenCookie": {
+  "Enabled": true,
+  "SameSite": "None"
+}
 ```
 
+> [!NOTE]
+> If you get stuck in a login loop, try clearing your browser cookies for localhost, and make sure that the `BackOfficeTokenCookie` settings are correct. Namely, that `SameSite` should be set to `None` when running the front-end server separately.
+
 Then run Umbraco from the command line.
 
 ```
diff --git a/.github/copilot-instructions.md b/.github/copilot-instructions.md
index ed34279ab99b..858984a9d38a 100644
--- a/.github/copilot-instructions.md
+++ b/.github/copilot-instructions.md
@@ -110,7 +110,11 @@ Use this for frontend-only development with hot module reloading:
    "BackOfficeHost": "http://localhost:5173",
    "AuthorizeCallbackPathName": "/oauth_complete",
    "AuthorizeCallbackLogoutPathName": "/logout",
-   "AuthorizeCallbackErrorPathName": "/error"
+   "AuthorizeCallbackErrorPathName": "/error",
+   "BackOfficeTokenCookie": {
+     "Enabled": true,
+     "SameSite": "None"
+   }
    ```
 2. Run backend: `cd src/Umbraco.Web.UI && dotnet run --no-build`
 3. Run frontend dev server: `cd src/Umbraco.Web.UI.Client && npm run dev:server`
diff --git a/.vscode/launch.json b/.vscode/launch.json
index f4d47c3dab86..c56f06dc2f8d 100644
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -105,7 +105,10 @@
         "UMBRACO__CMS__SECURITY__BACKOFFICEHOST": "http://localhost:5173",
         "UMBRACO__CMS__SECURITY__AUTHORIZECALLBACKPATHNAME": "/oauth_complete",
         "UMBRACO__CMS__SECURITY__AUTHORIZECALLBACKLOGOUTPATHNAME": "/logout",
-        "UMBRACO__CMS__SECURITY__AUTHORIZECALLBACKERRORPATHNAME": "/error"
+        "UMBRACO__CMS__SECURITY__AUTHORIZECALLBACKERRORPATHNAME": "/error",
+        "UMBRACO__CMS__SECURITY__KEEPUSERLOGGEDIN": "true",
+        "UMBRACO__CMS__SECURITY__BACKOFFICETOKENCOOKIE__ENABLED": "true",
+        "UMBRACO__CMS__SECURITY__BACKOFFICETOKENCOOKIE__SAMESITE": "None"
       },
       "sourceFileMap": {
         "/Views": "${workspaceFolder}/Umbraco.Web.UI/Views"
diff --git a/src/Umbraco.Cms.Api.Common/DependencyInjection/HideBackOfficeTokensHandler.cs b/src/Umbraco.Cms.Api.Common/DependencyInjection/HideBackOfficeTokensHandler.cs
new file mode 100644
index 000000000000..8d1dbd040ed4
--- /dev/null
+++ b/src/Umbraco.Cms.Api.Common/DependencyInjection/HideBackOfficeTokensHandler.cs
@@ -0,0 +1,187 @@
+using System.Diagnostics.CodeAnalysis;
+using Microsoft.AspNetCore.DataProtection;
+using Microsoft.AspNetCore.Http;
+using Microsoft.Extensions.Options;
+using OpenIddict.Server;
+using OpenIddict.Validation;
+using Umbraco.Cms.Core;
+using Umbraco.Cms.Core.Configuration.Models;
+using Umbraco.Cms.Core.Events;
+using Umbraco.Cms.Core.Notifications;
+using Umbraco.Cms.Web.Common.Security;
+using Umbraco.Extensions;
+
+namespace Umbraco.Cms.Api.Common.DependencyInjection;
+
+internal sealed class HideBackOfficeTokensHandler
+    : IOpenIddictServerHandler<OpenIddictServerEvents.ApplyTokenResponseContext>,
+        IOpenIddictServerHandler<OpenIddictServerEvents.ExtractTokenRequestContext>,
+        IOpenIddictValidationHandler<OpenIddictValidationEvents.ProcessAuthenticationContext>,
+        INotificationHandler<UserLogoutSuccessNotification>
+{
+    private const string RedactedTokenValue = "[redacted]";
+    private const string AccessTokenCookieKey = "__Host-umbAccessToken";
+    private const string RefreshTokenCookieKey = "__Host-umbRefreshToken";
+
+    private readonly IHttpContextAccessor _httpContextAccessor;
+    private readonly IDataProtectionProvider _dataProtectionProvider;
+    private readonly BackOfficeTokenCookieSettings _backOfficeTokenCookieSettings;
+    private readonly GlobalSettings _globalSettings;
+
+    public HideBackOfficeTokensHandler(
+        IHttpContextAccessor httpContextAccessor,
+        IDataProtectionProvider dataProtectionProvider,
+        IOptions<BackOfficeTokenCookieSettings> backOfficeTokenCookieSettings,
+        IOptions<GlobalSettings> globalSettings)
+    {
+        _httpContextAccessor = httpContextAccessor;
+        _dataProtectionProvider = dataProtectionProvider;
+        _backOfficeTokenCookieSettings = backOfficeTokenCookieSettings.Value;
+        _globalSettings = globalSettings.Value;
+    }
+
+    /// <summary>
+    /// This is invoked when tokens (access and refresh tokens) are issued to a client. For the back-office client,
+    /// we will intercept the response, write the tokens from the response into HTTP-only cookies, and redact the
+    /// tokens from the response, so they are not exposed to the client.
+    /// </summary>
+    public ValueTask HandleAsync(OpenIddictServerEvents.ApplyTokenResponseContext context)
+    {
+        if (context.Request?.ClientId is not Constants.OAuthClientIds.BackOffice)
+        {
+            // Only ever handle the back-office client.
+            return ValueTask.CompletedTask;
+        }
+
+        HttpContext httpContext = GetHttpContext();
+
+        if (context.Response.AccessToken is not null)
+        {
+            SetCookie(httpContext, AccessTokenCookieKey, context.Response.AccessToken);
+            context.Response.AccessToken = RedactedTokenValue;
+        }
+
+        if (context.Response.RefreshToken is not null)
+        {
+            SetCookie(httpContext, RefreshTokenCookieKey, context.Response.RefreshToken);
+            context.Response.RefreshToken = RedactedTokenValue;
+        }
+
+        return ValueTask.CompletedTask;
+    }
+
+    /// <summary>
+    /// This is invoked when requesting new tokens.
+    /// </summary>
+    public ValueTask HandleAsync(OpenIddictServerEvents.ExtractTokenRequestContext context)
+    {
+        if (context.Request?.ClientId != Constants.OAuthClientIds.BackOffice)
+        {
+            // Only ever handle the back-office client.
+            return ValueTask.CompletedTask;
+        }
+
+        // For the back-office client, this only happens when a refresh token is being exchanged for a new access token.
+        if (context.Request.RefreshToken == RedactedTokenValue
+            && TryGetCookie(RefreshTokenCookieKey, out var refreshToken))
+        {
+            context.Request.RefreshToken = refreshToken;
+        }
+        else
+        {
+            // If we got here, either the refresh token was not redacted, or nothing was found in the refresh token cookie.
+            // If OpenIddict found a refresh token, it could be an old token that is potentially still valid. For security
+            // reasons, we cannot accept that; at this point, we expect the refresh tokens to be explicitly redacted.
+            context.Request.RefreshToken = null;
+        }
+
+
+        return ValueTask.CompletedTask;
+    }
+
+    /// <summary>
+    /// This is invoked when extracting the auth context for a client request.
+    /// </summary>
+    public ValueTask HandleAsync(OpenIddictValidationEvents.ProcessAuthenticationContext context)
+    {
+        // For the back-office client, this only happens when an access token is sent to the API.
+        if (context.AccessToken != RedactedTokenValue)
+        {
+            return ValueTask.CompletedTask;
+        }
+
+        if (TryGetCookie(AccessTokenCookieKey, out var accessToken))
+        {
+            context.AccessToken = accessToken;
+        }
+
+        return ValueTask.CompletedTask;
+    }
+
+    public void Handle(UserLogoutSuccessNotification notification)
+    {
+        HttpContext? context = _httpContextAccessor.HttpContext;
+        if (context is null)
+        {
+            // For some reason there is no ambient HTTP context, so we can't clean up the cookies.
+            // This is OK, because the tokens in the cookies have already been revoked at user sign-out,
+            // so the cookie clean-up is mostly cosmetic.
+            return;
+        }
+
+        context.Response.Cookies.Delete(AccessTokenCookieKey);
+        context.Response.Cookies.Delete(RefreshTokenCookieKey);
+    }
+
+    private HttpContext GetHttpContext()
+        => _httpContextAccessor.GetRequiredHttpContext();
+
+    private void SetCookie(HttpContext httpContext, string key, string value)
+    {
+        var cookieValue = EncryptionHelper.Encrypt(value, _dataProtectionProvider);
+
+        var cookieOptions = new CookieOptions
+        {
+            // Prevent the client-side scripts from accessing the cookie.
+            HttpOnly = true,
+
+            // Mark the cookie as essential to the application, to enforce it despite any
+            // data collection consent options. This aligns with how ASP.NET Core Identity
+            // does when writing cookies for cookie authentication.
+            IsEssential = true,
+
+            // Cookie path must be root for optimal security.
+            Path = "/",
+
+            // For optimal security, the cooke must be secure. However, Umbraco allows for running development
+            // environments over HTTP, so we need to take that into account here.
+            // Thus, we will make the cookie secure if:
+            // - HTTPS is explicitly enabled by config (default for production environments), or
+            // - The current request is over HTTPS (meaning the environment supports it regardless of config).
+            Secure = _globalSettings.UseHttps || httpContext.Request.IsHttps,
+
+            // SameSite is configurable (see BackOfficeTokenCookieSettings for defaults):
+            SameSite = ParseSameSiteMode(_backOfficeTokenCookieSettings.SameSite),
+        };
+
+        httpContext.Response.Cookies.Delete(key, cookieOptions);
+        httpContext.Response.Cookies.Append(key, cookieValue, cookieOptions);
+    }
+
+    private bool TryGetCookie(string key, [NotNullWhen(true)] out string? value)
+    {
+        if (GetHttpContext().Request.Cookies.TryGetValue(key, out var cookieValue))
+        {
+            value = EncryptionHelper.Decrypt(cookieValue, _dataProtectionProvider);
+            return true;
+        }
+
+        value = null;
+        return false;
+    }
+
+    private static SameSiteMode ParseSameSiteMode(string sameSiteMode) =>
+        Enum.TryParse(sameSiteMode, ignoreCase: true, out SameSiteMode result)
+            ? result
+            : throw new ArgumentException($"The provided {nameof(sameSiteMode)} value could not be parsed into as SameSiteMode value.", nameof(sameSiteMode));
+}
diff --git a/src/Umbraco.Cms.Api.Common/DependencyInjection/UmbracoBuilderAuthExtensions.cs b/src/Umbraco.Cms.Api.Common/DependencyInjection/UmbracoBuilderAuthExtensions.cs
index 0139bb61ce91..92a24046b238 100644
--- a/src/Umbraco.Cms.Api.Common/DependencyInjection/UmbracoBuilderAuthExtensions.cs
+++ b/src/Umbraco.Cms.Api.Common/DependencyInjection/UmbracoBuilderAuthExtensions.cs
@@ -9,6 +9,7 @@
 using Umbraco.Cms.Core;
 using Umbraco.Cms.Core.Configuration.Models;
 using Umbraco.Cms.Core.DependencyInjection;
+using Umbraco.Cms.Core.Notifications;
 using Umbraco.Cms.Infrastructure.BackgroundJobs.Jobs;
 using Umbraco.Extensions;
 
@@ -28,6 +29,11 @@ public static IUmbracoBuilder AddUmbracoOpenIddict(this IUmbracoBuilder builder)
 
     private static void ConfigureOpenIddict(IUmbracoBuilder builder)
     {
+        // Optionally hide tokens from the back-office.
+        var hideBackOfficeTokens = (builder.Config
+            .GetSection(Constants.Configuration.ConfigBackOfficeTokenCookie)
+            .Get<BackOfficeTokenCookieSettings>() ?? new BackOfficeTokenCookieSettings()).Enabled;
+
         builder.Services.AddOpenIddict()
             // Register the OpenIddict server components.
             .AddServer(options =>
@@ -113,6 +119,22 @@ private static void ConfigureOpenIddict(IUmbracoBuilder builder)
                 {
                     configuration.UseSingletonHandler<ProcessRequestContextHandler>().SetOrder(OpenIddict.Server.AspNetCore.OpenIddictServerAspNetCoreHandlers.ResolveRequestUri.Descriptor.Order - 1);
                 });
+
+                if (hideBackOfficeTokens)
+                {
+                    options.AddEventHandler<OpenIddictServerEvents.ApplyTokenResponseContext>(configuration =>
+                    {
+                        configuration
+                            .UseSingletonHandler<HideBackOfficeTokensHandler>()
+                            .SetOrder(OpenIddict.Server.AspNetCore.OpenIddictServerAspNetCoreHandlers.ProcessJsonResponse<OpenIddictServerEvents.ApplyTokenResponseContext>.Descriptor.Order - 1);
+                    });
+                    options.AddEventHandler<OpenIddictServerEvents.ExtractTokenRequestContext>(configuration =>
+                    {
+                        configuration
+                            .UseSingletonHandler<HideBackOfficeTokensHandler>()
+                            .SetOrder(OpenIddict.Server.AspNetCore.OpenIddictServerAspNetCoreHandlers.ExtractPostRequest<OpenIddictServerEvents.ExtractTokenRequestContext>.Descriptor.Order + 1);
+                    });
+                }
             })
 
             // Register the OpenIddict validation components.
@@ -137,9 +159,25 @@ private static void ConfigureOpenIddict(IUmbracoBuilder builder)
                 {
                     configuration.UseSingletonHandler<ProcessRequestContextHandler>().SetOrder(OpenIddict.Validation.AspNetCore.OpenIddictValidationAspNetCoreHandlers.ResolveRequestUri.Descriptor.Order - 1);
                 });
+
+                if (hideBackOfficeTokens)
+                {
+                    options.AddEventHandler<OpenIddictValidationEvents.ProcessAuthenticationContext>(configuration =>
+                    {
+                        configuration
+                            .UseSingletonHandler<HideBackOfficeTokensHandler>()
+                            // IMPORTANT: the handler must be AFTER the built-in query string handler, because the client-side SignalR library sometimes appends access tokens to the query string.
+                            .SetOrder(OpenIddict.Validation.AspNetCore.OpenIddictValidationAspNetCoreHandlers.ExtractAccessTokenFromQueryString.Descriptor.Order + 1);
+                    });
+                }
             });
 
         builder.Services.AddRecurringBackgroundJob<OpenIddictCleanupJob>();
         builder.Services.ConfigureOptions<ConfigureOpenIddict>();
+
+        if (hideBackOfficeTokens)
+        {
+            builder.AddNotificationHandler<UserLogoutSuccessNotification, HideBackOfficeTokensHandler>();
+        }
     }
 }
diff --git a/src/Umbraco.Core/Configuration/Models/BackOfficeTokenCookieSettings.cs b/src/Umbraco.Core/Configuration/Models/BackOfficeTokenCookieSettings.cs
new file mode 100644
index 000000000000..4019c425474f
--- /dev/null
+++ b/src/Umbraco.Core/Configuration/Models/BackOfficeTokenCookieSettings.cs
@@ -0,0 +1,31 @@
+using System.ComponentModel;
+
+namespace Umbraco.Cms.Core.Configuration.Models;
+
+/// <summary>
+///     Typed configuration options for back-office token cookie settings.
+/// </summary>
+[UmbracoOptions(Constants.Configuration.ConfigBackOfficeTokenCookie)]
+[Obsolete("This will be replaced with a different authentication scheme. Scheduled for removal in Umbraco 18.")]
+public class BackOfficeTokenCookieSettings
+{
+    private const bool StaticEnabled = false;
+
+    private const string StaticSameSite = "Strict";
+
+    /// <summary>
+    ///     Gets or sets a value indicating whether to enable access and refresh tokens in cookies.
+    /// </summary>
+    [DefaultValue(StaticEnabled)]
+    [Obsolete("This is only configurable in Umbraco 16. Scheduled for removal in Umbraco 17.")]
+    public bool Enabled { get; set; } = StaticEnabled;
+
+    /// <summary>
+    ///     Gets or sets a value indicating whether the cookie SameSite configuration.
+    /// </summary>
+    /// <remarks>
+    ///     Valid values are "Unspecified", "None", "Lax" and "Strict" (default).
+    /// </remarks>
+    [DefaultValue(StaticSameSite)]
+    public string SameSite { get; set; } = StaticSameSite;
+}
diff --git a/src/Umbraco.Core/Constants-Configuration.cs b/src/Umbraco.Core/Constants-Configuration.cs
index 8504210504d8..7e506a978f7f 100644
--- a/src/Umbraco.Core/Constants-Configuration.cs
+++ b/src/Umbraco.Core/Constants-Configuration.cs
@@ -64,6 +64,7 @@ public static class Configuration
         public const string ConfigWebhook = ConfigPrefix + "Webhook";
         public const string ConfigWebhookPayloadType = ConfigWebhook + ":PayloadType";
         public const string ConfigCache = ConfigPrefix + "Cache";
+        public const string ConfigBackOfficeTokenCookie = ConfigSecurity + ":BackOfficeTokenCookie";
 
         public static class NamedOptions
         {
diff --git a/src/Umbraco.Core/DependencyInjection/UmbracoBuilder.Configuration.cs b/src/Umbraco.Core/DependencyInjection/UmbracoBuilder.Configuration.cs
index cc9b03e65b7d..81b387a74b3e 100644
--- a/src/Umbraco.Core/DependencyInjection/UmbracoBuilder.Configuration.cs
+++ b/src/Umbraco.Core/DependencyInjection/UmbracoBuilder.Configuration.cs
@@ -86,7 +86,8 @@ public static IUmbracoBuilder AddConfiguration(this IUmbracoBuilder builder)
             .AddUmbracoOptions<HelpPageSettings>()
             .AddUmbracoOptions<DataTypesSettings>()
             .AddUmbracoOptions<WebhookSettings>()
-            .AddUmbracoOptions<CacheSettings>();
+            .AddUmbracoOptions<CacheSettings>()
+            .AddUmbracoOptions<BackOfficeTokenCookieSettings>();
 
         // Configure connection string and ensure it's updated when the configuration changes
         builder.Services.AddSingleton<IConfigureOptions<ConnectionStrings>, ConfigureConnectionStrings>();
diff --git a/src/Umbraco.Web.UI.Client/.github/README.md b/src/Umbraco.Web.UI.Client/.github/README.md
index cf76fd68ef7c..d677ad9e0dfd 100644
--- a/src/Umbraco.Web.UI.Client/.github/README.md
+++ b/src/Umbraco.Web.UI.Client/.github/README.md
@@ -26,6 +26,7 @@ If you have an existing Vite server running, you can run the task **Backoffice A
 ### Run a Front-end server against a local Umbraco instance
 
 #### 1. Configure Umbraco instance
+
 Enable the front-end server communicating with the Backend server(Umbraco instance) you need need to correct the `appsettings.json` of your project.
 
 For code contributions use the backend project of `/src/Umbraco.Web.UI`.
@@ -38,7 +39,11 @@ Open this file in an editor: `/src/Umbraco.Web.UI/appsettings.Development.json`
 			"BackOfficeHost": "http://localhost:5173",
 			"AuthorizeCallbackPathName": "/oauth_complete",
 			"AuthorizeCallbackLogoutPathName": "/logout",
-			"AuthorizeCallbackErrorPathName": "/error",
+			"AuthorizeCallbackErrorPathName": "/error",,
+			"BackOfficeTokenCookie": {
+				"Enabled": true,
+				"SameSite": "None"
+			}
 		},
 	},
 }
@@ -46,10 +51,15 @@ Open this file in an editor: `/src/Umbraco.Web.UI/appsettings.Development.json`
 
 This will override the backoffice host URL, enabling the Client to run from a different origin.
 
+> [!NOTE]
+> If you get stuck in a login loop, try clearing your browser cookies for localhost, and make sure that the `BackOfficeTokenCookie` settings are correct. Namely, that `SameSite` should be set to `None` when running the front-end server separately.
+
 #### 2. Start Umbraco
+
 Then start the backend server by running the command: `dotnet run` in the `/src/Umbraco.Web.UI` folder.
 
 #### 3. Start Frontend server
+
 Now start the frontend server by running the command: `npm run dev:server` in the `/src/Umbraco.Web.UI.Client` folder.
 
 Finally open `http://localhost:5173` in your browser.
diff --git a/src/Umbraco.Web.UI.Client/src/external/openid/src/xhr.ts b/src/Umbraco.Web.UI.Client/src/external/openid/src/xhr.ts
index fc32dbf8cba0..0ef5981a5b0a 100644
--- a/src/Umbraco.Web.UI.Client/src/external/openid/src/xhr.ts
+++ b/src/Umbraco.Web.UI.Client/src/external/openid/src/xhr.ts
@@ -35,6 +35,7 @@ export class FetchRequestor extends Requestor {
 		const requestInit: RequestInit = {};
 		requestInit.method = settings.method;
 		requestInit.mode = 'cors';
+		requestInit.credentials = settings.credentials ?? 'include';
 
 		if (settings.data) {
 			if (settings.method && settings.method.toUpperCase() === 'POST') {
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/auth/auth-flow.ts b/src/Umbraco.Web.UI.Client/src/packages/core/auth/auth-flow.ts
index fc6f5d1ab2d2..7a9d0bbf2e8d 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/auth/auth-flow.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/auth/auth-flow.ts
@@ -365,6 +365,7 @@ export class UmbAuthFlow {
 		const token = await this.performWithFreshTokens();
 		const request = new Request(this.#unlink_endpoint, {
 			method: 'POST',
+			credentials: 'include',
 			headers: { 'Content-Type': 'application/json', Authorization: `Bearer ${token}` },
 			body: JSON.stringify({ loginProvider, providerKey }),
 		});
@@ -458,6 +459,7 @@ export class UmbAuthFlow {
 		const token = await this.performWithFreshTokens();
 
 		const request = await fetch(`${this.#link_key_endpoint}?provider=${provider}`, {
+			credentials: 'include',
 			headers: {
 				Authorization: `Bearer ${token}`,
 				'Content-Type': 'application/json',
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/http-client/index.ts b/src/Umbraco.Web.UI.Client/src/packages/core/http-client/index.ts
index 450649ecb292..26ee2b570c3f 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/http-client/index.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/http-client/index.ts
@@ -1 +1,14 @@
-export { client as umbHttpClient } from '@umbraco-cms/backoffice/external/backend-api';
+import { client } from '@umbraco-cms/backoffice/external/backend-api';
+
+/**
+ * Pre-configure the client with default credentials for cookie-based authentication.
+ * This ensures all requests include cookies by default, which is required for
+ * cookie-based authentication in Umbraco 17.0+.
+ *
+ * Extensions using this client will automatically get credentials: 'include'.
+ */
+client.setConfig({
+	credentials: 'include',
+});
+
+export { client as umbHttpClient };
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/resources/try-execute/tryXhrRequest.function.ts b/src/Umbraco.Web.UI.Client/src/packages/core/resources/try-execute/tryXhrRequest.function.ts
index 2be9e84fa792..dce562bc3a80 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/resources/try-execute/tryXhrRequest.function.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/resources/try-execute/tryXhrRequest.function.ts
@@ -44,6 +44,7 @@ function createXhrRequest<T>(options: XhrRequestOptions): UmbCancelablePromise<T
 	return new UmbCancelablePromise<T>(async (resolve, reject, onCancel) => {
 		const xhr = new XMLHttpRequest();
 		xhr.open(options.method, `${baseUrl}${options.url}`, true);
+		xhr.withCredentials = options.withCredentials ?? true;
 
 		// Set default headers
 		if (options.token) {
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/resources/types.ts b/src/Umbraco.Web.UI.Client/src/packages/core/resources/types.ts
index 60e415e0d5b0..887f09c18016 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/resources/types.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/resources/types.ts
@@ -7,6 +7,7 @@ export interface XhrRequestOptions extends UmbTryExecuteOptions {
 	baseUrl?: string;
 	method: 'GET' | 'POST' | 'PUT' | 'DELETE' | 'PATCH' | 'HEAD' | 'OPTIONS';
 	url: string;
+	withCredentials?: boolean;
 	body?: unknown;
 	token?: string | (() => undefined | string | Promise<string | undefined>);
 	headers?: Record<string, string>;
diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/user-permissions/document/repository/document-permission.server.data.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/user-permissions/document/repository/document-permission.server.data.ts
index 4d2cde0ffc1b..ae14cd16a9f1 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/user-permissions/document/repository/document-permission.server.data.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/user-permissions/document/repository/document-permission.server.data.ts
@@ -22,6 +22,7 @@ export class UmbDocumentPermissionServerDataSource {
 			this.#host,
 			fetch(`/umbraco/management/api/v1/document/${id}/permissions`, {
 				method: 'GET',
+				credentials: 'include',
 				headers: {
 					'Content-Type': 'application/json',
 				},

From d4d4b8a50a6855e0218abb4550194396ce294363 Mon Sep 17 00:00:00 2001
From: Engiber Lozada <89547469+engijlr@users.noreply.github.com>
Date: Thu, 13 Nov 2025 09:19:33 +0100
Subject: [PATCH 144/155] Content Type Designer: Always register root route to
 support drag-and-drop into empty Generic tab. (#20809)

Always register root route to enable drag-drop on empty Generic tab.
---
 .../content-type-design-editor.element.ts       | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/packages/content/content-type/workspace/views/design/content-type-design-editor.element.ts b/src/Umbraco.Web.UI.Client/src/packages/content/content-type/workspace/views/design/content-type-design-editor.element.ts
index 7eb5696694de..7dc47bef73e9 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/content/content-type/workspace/views/design/content-type-design-editor.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/content/content-type/workspace/views/design/content-type-design-editor.element.ts
@@ -207,15 +207,16 @@ export class UmbContentTypeDesignEditorElement extends UmbLitElement implements
 			});
 		}
 
+		routes.push({
+			path: 'root',
+			component: () => import('./content-type-design-editor-tab.element.js'),
+			setup: (component) => {
+				this.#currentTabComponent = component as UmbContentTypeDesignEditorTabElement;
+				this.#currentTabComponent.containerId = null;
+			},
+		});
+
 		if (this._hasRootGroups || this._tabs.length === 0) {
-			routes.push({
-				path: 'root',
-				component: () => import('./content-type-design-editor-tab.element.js'),
-				setup: (component) => {
-					this.#currentTabComponent = component as UmbContentTypeDesignEditorTabElement;
-					this.#currentTabComponent.containerId = null;
-				},
-			});
 			routes.push({
 				path: '',
 				pathMatch: 'full',

From f0752234124ce84d76cd22edcd0b85426d6fe919 Mon Sep 17 00:00:00 2001
From: Andy Butland <abutland73@gmail.com>
Date: Thu, 13 Nov 2025 09:32:18 +0100
Subject: [PATCH 145/155] Relations: Exclude the relate parent on delete
 relation type from checks for related documents and media on delete, when
 disable delete with references is enabled (closes #20803) (#20811)

* Exclude the relate parent on delete relation type from checks for related documents and media on delete, when disable delete with references is enabled.

* Apply suggestions from code review

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

* Applied suggestions from code review.

---------

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
---
 .../Persistence/Querying/IQuery.cs            |  8 ++++++
 .../Services/ContentEditingService.cs         |  3 +++
 .../Services/ContentEditingServiceBase.cs     | 27 +++++++++++++++++--
 src/Umbraco.Core/Services/IRelationService.cs | 17 +++++++++++-
 .../Services/MediaEditingService.cs           |  3 +++
 src/Umbraco.Core/Services/RelationService.cs  | 19 ++++++++++---
 .../Persistence/Querying/Query.cs             | 22 ++++++++++++---
 .../ContentEditingServiceTests.Delete.cs      | 18 +++++++++++++
 .../Services/ContentEditingServiceTests.cs    |  4 +--
 9 files changed, 110 insertions(+), 11 deletions(-)

diff --git a/src/Umbraco.Core/Persistence/Querying/IQuery.cs b/src/Umbraco.Core/Persistence/Querying/IQuery.cs
index 8803d69fc048..e87ec77b86ab 100644
--- a/src/Umbraco.Core/Persistence/Querying/IQuery.cs
+++ b/src/Umbraco.Core/Persistence/Querying/IQuery.cs
@@ -30,6 +30,14 @@ public interface IQuery<T>
     /// <returns>This instance so calls to this method are chainable</returns>
     IQuery<T> WhereIn(Expression<Func<T, object>> fieldSelector, IEnumerable? values);
 
+    /// <summary>
+    ///     Adds a where-not-in clause to the query
+    /// </summary>
+    /// <param name="fieldSelector"></param>
+    /// <param name="values"></param>
+    /// <returns>This instance so calls to this method are chainable</returns>
+    IQuery<T> WhereNotIn(Expression<Func<T, object>> fieldSelector, IEnumerable? values) => throw new NotImplementedException(); // TODO (V18): Remove default implementation.
+
     /// <summary>
     ///     Adds a set of OR-ed where clauses to the query.
     /// </summary>
diff --git a/src/Umbraco.Core/Services/ContentEditingService.cs b/src/Umbraco.Core/Services/ContentEditingService.cs
index 9b4f92615b12..783421a2c280 100644
--- a/src/Umbraco.Core/Services/ContentEditingService.cs
+++ b/src/Umbraco.Core/Services/ContentEditingService.cs
@@ -62,6 +62,9 @@ public ContentEditingService(
         _languageService = languageService;
     }
 
+    /// <inheritdoc/>
+    protected override string? RelateParentOnDeleteAlias => Constants.Conventions.RelationTypes.RelateParentDocumentOnDeleteAlias;
+
     public Task<IContent?> GetAsync(Guid key)
     {
         IContent? content = ContentService.GetById(key);
diff --git a/src/Umbraco.Core/Services/ContentEditingServiceBase.cs b/src/Umbraco.Core/Services/ContentEditingServiceBase.cs
index 15a4b9670e3b..41e1adf7b3f1 100644
--- a/src/Umbraco.Core/Services/ContentEditingServiceBase.cs
+++ b/src/Umbraco.Core/Services/ContentEditingServiceBase.cs
@@ -75,6 +75,11 @@ protected ContentEditingServiceBase(
 
     protected TContentTypeService ContentTypeService { get; }
 
+    /// <summary>
+    /// Gets the alias used to relate the parent entity when handling content (document or media) delete operations.
+    /// </summary>
+    protected virtual string? RelateParentOnDeleteAlias => null;
+
     protected async Task<Attempt<TContentCreateResult, ContentEditingOperationStatus>> MapCreate<TContentCreateResult>(ContentCreationModelBase contentCreationModelBase)
         where TContentCreateResult : ContentCreateResultBase<TContent>, new()
     {
@@ -202,9 +207,27 @@ private async Task<Attempt<ContentValidationResult, ContentEditingOperationStatu
             return Attempt.FailWithStatus<TContent?, ContentEditingOperationStatus>(status, content);
         }
 
-        if (disabledWhenReferenced && _relationService.IsRelated(content.Id, RelationDirectionFilter.Child))
+        if (disabledWhenReferenced)
         {
-            return Attempt.FailWithStatus<TContent?, ContentEditingOperationStatus>(referenceFailStatus, content);
+            // When checking if an item is related, we may need to exclude the "relate parent on delete" relation type, as this prevents
+            // deleting from the recycle bin.
+            int[]? excludeRelationTypeIds = null;
+            if (string.IsNullOrWhiteSpace(RelateParentOnDeleteAlias) is false)
+            {
+                IRelationType? relateParentOnDeleteRelationType = _relationService.GetRelationTypeByAlias(RelateParentOnDeleteAlias);
+                if (relateParentOnDeleteRelationType is not null)
+                {
+                    excludeRelationTypeIds = [relateParentOnDeleteRelationType.Id];
+                }
+            }
+
+            if (_relationService.IsRelated(
+                content.Id,
+                RelationDirectionFilter.Child,
+                excludeRelationTypeIds: excludeRelationTypeIds))
+            {
+                return Attempt.FailWithStatus<TContent?, ContentEditingOperationStatus>(referenceFailStatus, content);
+            }
         }
 
         var userId = await GetUserIdAsync(userKey);
diff --git a/src/Umbraco.Core/Services/IRelationService.cs b/src/Umbraco.Core/Services/IRelationService.cs
index 828abc1fd124..7ddae1394ded 100644
--- a/src/Umbraco.Core/Services/IRelationService.cs
+++ b/src/Umbraco.Core/Services/IRelationService.cs
@@ -297,9 +297,24 @@ public interface IRelationService : IService
     /// </summary>
     /// <param name="id">Id of an object to check relations for</param>
     /// <param name="directionFilter">Indicates whether to check for relations as parent, child or in either direction.</param>
-    /// <returns>Returns <c>True</c> if any relations exists with the given Id, otherwise <c>False</c></returns>
+    /// <returns>Returns <c>True</c> if any relations exists with the given Id, otherwise <c>False</c>.</returns>
+    [Obsolete("Please use the overload taking all parameters. Scheduled for removal in Umbraco 18.")]
     bool IsRelated(int id, RelationDirectionFilter directionFilter);
 
+    /// <summary>
+    ///     Checks whether any relations exists for the passed in Id and direction.
+    /// </summary>
+    /// <param name="id">Id of an object to check relations for</param>
+    /// <param name="directionFilter">Indicates whether to check for relations as parent, child or in either direction.</param>
+    /// <param name="includeRelationTypeIds">A collection of relation type Ids to include consideration in the relation checks.</param>
+    /// <param name="excludeRelationTypeIds">A collection of relation type Ids to exclude from consideration in the relation checks.</param>
+    /// <remarks>If no relation type Ids are provided in includeRelationTypeIds or excludeRelationTypeIds, all relation type Ids are considered.</remarks>
+    /// <returns>Returns <c>True</c> if any relations exists with the given Id, otherwise <c>False</c>.</returns>
+    bool IsRelated(int id, RelationDirectionFilter directionFilter, int[]? includeRelationTypeIds = null, int[]? excludeRelationTypeIds = null)
+#pragma warning disable CS0618 // Type or member is obsolete
+        => IsRelated(id, directionFilter);
+#pragma warning restore CS0618 // Type or member is obsolete
+
     /// <summary>
     ///     Checks whether two items are related
     /// </summary>
diff --git a/src/Umbraco.Core/Services/MediaEditingService.cs b/src/Umbraco.Core/Services/MediaEditingService.cs
index 6947e1dc5d0e..ec9177c150bd 100644
--- a/src/Umbraco.Core/Services/MediaEditingService.cs
+++ b/src/Umbraco.Core/Services/MediaEditingService.cs
@@ -43,6 +43,9 @@ public MediaEditingService(
             contentTypeFilters)
         => _logger = logger;
 
+    /// <inheritdoc/>
+    protected override string? RelateParentOnDeleteAlias => Constants.Conventions.RelationTypes.RelateParentMediaFolderOnDeleteAlias;
+
     public Task<IMedia?> GetAsync(Guid key)
     {
         IMedia? media = ContentService.GetById(key);
diff --git a/src/Umbraco.Core/Services/RelationService.cs b/src/Umbraco.Core/Services/RelationService.cs
index 35adb2e217bc..ed1d03df7029 100644
--- a/src/Umbraco.Core/Services/RelationService.cs
+++ b/src/Umbraco.Core/Services/RelationService.cs
@@ -485,11 +485,14 @@ public bool HasRelations(IRelationType relationType)
         return _relationRepository.Get(query).Any();
     }
 
-    /// <inheritdoc />
-    public bool IsRelated(int id) => IsRelated(id, RelationDirectionFilter.Any);
+    [Obsolete("No longer used in Umbraco, please the overload taking all parameters. Scheduled for removal in Umbraco 19.")]
+    public bool IsRelated(int id) => IsRelated(id, RelationDirectionFilter.Any, null, null);
+
+    [Obsolete("Please the overload taking all parameters. Scheduled for removal in Umbraco 18.")]
+    public bool IsRelated(int id, RelationDirectionFilter directionFilter) => IsRelated(id, directionFilter, null, null);
 
     /// <inheritdoc />
-    public bool IsRelated(int id, RelationDirectionFilter directionFilter)
+    public bool IsRelated(int id, RelationDirectionFilter directionFilter, int[]? includeRelationTypeIds = null, int[]? excludeRelationTypeIds = null)
     {
         using ICoreScope scope = ScopeProvider.CreateCoreScope(autoComplete: true);
         IQuery<IRelation> query = Query<IRelation>();
@@ -502,6 +505,16 @@ public bool IsRelated(int id, RelationDirectionFilter directionFilter)
             _ => throw new ArgumentOutOfRangeException(nameof(directionFilter)),
         };
 
+        if (includeRelationTypeIds is not null && includeRelationTypeIds.Length > 0)
+        {
+            query = query.WhereIn(x => x.RelationTypeId, includeRelationTypeIds);
+        }
+
+        if (excludeRelationTypeIds is not null && excludeRelationTypeIds.Length > 0)
+        {
+            query = query.WhereNotIn(x => x.RelationTypeId, excludeRelationTypeIds);
+        }
+
         return _relationRepository.Get(query).Any();
     }
 
diff --git a/src/Umbraco.Infrastructure/Persistence/Querying/Query.cs b/src/Umbraco.Infrastructure/Persistence/Querying/Query.cs
index 88d1326f44dd..c66e121cf736 100644
--- a/src/Umbraco.Infrastructure/Persistence/Querying/Query.cs
+++ b/src/Umbraco.Infrastructure/Persistence/Querying/Query.cs
@@ -22,7 +22,7 @@ public class Query<T> : IQuery<T>
     /// </summary>
     public virtual IQuery<T> Where(Expression<Func<T, bool>>? predicate)
     {
-        if (predicate == null)
+        if (predicate is null)
         {
             return this;
         }
@@ -38,7 +38,7 @@ public virtual IQuery<T> Where(Expression<Func<T, bool>>? predicate)
     /// </summary>
     public virtual IQuery<T> WhereIn(Expression<Func<T, object>>? fieldSelector, IEnumerable? values)
     {
-        if (fieldSelector == null)
+        if (fieldSelector is null)
         {
             return this;
         }
@@ -49,12 +49,28 @@ public virtual IQuery<T> WhereIn(Expression<Func<T, object>>? fieldSelector, IEn
         return this;
     }
 
+    /// <summary>
+    ///     Adds a where-not-in clause to the query.
+    /// </summary>
+    public virtual IQuery<T> WhereNotIn(Expression<Func<T, object>>? fieldSelector, IEnumerable? values)
+    {
+        if (fieldSelector is null)
+        {
+            return this;
+        }
+
+        var expressionHelper = new ModelToSqlExpressionVisitor<T>(_sqlContext.SqlSyntax, _sqlContext.Mappers);
+        var whereExpression = expressionHelper.Visit(fieldSelector);
+        _wheres.Add(new Tuple<string, object[]>(whereExpression + " NOT IN (@values)", new object[] { new { values } }));
+        return this;
+    }
+
     /// <summary>
     ///     Adds a set of OR-ed where clauses to the query.
     /// </summary>
     public virtual IQuery<T> WhereAny(IEnumerable<Expression<Func<T, bool>>>? predicates)
     {
-        if (predicates == null)
+        if (predicates is null)
         {
             return this;
         }
diff --git a/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/ContentEditingServiceTests.Delete.cs b/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/ContentEditingServiceTests.Delete.cs
index 95a7807fad33..8c0544421fa7 100644
--- a/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/ContentEditingServiceTests.Delete.cs
+++ b/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/ContentEditingServiceTests.Delete.cs
@@ -34,6 +34,24 @@ public async Task Cannot_Delete_When_Content_Is_Related_As_A_Child_And_Configure
         Assert.IsNotNull(subpage);
     }
 
+    [Test]
+    [ConfigureBuilder(ActionName = nameof(ConfigureDisableDeleteWhenReferenced))]
+    public async Task Can_Delete_When_Content_Is_Related_To_Parent_For_Restore_And_Configured_To_Disable_When_Related()
+    {
+        var moveAttempt = await ContentEditingService.MoveToRecycleBinAsync(Subpage.Key, Constants.Security.SuperUserKey);
+        Assert.IsTrue(moveAttempt.Success);
+
+        // Setup a relation where the page being deleted is related to it's parent (created as the location to restore to).
+        Relate(Subpage2, Subpage, Constants.Conventions.RelationTypes.RelateParentDocumentOnDeleteAlias);
+        var result = await ContentEditingService.DeleteFromRecycleBinAsync(Subpage.Key, Constants.Security.SuperUserKey);
+        Assert.IsTrue(result.Success);
+        Assert.AreEqual(ContentEditingOperationStatus.Success, result.Status);
+
+        // re-get and verify is deleted
+        var subpage = await ContentEditingService.GetAsync(Subpage.Key);
+        Assert.IsNull(subpage);
+    }
+
     [Test]
     [ConfigureBuilder(ActionName = nameof(ConfigureDisableDeleteWhenReferenced))]
     public async Task Can_Delete_When_Content_Is_Related_As_A_Parent_And_Configured_To_Disable_When_Related()
diff --git a/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/ContentEditingServiceTests.cs b/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/ContentEditingServiceTests.cs
index 4fca28f2ffd1..4c8508cfa684 100644
--- a/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/ContentEditingServiceTests.cs
+++ b/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/ContentEditingServiceTests.cs
@@ -16,9 +16,9 @@ public partial class ContentEditingServiceTests : ContentEditingServiceTestsBase
     [SetUp]
     public void Setup() => ContentRepositoryBase.ThrowOnWarning = true;
 
-    public void Relate(IContent parent, IContent child)
+    public void Relate(IContent parent, IContent child, string relationTypeAlias = Constants.Conventions.RelationTypes.RelatedDocumentAlias)
     {
-        var relatedContentRelType = RelationService.GetRelationTypeByAlias(Constants.Conventions.RelationTypes.RelatedDocumentAlias);
+        var relatedContentRelType = RelationService.GetRelationTypeByAlias(relationTypeAlias);
 
         var relation = RelationService.Relate(parent.Id, child.Id, relatedContentRelType);
         RelationService.Save(relation);

From b65d2b0ec7e6222a3a4d45cb7f1f801973f566b6 Mon Sep 17 00:00:00 2001
From: NguyenThuyLan <116753400+NguyenThuyLan@users.noreply.github.com>
Date: Thu, 13 Nov 2025 16:00:21 +0700
Subject: [PATCH 146/155] Collection view test: update changes for v17 (#20812)

update extension for collection view test

Co-authored-by: Lan Nguyen Thuy <lnt@umbraco.dk>
---
 .../my-collection-view/my-collection-view.js  | 271 ++++++------------
 .../my-collection-view.js.map                 |   2 +-
 .../my-collection-view/umbraco-package.json   |   2 +-
 3 files changed, 82 insertions(+), 193 deletions(-)

diff --git a/tests/Umbraco.Tests.AcceptanceTest/tests/ExtensionRegistry/AdditionalSetup/App_Plugins/my-collection-view/my-collection-view.js b/tests/Umbraco.Tests.AcceptanceTest/tests/ExtensionRegistry/AdditionalSetup/App_Plugins/my-collection-view/my-collection-view.js
index 38ef5a40de09..0629033aef97 100644
--- a/tests/Umbraco.Tests.AcceptanceTest/tests/ExtensionRegistry/AdditionalSetup/App_Plugins/my-collection-view/my-collection-view.js
+++ b/tests/Umbraco.Tests.AcceptanceTest/tests/ExtensionRegistry/AdditionalSetup/App_Plugins/my-collection-view/my-collection-view.js
@@ -1,217 +1,106 @@
-import { UMB_DOCUMENT_COLLECTION_CONTEXT as T, UMB_EDIT_DOCUMENT_WORKSPACE_PATH_PATTERN as P } from "@umbraco-cms/backoffice/document";
-import { css as D, state as d, customElement as x, html as n } from "@umbraco-cms/backoffice/external/lit";
-import { UmbLitElement as E } from "@umbraco-cms/backoffice/lit-element";
-import { UmbTextStyles as A } from "@umbraco-cms/backoffice/style";
-import { fromCamelCase as O } from "@umbraco-cms/backoffice/utils";
-var S = Object.defineProperty, $ = Object.getOwnPropertyDescriptor, y = (e) => {
-  throw TypeError(e);
-}, c = (e, t, a, s) => {
-  for (var r = s > 1 ? void 0 : s ? $(t, a) : t, p = e.length - 1, m; p >= 0; p--)
-    (m = e[p]) && (r = (s ? m(t, a, r) : m(r)) || r);
-  return s && r && S(t, a, r), r;
-}, f = (e, t, a) => t.has(e) || y("Cannot " + a), u = (e, t, a) => (f(e, t, "read from private field"), t.get(e)), _ = (e, t, a) => t.has(e) ? y("Cannot add the same private member more than once") : t instanceof WeakSet ? t.add(e) : t.set(e, a), I = (e, t, a, s) => (f(e, t, "write to private field"), t.set(e, a), a), h = (e, t, a) => (f(e, t, "access private method"), a), b, o, l, w, g, v, C;
-let i = class extends E {
+import { css as u, state as d, customElement as _, html as n } from "@umbraco-cms/backoffice/external/lit";
+import { UmbLitElement as f } from "@umbraco-cms/backoffice/lit-element";
+import { UMB_DOCUMENT_COLLECTION_CONTEXT as v } from "@umbraco-cms/backoffice/document";
+var y = Object.defineProperty, w = Object.getOwnPropertyDescriptor, h = (t) => {
+  throw TypeError(t);
+}, m = (t, e, a, s) => {
+  for (var i = s > 1 ? void 0 : s ? w(e, a) : e, o = t.length - 1, l; o >= 0; o--)
+    (l = t[o]) && (i = (s ? l(e, a, i) : l(i)) || i);
+  return s && i && y(e, a, i), i;
+}, b = (t, e, a) => e.has(t) || h("Cannot " + a), C = (t, e, a) => e.has(t) ? h("Cannot add the same private member more than once") : e instanceof WeakSet ? e.add(t) : e.set(t, a), E = (t, e, a) => (b(t, e, "access private method"), a), c, p;
+let r = class extends f {
   constructor() {
-    super(), _(this, l), this._tableColumns = [], _(this, b, [
-      {
-        name: this.localize.term("general_name"),
-        alias: "name",
-        elementName: "umb-document-table-column-name",
-        allowSorting: !0
-      },
-      {
-        name: this.localize.term("content_publishStatus"),
-        alias: "state",
-        elementName: "umb-document-table-column-state",
-        allowSorting: !1
-      }
-    ]), this._tableItems = [], _(this, o), this.consumeContext(T, (e) => {
-      I(this, o, e), e?.setupView(this), this.observe(
-        e?.workspacePathBuilder,
-        (t) => {
-          this._workspacePathBuilder = t, u(this, o) && h(this, l, v).call(this, u(this, o).getItems());
-        },
-        "observePath"
-      ), h(this, l, w).call(this);
+    super(), C(this, c), this._columns = [], this._items = [], this.consumeContext(v, (t) => {
+      t?.setupView(this), this.observe(t?.userDefinedProperties, (e) => {
+        E(this, c, p).call(this, e);
+      }), this.observe(t?.items, (e) => {
+        this._items = e;
+      });
     });
   }
   render() {
-    return n`
-		<table class="doc-table">
+    return this._items === void 0 ? n`<p>Not found...</p>` : n`
+			<table>
 				<thead>
 					<tr>
-						${this._tableColumns.map(
-      (e) => n`<th style="text-align:${e.align ?? "left"}">${e.name}</th>`
-    )}
+						${this._columns.map((t) => n`<th style="text-align:${t.align ?? "left"}">${t.name}</th>`)}
 					</tr>
 				</thead>
 				<tbody>
-					${this._tableItems.map(
-      (e) => n`
+					${this._items.map(
+      (t) => n`
 							<tr>
-								${this._tableColumns.map((t) => {
-        const s = e.data.find((r) => r.columnAlias === t.alias)?.value ?? "";
-        return t.alias === "name" && s?.item ? n`<td><a href=${s.editPath || "#"}>${s.item.name}</a></td>` : t.alias === "state" && s?.item ? n`<td>${s.item.state}</td>` : t.alias === "entityActions" ? n`<td style="text-align:right;">⋮</td>` : n`<td>${s}</td>`;
+								${this._columns.map((e) => {
+        switch (e.alias) {
+          case "name":
+            return n`<td><a href="#">${t.variants[0].name}</a></td>`;
+          case "entityActions":
+            return n`<td style="text-align:right;">⋮</td>`;
+          default:
+            const a = t.values.find((s) => s.alias === e.alias)?.value ?? "";
+            return n`<td>${a}</td>`;
+        }
       })}
 							</tr>
 						`
     )}
 				</tbody>
-			</table>`;
+			</table>
+		`;
   }
 };
-b = /* @__PURE__ */ new WeakMap();
-o = /* @__PURE__ */ new WeakMap();
-l = /* @__PURE__ */ new WeakSet();
-w = function() {
-  u(this, o) && (this.observe(
-    u(this, o).userDefinedProperties,
-    (e) => {
-      this._userDefinedProperties = e, h(this, l, g).call(this);
-    },
-    "_observeUserDefinedProperties"
-  ), this.observe(
-    u(this, o).items,
-    (e) => {
-      this._items = e, h(this, l, v).call(this, this._items);
-    },
-    "_observeItems"
-  ));
-};
-g = function() {
-  if (this._userDefinedProperties && this._userDefinedProperties.length > 0) {
-    const e = this._userDefinedProperties.map((t) => ({
-      name: this.localize.string(t.header),
-      alias: t.alias,
-      elementName: t.elementName,
-      labelTemplate: t.nameTemplate,
-      allowSorting: !0
-    }));
-    this._tableColumns = [
-      ...u(this, b),
-      ...e,
-      { name: "", alias: "entityActions", align: "right" }
-    ];
-  }
-};
-v = function(e) {
-  this._tableItems = e.map((t) => {
-    if (!t.unique) throw new Error("Item id is missing.");
-    const a = this._tableColumns?.map((s) => {
-      if (s.alias === "entityActions")
-        return {
-          columnAlias: "entityActions",
-          value: n`<umb-document-entity-actions-table-column-view
-								.value=${t}></umb-document-entity-actions-table-column-view>`
-        };
-      const r = t.unique && this._workspacePathBuilder ? this._workspacePathBuilder({ entityType: t.entityType }) + P.generateLocal({
-        unique: t.unique
-      }) : "";
-      return {
-        columnAlias: s.alias,
-        value: s.elementName ? { item: t, editPath: r } : h(this, l, C).call(this, t, s.alias)
-      };
-    }) ?? [];
-    return {
-      id: t.unique,
-      icon: t.documentType.icon,
-      entityType: "document",
-      data: a
-    };
-  });
-};
-C = function(e, t) {
-  switch (t) {
-    case "contentTypeAlias":
-      return e.contentTypeAlias;
-    case "createDate":
-      return e.createDate.toLocaleString();
-    case "creator":
-    case "owner":
-      return e.creator;
-    case "name":
-      return e.name;
-    case "state":
-      return O(e.state);
-    case "published":
-      return e.state !== "Draft" ? "True" : "False";
-    case "sortOrder":
-      return e.sortOrder;
-    case "updateDate":
-      return e.updateDate.toLocaleString();
-    case "updater":
-      return e.updater;
-    default:
-      return e.values.find((a) => a.alias === t)?.value ?? "";
-  }
+c = /* @__PURE__ */ new WeakSet();
+p = function(t = []) {
+  const e = [
+    { name: "Name", alias: "name" },
+    { name: "State", alias: "state" }
+  ], a = t.map((s) => ({
+    name: s.nameTemplate ?? s.alias,
+    alias: s.alias
+  }));
+  this._columns = [...e, ...a, { name: "", alias: "entityActions", align: "right" }];
 };
-i.styles = [
-  A,
-  D`
-			:host {
-				display: block;
-				box-sizing: border-box;
-				height: auto;
-				width: 100%;
-				padding: var(--uui-size-space-3) 0;
-			}
-
-			.container {
-				display: flex;
-				justify-content: center;
-				align-items: center;
-			}
-
-			:host {
+r.styles = u`
+		:host {
 			display: block;
 			width: 100%;
 			overflow-x: auto;
-			}
-			table {
-				width: 100%;
-				border-collapse: collapse;
-				font-size: 14px;
-			}
-			th,
-			td {
-				padding: 6px 10px;
-				border: 1px solid #ddd;
-				white-space: nowrap;
-			}
-			th {
-				background: #f8f8f8;
-				font-weight: 600;
-			}
-			a {
-				color: var(--uui-color-interactive, #0366d6);
-				text-decoration: none;
-			}
-			a:hover {
-				text-decoration: underline;
-			}
-			`
-];
-c([
-  d()
-], i.prototype, "_workspacePathBuilder", 2);
-c([
-  d()
-], i.prototype, "_userDefinedProperties", 2);
-c([
-  d()
-], i.prototype, "_items", 2);
-c([
+			font-family: sans-serif;
+		}
+		table {
+			width: 100%;
+			border-collapse: collapse;
+		}
+		th,
+		td {
+			padding: 6px 10px;
+			border: 1px solid #ddd;
+			white-space: nowrap;
+		}
+		th {
+			background: #f8f8f8;
+			font-weight: 600;
+		}
+		a {
+			color: var(--uui-color-interactive, #0366d6);
+			text-decoration: none;
+		}
+		a:hover {
+			text-decoration: underline;
+		}
+	`;
+m([
   d()
-], i.prototype, "_tableColumns", 2);
-c([
+], r.prototype, "_columns", 2);
+m([
   d()
-], i.prototype, "_tableItems", 2);
-i = c([
-  x("my-document-table-collection-view")
-], i);
-const z = i;
+], r.prototype, "_items", 2);
+r = m([
+  _("my-document-table-collection-view")
+], r);
+const O = r;
 export {
-  i as MyDocumentTableCollectionViewElement,
-  z as default
+  r as MyDocumentTableCollectionViewElement,
+  O as default
 };
 //# sourceMappingURL=my-collection-view.js.map
diff --git a/tests/Umbraco.Tests.AcceptanceTest/tests/ExtensionRegistry/AdditionalSetup/App_Plugins/my-collection-view/my-collection-view.js.map b/tests/Umbraco.Tests.AcceptanceTest/tests/ExtensionRegistry/AdditionalSetup/App_Plugins/my-collection-view/my-collection-view.js.map
index b613f3d7c86c..1b84b4da576a 100644
--- a/tests/Umbraco.Tests.AcceptanceTest/tests/ExtensionRegistry/AdditionalSetup/App_Plugins/my-collection-view/my-collection-view.js.map
+++ b/tests/Umbraco.Tests.AcceptanceTest/tests/ExtensionRegistry/AdditionalSetup/App_Plugins/my-collection-view/my-collection-view.js.map
@@ -1 +1 @@
-{"version":3,"file":"my-collection-view.js","sources":["../../my-collection-view/src/my-collection-view.ts"],"sourcesContent":["import { UMB_EDIT_DOCUMENT_WORKSPACE_PATH_PATTERN } from '@umbraco-cms/backoffice/document';\r\nimport type { UmbDocumentCollectionItemModel } from '@umbraco-cms/backoffice/document';\r\nimport { UMB_DOCUMENT_COLLECTION_CONTEXT } from '@umbraco-cms/backoffice/document';\r\nimport type { UmbCollectionColumnConfiguration } from '@umbraco-cms/backoffice/collection';\r\nimport { css, customElement, html, state } from '@umbraco-cms/backoffice/external/lit';\r\nimport { UmbLitElement } from '@umbraco-cms/backoffice/lit-element';\r\nimport { UmbTextStyles } from '@umbraco-cms/backoffice/style';\r\nimport type { UmbModalRouteBuilder } from '@umbraco-cms/backoffice/router';\r\nimport { fromCamelCase } from '@umbraco-cms/backoffice/utils';\r\nimport type {\r\n\tUmbTableColumn,\r\n\tUmbTableItem,\r\n} from '@umbraco-cms/backoffice/components';\r\n\r\n@customElement('my-document-table-collection-view')\r\nexport class MyDocumentTableCollectionViewElement extends UmbLitElement {\r\n\t@state()\r\n\tprivate _workspacePathBuilder?: UmbModalRouteBuilder;\r\n\r\n\t@state()\r\n\tprivate _userDefinedProperties?: Array<UmbCollectionColumnConfiguration>;\r\n\r\n\t@state()\r\n\tprivate _items?: Array<UmbDocumentCollectionItemModel>;\r\n\r\n\t@state()\r\n\tprivate _tableColumns: Array<UmbTableColumn> = [];\r\n\r\n\t#systemColumns: Array<UmbTableColumn> = [\r\n\t\t{\r\n\t\t\tname: this.localize.term('general_name'),\r\n\t\t\talias: 'name',\r\n\t\t\telementName: 'umb-document-table-column-name',\r\n\t\t\tallowSorting: true,\r\n\t\t},\r\n\t\t{\r\n\t\t\tname: this.localize.term('content_publishStatus'),\r\n\t\t\talias: 'state',\r\n\t\t\telementName: 'umb-document-table-column-state',\r\n\t\t\tallowSorting: false,\r\n\t\t},\r\n\t];\r\n\r\n\t@state()\r\n\tprivate _tableItems: Array<UmbTableItem> = [];\r\n\r\n\t#collectionContext?: typeof UMB_DOCUMENT_COLLECTION_CONTEXT.TYPE;\r\n\r\n\tconstructor() {\r\n\t\tsuper();\r\n\r\n\t\tthis.consumeContext(UMB_DOCUMENT_COLLECTION_CONTEXT, (collectionContext) => {\r\n\t\t\tthis.#collectionContext = collectionContext;\r\n\t\t\tcollectionContext?.setupView(this);\r\n\t\t\tthis.observe(\r\n\t\t\t\tcollectionContext?.workspacePathBuilder,\r\n\t\t\t\t(builder) => {\r\n\t\t\t\t\tthis._workspacePathBuilder = builder;\r\n\t\t\t\t\tif (this.#collectionContext) {\r\n\t\t\t\t\t\tthis.#createTableItems(this.#collectionContext.getItems());\r\n\t\t\t\t\t}\r\n\t\t\t\t},\r\n\t\t\t\t'observePath',\r\n\t\t\t);\r\n\t\t\tthis.#observeCollectionContext();\r\n\t\t});\r\n\t}\r\n\r\n\t#observeCollectionContext() {\r\n\t\tif (!this.#collectionContext) return;\r\n\r\n\t\tthis.observe(\r\n\t\t\tthis.#collectionContext.userDefinedProperties,\r\n\t\t\t(userDefinedProperties) => {\r\n\t\t\t\tthis._userDefinedProperties = userDefinedProperties;\r\n\t\t\t\tthis.#createTableHeadings();\r\n\t\t\t},\r\n\t\t\t'_observeUserDefinedProperties',\r\n\t\t);\r\n\r\n\t\tthis.observe(\r\n\t\t\tthis.#collectionContext.items,\r\n\t\t\t(items) => {\r\n\t\t\t\tthis._items = items;\r\n\t\t\t\tthis.#createTableItems(this._items);\r\n\t\t\t},\r\n\t\t\t'_observeItems',\r\n\t\t);\r\n\t}\r\n\r\n\t#createTableHeadings() {\r\n\t\tif (this._userDefinedProperties && this._userDefinedProperties.length > 0) {\r\n\t\t\tconst userColumns: Array<UmbTableColumn> = this._userDefinedProperties.map((item) => {\r\n\t\t\t\treturn {\r\n\t\t\t\t\tname: this.localize.string(item.header),\r\n\t\t\t\t\talias: item.alias,\r\n\t\t\t\t\telementName: item.elementName,\r\n\t\t\t\t\tlabelTemplate: item.nameTemplate,\r\n\t\t\t\t\tallowSorting: true,\r\n\t\t\t\t};\r\n\t\t\t});\r\n\r\n\t\t\tthis._tableColumns = [\r\n\t\t\t\t...this.#systemColumns,\r\n\t\t\t\t...userColumns,\r\n\t\t\t\t{ name: '', alias: 'entityActions', align: 'right' },\r\n\t\t\t];\r\n\t\t}\r\n\t}\r\n\r\n\t#createTableItems(items: Array<UmbDocumentCollectionItemModel>) {\r\n\t\tthis._tableItems = items.map((item) => {\r\n\t\t\tif (!item.unique) throw new Error('Item id is missing.');\r\n\r\n\t\t\tconst data =\r\n\t\t\t\tthis._tableColumns?.map((column) => {\r\n\t\t\t\t\tif (column.alias === 'entityActions') {\r\n\t\t\t\t\t\treturn {\r\n\t\t\t\t\t\t\tcolumnAlias: 'entityActions',\r\n\t\t\t\t\t\t\tvalue: html`<umb-document-entity-actions-table-column-view\r\n\t\t\t\t\t\t\t\t.value=${item}></umb-document-entity-actions-table-column-view>`,\r\n\t\t\t\t\t\t};\r\n\t\t\t\t\t}\r\n\r\n\t\t\t\t\tconst editPath =\r\n\t\t\t\t\t\titem.unique && this._workspacePathBuilder\r\n\t\t\t\t\t\t\t? this._workspacePathBuilder({ entityType: item.entityType }) +\r\n\t\t\t\t\t\t\tUMB_EDIT_DOCUMENT_WORKSPACE_PATH_PATTERN.generateLocal({\r\n\t\t\t\t\t\t\t\tunique: item.unique,\r\n\t\t\t\t\t\t\t})\r\n\t\t\t\t\t\t\t: '';\r\n\r\n\t\t\t\t\treturn {\r\n\t\t\t\t\t\tcolumnAlias: column.alias,\r\n\t\t\t\t\t\tvalue: column.elementName ? { item, editPath } : this.#getPropertyValueByAlias(item, column.alias),\r\n\t\t\t\t\t};\r\n\t\t\t\t}) ?? [];\r\n\r\n\t\t\treturn {\r\n\t\t\t\tid: item.unique,\r\n\t\t\t\ticon: item.documentType.icon,\r\n\t\t\t\tentityType: 'document',\r\n\t\t\t\tdata: data,\r\n\t\t\t};\r\n\t\t});\r\n\t}\r\n\r\n\t#getPropertyValueByAlias(item: UmbDocumentCollectionItemModel, alias: string) {\r\n\tswitch (alias) {\r\n\t\tcase 'contentTypeAlias':\r\n\t\t\treturn item.contentTypeAlias;\r\n\t\tcase 'createDate':\r\n\t\t\treturn item.createDate.toLocaleString();\r\n\t\tcase 'creator':\r\n\t\tcase 'owner':\r\n\t\t\treturn item.creator;\r\n\t\tcase 'name':\r\n\t\t\treturn item.name;\r\n\t\tcase 'state':\r\n\t\t\treturn fromCamelCase(item.state);\r\n\t\tcase 'published':\r\n\t\t\treturn item.state !== 'Draft' ? 'True' : 'False';\r\n\t\tcase 'sortOrder':\r\n\t\t\treturn item.sortOrder;\r\n\t\tcase 'updateDate':\r\n\t\t\treturn item.updateDate.toLocaleString();\r\n\t\tcase 'updater':\r\n\t\t\treturn item.updater;\r\n\t\tdefault:\r\n\t\t\treturn item.values.find((value) => value.alias === alias)?.value ?? '';\r\n\t}\r\n}\r\n\r\n\toverride render() {\r\n\t\treturn html`\r\n\t\t<table class=\"doc-table\">\r\n\t\t\t\t<thead>\r\n\t\t\t\t\t<tr>\r\n\t\t\t\t\t\t${this._tableColumns.map(\r\n\t\t\t\t\t\t\t(col) => html`<th style=\"text-align:${col.align ?? 'left'}\">${col.name}</th>`,\r\n\t\t\t\t\t\t)}\r\n\t\t\t\t\t</tr>\r\n\t\t\t\t</thead>\r\n\t\t\t\t<tbody>\r\n\t\t\t\t\t${this._tableItems.map(\r\n\t\t\t\t\t\t\t(item) => html`\r\n\t\t\t\t\t\t\t<tr>\r\n\t\t\t\t\t\t\t\t${this._tableColumns.map((col) => {\r\n\t\t\t\t\t\t\t\tconst cell = item.data.find((d) => d.columnAlias === col.alias);\r\n\t\t\t\t\t\t\t\tconst val = cell?.value ?? '';\r\n\t\t\t\t\t\t\t\tif (col.alias === 'name' && val?.item) {\r\n\t\t\t\t\t\t\t\t\treturn html`<td><a href=${val.editPath || '#'}>${val.item.name}</a></td>`;\r\n\t\t\t\t\t\t\t\t}\r\n\t\t\t\t\t\t\t\tif (col.alias === 'state' && val?.item) {\r\n\t\t\t\t\t\t\t\t\treturn html`<td>${val.item.state}</td>`;\r\n\t\t\t\t\t\t\t\t}\r\n\t\t\t\t\t\t\t\tif (col.alias === 'entityActions') {\r\n\t\t\t\t\t\t\t\t\treturn html`<td style=\"text-align:right;\">⋮</td>`;\r\n\t\t\t\t\t\t\t\t}\r\n\t\t\t\t\t\t\t\treturn html`<td>${val}</td>`;\r\n\t\t\t\t\t\t\t})}\r\n\t\t\t\t\t\t\t</tr>\r\n\t\t\t\t\t\t`,\r\n\t\t\t\t\t\t)}\r\n\t\t\t\t</tbody>\r\n\t\t\t</table>`;\r\n\t}\r\n\r\n\tstatic override styles = [\r\n\t\tUmbTextStyles,\r\n\t\tcss`\r\n\t\t\t:host {\r\n\t\t\t\tdisplay: block;\r\n\t\t\t\tbox-sizing: border-box;\r\n\t\t\t\theight: auto;\r\n\t\t\t\twidth: 100%;\r\n\t\t\t\tpadding: var(--uui-size-space-3) 0;\r\n\t\t\t}\r\n\r\n\t\t\t.container {\r\n\t\t\t\tdisplay: flex;\r\n\t\t\t\tjustify-content: center;\r\n\t\t\t\talign-items: center;\r\n\t\t\t}\r\n\r\n\t\t\t:host {\r\n\t\t\tdisplay: block;\r\n\t\t\twidth: 100%;\r\n\t\t\toverflow-x: auto;\r\n\t\t\t}\r\n\t\t\ttable {\r\n\t\t\t\twidth: 100%;\r\n\t\t\t\tborder-collapse: collapse;\r\n\t\t\t\tfont-size: 14px;\r\n\t\t\t}\r\n\t\t\tth,\r\n\t\t\ttd {\r\n\t\t\t\tpadding: 6px 10px;\r\n\t\t\t\tborder: 1px solid #ddd;\r\n\t\t\t\twhite-space: nowrap;\r\n\t\t\t}\r\n\t\t\tth {\r\n\t\t\t\tbackground: #f8f8f8;\r\n\t\t\t\tfont-weight: 600;\r\n\t\t\t}\r\n\t\t\ta {\r\n\t\t\t\tcolor: var(--uui-color-interactive, #0366d6);\r\n\t\t\t\ttext-decoration: none;\r\n\t\t\t}\r\n\t\t\ta:hover {\r\n\t\t\t\ttext-decoration: underline;\r\n\t\t\t}\r\n\t\t\t`,\r\n\t];\r\n}\r\n\r\nexport default MyDocumentTableCollectionViewElement;\r\n\r\ndeclare global {\r\n\tinterface HTMLElementTagNameMap {\r\n\t\t'my-document-table-collection-view': MyDocumentTableCollectionViewElement;\r\n\t}\r\n}\r\n"],"names":["_systemColumns","_collectionContext","_MyDocumentTableCollectionViewElement_instances","observeCollectionContext_fn","createTableHeadings_fn","createTableItems_fn","getPropertyValueByAlias_fn","MyDocumentTableCollectionViewElement","UmbLitElement","__privateAdd","UMB_DOCUMENT_COLLECTION_CONTEXT","collectionContext","__privateSet","builder","__privateGet","__privateMethod","html","col","item","val","d","userDefinedProperties","items","userColumns","data","column","editPath","UMB_EDIT_DOCUMENT_WORKSPACE_PATH_PATTERN","alias","fromCamelCase","value","UmbTextStyles","css","__decorateClass","state","customElement","MyDocumentTableCollectionViewElement$1"],"mappings":";;;;;;;;;;;wXAAAA,GAAAC,GAAAC,GAAAC,GAAAC,GAAAC,GAAAC;AAeO,IAAMC,IAAN,cAAmDC,EAAc;AAAA,EAiCvE,cAAc;AACb,UAAA,GAlCKC,EAAA,MAAAP,CAAA,GAWN,KAAQ,gBAAuC,CAAA,GAE/CO,EAAA,MAAAT,GAAwC;AAAA,MACvC;AAAA,QACC,MAAM,KAAK,SAAS,KAAK,cAAc;AAAA,QACvC,OAAO;AAAA,QACP,aAAa;AAAA,QACb,cAAc;AAAA,MAAA;AAAA,MAEf;AAAA,QACC,MAAM,KAAK,SAAS,KAAK,uBAAuB;AAAA,QAChD,OAAO;AAAA,QACP,aAAa;AAAA,QACb,cAAc;AAAA,MAAA;AAAA,IACf,CACD,GAGA,KAAQ,cAAmC,CAAA,GAE3CS,EAAA,MAAAR,CAAA,GAKC,KAAK,eAAeS,GAAiC,CAACC,MAAsB;AAC3E,MAAAC,EAAA,MAAKX,GAAqBU,CAAA,GAC1BA,GAAmB,UAAU,IAAI,GACjC,KAAK;AAAA,QACJA,GAAmB;AAAA,QACnB,CAACE,MAAY;AACZ,eAAK,wBAAwBA,GACzBC,QAAKb,CAAA,KACRc,EAAA,MAAKb,GAAAG,CAAA,EAAL,KAAA,MAAuBS,EAAA,MAAKb,CAAA,EAAmB,SAAA,CAAS;AAAA,QAE1D;AAAA,QACA;AAAA,MAAA,GAEDc,EAAA,MAAKb,GAAAC,CAAA,EAAL,KAAA,IAAA;AAAA,IACD,CAAC;AAAA,EACF;AAAA,EA2GS,SAAS;AACjB,WAAOa;AAAA;AAAA;AAAA;AAAA,QAID,KAAK,cAAc;AAAA,MACpB,CAACC,MAAQD,0BAA6BC,EAAI,SAAS,MAAM,KAAKA,EAAI,IAAI;AAAA,IAAA,CACtE;AAAA;AAAA;AAAA;AAAA,OAIA,KAAK,YAAY;AAAA,MACjB,CAACC,MAASF;AAAA;AAAA,UAEP,KAAK,cAAc,IAAI,CAACC,MAAQ;AAElC,cAAME,IADOD,EAAK,KAAK,KAAK,CAACE,MAAMA,EAAE,gBAAgBH,EAAI,KAAK,GAC5C,SAAS;AAC3B,eAAIA,EAAI,UAAU,UAAUE,GAAK,OACzBH,gBAAmBG,EAAI,YAAY,GAAG,IAAIA,EAAI,KAAK,IAAI,cAE3DF,EAAI,UAAU,WAAWE,GAAK,OAC1BH,QAAWG,EAAI,KAAK,KAAK,UAE7BF,EAAI,UAAU,kBACVD,0CAEDA,QAAWG,CAAG;AAAA,MACtB,CAAC,CAAC;AAAA;AAAA;AAAA,IAAA,CAGF;AAAA;AAAA;AAAA,EAGN;AAgDD;AAlOCnB,IAAA,oBAAA,QAAA;AAkBAC,IAAA,oBAAA,QAAA;AA/BMC,IAAA,oBAAA,QAAA;AAqDNC,IAAyB,WAAG;AAC3B,EAAKW,QAAKb,CAAA,MAEV,KAAK;AAAA,IACJa,QAAKb,CAAA,EAAmB;AAAA,IACxB,CAACoB,MAA0B;AAC1B,WAAK,yBAAyBA,GAC9BN,EAAA,MAAKb,GAAAE,CAAA,EAAL,KAAA,IAAA;AAAA,IACD;AAAA,IACA;AAAA,EAAA,GAGD,KAAK;AAAA,IACJU,QAAKb,CAAA,EAAmB;AAAA,IACxB,CAACqB,MAAU;AACV,WAAK,SAASA,GACdP,EAAA,MAAKb,GAAAG,CAAA,EAAL,WAAuB,KAAK,MAAA;AAAA,IAC7B;AAAA,IACA;AAAA,EAAA;AAEF;AAEAD,IAAoB,WAAG;AACtB,MAAI,KAAK,0BAA0B,KAAK,uBAAuB,SAAS,GAAG;AAC1E,UAAMmB,IAAqC,KAAK,uBAAuB,IAAI,CAACL,OACpE;AAAA,MACN,MAAM,KAAK,SAAS,OAAOA,EAAK,MAAM;AAAA,MACtC,OAAOA,EAAK;AAAA,MACZ,aAAaA,EAAK;AAAA,MAClB,eAAeA,EAAK;AAAA,MACpB,cAAc;AAAA,IAAA,EAEf;AAED,SAAK,gBAAgB;AAAA,MACpB,GAAGJ,EAAA,MAAKd,CAAA;AAAA,MACR,GAAGuB;AAAA,MACH,EAAE,MAAM,IAAI,OAAO,iBAAiB,OAAO,QAAA;AAAA,IAAQ;AAAA,EAErD;AACD;AAEAlB,IAAiB,SAACiB,GAA8C;AAC/D,OAAK,cAAcA,EAAM,IAAI,CAACJ,MAAS;AACtC,QAAI,CAACA,EAAK,OAAQ,OAAM,IAAI,MAAM,qBAAqB;AAEvD,UAAMM,IACL,KAAK,eAAe,IAAI,CAACC,MAAW;AACnC,UAAIA,EAAO,UAAU;AACpB,eAAO;AAAA,UACN,aAAa;AAAA,UACb,OAAOT;AAAA,iBACGE,CAAI;AAAA,QAAA;AAIhB,YAAMQ,IACLR,EAAK,UAAU,KAAK,wBACjB,KAAK,sBAAsB,EAAE,YAAYA,EAAK,WAAA,CAAY,IAC5DS,EAAyC,cAAc;AAAA,QACtD,QAAQT,EAAK;AAAA,MAAA,CACb,IACC;AAEJ,aAAO;AAAA,QACN,aAAaO,EAAO;AAAA,QACpB,OAAOA,EAAO,cAAc,EAAE,MAAAP,GAAM,UAAAQ,EAAA,IAAaX,EAAA,MAAKb,GAAAI,CAAA,EAAL,KAAA,MAA8BY,GAAMO,EAAO,KAAA;AAAA,MAAA;AAAA,IAE9F,CAAC,KAAK,CAAA;AAEP,WAAO;AAAA,MACN,IAAIP,EAAK;AAAA,MACT,MAAMA,EAAK,aAAa;AAAA,MACxB,YAAY;AAAA,MACZ,MAAAM;AAAA,IAAA;AAAA,EAEF,CAAC;AACF;AAEAlB,IAAwB,SAACY,GAAsCU,GAAe;AAC9E,UAAQA,GAAA;AAAA,IACP,KAAK;AACJ,aAAOV,EAAK;AAAA,IACb,KAAK;AACJ,aAAOA,EAAK,WAAW,eAAA;AAAA,IACxB,KAAK;AAAA,IACL,KAAK;AACJ,aAAOA,EAAK;AAAA,IACb,KAAK;AACJ,aAAOA,EAAK;AAAA,IACb,KAAK;AACJ,aAAOW,EAAcX,EAAK,KAAK;AAAA,IAChC,KAAK;AACJ,aAAOA,EAAK,UAAU,UAAU,SAAS;AAAA,IAC1C,KAAK;AACJ,aAAOA,EAAK;AAAA,IACb,KAAK;AACJ,aAAOA,EAAK,WAAW,eAAA;AAAA,IACxB,KAAK;AACJ,aAAOA,EAAK;AAAA,IACb;AACC,aAAOA,EAAK,OAAO,KAAK,CAACY,MAAUA,EAAM,UAAUF,CAAK,GAAG,SAAS;AAAA,EAAA;AAEvE;AA5JarB,EAiMI,SAAS;AAAA,EACxBwB;AAAA,EACAC;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AA2CD;AA5OQC,EAAA;AAAA,EADPC,EAAA;AAAM,GADK3B,EAEJ,WAAA,yBAAA,CAAA;AAGA0B,EAAA;AAAA,EADPC,EAAA;AAAM,GAJK3B,EAKJ,WAAA,0BAAA,CAAA;AAGA0B,EAAA;AAAA,EADPC,EAAA;AAAM,GAPK3B,EAQJ,WAAA,UAAA,CAAA;AAGA0B,EAAA;AAAA,EADPC,EAAA;AAAM,GAVK3B,EAWJ,WAAA,iBAAA,CAAA;AAkBA0B,EAAA;AAAA,EADPC,EAAA;AAAM,GA5BK3B,EA6BJ,WAAA,eAAA,CAAA;AA7BIA,IAAN0B,EAAA;AAAA,EADNE,EAAc,mCAAmC;AAAA,GACrC5B,CAAA;AAiPb,MAAA6B,IAAe7B;"}
\ No newline at end of file
+{"version":3,"file":"my-collection-view.js","sources":["../../my-collection-view/src/my-collection-view.ts"],"sourcesContent":["import { css, customElement, html, state } from '@umbraco-cms/backoffice/external/lit';\r\nimport { UmbLitElement } from '@umbraco-cms/backoffice/lit-element';\r\nimport { UMB_DOCUMENT_COLLECTION_CONTEXT } from '@umbraco-cms/backoffice/document';\r\nimport type { UmbDocumentCollectionItemModel } from '@umbraco-cms/backoffice/document';\r\nimport type { UmbCollectionColumnConfiguration } from '@umbraco-cms/backoffice/collection';\r\n\r\n@customElement('my-document-table-collection-view')\r\nexport class MyDocumentTableCollectionViewElement extends UmbLitElement {\r\n\r\n\t@state() private _columns: Array<{ name: string; alias: string; align?: string }> = [];\r\n\t@state() private _items?: Array<UmbDocumentCollectionItemModel> = [];\r\n\r\n\tconstructor() {\r\n\t\tsuper();\r\n\r\n\t\tthis.consumeContext(UMB_DOCUMENT_COLLECTION_CONTEXT, (collectionContext) => {\r\n\t\t\tcollectionContext?.setupView(this);\r\n\r\n\t\t\tthis.observe(collectionContext?.userDefinedProperties, (props) => {\r\n\t\t\t\tthis.#createColumns(props);\r\n\t\t\t});\r\n\r\n\t\t\tthis.observe(collectionContext?.items, (items) => {\r\n\t\t\t\tthis._items = items;\r\n\t\t\t});\r\n\t\t});\r\n\t}\r\n\r\n\t#createColumns(userProps: Array<UmbCollectionColumnConfiguration> = []) {\r\n\t\tconst baseCols = [\r\n\t\t\t{ name: 'Name', alias: 'name' },\r\n\t\t\t{ name: 'State', alias: 'state' },\r\n\t\t];\r\n\t\tconst userCols = userProps.map((p) => ({\r\n\t\t\tname: p.nameTemplate ?? p.alias,\r\n\t\t\talias: p.alias,\r\n\t\t}));\r\n\t\tthis._columns = [...baseCols, ...userCols, { name: '', alias: 'entityActions', align: 'right' }];\r\n\t}\r\n\r\n\toverride render() {\r\n        if (this._items === undefined) return html`<p>Not found...</p>`;\r\n\t\treturn html`\r\n\t\t\t<table>\r\n\t\t\t\t<thead>\r\n\t\t\t\t\t<tr>\r\n\t\t\t\t\t\t${this._columns.map((col) => html`<th style=\"text-align:${col.align ?? 'left'}\">${col.name}</th>`)}\r\n\t\t\t\t\t</tr>\r\n\t\t\t\t</thead>\r\n\t\t\t\t<tbody>\r\n\t\t\t\t\t${this._items.map(\r\n\t\t\t(item) => html`\r\n\t\t\t\t\t\t\t<tr>\r\n\t\t\t\t\t\t\t\t${this._columns.map((col) => {\r\n\t\t\t\tswitch (col.alias) {\r\n\t\t\t\t\tcase 'name':\r\n\t\t\t\t\t\treturn html`<td><a href=\"#\">${item.variants[0].name}</a></td>`;\r\n\t\t\t\t\tcase 'entityActions':\r\n\t\t\t\t\t\treturn html`<td style=\"text-align:right;\">⋮</td>`;\r\n\t\t\t\t\tdefault:\r\n\t\t\t\t\t\tconst val = item.values.find((v) => v.alias === col.alias)?.value ?? '';\r\n\t\t\t\t\t\treturn html`<td>${val}</td>`;\r\n\t\t\t\t}\r\n\t\t\t})}\r\n\t\t\t\t\t\t\t</tr>\r\n\t\t\t\t\t\t`\r\n\t\t)}\r\n\t\t\t\t</tbody>\r\n\t\t\t</table>\r\n\t\t`;\r\n\t}\r\n\r\n\tstatic override styles = css`\r\n\t\t:host {\r\n\t\t\tdisplay: block;\r\n\t\t\twidth: 100%;\r\n\t\t\toverflow-x: auto;\r\n\t\t\tfont-family: sans-serif;\r\n\t\t}\r\n\t\ttable {\r\n\t\t\twidth: 100%;\r\n\t\t\tborder-collapse: collapse;\r\n\t\t}\r\n\t\tth,\r\n\t\ttd {\r\n\t\t\tpadding: 6px 10px;\r\n\t\t\tborder: 1px solid #ddd;\r\n\t\t\twhite-space: nowrap;\r\n\t\t}\r\n\t\tth {\r\n\t\t\tbackground: #f8f8f8;\r\n\t\t\tfont-weight: 600;\r\n\t\t}\r\n\t\ta {\r\n\t\t\tcolor: var(--uui-color-interactive, #0366d6);\r\n\t\t\ttext-decoration: none;\r\n\t\t}\r\n\t\ta:hover {\r\n\t\t\ttext-decoration: underline;\r\n\t\t}\r\n\t`;\r\n}\r\n\r\nexport default MyDocumentTableCollectionViewElement;\r\n\r\ndeclare global {\r\n\tinterface HTMLElementTagNameMap {\r\n\t\t'my-document-table-collection-view': MyDocumentTableCollectionViewElement;\r\n\t}\r\n}\r\n"],"names":["_MyDocumentTableCollectionViewElement_instances","createColumns_fn","MyDocumentTableCollectionViewElement","UmbLitElement","__privateAdd","UMB_DOCUMENT_COLLECTION_CONTEXT","collectionContext","props","__privateMethod","items","html","col","item","val","v","userProps","baseCols","userCols","p","css","__decorateClass","state","customElement","MyDocumentTableCollectionViewElement$1"],"mappings":";;;;;;;;;8OAAAA,GAAAC;AAOO,IAAMC,IAAN,cAAmDC,EAAc;AAAA,EAKvE,cAAc;AACb,UAAA,GANKC,EAAA,MAAAJ,CAAA,GAEG,KAAQ,WAAmE,CAAA,GAC3E,KAAQ,SAAiD,CAAA,GAKjE,KAAK,eAAeK,GAAiC,CAACC,MAAsB;AAC3E,MAAAA,GAAmB,UAAU,IAAI,GAEjC,KAAK,QAAQA,GAAmB,uBAAuB,CAACC,MAAU;AACjE,QAAAC,EAAA,MAAKR,MAAL,KAAA,MAAoBO,CAAA;AAAA,MACrB,CAAC,GAED,KAAK,QAAQD,GAAmB,OAAO,CAACG,MAAU;AACjD,aAAK,SAASA;AAAA,MACf,CAAC;AAAA,IACF,CAAC;AAAA,EACF;AAAA,EAcS,SAAS;AACX,WAAI,KAAK,WAAW,SAAkBC,yBACrCA;AAAA;AAAA;AAAA;AAAA,QAID,KAAK,SAAS,IAAI,CAACC,MAAQD,0BAA6BC,EAAI,SAAS,MAAM,KAAKA,EAAI,IAAI,OAAO,CAAC;AAAA;AAAA;AAAA;AAAA,OAIjG,KAAK,OAAO;AAAA,MAChB,CAACC,MAASF;AAAA;AAAA,UAEH,KAAK,SAAS,IAAI,CAACC,MAAQ;AACjC,gBAAQA,EAAI,OAAA;AAAA,UACX,KAAK;AACJ,mBAAOD,oBAAuBE,EAAK,SAAS,CAAC,EAAE,IAAI;AAAA,UACpD,KAAK;AACJ,mBAAOF;AAAA,UACR;AACC,kBAAMG,IAAMD,EAAK,OAAO,KAAK,CAACE,MAAMA,EAAE,UAAUH,EAAI,KAAK,GAAG,SAAS;AACrE,mBAAOD,QAAWG,CAAG;AAAA,QAAA;AAAA,MAExB,CAAC,CAAC;AAAA;AAAA;AAAA,IAAA,CAGF;AAAA;AAAA;AAAA;AAAA,EAIF;AA+BD;AA9FOb,IAAA,oBAAA,QAAA;AAqBNC,IAAc,SAACc,IAAqD,IAAI;AACvE,QAAMC,IAAW;AAAA,IAChB,EAAE,MAAM,QAAQ,OAAO,OAAA;AAAA,IACvB,EAAE,MAAM,SAAS,OAAO,QAAA;AAAA,EAAQ,GAE3BC,IAAWF,EAAU,IAAI,CAACG,OAAO;AAAA,IACtC,MAAMA,EAAE,gBAAgBA,EAAE;AAAA,IAC1B,OAAOA,EAAE;AAAA,EAAA,EACR;AACF,OAAK,WAAW,CAAC,GAAGF,GAAU,GAAGC,GAAU,EAAE,MAAM,IAAI,OAAO,iBAAiB,OAAO,SAAS;AAChG;AA/BYf,EAiEI,SAASiB;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AA/DRC,EAAA;AAAA,EAAhBC,EAAA;AAAM,GAFKnB,EAEK,WAAA,YAAA,CAAA;AACAkB,EAAA;AAAA,EAAhBC,EAAA;AAAM,GAHKnB,EAGK,WAAA,UAAA,CAAA;AAHLA,IAANkB,EAAA;AAAA,EADNE,EAAc,mCAAmC;AAAA,GACrCpB,CAAA;AAgGb,MAAAqB,IAAerB;"}
\ No newline at end of file
diff --git a/tests/Umbraco.Tests.AcceptanceTest/tests/ExtensionRegistry/AdditionalSetup/App_Plugins/my-collection-view/umbraco-package.json b/tests/Umbraco.Tests.AcceptanceTest/tests/ExtensionRegistry/AdditionalSetup/App_Plugins/my-collection-view/umbraco-package.json
index 7cbeb21c79e5..1cef3bf27535 100644
--- a/tests/Umbraco.Tests.AcceptanceTest/tests/ExtensionRegistry/AdditionalSetup/App_Plugins/my-collection-view/umbraco-package.json
+++ b/tests/Umbraco.Tests.AcceptanceTest/tests/ExtensionRegistry/AdditionalSetup/App_Plugins/my-collection-view/umbraco-package.json
@@ -1,4 +1,4 @@
-{
+{
   "$schema": "../../umbraco-package-schema.json",
   "name": "My Collection View",
   "version": "0.1.0",

From eeda55c06f1f9b4215323472d1a06e10e2c60ada Mon Sep 17 00:00:00 2001
From: Jacob Overgaard <752371+iOvergaard@users.noreply.github.com>
Date: Thu, 13 Nov 2025 12:25:17 +0100
Subject: [PATCH 147/155] Preview: Add validation support to Save and Preview
 button (closes #20616) (#20805)

* chore(mock): adds missing try/catch around document lookup

* fix: lets the 'save and preview' button extend the 'save' button to follow the same logic in terms of when it enables/disabled - it did not have much logic before

* fix: runs validation from the server when save and previewing to ensure the UI shows what is missing
---
 .../handlers/document/detail.handlers.ts      | 11 +++++--
 .../save-and-preview.action.ts                | 31 +++----------------
 .../workspace/document-workspace.context.ts   |  9 +++++-
 3 files changed, 22 insertions(+), 29 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/mocks/handlers/document/detail.handlers.ts b/src/Umbraco.Web.UI.Client/src/mocks/handlers/document/detail.handlers.ts
index 9fbaebc38955..4b02a555c65c 100644
--- a/src/Umbraco.Web.UI.Client/src/mocks/handlers/document/detail.handlers.ts
+++ b/src/Umbraco.Web.UI.Client/src/mocks/handlers/document/detail.handlers.ts
@@ -1,4 +1,5 @@
 const { rest } = window.MockServiceWorker;
+import type { UmbMockDocumentModel } from '../../data/document/document.data.js';
 import { umbDocumentMockDb } from '../../data/document/document.db.js';
 import { items as referenceData } from '../../data/tracked-reference.data.js';
 import { UMB_SLUG } from './slug.js';
@@ -77,8 +78,14 @@ export const detailHandlers = [
 	rest.get(umbracoPath(`${UMB_SLUG}/:id/available-segment-options`), (req, res, ctx) => {
 		const id = req.params.id as string;
 		if (!id) return res(ctx.status(400));
-		const document = umbDocumentMockDb.detail.read(id);
-		if (!document) return res(ctx.status(404));
+
+		let document: UmbMockDocumentModel | null = null;
+
+		try {
+			document = umbDocumentMockDb.detail.read(id);
+		} catch {
+			return res(ctx.status(404));
+		}
 
 		const availableSegments = document.variants.filter((v) => !!v.segment).map((v) => v.segment!) ?? [];
 
diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/preview/workspace-action/save-and-preview.action.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/preview/workspace-action/save-and-preview.action.ts
index e622c57bf675..adac4f628664 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/preview/workspace-action/save-and-preview.action.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/preview/workspace-action/save-and-preview.action.ts
@@ -1,30 +1,9 @@
-import { UmbDocumentUserPermissionCondition } from '../../user-permissions/document/conditions/document-user-permission.condition.js';
-import { UMB_USER_PERMISSION_DOCUMENT_UPDATE } from '../../user-permissions/document/constants.js';
-import { UmbWorkspaceActionBase } from '@umbraco-cms/backoffice/workspace';
-import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api';
+import { UmbDocumentSaveWorkspaceAction } from '../../workspace/actions/save.action.js';
 
-export class UmbDocumentSaveAndPreviewWorkspaceAction extends UmbWorkspaceActionBase {
-	constructor(host: UmbControllerHost, args: any) {
-		super(host, args);
-
-		/* The action is disabled by default because the onChange callback
-		 will first be triggered when the condition is changed to permitted */
-		this.disable();
-
-		const condition = new UmbDocumentUserPermissionCondition(host, {
-			host,
-			config: {
-				alias: 'Umb.Condition.UserPermission.Document',
-				allOf: [UMB_USER_PERMISSION_DOCUMENT_UPDATE],
-			},
-			onChange: () => {
-				if (condition.permitted) {
-					this.enable();
-				} else {
-					this.disable();
-				}
-			},
-		});
+export class UmbDocumentSaveAndPreviewWorkspaceAction extends UmbDocumentSaveWorkspaceAction {
+	override async execute() {
+		await this._retrieveWorkspaceContext;
+		await this._workspaceContext?.saveAndPreview();
 	}
 }
 
diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/workspace/document-workspace.context.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/workspace/document-workspace.context.ts
index 50d45001ff16..6dadb4ae7c95 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/workspace/document-workspace.context.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/workspace/document-workspace.context.ts
@@ -332,7 +332,14 @@ export class UmbDocumentWorkspaceContext
 			firstVariantId = UmbVariantId.FromString(selected[0]);
 			const variantIds = [firstVariantId];
 			const saveData = await this._data.constructData(variantIds);
-			await this.runMandatoryValidationForSaveData(saveData);
+
+			// Run mandatory validation (checks for name, etc.)
+			await this.runMandatoryValidationForSaveData(saveData, variantIds);
+
+			// Ask server to validate and show validation tooltips (like the Save action does)
+			await this.askServerToValidate(saveData, variantIds);
+
+			// Perform save
 			await this.performCreateOrUpdate(variantIds, saveData);
 		}
 

From 714fbf31192c39970432295089996a1eaa7ce5eb Mon Sep 17 00:00:00 2001
From: Mathias Helsengren <mhe@umbraco.dk>
Date: Thu, 13 Nov 2025 12:55:45 +0100
Subject: [PATCH 148/155] Keyboard navigation: Return to opening element after
 modal close (#20782)

Removed the detroy from the modelContext.
It being destroyed prevented the uui-button getting into focus again after closing the modal.
---
 .../packages/core/modal/controller/open-modal.controller.ts   | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/modal/controller/open-modal.controller.ts b/src/Umbraco.Web.UI.Client/src/packages/core/modal/controller/open-modal.controller.ts
index 994cea878055..f10cbc3e73d9 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/modal/controller/open-modal.controller.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/modal/controller/open-modal.controller.ts
@@ -21,9 +21,7 @@ export class UmbOpenModalController extends UmbControllerBase {
 
 		const modalContext = modalManagerContext.open(this, modalAlias, args);
 
-		return await modalContext.onSubmit().finally(() => {
-			this.destroy();
-		});
+		return await modalContext.onSubmit();
 	}
 }
 

From 617d3014794a8144c9e7dc28c999824c639220f2 Mon Sep 17 00:00:00 2001
From: Andreas Zerbst <73799582+andr317c@users.noreply.github.com>
Date: Thu, 13 Nov 2025 15:39:51 +0100
Subject: [PATCH 149/155] Hides the content files that come from the
 Microsoft.CodeAnalysis.Workspaces.Common package in the web.ui project in 17
 (#20825)

* Hide content files

* Update src/Umbraco.Web.UI/Umbraco.Web.UI.csproj

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

---------

Co-authored-by: Andy Butland <abutland73@gmail.com>
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
---
 src/Umbraco.Web.UI/Umbraco.Web.UI.csproj | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
index 2ade2ca396d8..a9c363c8a0cd 100644
--- a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
+++ b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
@@ -57,6 +57,11 @@
     <_ContentIncludedByDefault Remove="umbraco\UmbracoBackOffice\Default.cshtml" />
   </ItemGroup>
 
+  <ItemGroup>
+    <!-- Hide the content files that come from the Microsoft.CodeAnalysis.Workspaces.MSBuild package. -->
+    <Content Update="$(NuGetPackageRoot)\microsoft.codeanalysis.workspaces.msbuild\**\**" Visible="false" />
+  </ItemGroup>
+
   <Target Name="CopyAppsettingsTemplate" BeforeTargets="Build" Condition="!Exists('appsettings.json')">
     <Message Text="Copying appsettings.template.json to appsettings.json because it doesn't exist" Importance="high" />
     <Copy SourceFiles="appsettings.template.json" DestinationFiles="appsettings.json" />

From bbd30363a2a357ba64fa35e1c5777e1253f7f425 Mon Sep 17 00:00:00 2001
From: Engiber Lozada <89547469+engijlr@users.noreply.github.com>
Date: Thu, 13 Nov 2025 20:38:32 +0100
Subject: [PATCH 150/155] Media Picker: Remove duplicate loaders in media
 cards. (#20793)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Removed isLoding condition from the rich media input and let the thumbnail handle the loader.

* Removed unused import.

* change loader and adjust lit property configuration

* update reflect configuration

---------

Co-authored-by: Niels Lyngsø <niels.lyngso@gmail.com>
---
 .../components/imaging-thumbnail.element.ts   | 31 ++++++++++---------
 .../input-rich-media.element.ts               | 19 +++++-------
 2 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/packages/media/imaging/components/imaging-thumbnail.element.ts b/src/Umbraco.Web.UI.Client/src/packages/media/imaging/components/imaging-thumbnail.element.ts
index b23d79e80a4d..0e8c0eef8fb4 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/media/imaging/components/imaging-thumbnail.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/media/imaging/components/imaging-thumbnail.element.ts
@@ -12,8 +12,8 @@ export class UmbImagingThumbnailElement extends UmbLitElement {
 	 * The unique identifier for the media item.
 	 * @description This is also known as the media key and is used to fetch the resource.
 	 */
-	@property()
-	unique = '';
+	@property({ type: String })
+	unique?: string;
 
 	/**
 	 * The width of the thumbnail in pixels.
@@ -34,19 +34,19 @@ export class UmbImagingThumbnailElement extends UmbLitElement {
 	 * @description The mode determines how the image is cropped.
 	 * @enum {UmbImagingCropMode}
 	 */
-	@property()
+	@property({ type: String })
 	mode: UmbImagingCropMode = UmbImagingCropMode.MIN;
 
 	/**
 	 * The alt text for the thumbnail.
 	 */
-	@property()
+	@property({ type: String })
 	alt = '';
 
 	/**
 	 * The fallback icon for the thumbnail.
 	 */
-	@property()
+	@property({ type: String })
 	icon = 'icon-picture';
 
 	/**
@@ -54,11 +54,17 @@ export class UmbImagingThumbnailElement extends UmbLitElement {
 	 * @enum {'lazy' | 'eager'}
 	 * @default 'lazy'
 	 */
-	@property()
+	@property({ type: String })
 	loading: (typeof HTMLImageElement)['prototype']['loading'] = 'lazy';
 
+	/**
+	 * External loading state (e.g., when parent is waiting for metadata)
+	 */
+	@property({ type: Boolean, reflect: false, attribute: 'external-loading' })
+	externalLoading = false;
+
 	@state()
-	private _isLoading = true;
+	private _isLoading = false;
 
 	@state()
 	private _thumbnailUrl = '';
@@ -69,7 +75,7 @@ export class UmbImagingThumbnailElement extends UmbLitElement {
 
 	override render() {
 		return when(
-			this._isLoading,
+			this.externalLoading || this._isLoading,
 			() => this.#renderLoading(),
 			() => this.#renderThumbnail(),
 		);
@@ -114,7 +120,7 @@ export class UmbImagingThumbnailElement extends UmbLitElement {
 	}
 
 	#renderLoading() {
-		return html`<div id="loader"><uui-loader></uui-loader></div>`;
+		return html`<uui-loader-circle id="loader"></uui-loader-circle>`;
 	}
 
 	#renderThumbnail() {
@@ -154,11 +160,8 @@ export class UmbImagingThumbnailElement extends UmbLitElement {
 			}
 
 			#loader {
-				display: flex;
-				justify-content: center;
-				align-items: center;
-				height: 100%;
-				width: 100%;
+				font-size: 2em;
+				margin-bottom: 1em;
 			}
 
 			#figure {
diff --git a/src/Umbraco.Web.UI.Client/src/packages/media/media/components/input-rich-media/input-rich-media.element.ts b/src/Umbraco.Web.UI.Client/src/packages/media/media/components/input-rich-media/input-rich-media.element.ts
index bab80c11764b..6e432890caa3 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/media/media/components/input-rich-media/input-rich-media.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/media/media/components/input-rich-media/input-rich-media.element.ts
@@ -4,7 +4,7 @@ import { UMB_MEDIA_ITEM_REPOSITORY_ALIAS } from '../../repository/constants.js';
 import { UmbMediaPickerInputContext } from '../input-media/input-media.context.js';
 import { UmbFileDropzoneItemStatus } from '@umbraco-cms/backoffice/dropzone';
 import type { UmbDropzoneChangeEvent } from '@umbraco-cms/backoffice/dropzone';
-import { css, customElement, html, nothing, property, repeat, state, when } from '@umbraco-cms/backoffice/external/lit';
+import { css, customElement, html, nothing, property, repeat, state } from '@umbraco-cms/backoffice/external/lit';
 import { UmbChangeEvent } from '@umbraco-cms/backoffice/event';
 import { UmbId } from '@umbraco-cms/backoffice/id';
 import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element';
@@ -409,18 +409,15 @@ export class UmbInputRichMediaElement extends UmbFormControlMixin<
 	#renderItem(item: UmbRichMediaCardModel) {
 		if (!item.unique) return nothing;
 		const href = this.readonly ? undefined : this._routeBuilder?.({ key: item.unique });
+
 		return html`
 			<uui-card-media id=${item.unique} name=${item.name} .href=${href} ?readonly=${this.readonly}>
-				${when(
-					item.isLoading,
-					() => html`<uui-loader-circle></uui-loader-circle>`,
-					() => html`
-						<umb-imaging-thumbnail
-							unique=${item.media}
-							alt=${item.name}
-							icon=${item.icon ?? 'icon-picture'}></umb-imaging-thumbnail>
-					`,
-				)}
+				<umb-imaging-thumbnail
+					.unique=${item.media}
+					.alt=${item.name}
+					.icon=${item.icon ?? 'icon-picture'}
+					.externalLoading=${item.isLoading ?? false}></umb-imaging-thumbnail>
+
 				${this.#renderIsTrashed(item)} ${this.#renderActions(item)}
 			</uui-card-media>
 		`;

From 8b076597b37ea9383f2d050aadfa956342e02dfd Mon Sep 17 00:00:00 2001
From: Engiber Lozada <89547469+engijlr@users.noreply.github.com>
Date: Thu, 13 Nov 2025 21:37:54 +0100
Subject: [PATCH 151/155] Entity Sign: Improve Firefox visibility and add focus
 support. (#20733)

* Chenged right and left position of the infobox.

* Added focus support to open the modal.

* Moved tabindex out the constructor and added support for enter and space keys.
---
 .../core/entity-sign/components/entity-sign-bundle.element.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/entity-sign/components/entity-sign-bundle.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/entity-sign/components/entity-sign-bundle.element.ts
index 731e8ba9234d..a872df301c54 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/entity-sign/components/entity-sign-bundle.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/entity-sign/components/entity-sign-bundle.element.ts
@@ -170,9 +170,9 @@ export class UmbEntitySignBundleElement extends UmbLitElement {
 
 			.infobox {
 				position: absolute;
-				top: 100%;
+				top: 0;
 				margin-top: calc(-12px + var(--offset-h));
-				left: 100%;
+				left: 19px;
 				margin-left: -6px;
 				background-color: transparent;
 				padding: var(--uui-size-2);

From e549217e66aee6c0f175e783b25425dafeeb2b23 Mon Sep 17 00:00:00 2001
From: Engiber Lozada <89547469+engijlr@users.noreply.github.com>
Date: Thu, 13 Nov 2025 21:42:48 +0100
Subject: [PATCH 152/155] Content Type Designer: Use input-with-alias and
 implement regex validation for Alias. (#20755)

* Implemented input-with-alias in the content-type-design-editor.

* Added auto-generate-alias property to the input and revert deletion of checkAliasAutoGenerate method.

* Added form-validation-message.

* Added validation to the input-with-alias element to avoid special characters.
---
 .../src/assets/lang/en.ts                     |   1 +
 .../src/assets/lang/es.ts                     |   1 +
 ...ent-type-design-editor-property.element.ts | 151 ++++++------------
 .../input-with-alias.element.ts               |  27 +++-
 4 files changed, 81 insertions(+), 99 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/assets/lang/en.ts b/src/Umbraco.Web.UI.Client/src/assets/lang/en.ts
index a04d3fe3cc3c..839dfc9e7ec8 100644
--- a/src/Umbraco.Web.UI.Client/src/assets/lang/en.ts
+++ b/src/Umbraco.Web.UI.Client/src/assets/lang/en.ts
@@ -2246,6 +2246,7 @@ export default {
 		rangeExceeds: 'The low value must not exceed the high value.',
 		invalidExtensions: 'One or more of the extensions are invalid.',
 		allowedExtensions: 'Allowed extensions are:',
+		aliasInvalidFormat: 'Special characters are not allowed in alias',
 		disallowedExtensions: 'Disallowed extensions are:',
 	},
 	healthcheck: {
diff --git a/src/Umbraco.Web.UI.Client/src/assets/lang/es.ts b/src/Umbraco.Web.UI.Client/src/assets/lang/es.ts
index 2e8ca5780b5c..6c525bd179dc 100644
--- a/src/Umbraco.Web.UI.Client/src/assets/lang/es.ts
+++ b/src/Umbraco.Web.UI.Client/src/assets/lang/es.ts
@@ -1393,6 +1393,7 @@ export default {
 		invalidDate: 'Fecha no válida',
 		invalidNumber: 'No es un número',
 		invalidEmail: 'Email no válido',
+		aliasInvalidFormat: 'No se permiten caracteres especiales en el alias',
 	},
 	healthcheck: {
 		checkSuccessMessage: "El valor fue establecido en el valor recomendado: '%0%'.",
diff --git a/src/Umbraco.Web.UI.Client/src/packages/content/content-type/workspace/views/design/content-type-design-editor-property.element.ts b/src/Umbraco.Web.UI.Client/src/packages/content/content-type/workspace/views/design/content-type-design-editor-property.element.ts
index 043d7cfd226b..0e322bd40339 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/content/content-type/workspace/views/design/content-type-design-editor-property.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/content/content-type/workspace/views/design/content-type-design-editor-property.element.ts
@@ -2,13 +2,14 @@ import type { UmbContentTypePropertyStructureHelper } from '../../../structure/i
 import type { UmbContentTypeModel, UmbPropertyTypeModel, UmbPropertyTypeScaffoldModel } from '../../../types.js';
 import { UmbPropertyTypeContext } from './content-type-design-editor-property.context.js';
 import { css, html, customElement, property, state, nothing } from '@umbraco-cms/backoffice/external/lit';
-import { generateAlias } from '@umbraco-cms/backoffice/utils';
 import { umbConfirmModal } from '@umbraco-cms/backoffice/modal';
 import { UmbDataTypeDetailRepository } from '@umbraco-cms/backoffice/data-type';
 import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element';
 import { UmbTextStyles } from '@umbraco-cms/backoffice/style';
 import { UMB_EDIT_PROPERTY_TYPE_WORKSPACE_PATH_PATTERN } from '@umbraco-cms/backoffice/property-type';
-import type { UUIInputElement, UUIInputLockElement, UUIInputEvent } from '@umbraco-cms/backoffice/external/uui';
+import type { UUIInputEvent } from '@umbraco-cms/backoffice/external/uui';
+import type { UmbInputWithAliasElement } from '@umbraco-cms/backoffice/components';
+import { umbBindToValidation } from '@umbraco-cms/backoffice/validation';
 
 /**
  *  @element umb-content-type-design-editor-property
@@ -20,7 +21,6 @@ export class UmbContentTypeDesignEditorPropertyElement extends UmbLitElement {
 	#context = new UmbPropertyTypeContext(this);
 	#dataTypeDetailRepository = new UmbDataTypeDetailRepository(this);
 	#dataTypeUnique?: string;
-	#propertyUnique?: string;
 
 	@property({ attribute: false })
 	public set propertyStructureHelper(value: UmbContentTypePropertyStructureHelper<UmbContentTypeModel> | undefined) {
@@ -49,7 +49,6 @@ export class UmbContentTypeDesignEditorPropertyElement extends UmbLitElement {
 		this._property = value;
 		this.#context.setAlias(value?.alias);
 		this.#context.setLabel(value?.name);
-		this.#checkAliasAutoGenerate(this._property?.unique);
 		this.#checkInherited();
 		this.#setDataType(this._property?.dataType?.unique);
 		this.requestUpdate('property', oldValue);
@@ -86,20 +85,6 @@ export class UmbContentTypeDesignEditorPropertyElement extends UmbLitElement {
 	@state()
 	private _dataTypeName?: string;
 
-	@state()
-	private _aliasLocked = true;
-
-	#autoGenerateAlias = true;
-
-	#checkAliasAutoGenerate(unique: string | undefined) {
-		if (unique === this.#propertyUnique) return;
-		this.#propertyUnique = unique;
-
-		if (this.#context.getAlias()) {
-			this.#autoGenerateAlias = false;
-		}
-	}
-
 	async #checkInherited() {
 		if (this._propertyStructureHelper && this._property) {
 			// We can first match with something if we have a name [NL]
@@ -131,19 +116,6 @@ export class UmbContentTypeDesignEditorPropertyElement extends UmbLitElement {
 		this._propertyStructureHelper.partialUpdateProperty(this._property.unique, partialObject);
 	}
 
-	#onToggleAliasLock(event: CustomEvent) {
-		if (!this.property?.alias && (event.target as UUIInputLockElement).locked) {
-			this.#autoGenerateAlias = true;
-		} else {
-			this.#autoGenerateAlias = false;
-		}
-
-		this._aliasLocked = !this._aliasLocked;
-		if (!this._aliasLocked) {
-			(event.target as UUIInputElement)?.focus();
-		}
-	}
-
 	async #setDataType(dataTypeUnique: string | undefined) {
 		if (!dataTypeUnique) {
 			this._dataTypeName = undefined;
@@ -173,28 +145,23 @@ export class UmbContentTypeDesignEditorPropertyElement extends UmbLitElement {
 		this._propertyStructureHelper?.removeProperty(unique);
 	}
 
-	#onAliasChanged(event: UUIInputEvent) {
-		this.#singleValueUpdate('alias', event.target.value.toString());
-	}
-
-	#onNameChanged(event: UUIInputEvent) {
-		const newName = event.target.value.toString();
-		if (this.#autoGenerateAlias) {
-			this.#singleValueUpdate('alias', generateAlias(newName ?? ''));
-		}
-		this.#singleValueUpdate('name', newName);
+	#onNameAliasChange(e: InputEvent & { target: UmbInputWithAliasElement }) {
+		this.#partialUpdate({
+			name: e.target.value,
+			alias: e.target.alias,
+		} as UmbPropertyTypeModel);
 	}
 
 	override render() {
 		// TODO: Only show alias on label if user has access to DocumentType within settings: [NL]
-		return this._inherited ? this.renderInheritedProperty() : this.renderEditableProperty();
+		return this._inherited ? this.#renderInheritedProperty() : this.#renderEditableProperty();
 	}
 
-	renderInheritedProperty() {
+	#renderInheritedProperty() {
 		if (!this.property) return;
 
 		if (this.sortModeActive) {
-			return this.renderSortableProperty();
+			return this.#renderSortableProperty();
 		} else {
 			return html`
 				<div id="header">
@@ -203,7 +170,7 @@ export class UmbContentTypeDesignEditorPropertyElement extends UmbLitElement {
 					<p>${this.property.description}</p>
 				</div>
 				<div id="editor">
-					${this.renderPropertyTags()}
+					${this.#renderPropertyName()} ${this.#renderPropertyTags()}
 					${this._inherited
 						? html`<uui-tag look="default" class="inherited">
 								<uui-icon name="icon-merge"></uui-icon>
@@ -220,22 +187,27 @@ export class UmbContentTypeDesignEditorPropertyElement extends UmbLitElement {
 		}
 	}
 
-	renderEditableProperty() {
+	#renderEditableProperty() {
 		if (!this.property || !this.editPropertyTypePath) return;
 
 		if (this.sortModeActive) {
-			return this.renderSortableProperty();
+			return this.#renderSortableProperty();
 		} else {
 			return html`
 				<div id="header">
-					<uui-input
-						name="label"
-						id="label-input"
-						placeholder=${this.localize.term('placeholders_label')}
-						label="label"
+					<umb-input-with-alias
+						name="name"
+						id="name-alias-input"
+						required
+						.placeholder=${this.localize.term('placeholders_label')}
+						.label=${this.localize.term('placeholders_label')}
+						.aliasLabel=${this.localize.term('placeholders_enterAlias')}
 						.value=${this.property.name}
-						@input=${this.#onNameChanged}></uui-input>
-					${this.renderPropertyAlias()}
+						.alias=${this.property.alias}
+						@change=${this.#onNameAliasChange}
+						${umbBindToValidation(this)}></umb-input-with-alias>
+					<umb-form-validation-message for="name-alias-input"></umb-form-validation-message>
+
 					<slot name="action-menu"></slot>
 					<p>
 						<uui-textarea
@@ -256,7 +228,7 @@ export class UmbContentTypeDesignEditorPropertyElement extends UmbLitElement {
 					label=${this.localize.term('contentTypeEditor_editorSettings')}
 					href=${this.editPropertyTypePath +
 					UMB_EDIT_PROPERTY_TYPE_WORKSPACE_PATH_PATTERN.generateLocal({ unique: this.property.unique })}>
-					${this.renderPropertyTags()}
+					${this.#renderPropertyName()} ${this.#renderPropertyTags()}
 					<uui-action-bar>
 						<uui-button label="${this.localize.term('actions_delete')}" @click="${this.#requestRemove}">
 							<uui-icon name="delete"></uui-icon>
@@ -270,7 +242,7 @@ export class UmbContentTypeDesignEditorPropertyElement extends UmbLitElement {
 	#onPropertyOrderChanged = (e: UUIInputEvent) =>
 		this.#partialUpdate({ sortOrder: parseInt(e.target.value as string) ?? 0 } as UmbPropertyTypeModel);
 
-	renderSortableProperty() {
+	#renderSortableProperty() {
 		if (!this.property) return;
 		return html`
 			<div class="sortable">
@@ -287,26 +259,13 @@ export class UmbContentTypeDesignEditorPropertyElement extends UmbLitElement {
 		`;
 	}
 
-	renderPropertyAlias() {
-		if (!this.property) return;
-		return html`
-			<uui-input-lock
-				name="alias"
-				id="alias-input"
-				label=${this.localize.term('placeholders_enterAlias')}
-				placeholder=${this.localize.term('placeholders_enterAlias')}
-				.value=${this.property.alias}
-				?locked=${this._aliasLocked}
-				@input=${this.#onAliasChanged}
-				@lock-change=${this.#onToggleAliasLock}>
-			</uui-input-lock>
-		`;
+	#renderPropertyName() {
+		return this.property?.dataType?.unique ? html`<div id="editor-name">${this._dataTypeName}</div>` : nothing;
 	}
 
-	renderPropertyTags() {
+	#renderPropertyTags() {
 		return this.property
 			? html`<div class="types">
-					${this.property.dataType?.unique ? html`<uui-tag look="default">${this._dataTypeName}</uui-tag>` : nothing}
 					${this.#renderVariantTags()}
 					${this.property.appearance?.labelOnTop == true
 						? html`<uui-tag look="default">
@@ -381,7 +340,7 @@ export class UmbContentTypeDesignEditorPropertyElement extends UmbLitElement {
 		css`
 			:host(:not([sort-mode-active])) {
 				display: grid;
-				grid-template-columns: 200px auto;
+				grid-template-columns: 300px auto;
 				column-gap: var(--uui-size-layout-2);
 				border-bottom: 1px solid var(--uui-color-divider);
 				padding: var(--uui-size-layout-1) 0;
@@ -458,6 +417,7 @@ export class UmbContentTypeDesignEditorPropertyElement extends UmbLitElement {
 			}
 
 			p {
+				margin-top: 0;
 				margin-bottom: 0;
 			}
 
@@ -471,6 +431,18 @@ export class UmbContentTypeDesignEditorPropertyElement extends UmbLitElement {
 				opacity: 0.55;
 			}
 
+			#header umb-input-with-alias {
+				--uui-input-border-color: transparent;
+			}
+			#name-alias-input,
+			#description-input {
+				width: 100%;
+			}
+
+			#description-input:not(:hover):not(:focus) {
+				--uui-textarea-border-color: transparent;
+			}
+
 			#editor {
 				position: relative;
 				--uui-button-background-color: var(--uui-color-background);
@@ -479,35 +451,18 @@ export class UmbContentTypeDesignEditorPropertyElement extends UmbLitElement {
 			#editor:not(uui-button) {
 				background-color: var(--uui-color-background);
 				border-radius: var(--uui-button-border-radius, var(--uui-border-radius, 3px));
-				min-height: 143px;
+				min-height: 92px;
 			}
 			#editor uui-action-bar {
 				--uui-button-background-color: var(--uui-color-surface);
 				--uui-button-background-color-hover: var(--uui-color-surface);
 			}
-			#alias-input,
-			#label-input,
-			#description-input {
-				width: 100%;
-			}
-
-			#alias-input {
-				border-color: transparent;
-				background: var(--uui-color-surface);
-			}
-
-			#label-input {
-				font-weight: bold; /* TODO: UUI Input does not support bold text yet */
-				--uui-input-border-color: transparent;
-			}
-			#label-input input {
-				font-weight: bold;
-				--uui-input-border-color: transparent;
-			}
-
-			#description-input {
-				--uui-textarea-border-color: transparent;
-				font-weight: 0.5rem; /* TODO: Cant change font size of UUI textarea yet */
+			#editor-name {
+				position: absolute;
+				top: var(--uui-size-space-4);
+				left: var(--uui-size-space-4);
+				font-size: var(--uui-type-small-size);
+				font-weight: 400;
 			}
 
 			.types > div uui-icon,
@@ -524,7 +479,7 @@ export class UmbContentTypeDesignEditorPropertyElement extends UmbLitElement {
 
 			.types {
 				position: absolute;
-				top: var(--uui-size-space-2);
+				bottom: var(--uui-size-space-2);
 				left: var(--uui-size-space-2);
 				display: flex;
 				flex-flow: wrap;
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/components/input-with-alias/input-with-alias.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/components/input-with-alias/input-with-alias.element.ts
index 50818ac19c38..a84d0659a4b5 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/components/input-with-alias/input-with-alias.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/components/input-with-alias/input-with-alias.element.ts
@@ -6,6 +6,8 @@ import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element';
 import { UUIInputEvent } from '@umbraco-cms/backoffice/external/uui';
 import type { UUIInputElement } from '@umbraco-cms/backoffice/external/uui';
 
+const DEFAULT_ALIAS_PATTERN = '^[A-Za-z][A-Za-z0-9_-]{0,254}$';
+
 @customElement('umb-input-with-alias')
 export class UmbInputWithAliasElement extends UmbFormControlMixin<string, typeof UmbLitElement, undefined>(
 	UmbLitElement,
@@ -31,6 +33,9 @@ export class UmbInputWithAliasElement extends UmbFormControlMixin<string, typeof
 	@property({ type: Boolean, attribute: 'auto-generate-alias' })
 	autoGenerateAlias?: boolean;
 
+	@property({ type: String, attribute: 'alias-pattern' })
+	aliasPattern: string = DEFAULT_ALIAS_PATTERN;
+
 	@state()
 	private _aliasLocked = true;
 
@@ -41,6 +46,20 @@ export class UmbInputWithAliasElement extends UmbFormControlMixin<string, typeof
 			() => this.required && !this.value,
 		);
 
+		this.addValidator(
+			'patternMismatch',
+			() => this.localize.term('validation_aliasInvalidFormat'),
+			() => {
+				if (!this.alias) return false;
+				try {
+					const re = new RegExp(this.aliasPattern);
+					return !re.test(this.alias);
+				} catch {
+					return false;
+				}
+			},
+		);
+
 		this.shadowRoot?.querySelectorAll<UUIInputElement>('uui-input').forEach((x) => this.addFormControlElement(x));
 	}
 
@@ -81,6 +100,7 @@ export class UmbInputWithAliasElement extends UmbFormControlMixin<string, typeof
 			this.alias = generateAlias(this.value ?? '');
 			this.dispatchEvent(new UmbChangeEvent());
 		}
+		this._aliasLocked = true;
 	}
 
 	#onToggleAliasLock(event: CustomEvent) {
@@ -121,7 +141,7 @@ export class UmbInputWithAliasElement extends UmbFormControlMixin<string, typeof
 								.value=${this.alias}
 								?auto-width=${!!this.value}
 								?locked=${this._aliasLocked && !this.aliasReadonly}
-								?readonly=${this.aliasReadonly}
+								?readonly=${this._aliasLocked || this.aliasReadonly}
 								?required=${this.required}
 								@input=${this.#onAliasChange}
 								@blur=${this.#onAliasBlur}
@@ -144,6 +164,7 @@ export class UmbInputWithAliasElement extends UmbFormControlMixin<string, typeof
 		}
 
 		#alias {
+			transition: opacity 80ms;
 			&.muted {
 				opacity: 0.55;
 				padding: var(--uui-size-1, 3px) var(--uui-size-space-3, 9px);
@@ -156,6 +177,10 @@ export class UmbInputWithAliasElement extends UmbFormControlMixin<string, typeof
 		:host(:invalid:not([pristine])) > uui-input {
 			border-color: var(--uui-color-invalid);
 		}
+		:host(:not(invalid):not(:hover):not(:focus-within)) #alias {
+			--uui-button-contrast: transparent;
+			--uui-input-background-color-readonly: transparent;
+		}
 	`;
 }
 

From 73847d1effac271541f533bd0b2595723e23fe52 Mon Sep 17 00:00:00 2001
From: Engiber Lozada <89547469+engijlr@users.noreply.github.com>
Date: Thu, 13 Nov 2025 21:57:27 +0100
Subject: [PATCH 153/155] Property Editors: Added form control and mandatory
 support to editors in rich content group(Code editor, Markdown, Block grid)
 (#20693)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Added mandatory support for block grid property editor.

* Added form control and mandatory support to code editor.

* Added form control and mandatory support to markdown editor.

---------

Co-authored-by: Niels Lyngsø <niels.lyngso@gmail.com>
---
 .../property-editor-ui-block-grid.element.ts  | 20 ++++++++++++++-
 .../property-editor-ui-code-editor.element.ts | 21 +++++++++++++---
 .../input-markdown.element.ts                 | 16 +++++++++++-
 ...perty-editor-ui-markdown-editor.element.ts | 25 +++++++++++++++----
 4 files changed, 72 insertions(+), 10 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/packages/block/block-grid/property-editors/block-grid-editor/property-editor-ui-block-grid.element.ts b/src/Umbraco.Web.UI.Client/src/packages/block/block-grid/property-editors/block-grid-editor/property-editor-ui-block-grid.element.ts
index 8ab27986e192..7b0ec0e6a590 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/block/block-grid/property-editors/block-grid-editor/property-editor-ui-block-grid.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/block/block-grid/property-editors/block-grid-editor/property-editor-ui-block-grid.element.ts
@@ -19,7 +19,11 @@ import type {
 } from '@umbraco-cms/backoffice/property-editor';
 import { jsonStringComparison, observeMultiple } from '@umbraco-cms/backoffice/observable-api';
 import { UMB_PROPERTY_CONTEXT, UMB_PROPERTY_DATASET_CONTEXT } from '@umbraco-cms/backoffice/property';
-import { UmbFormControlMixin, UmbValidationContext } from '@umbraco-cms/backoffice/validation';
+import {
+	UMB_VALIDATION_EMPTY_LOCALIZATION_KEY,
+	UmbFormControlMixin,
+	UmbValidationContext,
+} from '@umbraco-cms/backoffice/validation';
 import type { UmbBlockTypeGroup } from '@umbraco-cms/backoffice/block-type';
 import { debounceTime } from '@umbraco-cms/backoffice/external/rxjs';
 
@@ -77,6 +81,10 @@ export class UmbPropertyEditorUIBlockGridElement
 		return this.#readonly;
 	}
 	#readonly = false;
+	@property({ type: Boolean })
+	mandatory?: boolean;
+	@property({ type: String })
+	mandatoryMessage = UMB_VALIDATION_EMPTY_LOCALIZATION_KEY;
 
 	@state()
 	private _layoutColumns?: number;
@@ -112,6 +120,16 @@ export class UmbPropertyEditorUIBlockGridElement
 	constructor() {
 		super();
 
+		this.addValidator(
+			'valueMissing',
+			() => this.mandatoryMessage,
+			() => {
+				if (!this.mandatory || this.readonly) return false;
+				const count = this.value?.layout?.[UMB_BLOCK_GRID_PROPERTY_EDITOR_SCHEMA_ALIAS]?.length ?? 0;
+				return count === 0;
+			},
+		);
+
 		this.consumeContext(UMB_CONTENT_WORKSPACE_CONTEXT, (context) => {
 			if (context) {
 				this.observe(
diff --git a/src/Umbraco.Web.UI.Client/src/packages/code-editor/property-editor/property-editor-ui-code-editor.element.ts b/src/Umbraco.Web.UI.Client/src/packages/code-editor/property-editor/property-editor-ui-code-editor.element.ts
index 7d004f569306..50b68ae04820 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/code-editor/property-editor/property-editor-ui-code-editor.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/code-editor/property-editor/property-editor-ui-code-editor.element.ts
@@ -9,11 +9,15 @@ import type {
 } from '@umbraco-cms/backoffice/property-editor';
 
 import '../components/code-editor.element.js';
+import { UMB_VALIDATION_EMPTY_LOCALIZATION_KEY, UmbFormControlMixin } from '@umbraco-cms/backoffice/validation';
 
 const elementName = 'umb-property-editor-ui-code-editor';
 
 @customElement(elementName)
-export class UmbPropertyEditorUICodeEditorElement extends UmbLitElement implements UmbPropertyEditorUiElement {
+export class UmbPropertyEditorUICodeEditorElement
+	extends UmbFormControlMixin<string, typeof UmbLitElement, undefined>(UmbLitElement)
+	implements UmbPropertyEditorUiElement
+{
 	#defaultLanguage: CodeEditorLanguage = 'javascript';
 
 	@state()
@@ -31,8 +35,9 @@ export class UmbPropertyEditorUICodeEditorElement extends UmbLitElement implemen
 	@state()
 	private _wordWrap = false;
 
-	@property()
-	value = '';
+	mandatory?: boolean;
+	@property({ type: String })
+	mandatoryMessage = UMB_VALIDATION_EMPTY_LOCALIZATION_KEY;
 
 	@property({ attribute: false })
 	public set config(config: UmbPropertyEditorConfigCollection | undefined) {
@@ -53,6 +58,16 @@ export class UmbPropertyEditorUICodeEditorElement extends UmbLitElement implemen
 		this.dispatchEvent(new UmbChangeEvent());
 	}
 
+	constructor() {
+		super();
+
+		this.addValidator(
+			'valueMissing',
+			() => this.mandatoryMessage,
+			() => !!this.mandatory && (!this.value || this.value.length === 0),
+		);
+	}
+
 	override render() {
 		return html`
 			<umb-code-editor
diff --git a/src/Umbraco.Web.UI.Client/src/packages/markdown-editor/components/input-markdown-editor/input-markdown.element.ts b/src/Umbraco.Web.UI.Client/src/packages/markdown-editor/components/input-markdown-editor/input-markdown.element.ts
index f116b6eea45a..feec4065dfc3 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/markdown-editor/components/input-markdown-editor/input-markdown.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/markdown-editor/components/input-markdown-editor/input-markdown.element.ts
@@ -21,7 +21,7 @@ import { UMB_MEDIA_PICKER_MODAL, UmbMediaUrlRepository } from '@umbraco-cms/back
 import { UmbCodeEditorLoadedEvent } from '@umbraco-cms/backoffice/code-editor';
 import type { UmbCodeEditorController, UmbCodeEditorElement } from '@umbraco-cms/backoffice/code-editor';
 import type { UUIModalSidebarSize } from '@umbraco-cms/backoffice/external/uui';
-import { UmbFormControlMixin } from '@umbraco-cms/backoffice/validation';
+import { UMB_VALIDATION_EMPTY_LOCALIZATION_KEY, UmbFormControlMixin } from '@umbraco-cms/backoffice/validation';
 import { sanitizeHTML } from '@umbraco-cms/backoffice/utils';
 
 interface UmbMarkdownEditorAction extends monaco.editor.IActionDescriptor {
@@ -63,6 +63,10 @@ export class UmbInputMarkdownElement extends UmbFormControlMixin<string, typeof
 		this.#editor?.monacoEditor?.updateOptions({ readOnly: this.#readonly });
 	}
 	#readonly = false;
+	@property({ type: Boolean })
+	required?: boolean;
+	@property({ type: String })
+	requiredMessage?: string;
 
 	#editor?: UmbCodeEditorController;
 
@@ -74,6 +78,16 @@ export class UmbInputMarkdownElement extends UmbFormControlMixin<string, typeof
 
 	#mediaUrlRepository = new UmbMediaUrlRepository(this);
 
+	constructor() {
+		super();
+
+		this.addValidator(
+			'valueMissing',
+			() => this.requiredMessage ?? UMB_VALIDATION_EMPTY_LOCALIZATION_KEY,
+			() => !this.readonly && !!this.required && (this.value === undefined || this.value === null || this.value === ''),
+		);
+	}
+
 	#onCodeEditorLoaded(event: UmbCodeEditorLoadedEvent) {
 		if (event.type !== UmbCodeEditorLoadedEvent.TYPE) return;
 
diff --git a/src/Umbraco.Web.UI.Client/src/packages/markdown-editor/property-editors/markdown-editor/property-editor-ui-markdown-editor.element.ts b/src/Umbraco.Web.UI.Client/src/packages/markdown-editor/property-editors/markdown-editor/property-editor-ui-markdown-editor.element.ts
index 2307159e453c..ec4d19cdc78e 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/markdown-editor/property-editors/markdown-editor/property-editor-ui-markdown-editor.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/markdown-editor/property-editors/markdown-editor/property-editor-ui-markdown-editor.element.ts
@@ -9,15 +9,16 @@ import type { UUIModalSidebarSize } from '@umbraco-cms/backoffice/external/uui';
 
 import '../../components/input-markdown-editor/index.js';
 import { UmbChangeEvent } from '@umbraco-cms/backoffice/event';
+import { UMB_VALIDATION_EMPTY_LOCALIZATION_KEY, UmbFormControlMixin } from '@umbraco-cms/backoffice/validation';
 
 /**
  * @element umb-property-editor-ui-markdown-editor
  */
 @customElement('umb-property-editor-ui-markdown-editor')
-export class UmbPropertyEditorUIMarkdownEditorElement extends UmbLitElement implements UmbPropertyEditorUiElement {
-	@property()
-	value?: string;
-
+export class UmbPropertyEditorUIMarkdownEditorElement
+	extends UmbFormControlMixin<string, typeof UmbLitElement>(UmbLitElement)
+	implements UmbPropertyEditorUiElement
+{
 	/**
 	 * Sets the input to readonly mode, meaning value cannot be changed but still able to read and select its content.
 	 * @type {boolean}
@@ -26,6 +27,14 @@ export class UmbPropertyEditorUIMarkdownEditorElement extends UmbLitElement impl
 	 */
 	@property({ type: Boolean, reflect: true })
 	readonly = false;
+	/**
+	 * Sets the input to mandatory, meaning validation will fail if the value is empty.
+	 * @type {boolean}
+	 */
+	@property({ type: Boolean })
+	mandatory?: boolean;
+	@property({ type: String })
+	mandatoryMessage = UMB_VALIDATION_EMPTY_LOCALIZATION_KEY;
 
 	@state()
 	private _preview?: boolean;
@@ -45,6 +54,10 @@ export class UmbPropertyEditorUIMarkdownEditorElement extends UmbLitElement impl
 		this.dispatchEvent(new UmbChangeEvent());
 	}
 
+	protected override firstUpdated() {
+		this.addFormControlElement(this.shadowRoot!.querySelector('umb-input-markdown')!);
+	}
+
 	override render() {
 		return html`
 			<umb-input-markdown
@@ -52,7 +65,9 @@ export class UmbPropertyEditorUIMarkdownEditorElement extends UmbLitElement impl
 				.overlaySize=${this._overlaySize}
 				?preview=${this._preview}
 				@change=${this.#onChange}
-				?readonly=${this.readonly}></umb-input-markdown>
+				?readonly=${this.readonly}
+				?required=${this.mandatory}
+				.requiredMessage=${this.mandatoryMessage}></umb-input-markdown>
 		`;
 	}
 }

From a4438e5b2114bc44723ce1c797ea7224a2787cf5 Mon Sep 17 00:00:00 2001
From: Andy Butland <abutland73@gmail.com>
Date: Fri, 14 Nov 2025 02:20:12 +0100
Subject: [PATCH 154/155] Decimal property editor: Flexibly parse decimal value
 with different separators (closes #20823) (#20828)

* Flexibly parse decimal value with different separators.

* Applied suggestions from code review.
---
 .../PropertyEditors/DecimalPropertyEditor.cs  | 34 +++++++++++++++++--
 .../DecimalPropertyValueEditorTests.cs        | 22 +++++++++++-
 2 files changed, 53 insertions(+), 3 deletions(-)

diff --git a/src/Umbraco.Core/PropertyEditors/DecimalPropertyEditor.cs b/src/Umbraco.Core/PropertyEditors/DecimalPropertyEditor.cs
index 58c86b1426e0..9be861bff6f7 100644
--- a/src/Umbraco.Core/PropertyEditors/DecimalPropertyEditor.cs
+++ b/src/Umbraco.Core/PropertyEditors/DecimalPropertyEditor.cs
@@ -37,7 +37,6 @@ protected override IDataValueEditor CreateValueEditor()
     /// <inheritdoc />
     protected override IConfigurationEditor CreateConfigurationEditor() => new DecimalConfigurationEditor();
 
-
     /// <summary>
     /// Defines the value editor for the decimal property editor.
     /// </summary>
@@ -109,7 +108,38 @@ internal abstract class DecimalPropertyConfigurationValidatorBase : SimpleProper
 
             /// <inheritdoc/>
             protected override bool TryParsePropertyValue(object? value, out double parsedDecimalValue)
-                => double.TryParse(value?.ToString(), CultureInfo.InvariantCulture, out parsedDecimalValue);
+            {
+                if (value is null)
+                {
+                    parsedDecimalValue = default;
+                    return false;
+                }
+
+                if (value is decimal decimalValue)
+                {
+                    parsedDecimalValue = (double)decimalValue;
+                    return true;
+                }
+
+                if (value is double doubleValue)
+                {
+                    parsedDecimalValue = doubleValue;
+                    return true;
+                }
+
+                if (value is float floatValue)
+                {
+                    parsedDecimalValue = (double)floatValue;
+                    return true;
+                }
+
+                if (value is IFormattable formattableValue)
+                {
+                    return double.TryParse(formattableValue.ToString(null, CultureInfo.InvariantCulture), NumberStyles.Any, CultureInfo.InvariantCulture, out parsedDecimalValue);
+                }
+
+                return double.TryParse(value.ToString(), NumberStyles.Any, CultureInfo.CurrentCulture, out parsedDecimalValue);
+            }
         }
 
         /// <summary>
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/PropertyEditors/DecimalPropertyValueEditorTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/PropertyEditors/DecimalPropertyValueEditorTests.cs
index b70523403e71..4e16f85db135 100644
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/PropertyEditors/DecimalPropertyValueEditorTests.cs
+++ b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/PropertyEditors/DecimalPropertyValueEditorTests.cs
@@ -161,7 +161,27 @@ public void Validates_Is_Less_Than_Or_Equal_To_Configured_Max_With_Configured_Wh
             Assert.AreEqual(1, result.Count());
 
             var validationResult = result.First();
-            Assert.AreEqual(validationResult.ErrorMessage, "validation_outOfRangeMaximum");
+            Assert.AreEqual("validation_outOfRangeMaximum", validationResult.ErrorMessage);
+        }
+    }
+
+    [TestCase(1.8, true)]
+    [TestCase(2.2, false)]
+    [SetCulture("it-IT")] // Uses "," as the decimal separator.
+    public void Validates_Is_Less_Than_Or_Equal_To_Configured_Max_With_Comma_Decimal_Separator(object value, bool expectedSuccess)
+    {
+        var editor = CreateValueEditor(min: 1, max: 2);
+        var result = editor.Validate(value, false, null, PropertyValidationContext.Empty());
+        if (expectedSuccess)
+        {
+            Assert.IsEmpty(result);
+        }
+        else
+        {
+            Assert.AreEqual(1, result.Count());
+
+            var validationResult = result.First();
+            Assert.AreEqual("validation_outOfRangeMaximum", validationResult.ErrorMessage);
         }
     }
 

From 33ba522116843454b90a80c400f25fc7599c72d2 Mon Sep 17 00:00:00 2001
From: Warren Buckley <warren@hackmakedo.com>
Date: Fri, 14 Nov 2025 12:50:20 +0000
Subject: [PATCH 155/155] Remove Client build and restore targets from CSPROJ
 in template

Removed targets for restoring and building Client files.
---
 .../UmbracoExtension/Umbraco.Extension.csproj     | 15 ---------------
 1 file changed, 15 deletions(-)

diff --git a/templates/UmbracoExtension/Umbraco.Extension.csproj b/templates/UmbracoExtension/Umbraco.Extension.csproj
index 4bc359eaa809..d3e00b148a00 100644
--- a/templates/UmbracoExtension/Umbraco.Extension.csproj
+++ b/templates/UmbracoExtension/Umbraco.Extension.csproj
@@ -39,19 +39,4 @@
     <Folder Include="wwwroot\" />
   </ItemGroup>
 
-  <!-- Restore and build Client files -->
-  <Target Name="RestoreClient" Inputs="Client\package.json;Client\package-lock.json" Outputs="Client\node_modules\.package-lock.json">
-    <Message Importance="high" Text="Restoring Client NPM packages..." />
-    <Exec Command="npm i" WorkingDirectory="Client" />
-  </Target>
-
-  <Target Name="BuildClient" BeforeTargets="AssignTargetPaths" DependsOnTargets="RestoreClient" Inputs="@(ClientAssetsInputs)" Outputs="$(IntermediateOutputPath)client.complete.txt">
-    <Message Importance="high" Text="Executing Client NPM build script..." />
-    <Exec Command="npm run build" WorkingDirectory="Client" />
-    <ItemGroup>
-      <_ClientAssetsBuildOutput Include="wwwroot\App_Plugins\**" />
-    </ItemGroup>
-    <WriteLinesToFile File="$(IntermediateOutputPath)client.complete.txt" Lines="@(_ClientAssetsBuildOutput)" Overwrite="true" />
-  </Target>
-
 </Project>