V11: Merge dev to contrib

src/JsonSchema/AppSettings.cs

@@ -12,11 +12,12 @@ internal class AppSettings
     public CmsDefinition? CMS { get; set; }
 
     /// <summary>
-    ///     Configurations for the Umbraco CMS
+    /// Configurations for the Umbraco CMS
     /// </summary>
     public class CmsDefinition
     {
         public ContentSettings? Content { get; set; }
+
         public CoreDebugSettings? Debug { get; set; }
 
         public ExceptionFilterSettings? ExceptionFilter { get; set; }
@@ -37,7 +38,7 @@ public class CmsDefinition
 
         public LoggingSettings? Logging { get; set; }
 
-                public NuCacheSettings? NuCache { get; set; }
+        public NuCacheSettings? NuCache { get; set; }
 
         public RequestHandlerSettings? RequestHandler { get; set; }
 
@@ -49,7 +50,7 @@ public class CmsDefinition
 
         public TypeFinderSettings? TypeFinder { get; set; }
 
-                public WebRoutingSettings? WebRouting { get; set; }
+        public WebRoutingSettings? WebRouting { get; set; }
 
         public UmbracoPluginSettings? Plugins { get; set; }
 
@@ -72,5 +73,7 @@ public class CmsDefinition
         public InstallDefaultDataSettings? DefaultDataCreation { get; set; }
 
         public DataTypesSettings? DataTypes { get; set; }
+
+        public LicensesSettings? Licenses { get; set; }
     }
 }

src/JsonSchema/appsettings-schema.json

@@ -41,6 +41,17 @@
                   "$ref": "appsettings-schema.Umbraco.Deploy.json#/definitions/JsonSchemaDeployDefinition"
                 }
               ]
+            },
+            "Workflow": {
+              "description": "Configuration of Umbraco Workflow",
+              "oneOf": [
+                {
+                  "type": "null"
+                },
+                {
+                  "$ref": "appsettings-schema.Umbraco.Workflow.json#/definitions/JsonSchemaWorkflowDefinition"
+                }
+              ]
             }
           }
         }

src/Umbraco.Cms.ManagementApi/Controllers/Culture/CultureControllerBase.cs

@@ -1,12 +1,11 @@
 using Microsoft.AspNetCore.Mvc;
-using NSwag.Annotations;
 using Umbraco.New.Cms.Web.Common.Routing;
 
 namespace Umbraco.Cms.ManagementApi.Controllers.Culture;
 
 [ApiController]
 [VersionedApiBackOfficeRoute("culture")]
