fix viewhelper

Author: skttl

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

@@ -106,10 +106,10 @@ public static IHtmlContent RenderDocTypeGridEditorItem(
             if (string.IsNullOrWhiteSpace(viewPath) == false)
             {
                 var fullViewPath = $"{viewPath}{editorAlias}.cshtml";
-                //if (ViewHelper.ViewExists(helper.ViewContext, fullViewPath, true))
-                //{
-                //    return helper.PartialAsync(fullViewPath, content).Result;
-                //}
+                if (ViewHelper.ViewExists(helper.ViewContext, fullViewPath, true))
+                {
+                    return helper.PartialAsync(fullViewPath, content).Result;
+                }
 
                 fullViewPath = $"{viewPath}{content.ContentType.Alias}.cshtml";
                 if (ViewHelper.ViewExists(helper.ViewContext, fullViewPath, true))

src/Our.Umbraco.DocTypeGridEditor9/Web/Helpers/ViewHelper.cs

@@ -16,64 +16,11 @@ namespace Our.Umbraco.DocTypeGridEditor9.Web.Helpers
 {
     internal static class ViewHelper
     {
-        private class DummyController : Controller { }
-
-        public static string RenderPartial(string partialName, object model, HttpContext httpContext = null, IUmbracoContext umbracoContext = null)
-        {
-            using (var sw = new StringWriter())
-            {
-                if (httpContext == null)
-                    return null;
-                // TODO: Can we make a HttpContext?
-                // httpContext = new HttpContextWrapper(HttpContext.Current);
-
-                if (umbracoContext == null)
-                    return null;
-                // TODO: Can we get the UmbracoContext?
-                // umbracoContext = Current.UmbracoContext;
-
-                return null;
-                /*
-                 * TODO: Don't know how to do the rest
-                var routeData = new RouteData();
-                routeData.Values.Add("controller", "DummyController");
-
-                if (umbracoContext.PublishedRequest != null)
-                {
-                    routeData.DataTokens[Constants.UmbracoRouteDefinitionDataToken] = new RouteDefinition
-                    {
-                        PublishedRequest = umbracoContext.PublishedRequest
-                    };
-                }
-
-                var controllerContext = new ControllerContext(new RequestContext(httpContext, routeData), new DummyController());
-
-                var viewResult = ViewEngines.Engines.FindPartialView(controllerContext, partialName);
-                if (viewResult.View == null)
-                {
-                    Current.Logger.Warn(typeof(ViewHelper), $"No view found for partial '{partialName}'");
-                    return null;
-                }
-
-                viewResult.View.Render(new ViewContext(controllerContext, viewResult.View, new ViewDataDictionary { Model = model }, new TempDataDictionary(), sw), sw);
-
-                return sw.ToString();
-                */
-            }
-        }
-
         public static bool ViewExists(ViewContext viewContext, string viewName, bool isPartial = false)
         {
-            /* TODO: This doesn't work
-            var result = isPartial == false
-                ? viewContext..Engines.FindView(viewContext, viewName, null)
-                : ViewEngines.Engines.FindPartialView(viewContext, viewName);
-
-            if (result.View != null)
-                return true;
-
-            return false;*/
-            return true;
+            var viewEngine = viewContext.HttpContext.RequestServices.GetRequiredService<ICompositeViewEngine>();
+            var result = viewEngine.GetView(null, viewName, true).Success || viewEngine.GetView(null, viewName, false).Success;
+            return result;
         }
     }
 }

src/Our.Umbraco.DocTypeGridEditor9/Web/UI/App_Plugins/DocTypeGridEditor/package.manifest

@@ -5,11 +5,11 @@
       "alias": "docType",
       "view": "/App_Plugins/DocTypeGridEditor/Views/doctypegrideditor.html",
       "render": "/App_Plugins/DocTypeGridEditor/Render/DocTypeGridEditor.cshtml",
-      "icon": "icon-item-arrangement",
+      "icon": "icon-science",
       "config": {
         "allowedDocTypes": [],
         "nameTemplate": "",
-        "enablePreview": false,
+        "enablePreview": true,
         "viewPath": "/Views/Partials/Grid/Editors/DocTypeGridEditor/",
         "previewViewPath": "/Views/Partials/Grid/Editors/DocTypeGridEditor/Previews/",
         "previewCssFilePath": "",