Gets virtual page routing working, now just need to document.
This commit is contained in:
@@ -1,4 +1,3 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Threading.Tasks;
|
||||
using Microsoft.AspNetCore.Mvc;
|
||||
@@ -6,7 +5,6 @@ using Microsoft.AspNetCore.Mvc.Filters;
|
||||
using Microsoft.AspNetCore.Mvc.ViewEngines;
|
||||
using Microsoft.AspNetCore.Routing;
|
||||
using Microsoft.Extensions.Logging;
|
||||
using Umbraco.Core.Models.PublishedContent;
|
||||
using Umbraco.Web.Common.ActionsResults;
|
||||
using Umbraco.Web.Common.Filters;
|
||||
using Umbraco.Web.Common.Routing;
|
||||
@@ -15,107 +13,32 @@ using Umbraco.Web.Routing;
|
||||
|
||||
namespace Umbraco.Web.Common.Controllers
|
||||
{
|
||||
|
||||
/// <summary>
|
||||
/// Represents the default front-end rendering controller.
|
||||
/// </summary>
|
||||
[ModelBindingException]
|
||||
[PublishedRequestFilter]
|
||||
public class RenderController : UmbracoController, IRenderController
|
||||
public class RenderController : UmbracoPageController, IRenderController
|
||||
{
|
||||
private readonly ILogger<RenderController> _logger;
|
||||
private readonly ICompositeViewEngine _compositeViewEngine;
|
||||
private readonly IUmbracoContextAccessor _umbracoContextAccessor;
|
||||
private UmbracoRouteValues _umbracoRouteValues;
|
||||
|
||||
/// <summary>
|
||||
/// Initializes a new instance of the <see cref="RenderController"/> class.
|
||||
/// </summary>
|
||||
public RenderController(ILogger<RenderController> logger, ICompositeViewEngine compositeViewEngine, IUmbracoContextAccessor umbracoContextAccessor)
|
||||
public RenderController(ILoggerFactory loggerFactory, ICompositeViewEngine compositeViewEngine, IUmbracoContextAccessor umbracoContextAccessor)
|
||||
: base(loggerFactory, compositeViewEngine)
|
||||
{
|
||||
_logger = logger;
|
||||
_compositeViewEngine = compositeViewEngine;
|
||||
_logger = loggerFactory.CreateLogger<RenderController>();
|
||||
_umbracoContextAccessor = umbracoContextAccessor;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Gets the current content item.
|
||||
/// </summary>
|
||||
protected IPublishedContent CurrentPage
|
||||
{
|
||||
get
|
||||
{
|
||||
if (!UmbracoRouteValues.PublishedRequest.HasPublishedContent())
|
||||
{
|
||||
// This will never be accessed this way since the controller will handle redirects and not founds
|
||||
// before this can be accessed but we need to be explicit.
|
||||
throw new InvalidOperationException("There is no published content found in the request");
|
||||
}
|
||||
|
||||
return UmbracoRouteValues.PublishedRequest.PublishedContent;
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Gets the umbraco context
|
||||
/// </summary>
|
||||
protected IUmbracoContext UmbracoContext => _umbracoContextAccessor.UmbracoContext;
|
||||
|
||||
/// <summary>
|
||||
/// Gets the <see cref="UmbracoRouteValues"/>
|
||||
/// </summary>
|
||||
protected UmbracoRouteValues UmbracoRouteValues
|
||||
{
|
||||
get
|
||||
{
|
||||
if (_umbracoRouteValues != null)
|
||||
{
|
||||
return _umbracoRouteValues;
|
||||
}
|
||||
|
||||
_umbracoRouteValues = HttpContext.Features.Get<UmbracoRouteValues>();
|
||||
|
||||
if (_umbracoRouteValues == null)
|
||||
{
|
||||
throw new InvalidOperationException($"No {nameof(UmbracoRouteValues)} feature was found in the HttpContext");
|
||||
}
|
||||
|
||||
return _umbracoRouteValues;
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Ensures that a physical view file exists on disk.
|
||||
/// </summary>
|
||||
/// <param name="template">The view name.</param>
|
||||
protected bool EnsurePhsyicalViewExists(string template)
|
||||
{
|
||||
ViewEngineResult result = _compositeViewEngine.FindView(ControllerContext, template, false);
|
||||
if (result.View != null)
|
||||
{
|
||||
return true;
|
||||
}
|
||||
|
||||
_logger.LogWarning("No physical template file was found for template {Template}", template);
|
||||
return false;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Gets an action result based on the template name found in the route values and a model.
|
||||
/// </summary>
|
||||
/// <typeparam name="T">The type of the model.</typeparam>
|
||||
/// <param name="model">The model.</param>
|
||||
/// <returns>The action result.</returns>
|
||||
/// <exception cref="InvalidOperationException">If the template found in the route values doesn't physically exist and exception is thrown</exception>
|
||||
protected IActionResult CurrentTemplate<T>(T model)
|
||||
{
|
||||
if (EnsurePhsyicalViewExists(UmbracoRouteValues.TemplateName) == false)
|
||||
{
|
||||
throw new InvalidOperationException("No physical template file was found for template " + UmbracoRouteValues.TemplateName);
|
||||
}
|
||||
|
||||
return View(UmbracoRouteValues.TemplateName, model);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// The default action to render the front-end view.
|
||||
/// </summary>
|
||||
|
||||
Reference in New Issue
Block a user