Relocated "ViewExists" method to "ViewHelper" class.

Removed the ViewEnginesCollectionExtensions class.

Author: leekelleher

src/Our.Umbraco.DocTypeGridEditor/Extensions/ViewEnginesCollectionExtensions.cs

@@ -96,7 +96,6 @@
   <ItemGroup>
     <Compile Include="Bootstrap.cs" />
     <Compile Include="Extensions\JsonExtensions.cs" />
-    <Compile Include="Extensions\ViewEnginesCollectionExtensions.cs" />
     <Compile Include="Helpers\DocTypeGridEditorHelper.cs" />
     <Compile Include="Helpers\XmlHelper.cs" />
     <Compile Include="Models\DetachedPublishedContent.cs" />

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

@@ -1,6 +1,7 @@
 using System;
 using System.Web.Mvc;
 using Our.Umbraco.DocTypeGridEditor.Extensions;
+using Our.Umbraco.DocTypeGridEditor.Web.Helpers;
 using Umbraco.Core;
 using Umbraco.Core.Models;
 using Umbraco.Web.Mvc;
@@ -53,14 +54,14 @@ protected override PartialViewResult PartialView(string viewName, object model)
             if (IsPreview && string.IsNullOrWhiteSpace(PreviewViewPath) == false)
             {
                 var previewViewPath = GetFullViewPath(viewName, PreviewViewPath);
-                if (ViewEngines.Engines.ViewExists(ControllerContext, previewViewPath, true))
+                if (ViewHelper.ViewExists(ControllerContext, previewViewPath, true))
                     return base.PartialView(previewViewPath, model);
             }
 
             if (string.IsNullOrWhiteSpace(ViewPath) == false)
             {
                 var viewPath = GetFullViewPath(viewName, ViewPath);
-                if (ViewEngines.Engines.ViewExists(ControllerContext, viewPath, true))
+                if (ViewHelper.ViewExists(ControllerContext, viewPath, true))
                     return base.PartialView(viewPath, model);
             }
 

src/Our.Umbraco.DocTypeGridEditor/Web/Controllers/DocTypeGridEditorSurfaceController.cs

@@ -90,19 +90,19 @@ public static HtmlString RenderDocTypeGridEditorItem(
                 && isPreview)
             {
                 var fullPreviewViewPath = $"{previewViewPath}{editorAlias}.cshtml";
-                if (ViewEngines.Engines.ViewExists(helper.ViewContext, fullPreviewViewPath, true))
+                if (ViewHelper.ViewExists(helper.ViewContext, fullPreviewViewPath, true))
                 {
                     return helper.Partial(fullPreviewViewPath, content);
                 }
 
                 fullPreviewViewPath = $"{previewViewPath}{content.DocumentTypeAlias}.cshtml";
-                if (ViewEngines.Engines.ViewExists(helper.ViewContext, fullPreviewViewPath, true))
+                if (ViewHelper.ViewExists(helper.ViewContext, fullPreviewViewPath, true))
                 {
                     return helper.Partial(fullPreviewViewPath, content);
                 }
 
                 fullPreviewViewPath = $"{previewViewPath}Default.cshtml";
-                if (ViewEngines.Engines.ViewExists(helper.ViewContext, fullPreviewViewPath, true))
+                if (ViewHelper.ViewExists(helper.ViewContext, fullPreviewViewPath, true))
                 {
                     return helper.Partial(fullPreviewViewPath, content);
                 }
@@ -112,26 +112,26 @@ public static HtmlString RenderDocTypeGridEditorItem(
             if (string.IsNullOrWhiteSpace(viewPath) == false)
             {
                 var fullViewPath = $"{viewPath}{editorAlias}.cshtml";
-                if (ViewEngines.Engines.ViewExists(helper.ViewContext, fullViewPath, true))
+                if (ViewHelper.ViewExists(helper.ViewContext, fullViewPath, true))
                 {
                     return helper.Partial(fullViewPath, content);
                 }
 
                 fullViewPath = $"{viewPath}{content.DocumentTypeAlias}.cshtml";
-                if (ViewEngines.Engines.ViewExists(helper.ViewContext, fullViewPath, true))
+                if (ViewHelper.ViewExists(helper.ViewContext, fullViewPath, true))
                 {
                     return helper.Partial(fullViewPath, content);
                 }
 
                 fullViewPath = $"{viewPath}Default.cshtml";
-                if (ViewEngines.Engines.ViewExists(helper.ViewContext, fullViewPath, true))
+                if (ViewHelper.ViewExists(helper.ViewContext, fullViewPath, true))
                 {
                     return helper.Partial(fullViewPath, content);
                 }
             }
 
             // Resort to standard partial views
-            if (ViewEngines.Engines.ViewExists(helper.ViewContext, editorAlias, true))
+            if (ViewHelper.ViewExists(helper.ViewContext, editorAlias, true))
             {
                 return helper.Partial(editorAlias, content);
             }

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

@@ -10,7 +10,7 @@ internal static class ViewHelper
     {
         private class DummyController : Controller { }
 
-        internal static string RenderPartial(string partialName, object model, HttpContextBase httpContext = null)
+        public static string RenderPartial(string partialName, object model, HttpContextBase httpContext = null)
         {
             using (var sw = new StringWriter())
             {
@@ -34,5 +34,17 @@ internal static string RenderPartial(string partialName, object model, HttpConte
                 return sw.ToString();
             }
         }
+
+        public static bool ViewExists(ControllerContext controllerContext, string viewName, bool isPartial = false)
+        {
+            var result = isPartial == false
+                ? ViewEngines.Engines.FindView(controllerContext, viewName, null)
+                : ViewEngines.Engines.FindPartialView(controllerContext, viewName);
+
+            if (result.View != null)
+                return true;
+
+            return false;
+        }
     }
 }