Merge pull request #37 from contentstack/next

nadeem-cs · web-flow · commit 938b42986750 · 2024-03-06T18:29:27.000+05:30
Feat: Parameter support in References and Break attr handling in TextNode
diff --git a/.talismanrc b/.talismanrc
@@ -1,5 +1,5 @@
 threshold: medium
 fileignoreconfig:
 - filename: Contentstack.Management.Core.Tests/Mock/customUpload.html
-  checksum: 5244edc21796bf373f2de512e56171007e1d48d14688684a7bac448789d1d893
+  checksum: 854eb83dcacd62d3bf233c82e5cfd0c69dd20478fa0e7c6af9028f6c6386749d
 version: ""
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,13 @@
 # Changelog
 
+## [v0.1.7](https://github.com/contentstack/contentstack-management-dotnet/tree/v0.1.5) (2024-02-11)
+ - Feature
+   - Parameter support in References and ReferencesAsync methods
+
+## [v0.1.6](https://github.com/contentstack/contentstack-management-dotnet/tree/v0.1.5) (2024-02-11)
+ - Fix
+   - TextNode Deserializer
+
 ## [v0.1.5](https://github.com/contentstack/contentstack-management-dotnet/tree/v0.1.5) (2024-02-11)
  - Adds JsonConverters to Serializer for JSON Rte 
 
diff --git a/Contentstack.Management.ASPNETCore/contentstack.management.aspnetcore.csproj b/Contentstack.Management.ASPNETCore/contentstack.management.aspnetcore.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <TargetFramework>netstandard2.1</TargetFramework>
     <PackageId>contentstack.management.aspnetcore</PackageId>
-    <PackageVersion>0.1.6</PackageVersion>
+    <PackageVersion>0.1.7</PackageVersion>
     <Authors>Contentstack</Authors>
     <Copyright>Copyright © 2012-2024 Contentstack. All Rights Reserved</Copyright>
     <Owners>Contentstack </Owners>
@@ -14,8 +14,8 @@
     <Title>Contentstack Management</Title>
     <Description>.NET SDK for the Contentstack Content Management API.</Description>
     <PackageLicenseFile>LICENSE.txt</PackageLicenseFile>
-    <PackageTags>v0.1.6</PackageTags>
-    <ReleaseVersion>0.1.6</ReleaseVersion>
+    <PackageTags>v0.1.7</PackageTags>
+    <ReleaseVersion>0.1.7</ReleaseVersion>
     <RootNamespace>Contentstack.Management.ASPNETCore</RootNamespace>
   </PropertyGroup>
 
diff --git a/Contentstack.Management.Core.Tests/Mock/customUpload.html b/Contentstack.Management.Core.Tests/Mock/customUpload.html
@@ -6,7 +6,13 @@
         integrity="sha512-LMktiFAj7j/AUFctMlgY8qmLrLIQVctwwCsnCXIWnvgF9JlanilvFbZxOCtPNB5eO3vp2Nhw9ED1UsWa+ltSvQ=="
         crossorigin="anonymous"
     ></script>
-    <link rel="stylesheet" type="text/css" href="https://unpkg.com/@contentstack/ui-extensions-sdk@2.1.1/dist/ui-extension-sdk.css">
+    <link
+        rel="stylesheet"
+        type="text/css"
+        href="https://unpkg.com/@contentstack/ui-extensions-sdk/dist/ui-extension-sdk.css"
+        integrity="sha512-yPPI/jWiqPr0HIh+1A2QPP5p58sSYqbPoBykxIuBckT1vzGwNbrOmwYM03qGI4ffnxd7q4kkoDys0kdZzxYn9A=="
+        crossorigin="anonymous"
+    />
 </head>
 <body>
     <input type="color" id="html5colorpicker" onchange="colorChange()">
diff --git a/Contentstack.Management.Core.Unit.Tests/Contentstack.Management.Core.Unit.Tests.csproj b/Contentstack.Management.Core.Unit.Tests/Contentstack.Management.Core.Unit.Tests.csproj
@@ -4,7 +4,7 @@
     <TargetFramework>net7.0</TargetFramework>
 
     <IsPackable>false</IsPackable>
-    <ReleaseVersion>0.1.6</ReleaseVersion>
+    <ReleaseVersion>0.1.7</ReleaseVersion>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/Contentstack.Management.Core/ContentstackClient.cs b/Contentstack.Management.Core/ContentstackClient.cs
@@ -35,7 +35,7 @@ public class ContentstackClient : IContentstackClient
         private HttpClient _httpClient;
         private bool _disposed = false;
 
