New Backoffice: Return AnalyticsLevelViewModel instead of TelemetryLevel

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

@@ -12,8 +12,8 @@ namespace Umbraco.Cms.ManagementApi.Controllers.DataType.Tree;
 
 [ApiVersion("1.0")]
 [ApiController]
-[VersionedApiBackOfficeRoute($"{Constants.UdiEntityType.DataType}/tree")]
-[OpenApiTag(nameof(Constants.UdiEntityType.DataType))]
+[VersionedApiBackOfficeRoute($"tree/{Constants.UdiEntityType.DataType}")]
+[OpenApiTag("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/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

@@ -7,17 +7,17 @@
 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($"tree/dictionary")]
+[OpenApiTag("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

@@ -14,7 +14,7 @@ namespace Umbraco.Cms.ManagementApi.Controllers.Document.RecycleBin;
 
 [ApiVersion("1.0")]
 [ApiController]
-[VersionedApiBackOfficeRoute($"{Constants.UdiEntityType.Document}/recycle-bin")]
+[VersionedApiBackOfficeRoute($"recycle-bin/{Constants.UdiEntityType.Document}")]
 [RequireDocumentTreeRootAccess]
 [ProducesResponseType(StatusCodes.Status401Unauthorized)]
 [OpenApiTag(nameof(Constants.UdiEntityType.Document))]

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

@@ -16,7 +16,7 @@ namespace Umbraco.Cms.ManagementApi.Controllers.Document.Tree;
 
 [ApiVersion("1.0")]
 [ApiController]
-[VersionedApiBackOfficeRoute($"{Constants.UdiEntityType.Document}/tree")]
+[VersionedApiBackOfficeRoute($"tree/{Constants.UdiEntityType.Document}")]
 [OpenApiTag(nameof(Constants.UdiEntityType.Document))]
 public abstract class DocumentTreeControllerBase : UserStartNodeTreeControllerBase<DocumentTreeItemViewModel>
 {

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

@@ -21,7 +21,7 @@ public ItemsDocumentTreeController(
     {
     }
 
-    [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

@@ -12,8 +12,8 @@ namespace Umbraco.Cms.ManagementApi.Controllers.DocumentBlueprint.Tree;
 
 [ApiVersion("1.0")]
 [ApiController]
-[VersionedApiBackOfficeRoute($"{Constants.UdiEntityType.DocumentBlueprint}/tree")]
-[OpenApiTag(nameof(Constants.UdiEntityType.DocumentBlueprint))]
+[VersionedApiBackOfficeRoute($"tree/{Constants.UdiEntityType.DocumentBlueprint}")]
+[OpenApiTag("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

@@ -12,8 +12,8 @@ namespace Umbraco.Cms.ManagementApi.Controllers.DocumentType.Tree;
 
 [ApiVersion("1.0")]
 [ApiController]
-[VersionedApiBackOfficeRoute($"{Constants.UdiEntityType.DocumentType}/tree")]
-[OpenApiTag(nameof(Constants.UdiEntityType.DocumentType))]
+[VersionedApiBackOfficeRoute($"tree/{Constants.UdiEntityType.DocumentType}")]
+[OpenApiTag("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/Media/RecycleBin/MediaRecycleBinControllerBase.cs

@@ -14,7 +14,7 @@ namespace Umbraco.Cms.ManagementApi.Controllers.Media.RecycleBin;
 
 [ApiVersion("1.0")]
 [ApiController]
-[VersionedApiBackOfficeRoute($"{Constants.UdiEntityType.Media}/recycle-bin")]
+[VersionedApiBackOfficeRoute($"recycle-bin/{Constants.UdiEntityType.Media}")]
 [RequireMediaTreeRootAccess]
 [ProducesResponseType(StatusCodes.Status401Unauthorized)]
 [OpenApiTag(nameof(Constants.UdiEntityType.Media))]

src/Umbraco.Cms.ManagementApi/Controllers/Media/Tree/ItemsMediaTreeController.cs

@@ -20,7 +20,7 @@ public ItemsMediaTreeController(
     {
     }
 
-    [HttpGet("items")]
+    [HttpGet("item")]
     [MapToApiVersion("1.0")]
     [ProducesResponseType(typeof(IEnumerable<ContentTreeItemViewModel>), StatusCodes.Status200OK)]
     public async Task<ActionResult<IEnumerable<ContentTreeItemViewModel>>> Items([FromQuery(Name = "key")] Guid[] keys, Guid? dataTypeKey = null)

src/Umbraco.Cms.ManagementApi/Controllers/Media/Tree/MediaTreeControllerBase.cs

@@ -15,7 +15,7 @@ namespace Umbraco.Cms.ManagementApi.Controllers.Media.Tree;
 
 [ApiVersion("1.0")]
 [ApiController]
-[VersionedApiBackOfficeRoute($"{Constants.UdiEntityType.Media}/tree")]
+[VersionedApiBackOfficeRoute($"tree/{Constants.UdiEntityType.Media}")]
 [OpenApiTag(nameof(Constants.UdiEntityType.Media))]
 public class MediaTreeControllerBase : UserStartNodeTreeControllerBase<ContentTreeItemViewModel>
 {

src/Umbraco.Cms.ManagementApi/Controllers/MediaType/Tree/ItemsMediaTypeTreeController.cs

@@ -12,7 +12,7 @@ public ItemsMediaTypeTreeController(IEntityService entityService, IMediaTypeServ
     {
     }
 
-    [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/MediaType/Tree/MediaTypeTreeControllerBase.cs

@@ -12,8 +12,8 @@ namespace Umbraco.Cms.ManagementApi.Controllers.MediaType.Tree;
 
 [ApiVersion("1.0")]
 [ApiController]
-[VersionedApiBackOfficeRoute($"{Constants.UdiEntityType.MediaType}/tree")]
-[OpenApiTag(nameof(Constants.UdiEntityType.MediaType))]
+[VersionedApiBackOfficeRoute($"tree/{Constants.UdiEntityType.MediaType}")]
+[OpenApiTag("Media Type")]
 public class MediaTypeTreeControllerBase : FolderTreeControllerBase<FolderTreeItemViewModel>
 {
     private readonly IMediaTypeService _mediaTypeService;

src/Umbraco.Cms.ManagementApi/Controllers/MemberGroup/Tree/ItemsMemberGroupTreeController.cs

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

src/Umbraco.Cms.ManagementApi/Controllers/MemberGroup/Tree/MemberGroupTreeControllerBase.cs

@@ -12,8 +12,8 @@ namespace Umbraco.Cms.ManagementApi.Controllers.MemberGroup.Tree;
 
 [ApiVersion("1.0")]
 [ApiController]
-[VersionedApiBackOfficeRoute($"{Constants.UdiEntityType.MemberGroup}/tree")]
-[OpenApiTag(nameof(Constants.UdiEntityType.MemberGroup))]
+[VersionedApiBackOfficeRoute($"tree/{Constants.UdiEntityType.MemberGroup}")]
+[OpenApiTag("Member Group")]
 public class MemberGroupTreeControllerBase : EntityTreeControllerBase<EntityTreeItemViewModel>
 {
     public MemberGroupTreeControllerBase(IEntityService entityService)

src/Umbraco.Cms.ManagementApi/Controllers/MemberType/Tree/ItemsMemberTypeTreeController.cs

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

src/Umbraco.Cms.ManagementApi/Controllers/MemberType/Tree/MemberTypeTreeControllerBase.cs

@@ -12,8 +12,8 @@ namespace Umbraco.Cms.ManagementApi.Controllers.MemberType.Tree;
 
 [ApiVersion("1.0")]
 [ApiController]
-[VersionedApiBackOfficeRoute($"{Constants.UdiEntityType.MemberType}/tree")]
-[OpenApiTag(nameof(Constants.UdiEntityType.MemberType))]
+[VersionedApiBackOfficeRoute($"tree/{Constants.UdiEntityType.MemberType}")]
+[OpenApiTag("Member Type")]
 public class MemberTypeTreeControllerBase : EntityTreeControllerBase<EntityTreeItemViewModel>
 {
     public MemberTypeTreeControllerBase(IEntityService entityService)

src/Umbraco.Cms.ManagementApi/Controllers/ModelsBuilderDashboard/BuildModelsBuilderController.cs → src/Umbraco.Cms.ManagementApi/Controllers/ModelsBuilder/BuildModelsBuilderController.cs

@@ -8,7 +8,7 @@
 using Umbraco.Cms.Infrastructure.ModelsBuilder.Building;
 using Umbraco.Extensions;
 
-namespace Umbraco.Cms.ManagementApi.Controllers.ModelsBuilderDashboard;
+namespace Umbraco.Cms.ManagementApi.Controllers.ModelsBuilder;
 
 public class BuildModelsBuilderController : ModelsBuilderControllerBase
 {

src/Umbraco.Cms.ManagementApi/Controllers/ModelsBuilderDashboard/GetModelsBuilderController.cs → src/Umbraco.Cms.ManagementApi/Controllers/ModelsBuilder/GetModelsBuilderController.cs

@@ -4,15 +4,15 @@
 using Umbraco.Cms.ManagementApi.Factories;
 using Umbraco.Cms.ManagementApi.ViewModels.ModelsBuilderDashboard;
 
-namespace Umbraco.Cms.ManagementApi.Controllers.ModelsBuilderDashboard;
+namespace Umbraco.Cms.ManagementApi.Controllers.ModelsBuilder;
 
 public class GetModelsBuilderController : ModelsBuilderControllerBase
 {
     private readonly IModelsBuilderViewModelFactory _modelsBuilderViewModelFactory;
 
     public GetModelsBuilderController(IModelsBuilderViewModelFactory modelsBuilderViewModelFactory) => _modelsBuilderViewModelFactory = modelsBuilderViewModelFactory;
 
-    [HttpGet]
+    [HttpGet("dashboard")]
     [ProducesResponseType(typeof(CreatedResult), StatusCodes.Status200OK)]
     [MapToApiVersion("1.0")]
     public async Task<ActionResult<ModelsBuilderViewModel>> GetDashboard() => await Task.FromResult(Ok(_modelsBuilderViewModelFactory.Create()));

src/Umbraco.Cms.ManagementApi/Controllers/ModelsBuilderDashboard/ModelsBuilderControllerBase.cs → src/Umbraco.Cms.ManagementApi/Controllers/ModelsBuilder/ModelsBuilderControllerBase.cs

@@ -2,11 +2,11 @@
 using NSwag.Annotations;
 using Umbraco.New.Cms.Web.Common.Routing;
 
-namespace Umbraco.Cms.ManagementApi.Controllers.ModelsBuilderDashboard;
+namespace Umbraco.Cms.ManagementApi.Controllers.ModelsBuilder;
 
 [ApiController]
 [VersionedApiBackOfficeRoute("models-builder")]
-[OpenApiTag("ModelsBuilder")]
+[OpenApiTag("Models Builder")]
 [ApiVersion("1.0")]
 
 public class ModelsBuilderControllerBase : ManagementApiControllerBase

src/Umbraco.Cms.ManagementApi/Controllers/ModelsBuilderDashboard/StatusModelsBuilderController.cs → src/Umbraco.Cms.ManagementApi/Controllers/ModelsBuilder/StatusModelsBuilderController.cs

@@ -5,7 +5,7 @@
 using Umbraco.Cms.ManagementApi.ViewModels.ModelsBuilderDashboard;
 using Umbraco.New.Cms.Core.Models;
 
-namespace Umbraco.Cms.ManagementApi.Controllers.ModelsBuilderDashboard;
+namespace Umbraco.Cms.ManagementApi.Controllers.ModelsBuilder;
 
 public class StatusModelsBuilderController : ModelsBuilderControllerBase
 {

src/Umbraco.Cms.ManagementApi/Controllers/PartialView/Tree/ItemsPartialViewTreeController.cs

@@ -12,7 +12,7 @@ public ItemsPartialViewTreeController(FileSystems fileSystems)
     {
     }
 
-    [HttpGet("items")]
+    [HttpGet("item")]
     [MapToApiVersion("1.0")]
     [ProducesResponseType(typeof(IEnumerable<FileSystemTreeItemViewModel>), StatusCodes.Status200OK)]
     public async Task<ActionResult<IEnumerable<FileSystemTreeItemViewModel>>> Items([FromQuery(Name = "path")] string[] paths)

src/Umbraco.Cms.ManagementApi/Controllers/PartialView/Tree/PartialViewTreeControllerBase.cs

@@ -9,8 +9,8 @@ namespace Umbraco.Cms.ManagementApi.Controllers.PartialView.Tree;
 
 [ApiVersion("1.0")]
 [ApiController]
-[VersionedApiBackOfficeRoute($"{Constants.UdiEntityType.PartialView}/tree")]
-[OpenApiTag(nameof(Constants.UdiEntityType.PartialView))]
+[VersionedApiBackOfficeRoute($"tree/{Constants.UdiEntityType.PartialView}")]
+[OpenApiTag("Partial View")]
 public class PartialViewTreeControllerBase : FileSystemTreeControllerBase
 {
     public PartialViewTreeControllerBase(FileSystems fileSystems)

src/Umbraco.Cms.ManagementApi/Controllers/PublishedCache/PublishedCacheControllerBase.cs

@@ -7,7 +7,7 @@ namespace Umbraco.Cms.ManagementApi.Controllers.PublishedCache;
 [ApiVersion("1.0")]
 [ApiController]
 [VersionedApiBackOfficeRoute("published-cache")]
-[OpenApiTag("PublishedCache")]
+[OpenApiTag("Published Cache")]
 public class PublishedCacheControllerBase : ManagementApiControllerBase
 {
 }

src/Umbraco.Cms.ManagementApi/Controllers/Relation/ByChildRelationController.cs

@@ -22,7 +22,7 @@ public ByChildRelationController(
         _relationViewModelFactory = relationViewModelFactory;
     }
 
-    [HttpGet("child-relations/{childId:int}")]
+    [HttpGet("child-relation/{childId:int}")]
     [MapToApiVersion("1.0")]
     [ProducesResponseType(typeof(PagedViewModel<RelationViewModel>), StatusCodes.Status200OK)]
     public async Task<PagedViewModel<RelationViewModel>> ByChild(int childId, int skip, int take, string? relationTypeAlias = "")