Merge branch 'main' into v16/feature/menu-expansion

Author: madsrasmussen

src/Umbraco.Cms.Api.Management/Controllers/DataType/Tree/SiblingsDataTypeTreeController.cs

@@ -15,6 +15,9 @@ public SiblingsDataTypeTreeController(IEntityService entityService, IDataTypeSer
 
     [HttpGet("siblings")]
     [ProducesResponseType(typeof(SubsetViewModel<DataTypeTreeItemResponseModel>), StatusCodes.Status200OK)]
-    public Task<ActionResult<SubsetViewModel<DataTypeTreeItemResponseModel>>> Siblings(CancellationToken cancellationToken, Guid target, int before, int after)
-        => GetSiblings(target, before, after);
+    public async Task<ActionResult<SubsetViewModel<DataTypeTreeItemResponseModel>>> Siblings(CancellationToken cancellationToken, Guid target, int before, int after, bool foldersOnly = false)
+    {
+        RenderFoldersOnly(foldersOnly);
+        return await GetSiblings(target, before, after);
+    }
 }

src/Umbraco.Cms.Api.Management/Controllers/Document/Tree/SiblingsDocumentTreeController.cs

@@ -36,9 +36,9 @@ public SiblingsDocumentTreeController(
     [HttpGet("siblings")]
     [MapToApiVersion("1.0")]
     [ProducesResponseType(typeof(SubsetViewModel<DocumentTreeItemResponseModel>), StatusCodes.Status200OK)]
-    public Task<ActionResult<SubsetViewModel<DocumentTreeItemResponseModel>>> Siblings(CancellationToken cancellationToken, Guid target, int before, int after, Guid? dataTypeId = null)
+    public async Task<ActionResult<SubsetViewModel<DocumentTreeItemResponseModel>>> Siblings(CancellationToken cancellationToken, Guid target, int before, int after, Guid? dataTypeId = null)
     {
         IgnoreUserStartNodesForDataType(dataTypeId);
-        return GetSiblings(target, before, after);
+        return await GetSiblings(target, before, after);
     }
 }

src/Umbraco.Cms.Api.Management/Controllers/DocumentBlueprint/Tree/SiblingsDocumentBlueprintTreeController.cs

@@ -16,10 +16,14 @@ public SiblingsDocumentBlueprintTreeController(IEntityService entityService, IDo
 
     [HttpGet("siblings")]
     [ProducesResponseType(typeof(SubsetViewModel<DocumentBlueprintTreeItemResponseModel>), StatusCodes.Status200OK)]
-    public Task<ActionResult<SubsetViewModel<DocumentBlueprintTreeItemResponseModel>>> Siblings(
+    public async Task<ActionResult<SubsetViewModel<DocumentBlueprintTreeItemResponseModel>>> Siblings(
         CancellationToken cancellationToken,
         Guid target,
         int before,
-        int after) =>
-        GetSiblings(target, before, after);
+        int after,
+        bool foldersOnly = false)
+    {
+        RenderFoldersOnly(foldersOnly);
+        return await GetSiblings(target, before, after);
+    }
 }

src/Umbraco.Cms.Api.Management/Controllers/DocumentType/Tree/SiblingsDocumentTypeTreeController.cs

@@ -15,10 +15,14 @@ public SiblingsDocumentTypeTreeController(IEntityService entityService, IContent
 
     [HttpGet("siblings")]
     [ProducesResponseType(typeof(SubsetViewModel<DocumentTypeTreeItemResponseModel>), StatusCodes.Status200OK)]
-    public Task<ActionResult<SubsetViewModel<DocumentTypeTreeItemResponseModel>>> Siblings(
+    public async Task<ActionResult<SubsetViewModel<DocumentTypeTreeItemResponseModel>>> Siblings(
         CancellationToken cancellationToken,
         Guid target,
         int before,
-        int after) =>
-        GetSiblings(target, before, after);
+        int after,
+        bool foldersOnly = false)
+    {
+        RenderFoldersOnly(foldersOnly);
+        return await GetSiblings(target, before, after);
+    }
 }

src/Umbraco.Cms.Api.Management/Controllers/Media/Tree/SiblingsMediaTreeController.cs

@@ -25,9 +25,9 @@ public SiblingsMediaTreeController(
 
     [HttpGet("siblings")]
     [ProducesResponseType(typeof(SubsetViewModel<MediaTreeItemResponseModel>), StatusCodes.Status200OK)]
-    public Task<ActionResult<SubsetViewModel<MediaTreeItemResponseModel>>> Siblings(CancellationToken cancellationToken, Guid target, int before, int after, Guid? dataTypeId = null)
+    public async Task<ActionResult<SubsetViewModel<MediaTreeItemResponseModel>>> Siblings(CancellationToken cancellationToken, Guid target, int before, int after, Guid? dataTypeId = null)
     {
         IgnoreUserStartNodesForDataType(dataTypeId);
-        return GetSiblings(target, before, after);
+        return await GetSiblings(target, before, after);
     }
 }

