add isPreview parameter to ConvertValueToContent method, to prevent caching of preview data

skttl · skttl · commit dd1b21638df6 · 2019-05-27T11:06:15.000+02:00
diff --git a/src/Our.Umbraco.DocTypeGridEditor/Helpers/DocTypeGridEditorHelper.cs b/src/Our.Umbraco.DocTypeGridEditor/Helpers/DocTypeGridEditorHelper.cs
@@ -18,15 +18,15 @@ namespace Our.Umbraco.DocTypeGridEditor.Helpers
     public static class DocTypeGridEditorHelper
     {
 
-        public static IPublishedElement ConvertValueToContent(string id, string contentTypeAlias, string dataJson)
+        public static IPublishedElement ConvertValueToContent(string id, string contentTypeAlias, string dataJson, bool isPreview = false)
         {
             if (string.IsNullOrWhiteSpace(contentTypeAlias))
                 return null;
 
             if (dataJson == null)
                 return null;
 
-            if (Current.UmbracoContext == null)
+            if (Current.UmbracoContext == null || isPreview)
                 return ConvertValue(id, contentTypeAlias, dataJson);
 
             return (IPublishedElement)Current.AppCaches.RuntimeCache.GetCacheItem(
diff --git a/src/Our.Umbraco.DocTypeGridEditor/Web/Controllers/DocTypeGridEditorApiController.cs b/src/Our.Umbraco.DocTypeGridEditor/Web/Controllers/DocTypeGridEditorApiController.cs
@@ -183,7 +183,7 @@ public HttpResponseMessage GetPreviewMarkup([FromBody] PreviewData data, [FromUr
             }
 
             // Get content node object
-            var content = DocTypeGridEditorHelper.ConvertValueToContent(data.Id, data.ContentTypeAlias, data.Value);
+            var content = DocTypeGridEditorHelper.ConvertValueToContent(data.Id, data.ContentTypeAlias, data.Value, true);
 
             // Construct preview model
             var model = new PreviewModel

Original file line number	Diff line number	Diff line change
`@@ -18,15 +18,15 @@ namespace Our.Umbraco.DocTypeGridEditor.Helpers`
`18`	`18`	`public static class DocTypeGridEditorHelper`
`19`	`19`	`{`
`20`	`20`
`21`		`- public static IPublishedElement ConvertValueToContent(string id, string contentTypeAlias, string dataJson)`
	`21`	`+ public static IPublishedElement ConvertValueToContent(string id, string contentTypeAlias, string dataJson, bool isPreview = false)`
`22`	`22`	`{`
`23`	`23`	`if (string.IsNullOrWhiteSpace(contentTypeAlias))`
`24`	`24`	`return null;`
`25`	`25`
`26`	`26`	`if (dataJson == null)`
`27`	`27`	`return null;`
`28`	`28`
`29`		`- if (Current.UmbracoContext == null)`
	`29`	`+ if (Current.UmbracoContext == null \|\| isPreview)`
`30`	`30`	`return ConvertValue(id, contentTypeAlias, dataJson);`
`31`	`31`
`32`	`32`	`return (IPublishedElement)Current.AppCaches.RuntimeCache.GetCacheItem(`
Original file line number	Diff line number	Diff line change
`@@ -183,7 +183,7 @@ public HttpResponseMessage GetPreviewMarkup([FromBody] PreviewData data, [FromUr`
`183`	`183`	`}`
`184`	`184`
`185`	`185`	`// Get content node object`
`186`		`- var content = DocTypeGridEditorHelper.ConvertValueToContent(data.Id, data.ContentTypeAlias, data.Value);`
	`186`	`+ var content = DocTypeGridEditorHelper.ConvertValueToContent(data.Id, data.ContentTypeAlias, data.Value, true);`
`187`	`187`
`188`	`188`	`// Construct preview model`
`189`	`189`	`var model = new PreviewModel`