Merge remote-tracking branch 'origin/dev' into issue/OSOE-751

Lombiq · Feb 5, 2024 · 54b9865 · 54b9865
2 parents 00fb9f5 + 5c6e645
commit 54b9865
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 13 deletions.
diff --git a/Lombiq.JsonEditor/Controllers/AdminController.cs b/Lombiq.JsonEditor/Controllers/AdminController.cs
@@ -1,6 +1,7 @@
 using AngleSharp.Common;
 using Lombiq.HelpfulLibraries.OrchardCore.Contents;
 using Lombiq.HelpfulLibraries.OrchardCore.DependencyInjection;
+using Lombiq.HelpfulLibraries.OrchardCore.Mvc;
 using Lombiq.JsonEditor.ViewModels;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
@@ -57,6 +58,7 @@ public class AdminController : Controller
         H = services.HtmlLocalizer.Value;
     }
 
+    [AdminRoute("Contents/ContentItems/{contentItemId}/Edit/Json")]
     public async Task<IActionResult> Edit(string contentItemId)
     {
         if (string.IsNullOrWhiteSpace(contentItemId) ||

diff --git a/Lombiq.JsonEditor/Startup.cs b/Lombiq.JsonEditor/Startup.cs
@@ -1,12 +1,11 @@
 using Lombiq.HelpfulLibraries.OrchardCore.DependencyInjection;
+using Lombiq.HelpfulLibraries.OrchardCore.Mvc;
 using Lombiq.JsonEditor.Constants;
 using Lombiq.JsonEditor.Drivers;
 using Lombiq.JsonEditor.Fields;
 using Lombiq.JsonEditor.Services;
 using Lombiq.JsonEditor.Settings;
 using Lombiq.JsonEditor.TagHelpers;
-using Microsoft.AspNetCore.Builder;
-using Microsoft.AspNetCore.Routing;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Options;
 using OrchardCore.Admin;
@@ -15,11 +14,7 @@
 using OrchardCore.Contents.Controllers;
 using OrchardCore.ContentTypes.Editors;
 using OrchardCore.Modules;
-using OrchardCore.Mvc.Core.Utilities;
 using OrchardCore.ResourceManagement;
-using System;
-
-using AdminController = Lombiq.JsonEditor.Controllers.AdminController;
 
 namespace Lombiq.JsonEditor;
 
@@ -48,12 +43,6 @@ public override void ConfigureServices(IServiceCollection services)
         services.AddOrchardServices();
         services.AddScoped<ApiController>();
         services.AddContentSecurityPolicyProvider<JsonEditorContentSecurityPolicyProvider>();
+        AdminRouteAttributeRouteMapper.AddToServices(services);
     }
-
-    public override void Configure(IApplicationBuilder app, IEndpointRouteBuilder routes, IServiceProvider serviceProvider) =>
-        routes.MapAreaControllerRoute(
-            name: "EditContentItem",
-            areaName: FeatureIds.Area,
-            pattern: _adminOptions.AdminUrlPrefix + "/Contents/ContentItems/{contentItemId}/Edit/Json",
-            defaults: new { controller = typeof(AdminController).ControllerName(), action = nameof(AdminController.Edit) });
 }