-[OpenApiTag("Culture")]
+[ApiExplorerSettings(GroupName = "Culture")]
 [ApiVersion("1.0")]
 public abstract class CultureControllerBase : ManagementApiControllerBase
 {

src/Umbraco.Cms.ManagementApi/Controllers/DataType/Tree/DataTypeTreeControllerBase.cs

@@ -1,5 +1,4 @@
 using Microsoft.AspNetCore.Mvc;
-using NSwag.Annotations;
 using Umbraco.Cms.Core;
 using Umbraco.Cms.Core.Models;
 using Umbraco.Cms.Core.Models.Entities;
@@ -12,8 +11,8 @@ namespace Umbraco.Cms.ManagementApi.Controllers.DataType.Tree;
 
 [ApiVersion("1.0")]
 [ApiController]
-[VersionedApiBackOfficeRoute($"{Constants.UdiEntityType.DataType}/tree")]
-[OpenApiTag(nameof(Constants.UdiEntityType.DataType))]
+[VersionedApiBackOfficeRoute($"{Constants.Web.RoutePath.Tree}/{Constants.UdiEntityType.DataType}")]
+[ApiExplorerSettings(GroupName = "Data Type")]
 public class DataTypeTreeControllerBase : FolderTreeControllerBase<FolderTreeItemViewModel>
 {
     private readonly IDataTypeService _dataTypeService;

src/Umbraco.Cms.ManagementApi/Controllers/DataType/Tree/ItemsDataTypeTreeController.cs

@@ -12,7 +12,7 @@ public ItemsDataTypeTreeController(IEntityService entityService, IDataTypeServic
     {
     }
 
-    [HttpGet("items")]
+    [HttpGet("item")]
     [MapToApiVersion("1.0")]
     [ProducesResponseType(typeof(IEnumerable<FolderTreeItemViewModel>), StatusCodes.Status200OK)]
     public async Task<ActionResult<IEnumerable<FolderTreeItemViewModel>>> Items([FromQuery(Name = "key")] Guid[] keys)

src/Umbraco.Cms.ManagementApi/Controllers/Dictionary/DictionaryControllerBase.cs

@@ -1,12 +1,11 @@
 using Microsoft.AspNetCore.Mvc;
-using NSwag.Annotations;
 using Umbraco.New.Cms.Web.Common.Routing;
 
 namespace Umbraco.Cms.ManagementApi.Controllers.Dictionary;
 
 [ApiController]
 [VersionedApiBackOfficeRoute("dictionary")]
-[OpenApiTag("Dictionary")]
+[ApiExplorerSettings(GroupName = "Dictionary")]
 [ApiVersion("1.0")]
 // TODO: Add authentication
 public abstract class DictionaryControllerBase : ManagementApiControllerBase

src/Umbraco.Cms.ManagementApi/Controllers/Dictionary/ExportDictionaryController.cs

@@ -23,13 +23,13 @@ public ExportDictionaryController(ILocalizationService localizationService, IEnt
     [HttpGet("export/{key:guid}")]
     [MapToApiVersion("1.0")]
     [ProducesResponseType(typeof(FileContentResult), StatusCodes.Status200OK)]
-    [ProducesResponseType(typeof(NotFoundObjectResult), StatusCodes.Status404NotFound)]
+    [ProducesResponseType(typeof(NotFoundResult), StatusCodes.Status404NotFound)]
     public async Task<IActionResult> ExportDictionary(Guid key, bool includeChildren = false)
     {
         IDictionaryItem? dictionaryItem = _localizationService.GetDictionaryItemById(key);
         if (dictionaryItem is null)
         {
-            return await Task.FromResult(NotFound("No dictionary item found with id "));
+            return await Task.FromResult(NotFound());
         }
 
         XElement xml = _entityXmlSerializer.Serialize(dictionaryItem, includeChildren);

src/Umbraco.Cms.ManagementApi/Controllers/DictionaryItem/Tree/ChildrenDictionaryItemTreeController.cs → src/Umbraco.Cms.ManagementApi/Controllers/Dictionary/Tree/ChildrenDictionaryTreeController.cs

@@ -6,11 +6,11 @@
 using Umbraco.Cms.ManagementApi.ViewModels.Pagination;
 using Umbraco.Cms.ManagementApi.ViewModels.Tree;
 
-namespace Umbraco.Cms.ManagementApi.Controllers.DictionaryItem.Tree;
+namespace Umbraco.Cms.ManagementApi.Controllers.Dictionary.Tree;
 
-public class ChildrenDictionaryItemTreeController : DictionaryItemTreeControllerBase
+public class ChildrenDictionaryTreeController : DictionaryTreeControllerBase
 {
-    public ChildrenDictionaryItemTreeController(IEntityService entityService, ILocalizationService localizationService)
+    public ChildrenDictionaryTreeController(IEntityService entityService, ILocalizationService localizationService)
         : base(entityService, localizationService)
     {
     }

src/Umbraco.Cms.ManagementApi/Controllers/DictionaryItem/Tree/DictionaryItemTreeControllerBase.cs → src/Umbraco.Cms.ManagementApi/Controllers/Dictionary/Tree/DictionaryTreeControllerBase.cs

@@ -1,23 +1,22 @@
 using Microsoft.AspNetCore.Mvc;
-using NSwag.Annotations;
 using Umbraco.Cms.Core;
 using Umbraco.Cms.Core.Models;
 using Umbraco.Cms.Core.Services;
 using Umbraco.Cms.ManagementApi.Controllers.Tree;
 using Umbraco.Cms.ManagementApi.ViewModels.Tree;
 using Umbraco.New.Cms.Web.Common.Routing;
 
-namespace Umbraco.Cms.ManagementApi.Controllers.DictionaryItem.Tree;
+namespace Umbraco.Cms.ManagementApi.Controllers.Dictionary.Tree;
 
 [ApiVersion("1.0")]
 [ApiController]
-[VersionedApiBackOfficeRoute($"{Constants.UdiEntityType.DictionaryItem}/tree")]
-[OpenApiTag(nameof(Constants.UdiEntityType.DictionaryItem))]
-// NOTE: at the moment dictionary items aren't supported by EntityService, so we have little use of the
+[VersionedApiBackOfficeRoute($"{Constants.Web.RoutePath.Tree}/dictionary")]
+[ApiExplorerSettings(GroupName = "Dictionary")]
+// NOTE: at the moment dictionary items (renamed to dictionary tree) aren't supported by EntityService, so we have little use of the
 // tree controller base. We'll keep it though, in the hope that we can mend EntityService.
-public class DictionaryItemTreeControllerBase : EntityTreeControllerBase<EntityTreeItemViewModel>
+public class DictionaryTreeControllerBase : EntityTreeControllerBase<EntityTreeItemViewModel>
 {
-    public DictionaryItemTreeControllerBase(IEntityService entityService, ILocalizationService localizationService)
+    public DictionaryTreeControllerBase(IEntityService entityService, ILocalizationService localizationService)
         : base(entityService) =>
         LocalizationService = localizationService;
 

src/Umbraco.Cms.ManagementApi/Controllers/DictionaryItem/Tree/ItemsDictionaryItemTreeController.cs → src/Umbraco.Cms.ManagementApi/Controllers/Dictionary/Tree/ItemsDictionaryTreeController.cs

@@ -4,16 +4,16 @@
 using Umbraco.Cms.Core.Services;
 using Umbraco.Cms.ManagementApi.ViewModels.Tree;
 
-namespace Umbraco.Cms.ManagementApi.Controllers.DictionaryItem.Tree;
+namespace Umbraco.Cms.ManagementApi.Controllers.Dictionary.Tree;
 
-public class ItemsDictionaryItemTreeController : DictionaryItemTreeControllerBase
+public class ItemsDictionaryTreeController : DictionaryTreeControllerBase
 {
-    public ItemsDictionaryItemTreeController(IEntityService entityService, ILocalizationService localizationService)
+    public ItemsDictionaryTreeController(IEntityService entityService, ILocalizationService localizationService)
         : base(entityService, localizationService)
     {
     }
 
-    [HttpGet("items")]
+    [HttpGet("item")]
     [MapToApiVersion("1.0")]
     [ProducesResponseType(typeof(IEnumerable<FolderTreeItemViewModel>), StatusCodes.Status200OK)]
     public async Task<ActionResult<IEnumerable<FolderTreeItemViewModel>>> Items([FromQuery(Name = "key")] Guid[] keys)

src/Umbraco.Cms.ManagementApi/Controllers/DictionaryItem/Tree/RootDictionaryItemTreeController.cs → src/Umbraco.Cms.ManagementApi/Controllers/Dictionary/Tree/RootDictionaryTreeController.cs

@@ -6,11 +6,11 @@
 using Umbraco.Cms.ManagementApi.ViewModels.Pagination;
 using Umbraco.Cms.ManagementApi.ViewModels.Tree;
 
-namespace Umbraco.Cms.ManagementApi.Controllers.DictionaryItem.Tree;
+namespace Umbraco.Cms.ManagementApi.Controllers.Dictionary.Tree;
 
-public class RootDictionaryItemTreeController : DictionaryItemTreeControllerBase
+public class RootDictionaryTreeController : DictionaryTreeControllerBase
 {
-    public RootDictionaryItemTreeController(IEntityService entityService, ILocalizationService localizationService)
+    public RootDictionaryTreeController(IEntityService entityService, ILocalizationService localizationService)
         : base(entityService, localizationService)
     {
     }

src/Umbraco.Cms.ManagementApi/Controllers/Document/RecycleBin/DocumentRecycleBinControllerBase.cs

@@ -1,6 +1,5 @@
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
-using NSwag.Annotations;
 using Umbraco.Cms.Core;
 using Umbraco.Cms.Core.Models;
 using Umbraco.Cms.Core.Models.Entities;
@@ -14,10 +13,10 @@ namespace Umbraco.Cms.ManagementApi.Controllers.Document.RecycleBin;
 
 [ApiVersion("1.0")]
 [ApiController]
-[VersionedApiBackOfficeRoute($"{Constants.UdiEntityType.Document}/recycle-bin")]
+[VersionedApiBackOfficeRoute($"{Constants.Web.RoutePath.RecycleBin}/{Constants.UdiEntityType.Document}")]
 [RequireDocumentTreeRootAccess]
 [ProducesResponseType(StatusCodes.Status401Unauthorized)]
-[OpenApiTag(nameof(Constants.UdiEntityType.Document))]
+[ApiExplorerSettings(GroupName = nameof(Constants.UdiEntityType.Document))]
 public class DocumentRecycleBinControllerBase : RecycleBinControllerBase<RecycleBinItemViewModel>
 {
     public DocumentRecycleBinControllerBase(IEntityService entityService)

src/Umbraco.Cms.ManagementApi/Controllers/Document/Tree/DocumentTreeControllerBase.cs

@@ -1,5 +1,4 @@
 using Microsoft.AspNetCore.Mvc;
-using NSwag.Annotations;
 using Umbraco.Cms.Core;
 using Umbraco.Cms.Core.Cache;
 using Umbraco.Cms.Core.Models;
@@ -16,8 +15,8 @@ namespace Umbraco.Cms.ManagementApi.Controllers.Document.Tree;
 
 [ApiVersion("1.0")]
 [ApiController]
-[VersionedApiBackOfficeRoute($"{Constants.UdiEntityType.Document}/tree")]
-[OpenApiTag(nameof(Constants.UdiEntityType.Document))]
+[VersionedApiBackOfficeRoute($"{Constants.Web.RoutePath.Tree}/{Constants.UdiEntityType.Document}")]
+[ApiExplorerSettings(GroupName = nameof(Constants.UdiEntityType.Document))]
 public abstract class DocumentTreeControllerBase : UserStartNodeTreeControllerBase<DocumentTreeItemViewModel>
 {
     private readonly IPublicAccessService _publicAccessService;

src/Umbraco.Cms.ManagementApi/Controllers/Document/Tree/ItemsDocumentTreeController.cs

@@ -21,7 +21,7 @@ public class ItemsDocumentTreeController : DocumentTreeControllerBase
     {
     }
 
-    [HttpGet("items")]
+    [HttpGet("item")]
     [MapToApiVersion("1.0")]
     [ProducesResponseType(typeof(IEnumerable<DocumentTreeItemViewModel>), StatusCodes.Status200OK)]
     public async Task<ActionResult<IEnumerable<DocumentTreeItemViewModel>>> Items([FromQuery(Name = "key")] Guid[] keys, Guid? dataTypeKey = null, string? culture = null)

src/Umbraco.Cms.ManagementApi/Controllers/DocumentBlueprint/Tree/DocumentBlueprintTreeControllerBase.cs

@@ -1,5 +1,4 @@
 using Microsoft.AspNetCore.Mvc;
-using NSwag.Annotations;
 using Umbraco.Cms.Core;
 using Umbraco.Cms.Core.Models;
 using Umbraco.Cms.Core.Models.Entities;
@@ -12,8 +11,8 @@ namespace Umbraco.Cms.ManagementApi.Controllers.DocumentBlueprint.Tree;
 
 [ApiVersion("1.0")]
 [ApiController]
-[VersionedApiBackOfficeRoute($"{Constants.UdiEntityType.DocumentBlueprint}/tree")]
-[OpenApiTag(nameof(Constants.UdiEntityType.DocumentBlueprint))]
+[VersionedApiBackOfficeRoute($"{Constants.Web.RoutePath.Tree}/{Constants.UdiEntityType.DocumentBlueprint}")]
+[ApiExplorerSettings(GroupName = "Document Blueprint")]
 public class DocumentBlueprintTreeControllerBase : EntityTreeControllerBase<DocumentBlueprintTreeItemViewModel>
 {
     private readonly IContentTypeService _contentTypeService;

src/Umbraco.Cms.ManagementApi/Controllers/DocumentBlueprint/Tree/ItemsDocumentBlueprintTreeController.cs

@@ -13,7 +13,7 @@ public ItemsDocumentBlueprintTreeController(IEntityService entityService, IConte
     {
     }
 
-    [HttpGet("items")]
+    [HttpGet("item")]
     [MapToApiVersion("1.0")]
     [ProducesResponseType(typeof(IEnumerable<DocumentBlueprintTreeItemViewModel>), StatusCodes.Status200OK)]
     public async Task<ActionResult<IEnumerable<DocumentBlueprintTreeItemViewModel>>> Items([FromQuery(Name = "key")] Guid[] keys)

src/Umbraco.Cms.ManagementApi/Controllers/DocumentType/Tree/DocumentTypeTreeControllerBase.cs

@@ -1,5 +1,4 @@
 using Microsoft.AspNetCore.Mvc;
-using NSwag.Annotations;
 using Umbraco.Cms.Core;
 using Umbraco.Cms.Core.Models;
 using Umbraco.Cms.Core.Models.Entities;
@@ -12,8 +11,8 @@ namespace Umbraco.Cms.ManagementApi.Controllers.DocumentType.Tree;
 
 [ApiVersion("1.0")]
 [ApiController]
-[VersionedApiBackOfficeRoute($"{Constants.UdiEntityType.DocumentType}/tree")]
-[OpenApiTag(nameof(Constants.UdiEntityType.DocumentType))]
+[VersionedApiBackOfficeRoute($"{Constants.Web.RoutePath.Tree}/{Constants.UdiEntityType.DocumentType}")]
+[ApiExplorerSettings(GroupName = "Document Type")]
 public class DocumentTypeTreeControllerBase : FolderTreeControllerBase<DocumentTypeTreeItemViewModel>
 {
     private readonly IContentTypeService _contentTypeService;

src/Umbraco.Cms.ManagementApi/Controllers/DocumentType/Tree/ItemsDocumentTypeTreeController.cs

@@ -12,7 +12,7 @@ public ItemsDocumentTypeTreeController(IEntityService entityService, IContentTyp
     {
     }
 
-    [HttpGet("items")]
+    [HttpGet("item")]
     [MapToApiVersion("1.0")]
     [ProducesResponseType(typeof(IEnumerable<DocumentTypeTreeItemViewModel>), StatusCodes.Status200OK)]
     public async Task<ActionResult<IEnumerable<DocumentTypeTreeItemViewModel>>> Items([FromQuery(Name = "key")] Guid[] keys)

src/Umbraco.Cms.ManagementApi/Controllers/Help/HelpControllerBase.cs

@@ -1,12 +1,11 @@
 using Microsoft.AspNetCore.Mvc;
-using NSwag.Annotations;
 using Umbraco.New.Cms.Web.Common.Routing;
 
 namespace Umbraco.Cms.ManagementApi.Controllers.Help;
 
 [ApiController]
 [VersionedApiBackOfficeRoute("help")]
-[OpenApiTag("Help")]
+[ApiExplorerSettings(GroupName = "Help")]
 [ApiVersion("1.0")]
 public abstract class HelpControllerBase : ManagementApiControllerBase
 {

src/Umbraco.Cms.ManagementApi/Controllers/Install/InstallControllerBase.cs

@@ -1,5 +1,4 @@
 using Microsoft.AspNetCore.Mvc;
-using NSwag.Annotations;
 using Umbraco.Cms.Core;
 using Umbraco.Cms.ManagementApi.Filters;
 using Umbraco.New.Cms.Web.Common.Routing;
@@ -8,7 +7,7 @@ namespace Umbraco.Cms.ManagementApi.Controllers.Install;
 
 [ApiController]
 [VersionedApiBackOfficeRoute("install")]
-[OpenApiTag("Install")]
+[ApiExplorerSettings(GroupName = "Install")]
 [RequireRuntimeLevel(RuntimeLevel.Install)]
 public abstract class InstallControllerBase : ManagementApiControllerBase
 {