Media Picker: Present root nodes for users with more than one media root node assigned (closes #20967)

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

@@ -1,4 +1,4 @@
 using System.Dynamic;
 using System.Globalization;
 using System.Linq.Expressions;
 using System.Reflection;
@@ -847,73 +847,85 @@
             return NotFound();
         }
 
+        EntityBasic? MapEntityBasic(IEntitySlim source, string? culture)
+        {
+            EntityBasic? target = _umbracoMapper.Map<IEntitySlim, EntityBasic>(source, context =>
+            {
+                context.SetCulture(culture);
+            });
+
+            if (target is not null)
+            {
+                target.AdditionalData["hasChildren"] = source.HasChildren;
+            }
+
+            return target;
+        }
+
         UmbracoObjectTypes? objectType = ConvertToObjectType(type);
         if (objectType.HasValue)
         {
             IEnumerable<IEntitySlim> entities;
 
             var startNodeIds = GetStartNodeIds(type);
             var startNodePaths = GetStartNodePaths(type);
 
             var ignoreUserStartNodes = IsDataTypeIgnoringUserStartNodes(dataTypeKey);
 
+            var culture = ClientCulture();
+
             // root is special: we reduce it to start nodes if the user's start node is not the default, then we need to return their start nodes
             if (id == Constants.System.Root && startNodeIds.Length > 0 &&
-                startNodeIds.Contains(Constants.System.Root) == false && !ignoreUserStartNodes)
+                startNodeIds.Contains(Constants.System.Root) == false &&
+                ignoreUserStartNodes == false)
             {
-                return new PagedResult<EntityBasic>(0, 0, 0);
+                var startNodeEntities = _entityService.GetAll(objectType.Value, startNodeIds).ToList();
+                IEnumerable<IEntitySlim> pagedStartNodeEntities = startNodeEntities
+                    .Skip((pageNumber - 1) * pageSize)
+                    .Take(pageSize);
+                return new PagedResult<EntityBasic>(startNodeEntities.Count, pageNumber, pageSize)
+                {
+                    Items = pagedStartNodeEntities
+                        .Select(source => MapEntityBasic(source, culture))
+                        .WhereNotNull(),
+                };
             }
+
             //adding multiple conditions ,considering id,key & name as filter param
             //for id as int
             int.TryParse(filter, out int filterAsIntId);
             //for key as Guid
             Guid.TryParse(filter, out Guid filterAsGuid);
             // else proceed as usual
             entities = _entityService.GetPagedChildren(
                 id,
                 objectType.Value,
                 pageNumber - 1,
                 pageSize,
                 out long totalRecords,
                 filter.IsNullOrWhiteSpace()
                     ? null
                     : _sqlContext.Query<IUmbracoEntity>().Where(x => x.Name!.Contains(filter)
                       || x.Id == filterAsIntId
                       || x.Key == filterAsGuid),
                 Ordering.By(orderBy, orderDirection));
 
-
             if (totalRecords == 0)
             {
                 return new PagedResult<EntityBasic>(0, 0, 0);
             }
 
-            var culture = ClientCulture();
             var pagedResult = new PagedResult<EntityBasic>(totalRecords, pageNumber, pageSize)
             {
                 Items = entities
                     // Filtering out child nodes after getting a paged result is an active choice here, even though the pagination might get off.
                     // This has been the case with this functionality in Umbraco for a long time.
                     .Where(entity => ignoreUserStartNodes ||
                                      (objectType == UmbracoObjectTypes.Document || objectType == UmbracoObjectTypes.Media) is false ||
                                      (ContentPermissions.IsInBranchOfStartNode(entity.Path, startNodeIds, startNodePaths, out var hasPathAccess) &&
                                      hasPathAccess))
-                    .Select(source =>
-                    {
-                        EntityBasic? target = _umbracoMapper.Map<IEntitySlim, EntityBasic>(source, context =>
-                        {
-                            context.SetCulture(culture);
-                            context.SetCulture(culture);
-                        });
-
-                        if (target is not null)
-                        {
-                            //TODO: Why is this here and not in the mapping?
-                            target.AdditionalData["hasChildren"] = source.HasChildren;
-                        }
-
-                        return target;
-                    }).WhereNotNull()
+                    .Select(source => MapEntityBasic(source, culture))
+                    .WhereNotNull(),
             };
 
             return pagedResult;