-        private string Version => "0.1.6";
+        private string Version => "0.1.7";
         private string xUserAgent => $"contentstack-management-dotnet/{Version}";
         #endregion
 
diff --git a/Contentstack.Management.Core/Models/BaseModel.cs b/Contentstack.Management.Core/Models/BaseModel.cs
@@ -77,7 +77,6 @@ public virtual Task<ContentstackResponse> FetchAsync(ParameterCollection collect
             ThrowIfUidEmpty();
 
             var service = new FetchDeleteService(stack.client.serializer, stack, resourcePath, collection: collection);
-
             return stack.client.InvokeAsync<FetchDeleteService, ContentstackResponse>(service);
         }
 
diff --git a/Contentstack.Management.Core/Models/Entry.cs b/Contentstack.Management.Core/Models/Entry.cs
@@ -374,12 +374,12 @@ public Task<ContentstackResponse> LocalesAsync()
         /// </code></pre>
         /// </example>
         /// <returns>The <see cref="ContentstackResponse"/>.</returns>
-        public ContentstackResponse References()
+        public ContentstackResponse References(ParameterCollection collection = null)
         {
             stack.ThrowIfNotLoggedIn();
             ThrowIfUidEmpty();
 
-            var service = new FetchReferencesService(stack.client.serializer, stack, resourcePath);
+            var service = new FetchReferencesService(stack.client.serializer, stack, resourcePath, collection: collection);
             return stack.client.InvokeSync(service);
         }
 
@@ -393,12 +393,12 @@ public ContentstackResponse References()
         /// </code></pre>
         /// </example>
         /// <returns>The Task</returns>
-        public Task<ContentstackResponse> ReferencesAsync()
+        public Task<ContentstackResponse> ReferencesAsync(ParameterCollection collection = null)
         {
             stack.ThrowIfNotLoggedIn();
             ThrowIfUidEmpty();
 
-            var service = new FetchReferencesService(stack.client.serializer, stack, resourcePath);
+            var service = new FetchReferencesService(stack.client.serializer, stack, resourcePath, collection: collection);
             return stack.client.InvokeAsync<FetchReferencesService, ContentstackResponse>(service);
         }
 
diff --git a/Contentstack.Management.Core/Models/TextNode.cs b/Contentstack.Management.Core/Models/TextNode.cs
@@ -14,6 +14,7 @@ public class TextNode: Node
         public bool inlineCode { get; set; }
         public bool subscript { get; set; }
         public bool superscript { get; set; }
+        public bool @break { get; set; }
         public string text { get; set; }
     }
 }
diff --git a/Contentstack.Management.Core/Services/Models/FetchReferencesService.cs b/Contentstack.Management.Core/Services/Models/FetchReferencesService.cs
@@ -1,11 +1,13 @@
 ﻿using System;
 using Newtonsoft.Json;
