From a7c5bdafe4583628e20097f64967959287e72287 Mon Sep 17 00:00:00 2001
From: Bjarne Fyrstenborg <bjarne_fyrstenborg@hotmail.com>
Date: Tue, 22 Jun 2021 19:37:46 +0200
Subject: [PATCH] Render base grid editor partial async

---
 .../Views/Partials/grid/editors/base.cshtml   | 26 +++++++++++--------
 .../Views/Partials/grid/editors/media.cshtml  |  6 +++--
 .../Views/Partials/grid/editors/rte.cshtml    |  4 +--
 3 files changed, 21 insertions(+), 15 deletions(-)

diff --git a/src/Umbraco.Web.UI.NetCore/Views/Partials/grid/editors/base.cshtml b/src/Umbraco.Web.UI.NetCore/Views/Partials/grid/editors/base.cshtml
index d3cdf80f06..eca6381fd0 100644
--- a/src/Umbraco.Web.UI.NetCore/Views/Partials/grid/editors/base.cshtml
+++ b/src/Umbraco.Web.UI.NetCore/Views/Partials/grid/editors/base.cshtml
@@ -1,23 +1,27 @@
-@model dynamic
+@model dynamic
+
+@try
+{
+    string editor = EditorView(Model);
+    <text>@await Html.PartialAsync(editor, (object)Model)</text>
+}
+catch (Exception ex)
+{
+    <pre>@ex.ToString()</pre>
+}
+
+@functions{
 
-@functions {
     public static string EditorView(dynamic contentItem)
     {
         string view = contentItem.editor.render != null ? contentItem.editor.render.ToString() : contentItem.editor.view.ToString();
         view = view.ToLower().Replace(".html", ".cshtml");
 
-        if (!view.Contains("/")) {
+        if (!view.Contains("/"))
+        {
             view = "grid/editors/" + view;
         }
 
         return view;
     }
 }
-@try
-{
-    string editor = EditorView(Model);
-    <text>@Html.Partial(editor, (object)Model)</text>
-}
-catch (Exception ex) {
-<pre>@ex.ToString()</pre>
-}
diff --git a/src/Umbraco.Web.UI.NetCore/Views/Partials/grid/editors/media.cshtml b/src/Umbraco.Web.UI.NetCore/Views/Partials/grid/editors/media.cshtml
index 7e2d20fdbf..4cc31d0754 100644
--- a/src/Umbraco.Web.UI.NetCore/Views/Partials/grid/editors/media.cshtml
+++ b/src/Umbraco.Web.UI.NetCore/Views/Partials/grid/editors/media.cshtml
@@ -1,11 +1,13 @@
-@model dynamic
+@model dynamic
 @using Umbraco.Cms.Core.Media
 @using Umbraco.Cms.Core.PropertyEditors.ValueConverters
 @inject IImageUrlGenerator ImageUrlGenerator
 @if (Model.value != null)
 {
     var url = Model.value.image;
-    if(Model.editor.config != null && Model.editor.config.size != null){
+
+    if (Model.editor.config != null && Model.editor.config.size != null)
+    {
         if (Model.value.coordinates != null)
         {
             url = ImageCropperTemplateCoreExtensions.GetCropUrl(
diff --git a/src/Umbraco.Web.UI.NetCore/Views/Partials/grid/editors/rte.cshtml b/src/Umbraco.Web.UI.NetCore/Views/Partials/grid/editors/rte.cshtml
index 696b058212..e14c6e1a97 100644
--- a/src/Umbraco.Web.UI.NetCore/Views/Partials/grid/editors/rte.cshtml
+++ b/src/Umbraco.Web.UI.NetCore/Views/Partials/grid/editors/rte.cshtml
@@ -1,13 +1,13 @@
-@using Umbraco.Cms.Core.Templates
+@using Umbraco.Cms.Core.Templates
 @model dynamic
 @inject HtmlLocalLinkParser HtmlLocalLinkParser;
 @inject HtmlUrlParser HtmlUrlParser;
 @inject HtmlImageSourceParser HtmlImageSourceParser;
 
 @{
-
     var value = HtmlLocalLinkParser.EnsureInternalLinks(Model.value.ToString());
     value = HtmlUrlParser.EnsureUrls(value);
     value = HtmlImageSourceParser.EnsureImageSources(value);
 }
+
 @Html.Raw(value)