refactor: abstract controller logic

Author: jcdcdev

src/Umbraco.Community.SimpleTrees.TestSite/packages.lock.json

@@ -181,8 +181,8 @@
       },
       "jcdcdev.Umbraco.Core": {
         "type": "Transitive",
-        "resolved": "16.0.1",
-        "contentHash": "Bw1MR604hi623BdRsoVnd6SE6d886WNSnHy5Yb8TlLyXj5PumAclJCdOD7054OA6vQGKVYK7LhiERSFIDHm6yQ==",
+        "resolved": "16.1.0",
+        "contentHash": "zGLyOd4mMnVi9xfvzH4ITqqmbkc8wvdfiMp8hxPgkI8qLbIXkjaqApCi0yZXDeZg65YNiF12GeHnvrHbdihadQ==",
         "dependencies": {
           "Umbraco.Cms.Web.Common": "[16.0.0, 17.0.0)"
         }
@@ -2968,7 +2968,7 @@
           "Umbraco.Cms.Api.Common": "[16.0.0, 17.0.0)",
           "Umbraco.Cms.Api.Management": "[16.0.0, 17.0.0)",
           "Umbraco.Cms.Web.Website": "[16.0.0, 17.0.0)",
-          "jcdcdev.Umbraco.Core": "[16.0.1, 17.0.0)"
+          "jcdcdev.Umbraco.Core": "[16.1.0, 17.0.0)"
         }
       }
     }

src/Umbraco.Community.SimpleTrees/Umbraco.Community.SimpleTrees.csproj

@@ -26,7 +26,7 @@
 		<PackageReference Include="Umbraco.Cms.Api.Common" Version="[16.0.0,17.0.0)"/>
 		<PackageReference Include="Umbraco.Cms.Api.Management" Version="[16.0.0,17.0.0)"/>
 		<PackageReference Include="Umbraco.Cms.Web.Website" Version="[16.0.0,17.0.0)"/>
-		<PackageReference Include="jcdcdev.Umbraco.Core" Version="[16.0.1,17.0.0)"/>
+		<PackageReference Include="jcdcdev.Umbraco.Core" Version="[16.1.0,17.0.0)"/>
 	</ItemGroup>
 
 	<PropertyGroup Condition="'$(Configuration)' == 'Debug'">

src/Umbraco.Community.SimpleTrees/Web/Controllers/SimpleTreesController.cs

@@ -0,0 +1,61 @@
+using jcdcdev.Umbraco.Core.Extensions;
+using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Mvc.ViewEngines;
+using Microsoft.Extensions.Logging;
+using Umbraco.Cms.Api.Common.Attributes;
+using Umbraco.Cms.Api.Common.Filters;
+using Umbraco.Cms.Api.Management.Filters;
+using Umbraco.Cms.Web.Common.Authorization;
+using Umbraco.Community.SimpleTrees.Web.Models;
+
+namespace Umbraco.Community.SimpleTrees.Web.Controllers;
+
+[ApiExplorerSettings(GroupName = Constants.Api.GroupName)]
+[SimpleTreesVersionedRoute("tree")]
+[MapToApi(Constants.Api.ApiName)]
+[JsonOptionsName(Cms.Core.Constants.JsonOptionsNames.BackOffice)]
+[ApiController]
+[Authorize(Policy = AuthorizationPolicies.BackOfficeAccess)]
+[AppendEventMessages]
+[Produces("application/json")]
+public class SimpleTreesRenderController(ICompositeViewEngine viewEngine, ILogger<SimpleTreesRenderController> logger) : Controller
+{
+    [HttpGet("render")]
+    [Produces<SimpleTreeRenderModel>]
+    public async Task<IActionResult> Render(string unique, string entityType)
+    {
+        var model = new SimpleTreeViewModel(unique, entityType);
+        var path = model.ViewPath;
+        var result = viewEngine.GetView(null, path, false);
+        if (result.Success)
+        {
+            logger.LogDebug("Rendering view {ViewPath} for unique {Unique} and entity type {EntityType}", path, unique, entityType);
+            var partialViewResult = await this.RenderViewResultToStringAsync(result, model);
+            return Ok(SimpleTreeRenderModel.Create(partialViewResult));
+        }
+
+        var viewComponentName = model.ViewComponent;
+        if (!this.ViewComponentExists(viewComponentName))
+        {
+            logger.LogDebug("ViewComponent {ViewComponent} not found", viewComponentName);
+            return await ReturnError(model);
+        }
+
+        var viewComponentResult = await this.RenderViewComponentToStringAsync(viewComponentName, model);
+        logger.LogDebug("ViewComponent {ViewComponent} result for unique {Unique} and entity type {EntityType} {Body}", viewComponentName, unique, entityType, viewComponentResult);
+        return Ok(SimpleTreeRenderModel.Create(viewComponentResult));
+    }
+
+    private async Task<IActionResult> ReturnError(SimpleTreeViewModel viewModel)
+    {
+        var errorViewResult = viewEngine.GetView(null, Constants.ErrorViewPath, false);
+        if (errorViewResult.Success)
+        {
+            var body = await this.RenderViewResultToStringAsync(errorViewResult, viewModel);
+            return Ok(SimpleTreeRenderModel.Create(body));
+        }
+
+        return Ok(SimpleTreeRenderModel.Error);
+    }
+}

src/Umbraco.Community.SimpleTrees/Web/Controllers/SimpleTreesRenderController.cs

@@ -4,4 +4,14 @@ public class SimpleTreeRenderModel
 {
     public required string Body { get; set; }
     public static SimpleTreeRenderModel Error => new() { Body = Constants.ErrorView };
+
+    public static SimpleTreeRenderModel Create(string body)
+    {
+        if (string.IsNullOrWhiteSpace(body))
+        {
+            throw new ArgumentException("Body cannot be null or whitespace.", nameof(body));
+        }
+
+        return new SimpleTreeRenderModel { Body = body };
+    }
 }

src/Umbraco.Community.SimpleTrees/Web/Models/SimpleTreeRenderModel.cs

@@ -4,9 +4,9 @@
     "net9.0": {
       "jcdcdev.Umbraco.Core": {
         "type": "Direct",
-        "requested": "[16.0.1, 17.0.0)",
-        "resolved": "16.0.1",
-        "contentHash": "Bw1MR604hi623BdRsoVnd6SE6d886WNSnHy5Yb8TlLyXj5PumAclJCdOD7054OA6vQGKVYK7LhiERSFIDHm6yQ==",
+        "requested": "[16.1.0, 17.0.0)",
+        "resolved": "16.1.0",
+        "contentHash": "zGLyOd4mMnVi9xfvzH4ITqqmbkc8wvdfiMp8hxPgkI8qLbIXkjaqApCi0yZXDeZg65YNiF12GeHnvrHbdihadQ==",
         "dependencies": {
           "Umbraco.Cms.Web.Common": "[16.0.0, 17.0.0)"
         }