+using Contentstack.Management.Core.Queryable;
+
 namespace Contentstack.Management.Core.Services.Models
 {
     internal class FetchReferencesService : ContentstackService
     {
-        internal FetchReferencesService(JsonSerializer serializer, Core.Models.Stack stack, string resourcePath = null)
-           : base(serializer, stack: stack)
+        internal FetchReferencesService(JsonSerializer serializer, Core.Models.Stack stack, string resourcePath = null, ParameterCollection collection = null)
+           : base(serializer, stack: stack, collection)
         {
             if (stack.APIKey == null)
             {
@@ -17,6 +19,11 @@ internal FetchReferencesService(JsonSerializer serializer, Core.Models.Stack sta
             }
             this.ResourcePath = $"{resourcePath}/references";
             this.HttpMethod = "GET";
+
+            if (collection != null && collection.Count > 0)
+            {
+                this.UseQueryString = true;
+            }
         }
     }
 }
diff --git a/Contentstack.Management.Core/Utils/TextNodeJsonConverter.cs b/Contentstack.Management.Core/Utils/TextNodeJsonConverter.cs
@@ -75,6 +75,11 @@ public override void WriteJson(JsonWriter writer, TextNode value, JsonSerializer
                 writer.WritePropertyName("superscript");
                 writer.WriteValue(value.superscript);
             }
+            if (value.@break)
+            {
+                writer.WritePropertyName("break");
+                writer.WriteValue(value.@break);
+            }
             if (!string.IsNullOrEmpty(value.text))
             {
                 writer.WritePropertyName("text");
diff --git a/Contentstack.Management.Core/contentstack.management.core.csproj b/Contentstack.Management.Core/contentstack.management.core.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <TargetFrameworks>netstandard2.0;net471;net472;</TargetFrameworks>
     <PackageId>contentstack.management.csharp</PackageId>
-    <PackageVersion>0.1.6</PackageVersion>
+    <PackageVersion>0.1.7</PackageVersion>
     <Authors>Contentstack</Authors>
     <Copyright>Copyright © 2012-2024 Contentstack. All Rights Reserved</Copyright>
     <Owners>Contentstack </Owners>
@@ -14,8 +14,9 @@
     <Title>Contentstack Management</Title>
     <Description>.NET SDK for the Contentstack Content Management API.</Description>
     <PackageLicenseFile>LICENSE.txt</PackageLicenseFile>
-    <PackageTags>v0.1.6</PackageTags>
-    <ReleaseVersion>0.1.6</ReleaseVersion>
+    <PackageReadmeFile>README.md</PackageReadmeFile>
+    <PackageTags>v0.1.7</PackageTags>
+    <ReleaseVersion>0.1.7</ReleaseVersion>
   </PropertyGroup>
 
   <ItemGroup>
@@ -29,6 +30,12 @@
   </ItemGroup>
   <ItemGroup>
       <None Include="LICENSE.txt" Pack="true" PackagePath="LICENSE.txt" />
+      <None Include="..\CHANGELOG.md">
+        <Link>CHANGELOG.md</Link>
+      </None>
+      <None Include="..\README.md" Pack="true" PackagePath="">
+        <Link>README.md</Link>
+      </None>
   </ItemGroup>
   <ItemGroup>
     <Folder Include="Internal\" />

Original file line number	Diff line number	Diff line change
`@@ -77,7 +77,6 @@ public virtual Task<ContentstackResponse> FetchAsync(ParameterCollection collect`
`77`	`77`	`ThrowIfUidEmpty();`
`78`	`78`
`79`	`79`	`var service = new FetchDeleteService(stack.client.serializer, stack, resourcePath, collection: collection);`
`80`		`-`
`81`	`80`	`return stack.client.InvokeAsync<FetchDeleteService, ContentstackResponse>(service);`
`82`	`81`	`}`
`83`	`82`
Original file line number	Diff line number	Diff line change
`@@ -14,6 +14,7 @@ public class TextNode: Node`
`14`	`14`	`public bool inlineCode { get; set; }`
`15`	`15`	`public bool subscript { get; set; }`
`16`	`16`	`public bool superscript { get; set; }`
	`17`	`+ public bool @break { get; set; }`
`17`	`18`	`public string text { get; set; }`
`18`	`19`	`}`
`19`	`20`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,11 +1,13 @@`
`1`	`1`	`using System;`
`2`	`2`	`using Newtonsoft.Json;`
	`3`	`+using Contentstack.Management.Core.Queryable;`
	`4`	`+`
`3`	`5`	`namespace Contentstack.Management.Core.Services.Models`
`4`	`6`	`{`
`5`	`7`	`internal class FetchReferencesService : ContentstackService`
`6`	`8`	`{`
`7`		`- internal FetchReferencesService(JsonSerializer serializer, Core.Models.Stack stack, string resourcePath = null)`
`8`		`- : base(serializer, stack: stack)`
	`9`	`+ internal FetchReferencesService(JsonSerializer serializer, Core.Models.Stack stack, string resourcePath = null, ParameterCollection collection = null)`
	`10`	`+ : base(serializer, stack: stack, collection)`
`9`	`11`	`{`
`10`	`12`	`if (stack.APIKey == null)`
`11`	`13`	`{`
`@@ -17,6 +19,11 @@ internal FetchReferencesService(JsonSerializer serializer, Core.Models.Stack sta`
`17`	`19`	`}`
`18`	`20`	`this.ResourcePath = $"{resourcePath}/references";`
`19`	`21`	`this.HttpMethod = "GET";`
	`22`	`+`
	`23`	`+ if (collection != null && collection.Count > 0)`
	`24`	`+ {`
	`25`	`+ this.UseQueryString = true;`
	`26`	`+ }`
`20`	`27`	`}`
`21`	`28`	`}`
`22`	`29`	`}`