From 2ba3eb436cb3341b08d5f4f160deec6e237c1dbf Mon Sep 17 00:00:00 2001 From: Bjarke Berg Date: Wed, 17 Feb 2021 12:00:57 +0100 Subject: [PATCH] Fixed up small findings in refiew.. - Uses ILogger instead of ILoggerFactory - Uses the GetControllerName extension - Fixes views --- .../Routing/ControllerActionSearcherTests.cs | 7 ++----- .../Routing/UmbracoRouteValueTransformerTests.cs | 4 ++-- .../Trees/ApplicationTreeController.cs | 3 +-- src/Umbraco.Web.Common/Controllers/RenderController.cs | 8 +++----- .../Controllers/UmbracoPageController.cs | 4 ++-- .../Views/Partials/grid/editors/embed.cshtml | 4 ++-- .../Views/Partials/grid/editors/macro.cshtml | 2 +- 7 files changed, 13 insertions(+), 19 deletions(-) diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Web.Website/Routing/ControllerActionSearcherTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Web.Website/Routing/ControllerActionSearcherTests.cs index 7c96738a1e..9382621c99 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Web.Website/Routing/ControllerActionSearcherTests.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Web.Website/Routing/ControllerActionSearcherTests.cs @@ -3,15 +3,12 @@ using System.Linq; using System.Reflection; using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; -using Microsoft.AspNetCore.Mvc.Abstractions; using Microsoft.AspNetCore.Mvc.Controllers; using Microsoft.AspNetCore.Mvc.Infrastructure; using Microsoft.AspNetCore.Mvc.ViewEngines; using Microsoft.AspNetCore.Routing; -using Microsoft.Extensions.FileProviders; using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging.Abstractions; -using Microsoft.Extensions.Primitives; using Moq; using NUnit.Framework; using Umbraco.Core; @@ -53,8 +50,8 @@ namespace Umbraco.Tests.UnitTests.Umbraco.Web.Website.Routing private class Render2Controller : RenderController { - public Render2Controller(ILoggerFactory loggerFactory, ICompositeViewEngine compositeViewEngine, IUmbracoContextAccessor umbracoContextAccessor) - : base(loggerFactory, compositeViewEngine, umbracoContextAccessor) + public Render2Controller(ILogger logger, ICompositeViewEngine compositeViewEngine, IUmbracoContextAccessor umbracoContextAccessor) + : base(logger, compositeViewEngine, umbracoContextAccessor) { } } diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Web.Website/Routing/UmbracoRouteValueTransformerTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Web.Website/Routing/UmbracoRouteValueTransformerTests.cs index 5dbbb87813..9d7560060d 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Web.Website/Routing/UmbracoRouteValueTransformerTests.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Web.Website/Routing/UmbracoRouteValueTransformerTests.cs @@ -188,8 +188,8 @@ namespace Umbraco.Tests.UnitTests.Umbraco.Web.Website.Routing private class TestController : RenderController { - public TestController(ILoggerFactory loggerFactory, ICompositeViewEngine compositeViewEngine, IUmbracoContextAccessor umbracoContextAccessor) - : base(loggerFactory, compositeViewEngine, umbracoContextAccessor) + public TestController(ILogger logger, ICompositeViewEngine compositeViewEngine, IUmbracoContextAccessor umbracoContextAccessor) + : base(logger, compositeViewEngine, umbracoContextAccessor) { } } diff --git a/src/Umbraco.Web.BackOffice/Trees/ApplicationTreeController.cs b/src/Umbraco.Web.BackOffice/Trees/ApplicationTreeController.cs index c938dced9d..36eddd0d32 100644 --- a/src/Umbraco.Web.BackOffice/Trees/ApplicationTreeController.cs +++ b/src/Umbraco.Web.BackOffice/Trees/ApplicationTreeController.cs @@ -325,8 +325,7 @@ namespace Umbraco.Web.BackOffice.Trees // note: this is all required in order to execute the auth-filters for the sub request, we // need to "trick" mvc into thinking that it is actually executing the proxied controller. - // TODO: We have a method for this: ControllerExtensions.GetControllerName - var controllerName = controllerType.Name.Substring(0, controllerType.Name.Length - 10); // remove controller part of name; + var controllerName = ControllerExtensions.GetControllerName(controllerType); // create proxy route data specifying the action & controller to execute var routeData = new RouteData(new RouteValueDictionary() diff --git a/src/Umbraco.Web.Common/Controllers/RenderController.cs b/src/Umbraco.Web.Common/Controllers/RenderController.cs index bfa129df25..a1453ee6cd 100644 --- a/src/Umbraco.Web.Common/Controllers/RenderController.cs +++ b/src/Umbraco.Web.Common/Controllers/RenderController.cs @@ -3,11 +3,9 @@ using System.Threading.Tasks; using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc.Filters; using Microsoft.AspNetCore.Mvc.ViewEngines; -using Microsoft.AspNetCore.Routing; using Microsoft.Extensions.Logging; using Umbraco.Web.Common.ActionsResults; using Umbraco.Web.Common.Filters; -using Umbraco.Web.Common.Routing; using Umbraco.Web.Models; using Umbraco.Web.Routing; @@ -27,10 +25,10 @@ namespace Umbraco.Web.Common.Controllers /// /// Initializes a new instance of the class. /// - public RenderController(ILoggerFactory loggerFactory, ICompositeViewEngine compositeViewEngine, IUmbracoContextAccessor umbracoContextAccessor) - : base(loggerFactory, compositeViewEngine) + public RenderController(ILogger logger, ICompositeViewEngine compositeViewEngine, IUmbracoContextAccessor umbracoContextAccessor) + : base(logger, compositeViewEngine) { - _logger = loggerFactory.CreateLogger(); + _logger = logger; _umbracoContextAccessor = umbracoContextAccessor; } diff --git a/src/Umbraco.Web.Common/Controllers/UmbracoPageController.cs b/src/Umbraco.Web.Common/Controllers/UmbracoPageController.cs index bc0181412e..33fa4ca53e 100644 --- a/src/Umbraco.Web.Common/Controllers/UmbracoPageController.cs +++ b/src/Umbraco.Web.Common/Controllers/UmbracoPageController.cs @@ -20,9 +20,9 @@ namespace Umbraco.Web.Common.Controllers /// /// Initializes a new instance of the class. /// - protected UmbracoPageController(ILoggerFactory loggerFactory, ICompositeViewEngine compositeViewEngine) + protected UmbracoPageController(ILogger logger, ICompositeViewEngine compositeViewEngine) { - _logger = loggerFactory.CreateLogger(); + _logger = logger; _compositeViewEngine = compositeViewEngine; } diff --git a/src/Umbraco.Web.UI.NetCore/Views/Partials/grid/editors/embed.cshtml b/src/Umbraco.Web.UI.NetCore/Views/Partials/grid/editors/embed.cshtml index dfb7399ef9..39ba997194 100644 --- a/src/Umbraco.Web.UI.NetCore/Views/Partials/grid/editors/embed.cshtml +++ b/src/Umbraco.Web.UI.NetCore/Views/Partials/grid/editors/embed.cshtml @@ -1,5 +1,5 @@ -@ using Umbraco.Core -@inherits UmbracoViewPage +@using Umbraco.Core +@inherits Umbraco.Web.Common.Views.UmbracoViewPage @{ string embedValue = Convert.ToString(Model.value); diff --git a/src/Umbraco.Web.UI.NetCore/Views/Partials/grid/editors/macro.cshtml b/src/Umbraco.Web.UI.NetCore/Views/Partials/grid/editors/macro.cshtml index ee24207e5d..6cbc5c49cd 100644 --- a/src/Umbraco.Web.UI.NetCore/Views/Partials/grid/editors/macro.cshtml +++ b/src/Umbraco.Web.UI.NetCore/Views/Partials/grid/editors/macro.cshtml @@ -1,4 +1,4 @@ -@inherits UmbracoViewPage +@inherits Umbraco.Web.Common.Views.UmbracoViewPage @if (Model.value != null) {