Fixed the Timeline Preview

Author: cs-raj

Contentstack.Core/ContentstackClient.cs

@@ -360,7 +360,7 @@ private async Task<JObject> GetLivePreviewData()
                     headerAll.Add(header.Key, (String)header.Value);
                 }
             }
-            mainJson.Add("live_preview", this.LivePreviewConfig.LivePreview ?? "init");
+            mainJson.Add("live_preview", string.IsNullOrEmpty(this.LivePreviewConfig.LivePreview) ? "init": this.LivePreviewConfig.LivePreview);
 
             if (!string.IsNullOrEmpty(this.LivePreviewConfig.ManagementToken))
             {
@@ -402,7 +402,7 @@ public void SetEntryUid(string entryUid)
         {
             if (!string.IsNullOrEmpty(entryUid))
             {
-                lastEntryUid = entryUid;
+                this.lastEntryUid = entryUid;
             }
         }
         /// <summary>
@@ -420,7 +420,7 @@ public ContentType ContentType(String contentTypeName)
         {
             if (!string.IsNullOrEmpty(contentTypeName))
             {
-                lastContentTypeUid = contentTypeName;
+                this.lastContentTypeUid = contentTypeName;
             }
             ContentType contentType = new ContentType(contentTypeName);
             contentType.SetStackInstance(this);
@@ -610,18 +610,16 @@ public void SetHeader(string key, string value)
         public async Task LivePreviewQueryAsync(Dictionary<string, string> query)
         {
             this.LivePreviewConfig.LivePreview = null;
-            this.LivePreviewConfig.ContentTypeUID = null;
-            this.LivePreviewConfig.EntryUID = null;
 
             if (query.Keys.Contains("content_type_uid"))
             {
                 string contentTypeUID = null;
                 query.TryGetValue("content_type_uid", out contentTypeUID);
                 this.LivePreviewConfig.ContentTypeUID = contentTypeUID;
             }
-            else if (lastContentTypeUid != null)
+            else if (!string.IsNullOrEmpty(this.lastContentTypeUid))
             {
-                this.LivePreviewConfig.ContentTypeUID = lastContentTypeUid;
+                this.LivePreviewConfig.ContentTypeUID = this.lastContentTypeUid;
             }
 
 
@@ -631,9 +629,9 @@ public async Task LivePreviewQueryAsync(Dictionary<string, string> query)
                 query.TryGetValue("entry_uid", out entryUID);
                 this.LivePreviewConfig.EntryUID = entryUID;
             }
-            else if (lastEntryUid != null)
+            else if (!string.IsNullOrEmpty(this.lastEntryUid))
             {
-                this.LivePreviewConfig.EntryUID = lastEntryUid;
+                this.LivePreviewConfig.EntryUID = this.lastEntryUid;
             }
 
 

Contentstack.Core/Models/ContentType.cs

@@ -236,14 +236,11 @@ public void RemoveHeader(string key)
         /// </example>
         public Entry Entry(String entryUid)
         {
-            if(!String.IsNullOrEmpty(entryUid))
-            {
-                this.StackInstance.SetEntryUid(entryUid);
-            }
             Entry entry = new Entry(ContentTypeId);
             entry._FormHeaders = GetHeader(_Headers);
             entry.SetContentTypeInstance(this);
             entry.SetUid(entryUid);
+            this.StackInstance.SetEntryUid(entryUid);
             return entry;
         }
 

Contentstack.Core/Models/Entry.cs

@@ -1398,7 +1398,7 @@ public async Task<T> Fetch<T>()
             bool isLivePreview = false;
             if (this.ContentTypeInstance.StackInstance.LivePreviewConfig.Enable == true && this.ContentTypeInstance.StackInstance.LivePreviewConfig.ContentTypeUID == this.ContentTypeInstance.ContentTypeId)
             {
-                mainJson.Add("live_preview", this.ContentTypeInstance.StackInstance.LivePreviewConfig.LivePreview ?? "init");
+                mainJson.Add("live_preview", string.IsNullOrEmpty(this.ContentTypeInstance.StackInstance.LivePreviewConfig.LivePreview)? "init" : this.ContentTypeInstance.StackInstance.LivePreviewConfig.LivePreview);
 
                 if (!string.IsNullOrEmpty(this.ContentTypeInstance.StackInstance.LivePreviewConfig.ManagementToken)) {
                     headerAll["authorization"] = this.ContentTypeInstance.StackInstance.LivePreviewConfig.ManagementToken;

Contentstack.Core/Models/Query.cs

@@ -1857,7 +1857,7 @@ private async Task<JObject> Exec()
             if (this.ContentTypeInstance!=null && this.ContentTypeInstance.StackInstance.LivePreviewConfig.Enable == true
                 && this.ContentTypeInstance.StackInstance?.LivePreviewConfig.ContentTypeUID == this.ContentTypeInstance.ContentTypeId)
             {
-                mainJson.Add("live_preview", this.ContentTypeInstance.StackInstance.LivePreviewConfig.LivePreview ?? "init");
+                mainJson.Add("live_preview", string.IsNullOrEmpty(this.ContentTypeInstance.StackInstance.LivePreviewConfig.LivePreview) ? "init" : this.ContentTypeInstance.StackInstance.LivePreviewConfig.LivePreview);
 
                 if (!string.IsNullOrEmpty(this.ContentTypeInstance.StackInstance.LivePreviewConfig.ManagementToken)) {
                     headerAll["authorization"] = this.ContentTypeInstance.StackInstance.LivePreviewConfig.ManagementToken;