Merge branch 'v17/dev' into v17/feature/preview-urls

Author: kjac

.github/workflows/azure-backoffice.yml

@@ -17,6 +17,7 @@ on:
       - main
       - v*/dev
       - v*/main
+  workflow_dispatch:
 
 jobs:
   build_and_deploy_job:

.github/workflows/azure-storybook.yml

@@ -17,6 +17,7 @@ on:
       - main
       - v*/dev
       - v*/main
+  workflow_dispatch:
 
 env:
   NODE_OPTIONS: --max_old_space_size=16384

NOTICES.txt

@@ -3,7 +3,9 @@ Third-Party Notices
 
 This file contains notices and attributions for third-party software used in the Umbraco CMS project.
 
-It is not a license and does not grant any rights to use the third-party software.
+Third-party software may contain dependencies that are not explicitly listed here.
+
+This notice is not a license and does not grant any rights to use the third-party software.
 
 Umbraco CMS is licensed under the MIT License, which can be found in the LICENSE file.
 
@@ -113,14 +115,6 @@ Copyright: 2023 Shannon Deminick
 
 ---
 
-Glob: A library for matching file paths using glob patterns
-
-URL: https://github.com/isaacs/node-glob
-License: ISC License
-Copyright: 2009-2023 Isaac Z. Schlueter and Contributors
-
----
-
 Globals: A library for managing global variables in JavaScript
 
 URL: https://github.com/sindresorhus/globals
@@ -356,38 +350,6 @@ Copyright: Titus Wormer
 
 ---
 
-Rollup: A module bundler for JavaScript
-
-URL: https://rollupjs.org/
-License: MIT License
-Copyright: 2015-present Rollup contributors
-
----
-
-Rollup Plugins: A collection of Rollup plugins
-
-URL: https://github.com/rollup/plugins
-License: MIT License
-Copyright: 2019-present Rollup Plugins contributors
-
----
-
-Rollup-plugin-esbuild: A Rollup plugin for using esbuild
-
-URL: https://github.com/egoist/rollup-plugin-esbuild
-License: MIT License
-Copyright: 2020 EGOIST
-
----
-
-Rollup-plugin-import-css: A Rollup plugin for importing CSS files
-
-URL: https://github.com/jleeson/rollup-plugin-import-css
-License: MIT License
-Copyright: 2020 Jacob Leeson
-
----
-
 rxjs: Reactive Extensions for JavaScript
 
 URL: https://rxjs.dev/

src/Umbraco.Cms.Api.Management/Controllers/User/UserOrCurrentUserControllerBase.cs

@@ -25,7 +25,7 @@ protected IActionResult UserOperationStatusResult(UserOperationStatus status, Er
                 .Build()),
             UserOperationStatus.NoUserGroup => BadRequest(problemDetailsBuilder
                 .WithTitle("No User Group Specified")
-                .WithDetail("A user group must be specified to create a user")
+                .WithDetail("A user must be assigned to at least one group")
                 .Build()),
             UserOperationStatus.UserNameIsNotEmail => BadRequest(problemDetailsBuilder
                 .WithTitle("Invalid Username")

src/Umbraco.Cms.Persistence.Sqlite/Services/SqliteDatabaseCreator.cs

@@ -86,6 +86,7 @@ public void Create(string connectionString)
         // Copy our blank(ish) wal mode sqlite database to its final location.
         try
         {
+            EnsureDatabaseDirectory(original.DataSource);
             File.Copy(tempFile, original.DataSource, true);
         }
         catch (Exception ex)
@@ -104,4 +105,13 @@ public void Create(string connectionString)
             _logger.LogWarning(ex, "Unable to cleanup temporary sqlite database file {path}", tempFile);
         }
     }
+
+    private static void EnsureDatabaseDirectory(string dataSource)
+    {
+        var directoryPath = Path.GetDirectoryName(dataSource);
+        if (string.IsNullOrEmpty(directoryPath) is false && Directory.Exists(directoryPath) is false)
+        {
+            Directory.CreateDirectory(directoryPath);
+        }
+    }
 }

src/Umbraco.Core/Services/UserService.cs

@@ -883,7 +883,7 @@ private async Task<UserOperationStatus> ValidateUserCreateModel(UserCreateModel
             return UserOperationStatus.DuplicateUserName;
         }
 
-        if(model.UserGroupKeys.Count == 0)
+        if (model.UserGroupKeys.Count == 0)
         {
             return UserOperationStatus.NoUserGroup;
         }
@@ -912,6 +912,13 @@ private async Task<UserOperationStatus> ValidateUserCreateModel(UserCreateModel
             return Attempt.FailWithStatus<IUser?, UserOperationStatus>(UserOperationStatus.MissingUser, existingUser);
         }
 