src/Umbraco.Cms.Api.Management/Controllers/MediaType/Tree/SiblingsMediaTypeTreeController.cs

@@ -15,6 +15,14 @@ public SiblingsMediaTypeTreeController(IEntityService entityService, IMediaTypeS
 
     [HttpGet("siblings")]
     [ProducesResponseType(typeof(SubsetViewModel<MediaTypeTreeItemResponseModel>), StatusCodes.Status200OK)]
-    public Task<ActionResult<SubsetViewModel<MediaTypeTreeItemResponseModel>>> Siblings(CancellationToken cancellationToken, Guid target, int before, int after)
-        => GetSiblings(target, before, after);
+    public async Task<ActionResult<SubsetViewModel<MediaTypeTreeItemResponseModel>>> Siblings(
+        CancellationToken cancellationToken,
+        Guid target,
+        int before,
+        int after,
+        bool foldersOnly = false)
+    {
+        RenderFoldersOnly(foldersOnly);
+        return await GetSiblings(target, before, after);
+    }
 }

src/Umbraco.Cms.Api.Management/Controllers/Template/Tree/SiblingsTemplateTreeController.cs

@@ -15,10 +15,10 @@ public SiblingsTemplateTreeController(IEntityService entityService)
 
     [HttpGet("siblings")]
     [ProducesResponseType(typeof(SubsetViewModel<NamedEntityTreeItemResponseModel>), StatusCodes.Status200OK)]
-    public Task<ActionResult<SubsetViewModel<NamedEntityTreeItemResponseModel>>> Siblings(
+    public async Task<ActionResult<SubsetViewModel<NamedEntityTreeItemResponseModel>>> Siblings(
         CancellationToken cancellationToken,
         Guid target,
         int before,
         int after) =>
-        GetSiblings(target, before, after);
+        await GetSiblings(target, before, after);
 }

src/Umbraco.Cms.Api.Management/Controllers/Tree/EntityTreeControllerBase.cs

@@ -127,7 +127,7 @@ protected virtual IEntitySlim[] GetSiblingEntities(Guid target, int before, int
         EntityService
             .GetSiblings(
                 target,
-                ItemObjectType,
+                [ItemObjectType],
                 before,
                 after,
                 out totalBefore,

src/Umbraco.Cms.Api.Management/Controllers/Tree/FolderTreeControllerBase.cs

@@ -51,6 +51,24 @@ protected override IEntitySlim[] GetPagedChildEntities(Guid parentKey, int skip,
             take,
             out totalItems);
 
+    protected override IEntitySlim[] GetSiblingEntities(Guid target, int before, int after, out long totalBefore, out long totalAfter)
+    {
+        totalBefore = 0;
+        totalAfter = 0;
+
+        UmbracoObjectTypes[] siblingObjectTypes = GetObjectTypes();
+
+        return EntityService.GetSiblings(
+                target,
+                siblingObjectTypes,
+                before,
+                after,
+                out totalBefore,
+                out totalAfter,
+                ordering: ItemOrdering)
+            .ToArray();
+    }
+
     protected override TItem MapTreeItemViewModel(Guid? parentKey, IEntitySlim entity)
     {
         TItem viewModel = base.MapTreeItemViewModel(parentKey, entity);
@@ -93,19 +111,19 @@ private IEntitySlim[] GetEntities(Guid? parentKey, int skip, int take, out long
     {
         totalItems = 0;
 
-        UmbracoObjectTypes[] childObjectTypes = _foldersOnly ? [FolderObjectType] : [FolderObjectType, ItemObjectType];
-
-        IEntitySlim[] itemEntities = EntityService.GetPagedChildren(
-                    parentKey,
-                    [FolderObjectType, ItemObjectType],
-                    childObjectTypes,
-                    skip,
-                    take,
-                    false,
-                    out totalItems,
-                    ordering: ItemOrdering)
-                .ToArray();
-
-        return itemEntities;
+        UmbracoObjectTypes[] childObjectTypes = GetObjectTypes();
+
+        return EntityService.GetPagedChildren(
+                parentKey,
+                [FolderObjectType, ItemObjectType],
+                childObjectTypes,
+                skip,
+                take,
+                false,
+                out totalItems,
+                ordering: ItemOrdering)
+            .ToArray();
     }
+
+    private UmbracoObjectTypes[] GetObjectTypes() => _foldersOnly ? [FolderObjectType] : [FolderObjectType, ItemObjectType];
 }

src/Umbraco.Cms.Api.Management/ServerEvents/UserConnectionManager.cs

@@ -7,7 +7,7 @@ internal sealed class UserConnectionManager : IUserConnectionManager
 {
     // We use a normal dictionary instead of ConcurrentDictionary, since we need to lock the set anyways.
     private readonly Dictionary<Guid, HashSet<string>> _connections = new();
-    private readonly object _lock = new();
+    private readonly Lock _lock = new();
 
     /// <inheritdoc/>
     public ISet<string> GetConnections(Guid userKey)