Merge branch 'v15/dev' into v15/feature/workspace-info-app-extension

Author: madsrasmussen

src/Umbraco.Cms.Api.Management/Controllers/Document/Item/SearchDocumentItemController.cs

@@ -1,4 +1,5 @@
-using Asp.Versioning;
+using System.Text.Json.Serialization;
+using Asp.Versioning;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 using Umbraco.Cms.Api.Management.Factories;
@@ -26,12 +27,17 @@ public SearchDocumentItemController(IIndexedEntitySearchService indexedEntitySea
     public async Task<IActionResult> Search(CancellationToken cancellationToken, string query, int skip = 0, int take = 100)
         => await SearchFromParent(cancellationToken, query, skip, take);
 
+    [NonAction]
+    [Obsolete("Scheduled to be removed in v16, use the non obsoleted method instead")]
+    public async Task<IActionResult> SearchFromParent(CancellationToken cancellationToken, string query, int skip = 0, int take = 100, Guid? parentId = null)
+        => await SearchFromParentWithAllowedTypes(cancellationToken, query, skip, take, parentId);
+
     [HttpGet("search")]
     [MapToApiVersion("1.0")]
     [ProducesResponseType(typeof(PagedModel<DocumentItemResponseModel>), StatusCodes.Status200OK)]
-    public async Task<IActionResult> SearchFromParent(CancellationToken cancellationToken, string query, int skip = 0, int take = 100, Guid? parentId = null)
+    public async Task<IActionResult> SearchFromParentWithAllowedTypes(CancellationToken cancellationToken, string query, int skip = 0, int take = 100, Guid? parentId = null, [FromQuery]IEnumerable<Guid>? allowedDocumentTypes = null)
     {
-        PagedModel<IEntitySlim> searchResult = _indexedEntitySearchService.Search(UmbracoObjectTypes.Document, query, parentId, skip, take);
+        PagedModel<IEntitySlim> searchResult = _indexedEntitySearchService.Search(UmbracoObjectTypes.Document, query, parentId, allowedDocumentTypes, skip, take);
         var result = new PagedModel<DocumentItemResponseModel>
         {
             Items = searchResult.Items.OfType<IDocumentEntitySlim>().Select(_documentPresentationFactory.CreateItemResponseModel),

src/Umbraco.Cms.Api.Management/Controllers/Media/Item/SearchMediaItemController.cs

@@ -26,12 +26,18 @@ public SearchMediaItemController(IIndexedEntitySearchService indexedEntitySearch
     public async Task<IActionResult> Search(CancellationToken cancellationToken, string query, int skip = 0, int take = 100)
         => await SearchFromParent(cancellationToken, query, skip, take, null);
 
+    [NonAction]
+    [Obsolete("Scheduled to be removed in v16, use the non obsoleted method instead")]
+    [ProducesResponseType(typeof(PagedModel<MediaItemResponseModel>), StatusCodes.Status200OK)]
+    public async Task<IActionResult> SearchFromParent(CancellationToken cancellationToken, string query, int skip = 0, int take = 100, Guid? parentId = null)
+        => await SearchFromParentWithAllowedTypes(cancellationToken, query, skip, take, parentId);
+
     [HttpGet("search")]
     [MapToApiVersion("1.0")]
     [ProducesResponseType(typeof(PagedModel<MediaItemResponseModel>), StatusCodes.Status200OK)]
-    public async Task<IActionResult> SearchFromParent(CancellationToken cancellationToken, string query, int skip = 0, int take = 100, Guid? parentId = null)
+    public async Task<IActionResult> SearchFromParentWithAllowedTypes(CancellationToken cancellationToken, string query, int skip = 0, int take = 100, Guid? parentId = null, [FromQuery]IEnumerable<Guid>? allowedMediaTypes = null)
     {
-        PagedModel<IEntitySlim> searchResult = _indexedEntitySearchService.Search(UmbracoObjectTypes.Media, query, parentId, skip, take);
+        PagedModel<IEntitySlim> searchResult = _indexedEntitySearchService.Search(UmbracoObjectTypes.Media, query, parentId, allowedMediaTypes, skip, take);
         var result = new PagedModel<MediaItemResponseModel>
         {
             Items = searchResult.Items.OfType<IMediaEntitySlim>().Select(_mediaPresentationFactory.CreateItemResponseModel),

src/Umbraco.Cms.Api.Management/Controllers/Member/Item/SearchMemberItemController.cs

@@ -21,12 +21,17 @@ public SearchMemberItemController(IIndexedEntitySearchService indexedEntitySearc
         _memberPresentationFactory = memberPresentationFactory;
     }
 
+    [NonAction]
+    [Obsolete("Scheduled to be removed in v16, use the non obsoleted method instead")]
+    public async Task<IActionResult> Search(CancellationToken cancellationToken, string query, int skip = 0, int take = 100)
+        => await SearchWithAllowedTypes(cancellationToken, query, skip, take);
+
     [HttpGet("search")]
     [MapToApiVersion("1.0")]
     [ProducesResponseType(typeof(PagedModel<MemberItemResponseModel>), StatusCodes.Status200OK)]
-    public async Task<IActionResult> Search(CancellationToken cancellationToken, string query, int skip = 0, int take = 100)
+    public async Task<IActionResult> SearchWithAllowedTypes(CancellationToken cancellationToken, string query, int skip = 0, int take = 100, [FromQuery]IEnumerable<Guid>? allowedMemberTypes = null)
     {
-        PagedModel<IEntitySlim> searchResult = _indexedEntitySearchService.Search(UmbracoObjectTypes.Member, query, skip, take);
+        PagedModel<IEntitySlim> searchResult = _indexedEntitySearchService.Search(UmbracoObjectTypes.Member, query, null, allowedMemberTypes, skip, take);
         var result = new PagedModel<MemberItemResponseModel>
         {
             Items = searchResult.Items.OfType<IMemberEntitySlim>().Select(_memberPresentationFactory.CreateItemResponseModel),

src/Umbraco.Cms.Api.Management/Factories/DocumentUrlFactory.cs

@@ -1,31 +1,38 @@
 using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Logging;
 using Umbraco.Cms.Api.Management.ViewModels.Document;
 using Umbraco.Cms.Core.DependencyInjection;
 using Umbraco.Cms.Core.Models;
-using Umbraco.Cms.Core.Models.PublishedContent;
-using Umbraco.Cms.Core.PublishedCache;
 using Umbraco.Cms.Core.Routing;
 using Umbraco.Cms.Core.Services;
-using Umbraco.Cms.Core.Services.Navigation;
-using Umbraco.Cms.Core.Web;
-using Umbraco.Extensions;
 
 namespace Umbraco.Cms.Api.Management.Factories;
 
 public class DocumentUrlFactory : IDocumentUrlFactory
 {
-    private readonly IDocumentUrlService _documentUrlService;
+    private readonly IPublishedUrlInfoProvider _publishedUrlInfoProvider;
 
 
+    [Obsolete("Use the constructor that takes all dependencies, scheduled for removal in v16")]
     public DocumentUrlFactory(IDocumentUrlService documentUrlService)
+    : this(StaticServiceProvider.Instance.GetRequiredService<IPublishedUrlInfoProvider>())
     {
-        _documentUrlService = documentUrlService;
+    }
+
+    [Obsolete("Use the constructor that takes all dependencies, scheduled for removal in v16")]
+    public DocumentUrlFactory(IDocumentUrlService documentUrlService, IPublishedUrlInfoProvider publishedUrlInfoProvider)
+    : this(publishedUrlInfoProvider)
+    {
+
+    }
+
+    public DocumentUrlFactory(IPublishedUrlInfoProvider publishedUrlInfoProvider)
+    {
+        _publishedUrlInfoProvider = publishedUrlInfoProvider;
     }
 
     public async Task<IEnumerable<DocumentUrlInfo>> CreateUrlsAsync(IContent content)
     {
-        IEnumerable<UrlInfo> urlInfos = await _documentUrlService.ListUrlsAsync(content.Key);
+        ISet<UrlInfo> urlInfos = await _publishedUrlInfoProvider.GetAllAsync(content);
 
         return urlInfos
             .Where(urlInfo => urlInfo.IsUrl)

src/Umbraco.Cms.Api.Management/Factories/IDocumentUrlFactory.cs

@@ -6,5 +6,6 @@ namespace Umbraco.Cms.Api.Management.Factories;
 public interface IDocumentUrlFactory
 {
     Task<IEnumerable<DocumentUrlInfo>> CreateUrlsAsync(IContent content);
+
     Task<IEnumerable<DocumentUrlInfoResponseModel>> CreateUrlSetsAsync(IEnumerable<IContent> contentItems);
 }

src/Umbraco.Cms.Api.Management/OpenApi.json

@@ -10086,6 +10086,17 @@
               "type": "string",
               "format": "uuid"
             }
+          },
+          {
+            "name": "allowedDocumentTypes",
+            "in": "query",
+            "schema": {
+              "type": "array",
+              "items": {
+                "type": "string",
+                "format": "uuid"
+              }
+            }
           }
         ],
         "responses": {
@@ -15764,6 +15775,17 @@
               "type": "string",
               "format": "uuid"
             }
+          },
+          {
+            "name": "allowedMediaTypes",
+            "in": "query",
+            "schema": {
+              "type": "array",
+              "items": {
+                "type": "string",
+                "format": "uuid"
+              }
+            }
           }
         ],
         "responses": {
@@ -19638,6 +19660,17 @@
               "format": "int32",
               "default": 100
             }
+          },
+          {
+            "name": "allowedMemberTypes",
+            "in": "query",
+            "schema": {
+              "type": "array",
+              "items": {
+                "type": "string",
+                "format": "uuid"
+              }
+            }
           }
         ],
         "responses": {
@@ -35978,14 +36011,11 @@
           "mediaStartNodeIds",
           "name",
           "permissions",
+          "userGroupIds",
           "userName"
         ],
         "type": "object",
         "properties": {
-          "id": {
-            "type": "string",
-            "format": "uuid"
-          },
           "email": {
             "type": "string"
           },
@@ -35995,6 +36025,21 @@
           "name": {
             "type": "string"
           },
+          "userGroupIds": {
+            "uniqueItems": true,
+            "type": "array",
+            "items": {
+              "oneOf": [
+                {
+                  "$ref": "#/components/schemas/ReferenceByIdModel"
+                }
+              ]
+            }
+          },
+          "id": {
+            "type": "string",
+            "format": "uuid"
+          },
           "languageIsoCode": {
             "type": "string",
             "nullable": true
@@ -37794,6 +37839,16 @@
             "type": "string",
             "format": "date-time",
             "nullable": true
+          },
+          "scheduledPublishDate": {
+            "type": "string",
+            "format": "date-time",
+            "nullable": true
+          },
+          "scheduledUnpublishDate": {
+            "type": "string",
+            "format": "date-time",
+            "nullable": true
           }
         },
         "additionalProperties": false

src/Umbraco.Core/Configuration/Models/RuntimeSettings.cs

@@ -21,6 +21,7 @@ public class RuntimeSettings
     /// <summary>
     /// Gets or sets a value for the maximum query string length.
     /// </summary>
+    [Obsolete("No longer used and will be removed in Umbraco 16.")]
     public int? MaxQueryStringLength { get; set; }
 
     /// <summary>

src/Umbraco.Core/DependencyInjection/UmbracoBuilder.cs

@@ -241,6 +241,7 @@ private void AddCoreServices()
 
             // register published router
             Services.AddUnique<IPublishedRouter, PublishedRouter>();
+            Services.AddUnique<IPublishedUrlInfoProvider, PublishedUrlInfoProvider>();
 
             Services.AddUnique<IEventMessagesFactory, DefaultEventMessagesFactory>();
             Services.AddUnique<IEventMessagesAccessor, HybridEventMessagesAccessor>();

src/Umbraco.Core/Models/ContentRepositoryExtensions.cs

@@ -237,7 +237,7 @@ public static void CopyFrom(this IContent content, IContent other, string? cultu
         {
             foreach (ContentCultureInfos cultureInfo in other.CultureInfos)
             {
-                if (culture == "*" || culture == cultureInfo.Culture)
+                if (culture == "*" || culture.InvariantEquals(cultureInfo.Culture))
                 {
                     content.SetCultureName(cultureInfo.Name, cultureInfo.Culture);
                 }

src/Umbraco.Core/Routing/IPublishedUrlInfoProvider.cs

@@ -0,0 +1,13 @@
+using Umbraco.Cms.Core.Models;
+
+namespace Umbraco.Cms.Core.Routing;
+
+public interface IPublishedUrlInfoProvider
+{
+    /// <summary>
+    /// Gets all published urls for a content item.
+    /// </summary>
+    /// <param name="content">The content to get urls for.</param>
+    /// <returns>Set of all published url infos.</returns>
+    Task<ISet<UrlInfo>> GetAllAsync(IContent content);
+}