+        // A user must remain assigned to at least one group.
+        if (model.UserGroupKeys.Count == 0)
+        {
+            scope.Complete();
+            return Attempt.FailWithStatus<IUser?, UserOperationStatus>(UserOperationStatus.NoUserGroup, existingUser);
+        }
+
         // User names can only contain the configured allowed characters. This is validated by ASP.NET Identity on create
         // as the setting is applied to the BackOfficeIdentityOptions, but we need to check ourselves for updates.
         var allowedUserNameCharacters = _securitySettings.AllowedUserNameCharacters;

src/Umbraco.PublishedCache.HybridCache/Factories/IPublishedContentFactory.cs

@@ -1,12 +1,25 @@
-using Umbraco.Cms.Core.Models;
+using Umbraco.Cms.Core.Models;
 using Umbraco.Cms.Core.Models.PublishedContent;
 
 namespace Umbraco.Cms.Infrastructure.HybridCache.Factories;
 
+/// <summary>
+/// Defines a factory to create <see cref="IPublishedContent"/> and <see cref="IPublishedMember"/> from a <see cref="ContentCacheNode"/> or <see cref="IMember"/>.
+/// </summary>
 internal interface IPublishedContentFactory
 {
+    /// <summary>
+    /// Converts a <see cref="ContentCacheNode"/> to an <see cref="IPublishedContent"/> if document type.
+    /// </summary>
     IPublishedContent? ToIPublishedContent(ContentCacheNode contentCacheNode, bool preview);
+
+    /// <summary>
+    /// Converts a <see cref="ContentCacheNode"/> to an <see cref="IPublishedContent"/> of media type.
+    /// </summary>
     IPublishedContent? ToIPublishedMedia(ContentCacheNode contentCacheNode);
 
+    /// <summary>
+    /// Converts a <see cref="IMember"/> to an <see cref="IPublishedMember"/>.
+    /// </summary>
     IPublishedMember ToPublishedMember(IMember member);
 }

src/Umbraco.PublishedCache.HybridCache/Factories/PublishedContentFactory.cs

@@ -1,30 +1,62 @@
+using Microsoft.Extensions.Logging;
+using Umbraco.Cms.Core.Cache;
 using Umbraco.Cms.Core.Extensions;
 using Umbraco.Cms.Core.Models;
 using Umbraco.Cms.Core.Models.PublishedContent;
 using Umbraco.Cms.Core.PublishedCache;
+using Umbraco.Extensions;
 
 namespace Umbraco.Cms.Infrastructure.HybridCache.Factories;
 
+/// <summary>
+/// Defines a factory to create <see cref="IPublishedContent"/> and <see cref="IPublishedMember"/> from a <see cref="ContentCacheNode"/> or <see cref="IMember"/>.
+/// </summary>
 internal sealed class PublishedContentFactory : IPublishedContentFactory
 {
     private readonly IElementsCache _elementsCache;
     private readonly IVariationContextAccessor _variationContextAccessor;
     private readonly IPublishedContentTypeCache _publishedContentTypeCache;
+    private readonly ILogger<PublishedContentFactory> _logger;
+    private readonly AppCaches _appCaches;
 
-
+    /// <summary>
+    /// Initializes a new instance of the <see cref="PublishedContentFactory"/> class.
+    /// </summary>
     public PublishedContentFactory(
         IElementsCache elementsCache,
         IVariationContextAccessor variationContextAccessor,
-        IPublishedContentTypeCache publishedContentTypeCache)
+        IPublishedContentTypeCache publishedContentTypeCache,
+        ILogger<PublishedContentFactory> logger,
+        AppCaches appCaches)
     {
         _elementsCache = elementsCache;
         _variationContextAccessor = variationContextAccessor;
         _publishedContentTypeCache = publishedContentTypeCache;
+        _logger = logger;
+        _appCaches = appCaches;
     }
 
