Revert "Merge pull request #105 from kows/feature/preview-unpublished"

This reverts commit ad3b326, reversing
changes made to 3b319a2.

Author: leekelleher

src/Our.Umbraco.DocTypeGridEditor/Bootstrap.cs

@@ -1,5 +1,7 @@
 using System;
+using System.Web.Mvc;
 using Newtonsoft.Json;
+using Our.Umbraco.DocTypeGridEditor.Web.Attributes;
 using Our.Umbraco.DocTypeGridEditor.Web.Mvc;
 using Umbraco.Core;
 using Umbraco.Core.Sync;
@@ -12,6 +14,8 @@ internal class Bootstrap : ApplicationEventHandler
     {
         protected override void ApplicationStarting(UmbracoApplicationBase umbracoApplication, ApplicationContext applicationContext)
         {
+            GlobalFilters.Filters.Add(new DocTypeGridEditorPreviewAttribute());
+
             if (DefaultDocTypeGridEditorSurfaceControllerResolver.HasCurrent == false)
             {
                 DefaultDocTypeGridEditorSurfaceControllerResolver.Current = new DefaultDocTypeGridEditorSurfaceControllerResolver();

src/Our.Umbraco.DocTypeGridEditor/Models/UnpublishedContent.cs

@@ -70,12 +70,6 @@
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
-    <Reference Include="System.Net.Http" />
-    <Reference Include="System.Net.Http.Formatting, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\Microsoft.AspNet.WebApi.Client.5.2.3\lib\net45\System.Net.Http.Formatting.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
     <Reference Include="System.Web" />
     <Reference Include="System.Web.Http, Version=5.2.3.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <HintPath>..\packages\Microsoft.AspNet.WebApi.Core.5.2.3\lib\net45\System.Web.Http.dll</HintPath>
@@ -106,19 +100,16 @@
     <Compile Include="Models\DetachedPublishedContent.cs" />
     <Compile Include="Models\DetachedPublishedProperty.cs" />
     <Compile Include="Models\JsonDbRow.cs" />
-    <Compile Include="Models\UnpublishedContent.cs" />
-    <Compile Include="Models\UnpublishedProperty.cs" />
     <Compile Include="PackageActions\AddObjectToJsonArray.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Properties\VersionInfo.cs" />
+    <Compile Include="Web\Attributes\DocTypeGridEditorPreviewAttribute.cs" />
     <Compile Include="Web\Controllers\DocTypeGridEditorApiController.cs" />
     <Compile Include="Extensions\ContentTypeServiceExtensions.cs" />
     <Compile Include="Web\Controllers\DocTypeGridEditorSurfaceController.cs" />
     <Compile Include="Web\Extensions\HtmlHelperExtensions.cs" />
     <Compile Include="Web\Helpers\SurfaceControllerHelper.cs" />
-    <Compile Include="Web\Helpers\ViewHelper.cs" />
     <Compile Include="Web\Mvc\DefaultDocTypeGridEditorSurfaceControllerResolver.cs" />
-    <Compile Include="Web\PreviewModel.cs" />
   </ItemGroup>
   <ItemGroup>
     <None Include="app.config" />

src/Our.Umbraco.DocTypeGridEditor/Models/UnpublishedProperty.cs

@@ -0,0 +1,32 @@
+using System.Web;
+using System.Web.Mvc;
+
+namespace Our.Umbraco.DocTypeGridEditor.Web.Attributes
+{
+    internal class DocTypeGridEditorPreviewAttribute : ActionFilterAttribute
+    {
+        public override void OnResultExecuting(ResultExecutingContext filterContext)
+        {
+            if (HttpContext.Current.Request.QueryString["dtgePreview"] == "1"
+                && HttpContext.Current.Request.HttpMethod == "POST")
+            {
+                var viewResult = filterContext.Result as ViewResult;
+                if (viewResult != null)
+                {
+                    viewResult.ViewName =
+                        "~/App_Plugins/DocTypeGridEditor/Render/DocTypeGridEditorPreviewer.cshtml";
+                }
+                // NOTE: [LK:2016-11-16] If the preview result is a redirect, then cancel the request.
+                // The issue here is that typically a redirect from a controller would be to a full-loading HTML page.
+                // Meaning that a full bodied HTML page would be injected into a DTGE grid cell, causing havoc.
+                // This is a temporary resolution until we implement a more robust DTGE previewer mechanism.
+                else if (filterContext.Result is RedirectResult)
+                {
+                    filterContext.Cancel = true;
+                }
+            }
+
+            base.OnResultExecuting(filterContext);
+        }
+    }
+}

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

@@ -1,19 +1,13 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Net.Http;
-using System.Net.Http.Formatting;
-using System.Net.Http.Headers;
-using System.Net.Mime;
 using System.Text.RegularExpressions;
 using System.Web.Http;
 using System.Web.Http.ModelBinding;
 using Our.Umbraco.DocTypeGridEditor.Extensions;
-using Our.Umbraco.DocTypeGridEditor.Models;
 using Umbraco.Core.Models;
 using Umbraco.Core.PropertyEditors;
 using Umbraco.Web.Editors;
-using Umbraco.Web.Models;
 using Umbraco.Web.Mvc;
 
 namespace Our.Umbraco.DocTypeGridEditor.Web.Controllers
@@ -92,43 +86,5 @@ public object GetDataTypePreValues(string dtdId)
             var propEditor = PropertyEditorResolver.Current.GetByAlias(dtd.PropertyEditorAlias);
             return propEditor.PreValueEditor.ConvertDbToEditor(propEditor.DefaultPreValues, preValue);
         }
-
-        [HttpPost]
-        public HttpResponseMessage GetPreviewMarkup([FromBody] FormDataCollection item, [FromUri] int pageId)
-        {
-            var page = default(IPublishedContent);
-
-            // If the page is new, then the ID will be zero
-            if (pageId > 0)
-            {
-                // Get page container node
-                page = UmbracoContext.ContentCache.GetById(pageId);
-                if (page == null)
-                {
-                    // If unpublished, then fake PublishedContent (with IContent object)
-                    page = new UnpublishedContent(pageId, Services);
-                }
-            }
-
-            var culture = UmbracoContext.Application.Services.ContentService.GetById(pageId).GetCulture();
-            System.Threading.Thread.CurrentThread.CurrentCulture = culture;
-            System.Threading.Thread.CurrentThread.CurrentUICulture = culture;
-
-            // Construct preview model
-            var model = new PreviewModel { Page = page, Values = item };
-
-            // Render view
-            var markup = Helpers.ViewHelper.RenderPartial("~/App_Plugins/DocTypeGridEditor/Render/DocTypeGridEditorPreviewer.cshtml", model);
-
-            // Return response
-            var response = new HttpResponseMessage
-            {
-                Content = new StringContent(markup ?? string.Empty)
-            };
-
-            response.Content.Headers.ContentType = new MediaTypeHeaderValue(MediaTypeNames.Text.Html);
-
-            return response;
-        }
     }
 }

src/Our.Umbraco.DocTypeGridEditor/Web/Attributes/DocTypeGridEditorPreviewAttribute.cs

@@ -6,6 +6,7 @@
 using Our.Umbraco.DocTypeGridEditor.Web.Mvc;
 using Umbraco.Core;
 using Umbraco.Core.Models;
+using Umbraco.Web;
 
 namespace Our.Umbraco.DocTypeGridEditor.Web.Extensions
 {

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

@@ -116,7 +116,8 @@
                 dtgeResources.getEditorMarkupForDocTypePartial(editorState.current.id, model.id,
                     $scope.control.editor.alias, model.dtgeContentTypeAlias, model.value,
                     $scope.control.editor.config.viewPath,
-                    $scope.control.editor.config.previewViewPath)
+                    $scope.control.editor.config.previewViewPath,
+                    !!editorState.current.publishDate)
                     .success(function (htmlResult) {
                         if (htmlResult.trim().length > 0) {
                             $scope.preview = htmlResult;

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

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