Skip to content

Commit dc678b5

Browse files
nadeem-csnadeem-cs
authored
Merge pull request #5 from contentstack/feat/CS-43148-missing-style-attrs
Feat: missing style attrs of Node
2 parents c1e04ae + cfc8f5f commit dc678b5

14 files changed

Lines changed: 129 additions & 91 deletions

File tree

‎.github/workflows/ci.yml‎

Lines changed: 0 additions & 33 deletions
This file was deleted.

‎.github/workflows/nuget-publish.yml‎

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
# This workflow will publish a package when a release is created
2+
3+
name: Publish package to NuGet repository
4+
on:
5+
release:
6+
types: [created]
7+
jobs:
8+
publish-nuget:
9+
runs-on: windows-latest
10+
steps:
11+
- name: Checkout repository
12+
uses: actions/checkout@v1
13+
- name: Setup .NET Core @ Latest
14+
uses: actions/setup-dotnet@v1
15+
with:
16+
dotnet-version: '3.1.x'
17+
env:
18+
NUGET_AUTH_TOKEN: ${{ secrets.NUGET_AUTH_TOKEN }}
19+
- name: Build solution and generate NuGet package
20+
run: |
21+
cd contentstack-utils-dotnet
22+
dotnet pack -c Release -o out
23+
24+
- name: Push generated package to GitHub registry
25+
run: dotnet nuget push ./contentstack-utils-dotnet/out/*.nupkg --api-key $NUGET_AUTH_TOKEN --skip-duplicate --no-symbols true
26+
27+
publish-git:
28+
runs-on: windows-latest
29+
steps:
30+
- name: Checkout repository
31+
uses: actions/checkout@v1
32+
- name: Setup .NET Core @ Latest
33+
uses: actions/setup-dotnet@v1
34+
with:
35+
dotnet-version: '3.1.x'
36+
source-url: https://nuget.pkg.github.com/Contentstack/index.json
37+
env:
38+
NUGET_AUTH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
39+
- name: Build solution and generate NuGet package
40+
run: |
41+
cd contentstack-utils-dotnet
42+
dotnet pack -c Release -o out
43+
44+
- name: Push generated package to GitHub registry
45+
run: dotnet nuget push ./contentstack-utils-dotnet/out/*.nupkg --api-key ${{ secrets.GITHUB_TOKEN }} --skip-duplicate --no-symbols true

‎.github/workflows/sast-scan.yml‎

Lines changed: 0 additions & 11 deletions
This file was deleted.

‎.github/workflows/sca-scan.yml‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,14 @@ jobs:
66
security:
77
runs-on: ubuntu-latest
88
steps:
9-
- uses: actions/checkout@master
9+
- name: Checkout repository
10+
uses: actions/checkout@master
11+
- uses: snyk/actions/setup@master
12+
- name: Setup .NET
13+
uses: actions/setup-dotnet@v3.0.3
14+
- name: Restore dependencies
15+
run: dotnet restore ./Contentstack.Utils.sln
1016
- name: Run Snyk to check for vulnerabilities
11-
uses: snyk/actions/dotnet@master
17+
run: cd Contentstack.Utils && snyk test --fail-on=all
1218
env:
1319
SNYK_TOKEN: ${{ secrets.SNYK_TOKEN }}
14-
with:
15-
args: --fail-on=all

‎.github/workflows/secrets-scan.yml‎

Lines changed: 0 additions & 11 deletions
This file was deleted.

‎.talismanrc‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
fileignoreconfig:
2+
- filename: Contentstack.Utils/Models/Options.cs
3+
checksum: 3dc51f0de02429ef9a43b66e666ac4dbde41195e245f8ecc0094548ca8603245
4+
version: ""

‎CHANGELOG.md‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,8 @@
11

2+
### Version: 1.0.2
3+
#### Date: Mar-14-2024
4+
- Style attributes supported in converted HTML.
5+
26
### Version: 1.0.1
37
#### Date: July-16-2021
48
- Json RTE content to Html Support added.

‎Contentstack.Utils.Tests/Constants/JsonToHtmlConstants.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ public static class JsonToHtmlResultConstants
44
{
55
public const string kPlainTextHtml = "<strong>Aliquam sit amet libero dapibus, eleifend ligula at, varius justo</strong><strong><em>Lorem ipsum</em></strong><strong><em><u>dolor sit amet</u></em></strong><strong><em><u><strike>consectetur adipiscing elit.</strike></u></em></strong><strong><em><u><span>Sed condimentum iaculis magna in vehicula. </span></u></em></strong><strong><em><u><sup> Vestibulum vitae convallis </sup></u></em></strong><strong><em><u><sub> lacus. </sub></u></em></strong>";
66
public const string kParagraphHtml = "<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Sed condimentum iaculis magna in vehicula. Vestibulum vitae convallis lacus. Praesent a diam iaculis turpis rhoncus faucibus. Aliquam sed pulvinar sem.</p>";
7-
public const string kH1Html = "<h1><strong><em><u><sub>Lorem ipsum dolor sit amet.</sub></u></em></strong></h1>";
7+
public const string kH1Html = "<h1 style=\"color: blue; font-size: 24px;\"><strong><em><u><sub>Lorem ipsum dolor sit amet.</sub></u></em></strong></h1>";
88
public const string kH2Html = "<h2><strong><em><u><sub>Vestibulum a ligula eget massa sagittis aliquam sit amet quis tortor. </sub></u></em></strong></h2>";
99
public const string kH3Html = "<h3><strong><em><u><sub>Mauris venenatis dui id massa sollicitudin, non bibendum nunc dictum.</sub></u></em></strong></h3>";
1010
public const string kH4Html = "<h4><strong><em><u><sub>MaNullam feugiat turpis quis elit interdum, vitae laoreet quam viverra</sub></u></em></strong></h4>";
@@ -24,7 +24,7 @@ public static class JsonToHtmlConstants
2424
{
2525
public const string kBlankDocument = "{ \"uid\":\"06e34a7a4e5d7fc2acd\", \"_version\":13, \"attrs\":{ }, \"children\":[],\"type\":\"doc\"}";
2626
public const string kPlainTextJson = "{ \"uid\":\"06e34a7a4e5d7fc2acd\", \"_version\":13, \"attrs\":{ }, \"children\":[{\"text\":\"Aliquam sit amet libero dapibus, eleifend ligula at, varius justo\",\"bold\":true},{ \"text\":\"Lorem ipsum\",\"bold\":true,\"italic\":true},{ \"text\":\"dolor sit amet\",\"bold\":true,\"italic\":true,\"underline\":true},{ \"text\":\"consectetur adipiscing elit.\",\"bold\":true,\"italic\":true,\"underline\":true,\"strikethrough\":true},{ \"text\":\"Sed condimentum iaculis magna in vehicula. \",\"bold\":true,\"italic\":true,\"underline\":true,\"inlineCode\":true},{ \"text\":\" Vestibulum vitae convallis \",\"bold\":true,\"italic\":true,\"underline\":true,\"superscript\":true},{ \"text\":\" lacus. \",\"bold\":true,\"italic\":true,\"underline\":true,\"subscript\":true}],\"type\":\"doc\"}";
27-
public const string kH1Json = "{ \"uid\":\"06e34a7a449d7fc2acd\",\"_version\":13,\"attrs\":{ },\"children\":[{ \"type\":\"h1\",\"attrs\":{ },\"uid\":\"c2dfed70 4d7030c65e2e1\",\"children\":[{ \"text\":\"Lorem ipsum dolor sit amet.\",\"bold\":true,\"italic\":true,\"underline\":true,\"subscript\":true}]}],\"type\":\"doc\"}";
27+
public const string kH1Json = "{ \"uid\":\"06e34a7a449d7fc2acd\",\"_version\":13,\"attrs\":{ },\"children\":[{ \"type\":\"h1\",\"attrs\":{ \"style\": { \"color\": \"blue\", \"font-size\": \"24px\" } },\"uid\":\"c2dfed70 4d7030c65e2e1\",\"children\":[{ \"text\":\"Lorem ipsum dolor sit amet.\",\"bold\":true,\"italic\":true,\"underline\":true,\"subscript\":true}]}],\"type\":\"doc\"}";
2828
public const string kH2Json = "{ \"uid\":\"06e34a7a4e2acd\",\"_version\":13,\"attrs\":{ },\"children\":[{ \"type\":\"h2\",\"attrs\":{ },\"uid\":\"c2dfed9a7030c65e2e1\",\"children\":[{ \"text\":\"Vestibulum a ligula eget massa sagittis aliquam sit amet quis tortor. \",\"bold\":true,\"italic\":true,\"underline\":true,\"subscript\":true}]}],\"type\":\"doc\"}";
2929
public const string kH3Json = "{ \"uid\":\"06e34ad7fc2acd\",\"_version\":13,\"attrs\":{ },\"children\":[{ \"type\":\"h3\",\"attrs\":{ },\"uid\":\"c2df42cfb70 4d7030c65e2e1\",\"children\":[{ \"text\":\"Mauris venenatis dui id massa sollicitudin, non bibendum nunc dictum.\",\"bold\":true,\"italic\":true,\"underline\":true,\"subscript\":true}]}],\"type\":\"doc\"}";
3030
public const string kH4Json = "{ \"uid\":\"06e34a7a4e54cd\", \"_version\":13, \"attrs\":{ \"style\":{ \"text-align\":\"center\" }, \"redactor-attributes\":{ } }, \"children\":[{\"type\":\"h4\",\"attrs\":{},\"uid\":\"c2dfed4d7030c65e2e1\",\"children\":[{\"text\":\"MaNullam feugiat turpis quis elit interdum, vitae laoreet quam viverra\",\"bold\":true,\"italic\":true,\"underline\":true,\"subscript\":true}]}],\"type\":\"doc\"}";

‎Contentstack.Utils.Tests/Contentstack.Utils.Tests.csproj‎

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,30 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>netcoreapp3.1</TargetFramework>
4+
<TargetFrameworks>netstandard2.0;net47;net472;</TargetFrameworks>
55

66
<IsPackable>false</IsPackable>
7-
<ReleaseVersion>1.0.1</ReleaseVersion>
7+
<ReleaseVersion>$(Version)</ReleaseVersion>
88
</PropertyGroup>
99

1010
<ItemGroup>
1111
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.9.0" />
1212
<PackageReference Include="xunit" Version="2.4.0" />
13-
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.0" />
13+
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.0" >
14+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
15+
<PrivateAssets>all</PrivateAssets>
16+
</PackageReference>
1417
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
1518
<PackageReference Include="coverlet.collector" Version="3.0.3">
1619
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
1720
<PrivateAssets>all</PrivateAssets>
1821
</PackageReference>
1922
</ItemGroup>
20-
23+
<ItemGroup>
24+
<Reference Include="Contentstack.Utils">
25+
<HintPath>..\Contentstack.Utils\bin\Debug\netstandard2.0\Contentstack.Utils.dll</HintPath>
26+
</Reference>
27+
</ItemGroup>
2128
<ItemGroup>
2229
<ProjectReference Include="..\Contentstack.Utils\Contentstack.Utils.csproj" />
2330
</ItemGroup>

‎Contentstack.Utils.sln‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ Global
2121
{EB2B5E23-E45F-4C6C-BF98-FE3971DE4250}.Release|Any CPU.Build.0 = Release|Any CPU
2222
EndGlobalSection
2323
GlobalSection(MonoDevelopProperties) = preSolution
24-
version = 1.0.1
24+
version = 1.0.2
2525
Policies = $0
2626
$0.DotNetNamingPolicy = $1
2727
$1.DirectoryNamespaceAssociation = PrefixedHierarchical

0 commit comments

Comments
 (0)