Removed references to the "dtgePreview" querystring

Author: leekelleher

src/Our.Umbraco.DocTypeGridEditor/Bootstrap.cs

@@ -63,16 +63,6 @@ protected override void ApplicationStarted(UmbracoApplicationBase umbracoApplica
                     }
                 }
             };
-
-            PublishedContentRequest.Prepared += (sender, e) =>
-            {
-                // Check if it's a dtgePreview request and is set to redirect.
-                // If so reset the redirect url to an empty string to stop the redirect happening in preview mode.
-                if (sender is PublishedContentRequest request && request.Uri.Query.InvariantContains("dtgePreview") && request.IsRedirect)
-                {
-                    request.SetRedirect(string.Empty);
-                }
-            };
         }
     }
 }

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

@@ -1,4 +1,5 @@
-using System.Web.Mvc;
+using System;
+using System.Web.Mvc;
 using Our.Umbraco.DocTypeGridEditor.Extensions;
 using Umbraco.Core;
 using Umbraco.Core.Models;
@@ -29,7 +30,7 @@ public string PreviewViewPath
 
         public bool IsPreview
         {
-            get { return Request.QueryString["dtgePreview"] == "1"; }
+            get { return ControllerContext.RouteData.Values.TryGetValue("dtgePreview", out object value) && Convert.ToBoolean(value); }
         }
 
         protected PartialViewResult CurrentPartialView(object model = null)

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

@@ -31,26 +31,24 @@ public static HtmlString RenderDocTypeGridEditorItem(
             if (string.IsNullOrWhiteSpace(previewViewPath) == false)
                 previewViewPath = previewViewPath.EnsureEndsWith('/');
 
+            var routeValues = new
+            {
+                dtgeModel = content,
+                dtgeViewPath = viewPath,
+                dtgePreviewViewPath = previewViewPath,
+                dtgePreview = isPreview
+            };
+
             // Try looking for surface controller with action named after the editor alias
             if (string.IsNullOrWhiteSpace(editorAlias) == false && SurfaceControllerHelper.SurfaceControllerExists(controllerName, editorAlias, true))
             {
-                return helper.Action(editorAlias, controllerName, new
-                {
-                    dtgeModel = content,
-                    dtgeViewPath = viewPath,
-                    dtgePreviewViewPath = previewViewPath
-                });
+                return helper.Action(editorAlias, controllerName, routeValues);
             }
 
             // Try looking for surface controller with action named after the doc type alias alias
             if (SurfaceControllerHelper.SurfaceControllerExists(controllerName, content.DocumentTypeAlias, true))
             {
-                return helper.Action(content.DocumentTypeAlias, controllerName, new
-                {
-                    dtgeModel = content,
-                    dtgeViewPath = viewPath,
-                    dtgePreviewViewPath = previewViewPath
-                });
+                return helper.Action(content.DocumentTypeAlias, controllerName, routeValues);
             }
 
             // See if a default surface controller has been registered
@@ -62,32 +60,17 @@ public static HtmlString RenderDocTypeGridEditorItem(
                 // Try looking for an action named after the editor alias
                 if (string.IsNullOrWhiteSpace(editorAlias) == false && SurfaceControllerHelper.SurfaceControllerExists(defaultControllerName, editorAlias, true))
                 {
-                    return helper.Action(editorAlias, defaultControllerName, new
-                    {
-                        dtgeModel = content,
-                        dtgeViewPath = viewPath,
-                        dtgePreviewViewPath = previewViewPath
-                    });
+                    return helper.Action(editorAlias, defaultControllerName, routeValues);
                 }
 
                 // Try looking for a doc type alias action
                 if (SurfaceControllerHelper.SurfaceControllerExists(defaultControllerName, content.DocumentTypeAlias, true))
                 {
-                    return helper.Action(content.DocumentTypeAlias, defaultControllerName, new
-                    {
-                        dtgeModel = content,
-                        dtgeViewPath = viewPath,
-                        dtgePreviewViewPath = previewViewPath
-                    });
+                    return helper.Action(content.DocumentTypeAlias, defaultControllerName, routeValues);
                 }
 
                 // Just go with a default action name
-                return helper.Action("Index", defaultControllerName, new
-                {
-                    dtgeModel = content,
-                    dtgeViewPath = viewPath,
-                    dtgePreviewViewPath = previewViewPath
-                });
+                return helper.Action("Index", defaultControllerName, routeValues);
             }
 
             // Check for preview view

src/Our.Umbraco.DocTypeGridEditor/Web/UI/App_Plugins/DocTypeGridEditor/Js/doctypegrideditor.resources.js

@@ -35,7 +35,7 @@
                 );
             },
             getEditorMarkupForDocTypePartial: function (nodeId, id, editorAlias, contentTypeAlias, value, viewPath, previewViewPath, published) {
-                var url = umbRequestHelper.convertVirtualToAbsolutePath("~/" + (published ? nodeId : "") + "?dtgePreview=1" + (published ? "" : "&nodeId=" + nodeId));
+                var url = umbRequestHelper.convertVirtualToAbsolutePath("~/umbraco/backoffice/DocTypeGridEditorApi/DocTypeGridEditorApi/GetPreviewMarkup?pageId=" + pageId);
                 return $http({
                     method: 'POST',
                     url: url,