Refactored the SurfaceControllerExists

as UmbracoHelper was being not used nor required.

Author: leekelleher

src/Our.Umbraco.DocTypeGridEditor/Our.Umbraco.DocTypeGridEditor.csproj

@@ -237,7 +237,7 @@
     <Compile Include="Extensions\ContentTypeServiceExtensions.cs" />
     <Compile Include="Web\Controllers\DocTypeGridEditorSurfaceController.cs" />
     <Compile Include="Web\Extensions\HtmlHelperExtensions.cs" />
-    <Compile Include="Web\Extensions\UmbracoHelperExtensions.cs" />
+    <Compile Include="Web\Helpers\SurfaceControllerHelper.cs" />
     <Compile Include="Web\Mvc\DefaultDocTypeGridEditorSurfaceControllerResolver.cs" />
   </ItemGroup>
   <ItemGroup>

src/Our.Umbraco.DocTypeGridEditor/Web/Extensions/HtmlHelperExtensions.cs

@@ -2,6 +2,7 @@
 using System.Web.Mvc;
 using System.Web.Mvc.Html;
 using Our.Umbraco.DocTypeGridEditor.Extensions;
+using Our.Umbraco.DocTypeGridEditor.Web.Helpers;
 using Our.Umbraco.DocTypeGridEditor.Web.Mvc;
 using Umbraco.Core;
 using Umbraco.Core.Models;
@@ -11,7 +12,8 @@ namespace Our.Umbraco.DocTypeGridEditor.Web.Extensions
 {
     public static class HtmlHelperExtensions
     {
-        public static HtmlString RenderDocTypeGridEditorItem(this HtmlHelper helper,
+        public static HtmlString RenderDocTypeGridEditorItem(
+            this HtmlHelper helper,
             IPublishedContent content,
             string editorAlias = "",
             string viewPath = "",
@@ -28,10 +30,8 @@ public static HtmlString RenderDocTypeGridEditorItem(this HtmlHelper helper,
             if (!string.IsNullOrWhiteSpace(previewViewPath))
                 previewViewPath = previewViewPath.TrimEnd('/') + "/";
 
-            var umbracoHelper = new UmbracoHelper(UmbracoContext.Current);
-
             // Try looking for surface controller with action named after the editor alias
-            if (!editorAlias.IsNullOrWhiteSpace() && umbracoHelper.SurfaceControllerExists(controllerName, editorAlias, true))
+            if (!editorAlias.IsNullOrWhiteSpace() && SurfaceControllerHelper.SurfaceControllerExists(controllerName, editorAlias, true))
             {
                 return helper.Action(editorAlias, controllerName, new
                 {
@@ -42,7 +42,7 @@ public static HtmlString RenderDocTypeGridEditorItem(this HtmlHelper helper,
             }
 
             // Try looking for surface controller with action named after the doc type alias alias
-            if (umbracoHelper.SurfaceControllerExists(controllerName, content.DocumentTypeAlias, true))
+            if (SurfaceControllerHelper.SurfaceControllerExists(controllerName, content.DocumentTypeAlias, true))
             {
                 return helper.Action(content.DocumentTypeAlias, controllerName, new
                 {
@@ -59,7 +59,7 @@ public static HtmlString RenderDocTypeGridEditorItem(this HtmlHelper helper,
                 var defaultControllerName = defaultController.Name.Substring(0, defaultController.Name.LastIndexOf("Controller"));
 
                 // Try looking for an action named after the editor alias
-                if (!editorAlias.IsNullOrWhiteSpace() && umbracoHelper.SurfaceControllerExists(defaultControllerName, editorAlias, true))
+                if (!editorAlias.IsNullOrWhiteSpace() && SurfaceControllerHelper.SurfaceControllerExists(defaultControllerName, editorAlias, true))
                 {
                     return helper.Action(editorAlias, defaultControllerName, new
                     {
@@ -70,7 +70,7 @@ public static HtmlString RenderDocTypeGridEditorItem(this HtmlHelper helper,
                 }
 
                 // Try looking for a doc type alias action
-                if (umbracoHelper.SurfaceControllerExists(defaultControllerName, content.DocumentTypeAlias, true))
+                if (SurfaceControllerHelper.SurfaceControllerExists(defaultControllerName, content.DocumentTypeAlias, true))
                 {
                     return helper.Action(content.DocumentTypeAlias, defaultControllerName, new
                     {

…eb/Extensions/UmbracoHelperExtensions.cs …r/Web/Helpers/SurfaceControllerHelper.cssrc/Our.Umbraco.DocTypeGridEditor/Web/Extensions/UmbracoHelperExtensions.cs renamed to src/Our.Umbraco.DocTypeGridEditor/Web/Helpers/SurfaceControllerHelper.cs src/Our.Umbraco.DocTypeGridEditor/Web/Extensions/UmbracoHelperExtensions.cs renamed to src/Our.Umbraco.DocTypeGridEditor/Web/Helpers/SurfaceControllerHelper.cs

@@ -8,13 +8,13 @@
 using Umbraco.Web;
 using Umbraco.Web.Mvc;
 
-namespace Our.Umbraco.DocTypeGridEditor.Web.Extensions
+namespace Our.Umbraco.DocTypeGridEditor.Web.Helpers
 {
-    internal static class UmbracoHelperExtensions
+    internal static class SurfaceControllerHelper
     {
-        public static bool SurfaceControllerExists(this UmbracoHelper helper, string controllerName, string actionName = "Index")
+        public static bool SurfaceControllerExists(string controllerName, string actionName = "Index")
         {
-            using (var timer = DisposableTimer.DebugDuration<UmbracoHelper>(string.Format("SurfaceControllerExists ({0}, {1})", controllerName, actionName)))
+            using (var timer = DisposableTimer.DebugDuration<Bootstrap>(string.Format("SurfaceControllerExists ({0}, {1})", controllerName, actionName)))
             {
                 // Setup dummy route data
                 var rd = new RouteData();
@@ -64,14 +64,14 @@ public static bool SurfaceControllerExists(this UmbracoHelper helper, string con
             }
         }
 
-        public static bool SurfaceControllerExists(this UmbracoHelper helper, string name, string actionName = "Index", bool cacheResult = true)
+        public static bool SurfaceControllerExists(string name, string actionName = "Index", bool cacheResult = true)
         {
             if (!cacheResult)
-                return SurfaceControllerExists(helper, name, actionName);
+                return SurfaceControllerExists(name, actionName);
 
             return (bool)ApplicationContext.Current.ApplicationCache.RuntimeCache.GetCacheItem(
-                string.Join("_", new[] { "Our.Umbraco.Mortar.Web.Extensions.UmbracoHelperExtensions.SurfaceControllerExists", name, actionName }),
-                () => SurfaceControllerExists(helper, name, actionName));
+                string.Join("_", new[] { "Our.Umbraco.DocTypeGridEditor.Web.Helpers.SurfaceControllerHelper.SurfaceControllerExists", name, actionName }),
+                () => SurfaceControllerExists(name, actionName));
         }
     }
 }