+    /// <inheritdoc/>
     public IPublishedContent? ToIPublishedContent(ContentCacheNode contentCacheNode, bool preview)
     {
-        IPublishedContentType contentType = _publishedContentTypeCache.Get(PublishedItemType.Content, contentCacheNode.ContentTypeId);
+        var cacheKey = $"{nameof(PublishedContentFactory)}DocumentCache_{contentCacheNode.Id}_{preview}";
+        IPublishedContent? publishedContent = _appCaches.RequestCache.GetCacheItem<IPublishedContent?>(cacheKey);
+        if (publishedContent is not null)
+        {
+            _logger.LogDebug(
+                "Using cached IPublishedContent for document {ContentCacheNodeName} ({ContentCacheNodeId}).",
+                contentCacheNode.Data?.Name ?? "No Name",
+                contentCacheNode.Id);
+            return publishedContent;
+        }
+
+        _logger.LogDebug(
+            "Creating IPublishedContent for document {ContentCacheNodeName} ({ContentCacheNodeId}).",
+            contentCacheNode.Data?.Name ?? "No Name",
+            contentCacheNode.Id);
+
+        IPublishedContentType contentType =
+            _publishedContentTypeCache.Get(PublishedItemType.Content, contentCacheNode.ContentTypeId);
         var contentNode = new ContentNode(
             contentCacheNode.Id,
             contentCacheNode.Key,
@@ -35,19 +67,42 @@ public PublishedContentFactory(
             preview ? contentCacheNode.Data : null,
             preview ? null : contentCacheNode.Data);
 
-        IPublishedContent? model = GetModel(contentNode, preview);
+        publishedContent = GetModel(contentNode, preview);
 
         if (preview)
         {
-            return model ?? GetPublishedContentAsDraft(model);
+            publishedContent ??= GetPublishedContentAsDraft(publishedContent);
+        }
+
+        if (publishedContent is not null)
+        {
+            _appCaches.RequestCache.Set(cacheKey, publishedContent);
         }
 
-        return model;
+        return publishedContent;
     }
 
+    /// <inheritdoc/>
     public IPublishedContent? ToIPublishedMedia(ContentCacheNode contentCacheNode)
     {
-        IPublishedContentType contentType = _publishedContentTypeCache.Get(PublishedItemType.Media, contentCacheNode.ContentTypeId);
+        var cacheKey = $"{nameof(PublishedContentFactory)}MediaCache_{contentCacheNode.Id}";
+        IPublishedContent? publishedContent = _appCaches.RequestCache.GetCacheItem<IPublishedContent?>(cacheKey);
+        if (publishedContent is not null)
+        {
+            _logger.LogDebug(
+                "Using cached IPublishedContent for media {ContentCacheNodeName} ({ContentCacheNodeId}).",
+                contentCacheNode.Data?.Name ?? "No Name",
+                contentCacheNode.Id);
+            return publishedContent;
+        }
+
+        _logger.LogDebug(
+            "Creating IPublishedContent for media {ContentCacheNodeName} ({ContentCacheNodeId}).",
+            contentCacheNode.Data?.Name ?? "No Name",
+            contentCacheNode.Id);
+
+        IPublishedContentType contentType =
+            _publishedContentTypeCache.Get(PublishedItemType.Media, contentCacheNode.ContentTypeId);
         var contentNode = new ContentNode(
             contentCacheNode.Id,
             contentCacheNode.Key,
@@ -58,12 +113,38 @@ public PublishedContentFactory(
             null,
             contentCacheNode.Data);
 
-        return GetModel(contentNode, false);
+        publishedContent = GetModel(contentNode, false);
+
+        if (publishedContent is not null)
+        {
+            _appCaches.RequestCache.Set(cacheKey, publishedContent);
+        }
+
+        return publishedContent;
     }
 
+    /// <inheritdoc/>
     public IPublishedMember ToPublishedMember(IMember member)
     {
-        IPublishedContentType contentType = _publishedContentTypeCache.Get(PublishedItemType.Member, member.ContentTypeId);
+        string cacheKey = $"{nameof(PublishedContentFactory)}MemberCache_{member.Id}";
+        IPublishedMember? publishedMember = _appCaches.RequestCache.GetCacheItem<IPublishedMember?>(cacheKey);
+        if (publishedMember is not null)
+        {
+            _logger.LogDebug(
+                "Using cached IPublishedMember for member {MemberName} ({MemberId}).",
+                member.Username,
+                member.Id);
+
+            return publishedMember;
+        }
+
+        _logger.LogDebug(
+            "Creating IPublishedMember for member {MemberName} ({MemberId}).",
+            member.Username,
+            member.Id);
+
+        IPublishedContentType contentType =
+            _publishedContentTypeCache.Get(PublishedItemType.Member, member.ContentTypeId);
 
         // Members are only "mapped" never cached, so these default values are a bit weird, but they are not used.
         var contentData = new ContentData(
@@ -86,7 +167,11 @@ public IPublishedMember ToPublishedMember(IMember member)
             contentType,
             null,
             contentData);
-        return new PublishedMember(member, contentNode, _elementsCache, _variationContextAccessor);
+        publishedMember = new PublishedMember(member, contentNode, _elementsCache, _variationContextAccessor);
+
+        _appCaches.RequestCache.Set(cacheKey, publishedMember);
+
+        return publishedMember;
     }
 
     private static Dictionary<string, PropertyData[]> GetPropertyValues(IPublishedContentType contentType, IMember member)
@@ -135,7 +220,6 @@ private static void AddIf(IPublishedContentType contentType, IDictionary<string,
                 _variationContextAccessor);
     }
 
-
     private static IPublishedContent? GetPublishedContentAsDraft(IPublishedContent? content) =>
         content == null ? null :
             // an object in the cache is either an IPublishedContentOrMedia,
@@ -150,7 +234,7 @@ private static PublishedContent UnwrapIPublishedContent(IPublishedContent conten
             content = wrapped.Unwrap();
         }
 
-        if (!(content is PublishedContent inner))
+        if (content is not PublishedContent inner)
         {
             throw new InvalidOperationException("Innermost content is not PublishedContent.");
         }