diff --git a/CHANGELOG.md b/CHANGELOG.md
index ae8dc8e..8e5cf09 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,9 @@
+### Version: 2.21.0
+#### Date: March-03-2025
+
+##### Feat:
+- Added Support for Timeline Preview
+
### Version: 2.20.0
#### Date: Dec-19-2024
diff --git a/Contentstack.Core.Tests/ContentTypeTest.cs b/Contentstack.Core.Tests/ContentTypeTest.cs
index 982c751..2b7cc87 100644
--- a/Contentstack.Core.Tests/ContentTypeTest.cs
+++ b/Contentstack.Core.Tests/ContentTypeTest.cs
@@ -2,11 +2,7 @@
using Xunit;
using Contentstack.Core.Models;
using System.Threading.Tasks;
-using Contentstack.Core.Configuration;
using System.Collections.Generic;
-using System.Linq;
-using System.Text.RegularExpressions;
-using System.Collections;
namespace Contentstack.Core.Tests
{
diff --git a/Contentstack.Core.Tests/EntryTest.cs b/Contentstack.Core.Tests/EntryTest.cs
index ea9fbd4..f7f7778 100644
--- a/Contentstack.Core.Tests/EntryTest.cs
+++ b/Contentstack.Core.Tests/EntryTest.cs
@@ -72,7 +72,7 @@ public async Task FetchEntryByUIDPublishFallback()
ContentType contenttype = client.ContentType(source);
string uid = await GetUID("source1");
Entry sourceEntry = contenttype.Entry(uid);
- await sourceEntry
+ sourceEntry = await sourceEntry
.SetLocale("ja-jp")
.IncludeFallback()
.Fetch<Entry>();
@@ -98,8 +98,7 @@ await sourceEntry
else
{
Assert.True(result.Uid == sourceEntry.Uid);
- Assert.NotNull(result._variant);
- Assert.NotNull(result._variant["_uid"]);
+ Assert.Null(result._variant);
}
});
}
@@ -122,8 +121,7 @@ await sourceEntry
else
{
Assert.True(result.Uid == sourceEntry.Uid);
- Assert.NotNull(result._variant);
- Assert.NotNull(result._variant["_uid"]);
+ Assert.Null(result._variant);
}
});
}
diff --git a/Contentstack.Core.Tests/LivePreviewTests.cs b/Contentstack.Core.Tests/LivePreviewTests.cs
new file mode 100644
index 0000000..66ce5d1
--- /dev/null
+++ b/Contentstack.Core.Tests/LivePreviewTests.cs
@@ -0,0 +1,122 @@
+using System;
+using Xunit;
+using Contentstack.Core.Configuration;
+using System.Threading.Tasks;
+using System.Collections.Generic;
+using Newtonsoft.Json.Linq;
+using Newtonsoft.Json;
+
+namespace Contentstack.Core.Tests
+{
+ public class TestContentstackClient : ContentstackClient
+ {
+ public TestContentstackClient(ContentstackOptions options)
+ : base(options)
+ {
+ }
+
+ // Override GetLivePreviewData with a hardcoded response
+ private new async Task<JObject> GetLivePreviewData()
+ {
+ var mockResponse = new
+ {
+ entry = new
+ {
+ uid = "mock_entry_uid",
+ title = "Mocked Entry",
+ content_type_uid = "mock_content_type",
+ status = "preview"
+ }
+ };
+ string jsonResponse = Newtonsoft.Json.JsonConvert.SerializeObject(mockResponse);
+ JObject data = JsonConvert.DeserializeObject<JObject>(jsonResponse, this.SerializerSettings);
+ return await Task.FromResult((JObject)data["entry"]);
+ }
+
+ // Public method to access the private method in tests
+ public async Task<JObject> TestGetLivePreviewData()
+ {
+ return await GetLivePreviewData();
+ }
+ }
+
+ public class LivePreviewTests
+ {
+ ContentstackClient client = StackConfig.GetStack();
+
+ ContentstackClient Lpclient = StackConfig.GetLPStack();
+
+ private String numbersContentType = "numbers_content_type";
+ String source = "source";
+
+ public double EPSILON { get; private set; }
+
+ [Fact]
+ public async Task CheckLivePreviewConfigNotSet()
+ {
+ var LPConfig = client.GetLivePreviewConfig();
+ Assert.False(LPConfig.Enable);
+ Assert.Null(LPConfig.PreviewToken);
+ Assert.Null(LPConfig.Host);
+ }
+
+ [Fact]
+ public async Task CheckLivePreviewConfigSet()
+ {
+ var LPConfig = Lpclient.GetLivePreviewConfig();
+ Assert.True(LPConfig.Enable);
+ Assert.NotEmpty(LPConfig.PreviewToken);
+ Assert.NotEmpty(LPConfig.Host);
+ }
+
+ [Fact]
+ public async Task setQueryWithLivePreview()
+ {
+ Dictionary<string, string> query = new Dictionary<string, string>
+ {
+ { "content_type_uid", "ct1" },
+ { "live_preview", "lphash" },
+ { "release_id", "release_id" },
+ { "preview_timestamp", "preview_timestamp" },
+ { "entry_uid", "euid" }
+ };
+ Lpclient.LivePreviewQueryAsync(query);
+ var LPConfig = Lpclient.GetLivePreviewConfig();
+ Assert.Equal(LPConfig.PreviewTimestamp, "preview_timestamp");
+ Assert.NotEmpty(LPConfig.PreviewToken);
+ Assert.NotEmpty(LPConfig.PreviewToken);
+ Assert.NotEmpty(LPConfig.Host);
+ }
+
+ [Fact]
+ public async Task TestGetLivePreviewData()
+ {
+ // Arrange
+ var options = new ContentstackOptions
+ {
+ ApiKey = "test_api_key",
+ DeliveryToken = "test_delivery_token",
+ Environment = "test_environment",
+ LivePreview = new LivePreviewConfig
+ {
+ Enable = true,
+ PreviewToken = "preview_token", // Replace with a valid preview token
+ Host = "test-host" // Replace with a valid preview host (e.g., "rest-preview.contentstack.com")
+
+ }
+ };
+
+ var client = new TestContentstackClient(options);
+
+ // Act
+ var result = await client.TestGetLivePreviewData();
+
+ // Assert
+ Assert.NotNull(result);
+ Assert.Equal("mock_entry_uid", result["uid"].ToString());
+ Assert.Equal("Mocked Entry", result["title"].ToString());
+ }
+
+ }
+}
+
diff --git a/Contentstack.Core.Tests/PluginsTest.cs b/Contentstack.Core.Tests/PluginsTest.cs
index 2f9dc27..ce27682 100644
--- a/Contentstack.Core.Tests/PluginsTest.cs
+++ b/Contentstack.Core.Tests/PluginsTest.cs
@@ -1,5 +1,4 @@
-using System;
-using System.Threading.Tasks;
+using System.Threading.Tasks;
using Contentstack.Core.Models;
using Contentstack.Core.Tests.Models;
using Xunit;
diff --git a/Contentstack.Core.Tests/QueryTest.cs b/Contentstack.Core.Tests/QueryTest.cs
index c8ea1ab..d5a2a06 100644
--- a/Contentstack.Core.Tests/QueryTest.cs
+++ b/Contentstack.Core.Tests/QueryTest.cs
@@ -1,7 +1,5 @@
using System;
using Xunit;
-using Contentstack.Core;
-using Contentstack.Core.Configuration;
using Contentstack.Core.Models;
using System.Threading.Tasks;
using System.Collections.Generic;
diff --git a/Contentstack.Core.Tests/StackConfig.cs b/Contentstack.Core.Tests/StackConfig.cs
index c0df3cc..fe9a39d 100644
--- a/Contentstack.Core.Tests/StackConfig.cs
+++ b/Contentstack.Core.Tests/StackConfig.cs
@@ -1,8 +1,7 @@
using System;
-using Contentstack.Core;
-using Contentstack.Core.Models;
using System.Configuration;
using Microsoft.Extensions.Options;
+using Contentstack.Core.Configuration;
namespace Contentstack.Core.Tests
{
@@ -38,7 +37,7 @@ public static ContentstackClient GetStack()
Environment = environment,
Host = host,
Timeout = 4500,
- //Proxy = new System.Net.WebProxy("http://example.com:8080")
+ //Proxy = new System.Net.WebProxy("http://example.com:8080")
};
ContentstackClient contentstackClient = new ContentstackClient(new OptionsWrapper<Configuration.ContentstackOptions>(contentstackOptions));
@@ -46,5 +45,40 @@ public static ContentstackClient GetStack()
return contentstackClient;
}
+
+ public static ContentstackClient GetLPStack()
+ {
+ StackConfig config = new StackConfig();
+ if (config.assemblyConfiguration.HasFile && string.Compare(config.assemblyConfiguration.FilePath, config.currentConfiguration.FilePath, true) != 0)
+ {
+ config.assemblyConfiguration.SaveAs(config.currentConfiguration.FilePath);
+ ConfigurationManager.RefreshSection("appSettings");
+ ConfigurationManager.RefreshSection("connectionStrings");
+ }
+ string apiKey = ConfigurationManager.AppSettings["api_key"];
+ string delivery_token = ConfigurationManager.AppSettings["delivery_token"];
+ string environment = ConfigurationManager.AppSettings["environment"];
+ string host = ConfigurationManager.AppSettings["host"];
+ Configuration.ContentstackOptions contentstackOptions = new Configuration.ContentstackOptions
+ {
+ ApiKey = apiKey,
+ DeliveryToken = delivery_token,
+ Environment = environment,
+ Host = host,
+ Timeout = 4500,
+ LivePreview = new LivePreviewConfig
+ {
+ Enable = true,
+ PreviewToken = "preview_token", // Replace with a valid preview token
+ Host = "test_host" // Replace with a valid preview host (e.g., "rest-preview.contentstack.com")
+ }
+ //Proxy = new System.Net.WebProxy("http://example.com:8080")
+ };
+
+ ContentstackClient contentstackClient = new ContentstackClient(new OptionsWrapper<Configuration.ContentstackOptions>(contentstackOptions));
+
+ return contentstackClient;
+
+ }
}
}
diff --git a/Contentstack.Core.Tests/TaxonomyTest.cs b/Contentstack.Core.Tests/TaxonomyTest.cs
index b5d49aa..bb2b747 100644
--- a/Contentstack.Core.Tests/TaxonomyTest.cs
+++ b/Contentstack.Core.Tests/TaxonomyTest.cs
@@ -1,14 +1,8 @@
using System;
using Xunit;
-using Contentstack.Core;
-using Contentstack.Core.Configuration;
using Contentstack.Core.Models;
using System.Threading.Tasks;
-using System.Collections.Generic;
using System.Linq;
-using Contentstack.Core.Tests.Models;
-using Newtonsoft.Json.Linq;
-using System.Reflection.PortableExecutable;
namespace Contentstack.Core.Tests
{
@@ -39,7 +33,7 @@ public async Task TaxonomyExists()
bool IsTrue = false;
foreach (Entry data in result.Items)
{
- IsTrue = data.GetContentType() != null;
+ IsTrue = data.Get("_content_type_uid") != null;
if (!IsTrue)
{
break;
@@ -69,7 +63,7 @@ public async Task TaxonomyEqualAndBelow()
bool IsTrue = false;
foreach (Entry data in result.Items)
{
- IsTrue = data.GetContentType() != null;
+ IsTrue = data.Get("_content_type_uid") != null;
if (!IsTrue)
{
break;
@@ -99,7 +93,7 @@ public async Task TaxonomyBelow()
bool IsTrue = false;
foreach (Entry data in result.Items)
{
- IsTrue = data.GetContentType() != null;
+ IsTrue = data.Get("_content_type_uid") != null;
if (!IsTrue)
{
break;
@@ -118,7 +112,7 @@ public async Task TaxonomyEqualAndAbove()
{
// Description: Taxonomy EqualAndAbove - Get Entries With Taxonomy Terms and Also Matching Its Parent Term ($eq_above, level)
Taxonomy query = client.Taxonomies();
- query.EqualAndAbove("taxonomies.one", "term_one");
+ query.EqualAndAbove("taxonomies.one", "term_one_child");
var result = await query.Find<Entry>();
if (result == null && result.Items.Count() == 0)
{
@@ -129,7 +123,7 @@ public async Task TaxonomyEqualAndAbove()
bool IsTrue = false;
foreach (Entry data in result.Items)
{
- IsTrue = data.GetContentType() != null;
+ IsTrue = data.Get("_content_type_uid") != null;
if (!IsTrue)
{
break;
@@ -148,7 +142,7 @@ public async Task TaxonomyAbove()
{
// Description: Taxonomy Above - Get Entries With Taxonomy Terms Parent and Excluding the term itself ($above, level)
Taxonomy query = client.Taxonomies();
- query.Above("taxonomies.one", "term_one");
+ query = query.Above("taxonomies.one", "term_one_child");
var result = await query.Find<Entry>();
if (result == null && result.Items.Count() == 0)
{
@@ -157,9 +151,9 @@ public async Task TaxonomyAbove()
else if (result != null)
{
bool IsTrue = false;
- foreach (Entry data in result.Items)
+ foreach (var data in result.Items)
{
- IsTrue = data.GetContentType() != null;
+ IsTrue = data.Get("_content_type_uid") != null;
if (!IsTrue)
{
break;
diff --git a/Contentstack.Core/Configuration/Config.cs b/Contentstack.Core/Configuration/Config.cs
index f8b3406..58901e9 100644
--- a/Contentstack.Core/Configuration/Config.cs
+++ b/Contentstack.Core/Configuration/Config.cs
@@ -13,7 +13,7 @@ internal class Config
private string _Port;
private string _Version;
private string _Environment;
- private string _Branch;
+ private string _Branch="main";
private int _Timeout;
private WebProxy _proxy;
#endregion
diff --git a/Contentstack.Core/Configuration/LivePreviewConfig.cs b/Contentstack.Core/Configuration/LivePreviewConfig.cs
index 240db8e..18670ca 100644
--- a/Contentstack.Core/Configuration/LivePreviewConfig.cs
+++ b/Contentstack.Core/Configuration/LivePreviewConfig.cs
@@ -1,6 +1,4 @@
-using System;
-using System.Collections;
-using Newtonsoft.Json.Linq;
+using Newtonsoft.Json.Linq;
namespace Contentstack.Core.Configuration
{
@@ -14,5 +12,7 @@ public class LivePreviewConfig
internal string ContentTypeUID { get; set; }
internal string EntryUID { get; set; }
internal JObject PreviewResponse { get; set; }
+ public string ReleaseId {get; set;}
+ public string PreviewTimestamp {get; set;}
}
}
diff --git a/Contentstack.Core/ContentstackClient.cs b/Contentstack.Core/ContentstackClient.cs
index b86d2f4..2811773 100644
--- a/Contentstack.Core/ContentstackClient.cs
+++ b/Contentstack.Core/ContentstackClient.cs
@@ -11,7 +11,6 @@
using System.Net;
using System.IO;
using System.Collections;
-using Contentstack.Utils;
using Contentstack.Core.Interfaces;
namespace Contentstack.Core
@@ -46,7 +45,7 @@ internal string _SyncUrl
}
}
- internal LivePreviewConfig LivePreviewConfig;
+ internal LivePreviewConfig LivePreviewConfig { get; set; }
private Dictionary<string, object> UrlQueries = new Dictionary<string, object>();
private Dictionary<string, object> _Headers = new Dictionary<string, object>();
private string _Url
@@ -364,9 +363,19 @@ private async Task<JObject> GetLivePreviewData()
throw new InvalidOperationException("Either ManagementToken or PreviewToken is required in LivePreviewConfig");
}
+ if (!string.IsNullOrEmpty(this.LivePreviewConfig.ReleaseId))
+ {
+ headerAll["release_id"] = this.LivePreviewConfig.ReleaseId;
+ }
+ if (!string.IsNullOrEmpty(this.LivePreviewConfig.PreviewTimestamp))
+ {
+ headerAll["preview_timestamp"] = this.LivePreviewConfig.PreviewTimestamp;
+ }
+
try
{
HttpRequestHandler RequestHandler = new HttpRequestHandler(this);
+ //string branch = this.Config.Branch ? this.Config.Branch : "main";
var outputResult = await RequestHandler.ProcessRequest(String.Format("{0}/content_types/{1}/entries/{2}", this.Config.getLivePreviewUrl(this.LivePreviewConfig), this.LivePreviewConfig.ContentTypeUID, this.LivePreviewConfig.EntryUID), headerAll, mainJson, Branch: this.Config.Branch, isLivePreview: true, timeout: this.Config.Timeout, proxy: this.Config.Proxy);
JObject data = JsonConvert.DeserializeObject<JObject>(outputResult.Replace("\r\n", ""), this.SerializerSettings);
return (JObject)data["entry"];
@@ -474,6 +483,13 @@ public string GetApplicationKey()
return StackApiKey;
}
+
+ public LivePreviewConfig GetLivePreviewConfig()
+ {
+ return LivePreviewConfig;
+ }
+
+
/// <summary>
/// Get stack access token
/// </summary>
@@ -576,6 +592,16 @@ public async Task LivePreviewQueryAsync(Dictionary<string, string> query)
string hash = null;
query.TryGetValue("live_preview", out hash);
this.LivePreviewConfig.LivePreview = hash;
+ }
+ if (query.Keys.Contains("release_id")) {
+ string ReleaseId = null;
+ query.TryGetValue("release_id", out ReleaseId);
+ this.LivePreviewConfig.ReleaseId = ReleaseId;
+ }
+ if (query.Keys.Contains("preview_timestamp")) {
+ string PreviewTimestamp = null;
+ query.TryGetValue("preview_timestamp", out PreviewTimestamp);
+ this.LivePreviewConfig.PreviewTimestamp = PreviewTimestamp;
}
this.LivePreviewConfig.PreviewResponse = await GetLivePreviewData();
}
diff --git a/Contentstack.Core/Interfaces/IContentstackPlugin.cs b/Contentstack.Core/Interfaces/IContentstackPlugin.cs
index 0078469..0865006 100644
--- a/Contentstack.Core/Interfaces/IContentstackPlugin.cs
+++ b/Contentstack.Core/Interfaces/IContentstackPlugin.cs
@@ -1,7 +1,5 @@
-using System;
-using System.Net;
+using System.Net;
using System.Threading.Tasks;
-using Contentstack.Core.Models;
namespace Contentstack.Core.Interfaces
{
public interface IContentstackPlugin
diff --git a/Contentstack.Core/Internals/AssetJsonConverter.cs b/Contentstack.Core/Internals/AssetJsonConverter.cs
index 9fc7215..9eee45a 100644
--- a/Contentstack.Core/Internals/AssetJsonConverter.cs
+++ b/Contentstack.Core/Internals/AssetJsonConverter.cs
@@ -1,5 +1,4 @@
using System;
-using Contentstack.Core;
using Contentstack.Core.Models;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
diff --git a/Contentstack.Core/Internals/ContentstackConstants.cs b/Contentstack.Core/Internals/ContentstackConstants.cs
index 3ea6e95..f14d276 100644
--- a/Contentstack.Core/Internals/ContentstackConstants.cs
+++ b/Contentstack.Core/Internals/ContentstackConstants.cs
@@ -1,7 +1,4 @@
-using System;
-using System.IO;
-
-namespace Contentstack.Core.Internals
+namespace Contentstack.Core.Internals
{
internal class ContentstackConstants
{
diff --git a/Contentstack.Core/Internals/ContentstackConvert.cs b/Contentstack.Core/Internals/ContentstackConvert.cs
index b2d4d74..a35a235 100644
--- a/Contentstack.Core/Internals/ContentstackConvert.cs
+++ b/Contentstack.Core/Internals/ContentstackConvert.cs
@@ -1,9 +1,5 @@
-using Newtonsoft.Json;
-using System;
+using System;
using System.IO;
-using System.Net.NetworkInformation;
-using System.Security.Cryptography;
-using System.Text;
using System.Text.RegularExpressions;
namespace Contentstack.Core.Internals
diff --git a/Contentstack.Core/Internals/EntryJsonConverter.cs b/Contentstack.Core/Internals/EntryJsonConverter.cs
index 9c4ab9d..230e1b8 100644
--- a/Contentstack.Core/Internals/EntryJsonConverter.cs
+++ b/Contentstack.Core/Internals/EntryJsonConverter.cs
@@ -1,5 +1,4 @@
using System;
-using System.Collections.Generic;
using Contentstack.Core.Models;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
diff --git a/Contentstack.Core/Internals/HttpRequestHandler.cs b/Contentstack.Core/Internals/HttpRequestHandler.cs
index 6252f51..3f5e45e 100644
--- a/Contentstack.Core/Internals/HttpRequestHandler.cs
+++ b/Contentstack.Core/Internals/HttpRequestHandler.cs
@@ -48,7 +48,7 @@ public async Task<string> ProcessRequest(string Url, Dictionary<string, object>
var request = (HttpWebRequest)WebRequest.Create(uri);
request.Method = "GET";
request.ContentType = "application/json";
- request.Headers["x-user-agent"]="contentstack-delivery-dotnet/2.20.0";
+ request.Headers["x-user-agent"]="contentstack-delivery-dotnet/2.21.0";
request.Timeout = timeout;
if (proxy != null)
diff --git a/Contentstack.Core/Internals/LanguageEnums.cs b/Contentstack.Core/Internals/LanguageEnums.cs
index e8a8b4c..51f50b6 100644
--- a/Contentstack.Core/Internals/LanguageEnums.cs
+++ b/Contentstack.Core/Internals/LanguageEnums.cs
@@ -1,8 +1,4 @@
using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
namespace Contentstack.Core.Internals
{
diff --git a/Contentstack.Core/Internals/StackOutput.cs b/Contentstack.Core/Internals/StackOutput.cs
index a934059..0b20489 100644
--- a/Contentstack.Core/Internals/StackOutput.cs
+++ b/Contentstack.Core/Internals/StackOutput.cs
@@ -1,8 +1,5 @@
-using Newtonsoft.Json;
-using Newtonsoft.Json.Linq;
-using System;
+using System;
using System.Collections.Generic;
-using System.Linq;
namespace Contentstack.Core.Internals
diff --git a/Contentstack.Core/Models/Asset.cs b/Contentstack.Core/Models/Asset.cs
index 05756a2..ac49192 100644
--- a/Contentstack.Core/Models/Asset.cs
+++ b/Contentstack.Core/Models/Asset.cs
@@ -139,8 +139,8 @@ public string Url
/// Uid of user who updated the file
/// </summary>
[JsonProperty(PropertyName = "updated_by")]
- public string UpdatedBy { get; set; }
-
+ public string UpdatedBy { get; set; }
+
/// <summary>
/// Uid of user who updated the file
/// </summary>
@@ -167,7 +167,7 @@ public string Url
public Dictionary<string, object> Dimension { get; set; }
/// <summary>
- /// Dimension Object of the asset containing Height and width
+ /// Dimension Object of the asset publish details
/// </summary>
[JsonProperty(PropertyName = "publish_details")]
public Dictionary<string, object> PublishDetails { get; set; }
diff --git a/Contentstack.Core/Models/ContentstackCollection.cs b/Contentstack.Core/Models/ContentstackCollection.cs
old mode 100755
new mode 100644
index 0edd7c6..9a1086d
--- a/Contentstack.Core/Models/ContentstackCollection.cs
+++ b/Contentstack.Core/Models/ContentstackCollection.cs
@@ -1,8 +1,6 @@
using Newtonsoft.Json;
-using System;
using System.Collections;
using System.Collections.Generic;
-using System.Text;
namespace Contentstack.Core.Models
{
diff --git a/Contentstack.Core/Models/Entry.cs b/Contentstack.Core/Models/Entry.cs
index c8a8788..b1d8391 100644
--- a/Contentstack.Core/Models/Entry.cs
+++ b/Contentstack.Core/Models/Entry.cs
@@ -1,5 +1,4 @@
using Markdig;
-using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
using System;
using System.Collections.Generic;
@@ -9,7 +8,8 @@
using System.Threading.Tasks;
using Contentstack.Core.Internals;
using Contentstack.Core.Configuration;
-
+using Newtonsoft.Json;
+
namespace Contentstack.Core.Models
{
/// <summary>
@@ -110,6 +110,12 @@ private string _Url
/// </example>
public Dictionary<string, object> Metadata { get; set; }
+ /// <summary>
+ /// Dimension Object of the entries publish details
+ /// </summary>
+ [JsonProperty(PropertyName = "publish_details")]
+ public Dictionary<string, object> PublishDetails { get; set; }
+
/// <summary>
/// Set key/value attributes of an current entry instance.
/// </summary>
@@ -1402,6 +1408,15 @@ public async Task<T> Fetch<T>()
throw new InvalidOperationException("Either ManagementToken or PreviewToken is required in LivePreviewConfig");
}
+ if (!string.IsNullOrEmpty(this.ContentTypeInstance.StackInstance.LivePreviewConfig.ReleaseId))
+ {
+ headerAll["release_id"] = this.ContentTypeInstance.StackInstance.LivePreviewConfig.ReleaseId;
+ }
+ if (!string.IsNullOrEmpty(this.ContentTypeInstance.StackInstance.LivePreviewConfig.PreviewTimestamp))
+ {
+ headerAll["preview_timestamp"] = this.ContentTypeInstance.StackInstance.LivePreviewConfig.PreviewTimestamp;
+ }
+
isLivePreview = true;
}
@@ -1418,7 +1433,7 @@ public async Task<T> Fetch<T>()
{
cachePolicy = _CachePolicy;
}
-
+
HttpRequestHandler RequestHandler = new HttpRequestHandler(this.ContentTypeInstance.StackInstance);
var outputResult = await RequestHandler.ProcessRequest(_Url, headerAll, mainJson, Branch: this.ContentTypeInstance.StackInstance.Config.Branch, isLivePreview: isLivePreview, timeout: this.ContentTypeInstance.StackInstance.Config.Timeout, proxy: this.ContentTypeInstance.StackInstance.Config.Proxy);
JObject obj = JObject.Parse(ContentstackConvert.ToString(outputResult, "{}"));
@@ -1484,7 +1499,12 @@ internal void ParseObject(JObject jsonObj, string url = null)
this._ObjectAttributes = jsonObj.ToObject<Dictionary<string, object>>();
if (_ObjectAttributes != null && _ObjectAttributes.ContainsKey("_metadata"))
{
- Dictionary<string, object> _metadataJSON = (Dictionary<string, object>)_ObjectAttributes["_metadata"];
+ var jObject = (Newtonsoft.Json.Linq.JObject)_ObjectAttributes["_metadata"];
+ var _metadataJSON = new Dictionary<string, object>();
+ foreach (var property in jObject.Properties())
+ {
+ _metadataJSON[property.Name] = property.Value.ToObject<object>();
+ }
List<string> iterator = _metadataJSON.Keys.ToList();
Metadata = new Dictionary<string, object>();
foreach (var key in iterator)
diff --git a/Contentstack.Core/Models/Query.cs b/Contentstack.Core/Models/Query.cs
index a6b453e..dba3aac 100644
--- a/Contentstack.Core/Models/Query.cs
+++ b/Contentstack.Core/Models/Query.cs
@@ -1,5 +1,4 @@
-using Newtonsoft.Json;
-using Newtonsoft.Json.Linq;
+using Newtonsoft.Json.Linq;
using System;
using System.Collections.Generic;
using System.IO;
@@ -9,7 +8,6 @@
using Contentstack.Core.Internals;
using Contentstack.Core.Configuration;
-
namespace Contentstack.Core.Models
{
/// <summary>
@@ -22,12 +20,12 @@ public class Query
internal Dictionary<string, object> _FormHeaders = new Dictionary<string, object>();
private Dictionary<string, object> _Headers = new Dictionary<string, object>();
private Dictionary<string, object> UrlQueries = new Dictionary<string, object>();
- private Dictionary<string, object> QueryValueJson = new Dictionary<string, object>();
- private string _ResultJson = string.Empty; private CachePolicy _CachePolicy;
+ protected Dictionary<string, object> QueryValueJson = new Dictionary<string, object>();
+ private string _ResultJson = string.Empty; private CachePolicy _CachePolicy;
private ContentType ContentTypeInstance { get; set; }
-
- private string _Url
+ private ContentstackClient TaxonomyInstance { get; set; }
+ protected virtual string _Url
{
get
{
@@ -38,6 +36,7 @@ private string _Url
baseURL,
this.ContentTypeId);
}
+
}
#endregion
@@ -56,6 +55,7 @@ private string _Url
/// </code>
/// </example>
public string ContentTypeId { get; set; }
+ public ContentstackClient Stack { get; private set; }
#endregion
@@ -68,9 +68,14 @@ internal Query(string contentTypeName)
{
this.ContentTypeId = contentTypeName;
}
+ internal Query(ContentstackClient Tax)
+ {
+ SetTaxonomyInstance(Tax);
+ }
#endregion
#region Internal Functions
+
internal static ContentstackException GetContentstackError(Exception ex)
{
Int32 errorCode = 0;
@@ -127,6 +132,12 @@ internal void SetContentTypeInstance(ContentType contentTypeInstance)
this.ContentTypeInstance = contentTypeInstance;
//SetLocale("en-us");
}
+ internal void SetTaxonomyInstance(ContentstackClient Tax)
+ {
+ this.TaxonomyInstance = Tax;
+ //SetLocale("en-us");
+ }
+
#endregion
@@ -1810,17 +1821,29 @@ public async Task<ContentstackCollection<T>> FindOne<T>()
private ContentstackCollection<T> parseJObject<T>(JObject jObject)
{
- var entries = jObject.SelectToken("$.entries").ToObject<IEnumerable<T>>(this.ContentTypeInstance.StackInstance.Serializer);
- var collection = jObject.ToObject<ContentstackCollection<T>>(this.ContentTypeInstance.StackInstance.Serializer);
- foreach (var entry in entries)
+
+ if(this.TaxonomyInstance!=null)
+ {
+ var entries = jObject.SelectToken("$.entries").ToObject<IEnumerable<T>>(this.TaxonomyInstance.Serializer);
+ var collection = jObject.ToObject<ContentstackCollection<T>>(this.TaxonomyInstance.Serializer);
+ collection.Items = entries;
+ return collection;
+
+ } else
{
- if (entry.GetType() == typeof(Entry))
+ var entries = jObject.SelectToken("$.entries").ToObject<IEnumerable<T>>(this.ContentTypeInstance.StackInstance.Serializer);
+ var collection = jObject.ToObject<ContentstackCollection<T>>(this.ContentTypeInstance.StackInstance.Serializer);
+ foreach (var entry in entries)
{
- (entry as Entry).SetContentTypeInstance(this.ContentTypeInstance);
+ if (entry.GetType() == typeof(Entry))
+ {
+ (entry as Entry).SetContentTypeInstance(this.ContentTypeInstance);
+ }
}
+ collection.Items = entries;
+ return collection;
}
- collection.Items = entries;
- return collection;
+
}
#endregion
@@ -1831,8 +1854,8 @@ private async Task<JObject> Exec()
Dictionary<string, object> mainJson = new Dictionary<string, object>();
bool isLivePreview = false;
- if (this.ContentTypeInstance.StackInstance.LivePreviewConfig.Enable == true
- && this.ContentTypeInstance.StackInstance.LivePreviewConfig.ContentTypeUID == this.ContentTypeInstance.ContentTypeId)
+ 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");
@@ -1844,6 +1867,15 @@ private async Task<JObject> Exec()
throw new InvalidOperationException("Either ManagementToken or PreviewToken is required in LivePreviewConfig");
}
+ if (!string.IsNullOrEmpty(this.ContentTypeInstance.StackInstance.LivePreviewConfig.ReleaseId))
+ {
+ headerAll["release_id"] = this.ContentTypeInstance.StackInstance.LivePreviewConfig.ReleaseId;
+ }
+ if (!string.IsNullOrEmpty(this.ContentTypeInstance.StackInstance.LivePreviewConfig.PreviewTimestamp))
+ {
+ headerAll["preview_timestamp"] = this.ContentTypeInstance.StackInstance.LivePreviewConfig.PreviewTimestamp;
+ }
+
isLivePreview = true;
}
@@ -1851,8 +1883,8 @@ private async Task<JObject> Exec()
{
foreach (var header in headers)
{
- if (this.ContentTypeInstance.StackInstance.LivePreviewConfig.Enable == true
- && this.ContentTypeInstance.StackInstance.LivePreviewConfig.ContentTypeUID == this.ContentTypeInstance.ContentTypeId
+ if (this.ContentTypeInstance!=null && this.ContentTypeInstance?.StackInstance.LivePreviewConfig.Enable == true
+ && this.ContentTypeInstance?.StackInstance.LivePreviewConfig.ContentTypeUID == this.ContentTypeInstance?.ContentTypeId
&& header.Key == "access_token"
&& isLivePreview)
{
@@ -1861,13 +1893,35 @@ private async Task<JObject> Exec()
headerAll.Add(header.Key, (string)header.Value);
}
}
-
+
+ if(this.TaxonomyInstance!=null && this.TaxonomyInstance._LocalHeaders!=null)
+ {
+ foreach (var header in this.TaxonomyInstance._LocalHeaders)
+ {
+ headerAll.Add(header.Key, (string)header.Value);
+ }
+ }
if (!isLivePreview && headerAll.ContainsKey("preview_token"))
{
headerAll.Remove("preview_token");
}
+ if (!isLivePreview && headerAll.ContainsKey("release_id"))
+ {
+ headerAll.Remove("release_id");
+ }
+ if (!isLivePreview && headerAll.ContainsKey("preview_timestamp"))
+ {
+ headerAll.Remove("preview_timestamp");
+ }
- mainJson.Add("environment", this.ContentTypeInstance.StackInstance.Config.Environment);
+ if(this.ContentTypeInstance!=null)
+ {
+ mainJson.Add("environment", this.ContentTypeInstance?.StackInstance.Config.Environment);
+ }
+ else if (this.TaxonomyInstance!=null && this.TaxonomyInstance.Config.Environment != null)
+ {
+ mainJson.Add("environment", this.TaxonomyInstance?.Config.Environment);
+ }
if (QueryValueJson != null && QueryValueJson.Count > 0)
mainJson.Add("query", QueryValueJson);
@@ -1878,9 +1932,19 @@ private async Task<JObject> Exec()
try
{
- HttpRequestHandler requestHandler = new HttpRequestHandler(this.ContentTypeInstance.StackInstance);
- var outputResult = await requestHandler.ProcessRequest(_Url, headerAll, mainJson, Branch: this.ContentTypeInstance.StackInstance.Config.Branch, isLivePreview: isLivePreview, timeout: this.ContentTypeInstance.StackInstance.Config.Timeout);
- return JObject.Parse(ContentstackConvert.ToString(outputResult, "{}"));
+ if(this.TaxonomyInstance!=null)
+ {
+ HttpRequestHandler requestHandler = new HttpRequestHandler(this.TaxonomyInstance);
+ var branch = this.TaxonomyInstance.Config.Branch != null ? this.TaxonomyInstance.Config.Branch : "main";
+ var outputResult = await requestHandler.ProcessRequest(this._Url, headerAll, mainJson, Branch: branch, isLivePreview: isLivePreview, timeout: this.TaxonomyInstance.Config.Timeout);
+ return JObject.Parse(ContentstackConvert.ToString(outputResult, "{}"));
+ }
+ else
+ {
+ HttpRequestHandler requestHandler = new HttpRequestHandler(this.ContentTypeInstance.StackInstance);
+ var outputResult = await requestHandler.ProcessRequest(_Url, headerAll, mainJson, Branch: this.ContentTypeInstance.StackInstance.Config.Branch, isLivePreview: isLivePreview, timeout: this.ContentTypeInstance.StackInstance.Config.Timeout);
+ return JObject.Parse(ContentstackConvert.ToString(outputResult, "{}"));
+ }
}
catch (Exception ex)
{
@@ -1888,6 +1952,7 @@ private async Task<JObject> Exec()
}
}
+
#region Private Functions
private Dictionary<string, object> GetHeader(Dictionary<string, object> localHeader)
{
diff --git a/Contentstack.Core/Models/SyncStack.cs b/Contentstack.Core/Models/SyncStack.cs
index 90da34d..bd531dc 100644
--- a/Contentstack.Core/Models/SyncStack.cs
+++ b/Contentstack.Core/Models/SyncStack.cs
@@ -1,5 +1,4 @@
-using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
using Newtonsoft.Json;
namespace Contentstack.Core.Models
diff --git a/Contentstack.Core/Models/Taxonomy.cs b/Contentstack.Core/Models/Taxonomy.cs
index ff979da..f9d63cd 100644
--- a/Contentstack.Core/Models/Taxonomy.cs
+++ b/Contentstack.Core/Models/Taxonomy.cs
@@ -1,9 +1,7 @@
using System;
using System.Collections.Generic;
using System.IO;
-using System.Linq;
using System.Net;
-using System.Threading.Tasks;
using Contentstack.Core.Configuration;
using Contentstack.Core.Internals;
using Newtonsoft.Json.Linq;
@@ -13,36 +11,34 @@ namespace Contentstack.Core.Models
public class Taxonomy: Query
{
-
#region Internal Variables
private Dictionary<string, object> _ObjectAttributes = new Dictionary<string, object>();
private Dictionary<string, object> _Headers = new Dictionary<string, object>();
private Dictionary<string, object> _StackHeaders = new Dictionary<string, object>();
private Dictionary<string, object> UrlQueries = new Dictionary<string, object>();
- private Dictionary<string, object> QueryValueJson = new Dictionary<string, object>();
- private string _Url
+ protected override string _Url
{
get
{
Config config = this.Stack.Config;
return String.Format("{0}/taxonomies/entries", config.BaseUrl);
}
- }
+ }
#endregion
-
public ContentstackClient Stack
{
get;
set;
}
+
#region Internal Constructors
internal Taxonomy()
{
}
- internal Taxonomy(ContentstackClient stack)
+ internal Taxonomy(ContentstackClient stack): base(stack)
{
this.Stack = stack;
this._StackHeaders = stack._LocalHeaders;
@@ -189,7 +185,7 @@ public Taxonomy EqualAndBelow(String key, Object value)
{
try
{
- Dictionary<string, object> queryValue = new Dictionary<string, object> { { "eq_$below", value } };
+ Dictionary<string, object> queryValue = new Dictionary<string, object> { { "$eq_below", value } };
QueryValueJson.Add(key, queryValue);
}
catch (Exception e)
diff --git a/Directory.Build.props b/Directory.Build.props
index 2beb17e..402aa0e 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -1,5 +1,5 @@
<Project>
<PropertyGroup>
- <Version>2.20.0</Version>
+ <Version>2.21.0</Version>
</PropertyGroup>
</Project>
diff --git a/LICENSE b/LICENSE
index ec1403b..e1238b5 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,6 +1,6 @@
MIT License
-Copyright (c) 2012-2024 Contentstack (http://app.contentstack.com). All Rights Reserved
+Copyright (c) 2012-2025 Contentstack (http://app.contentstack.com). All Rights Reserved
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal