Merge branch 'dev' into RT-496

Author: shreya-kamble

.github/workflows/secrets-scan.yml

@@ -0,0 +1,29 @@
+name: Secrets Scan
+on:
+  pull_request:
+    types: [opened, synchronize, reopened]
+jobs:
+  security-secrets:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: '2'
+          ref: '${{ github.event.pull_request.head.ref }}'
+      - run: |
+          git reset --soft HEAD~1
+      - name: Install Talisman
+        run: |
+          # Download Talisman
+          wget https://github.com/thoughtworks/talisman/releases/download/v1.37.0/talisman_linux_amd64 -O talisman
+
+          # Checksum verification
+          checksum=$(sha256sum ./talisman | awk '{print $1}')
+          if [ "$checksum" != "8e0ae8bb7b160bf10c4fa1448beb04a32a35e63505b3dddff74a092bccaaa7e4" ]; then exit 1; fi  
+
+          # Make it executable
+          chmod +x talisman
+      - name: Run talisman
+        run: |
+          # Run Talisman with the pre-commit hook
+          ./talisman --githook pre-commit

.talismanrc

@@ -1,4 +1,7 @@
 fileignoreconfig:
+- filename: .github/workflows/secrets-scan.yml
+  ignore_detectors:
+    - filecontent
 - filename: README.md
   checksum: 4bffa07e1e88d50a311464c9f90ff92bcba7fe434be4d9374bcd49bf76b1e6a8
 - filename: coverage/lcov-report/base.css

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@contentstack/json-rte-serializer",
-  "version": "3.0.1",
+  "version": "3.0.2",
   "description": "This Package converts Html Document to Json and vice-versa.",
   "main": "lib/index.js",
   "module": "lib/index.mjs",

src/fromRedactor.tsx

@@ -20,12 +20,16 @@ export const ELEMENT_TAGS: IHtmlToJsonElementTags = {
     const attrs: Record<string, string> = {}
     const target = el.getAttribute('target');
     const href = el.getAttribute('href');
+    const title = el.getAttribute('title');
 
     attrs.url = href ? href : '#';
 
     if(target && target !== '') {
       attrs.target = target; 
     }
+    if(title && title !== '') {
+      attrs.title = title; 
+    }
 
     return {
       type: "a",

src/jsonToMarkdown.tsx

@@ -14,32 +14,32 @@ const ELEMENT_TYPES: IJsonToMarkdownElementTags = {
   'h1': (attrs: any, child: string) => {
     return `
 
-#${child}#`
+# ${child} #`
   },
   'h2': (attrs: any, child: any) => {
     return `
 
-##${child}##`
+## ${child} ##`
   },
   'h3': (attrs: any, child: any) => {
     return `
 
-###${child}###`
+### ${child} ###`
   },
   'h4': (attrs: any, child: any) => {
     return `
 
-####${child}####`
+#### ${child} ####`
   },
   'h5': (attrs: any, child: any) => {
     return `
     
-#####${child}#####`
+##### ${child} #####`
   },
   'h6': (attrs: any, child: any) => {
     return `
     
-######${child}######`
+###### ${child} ######`
   },
   img: (attrsJson: any, child: any) => {
     if(attrsJson) {

test/expectedJson.ts

@@ -2416,6 +2416,77 @@ export default {
                 "_version": 2
             }
         ]
+    },
+    "RT-501":{
+        "html" : [
+            `<p><a href="google.in" target="_blank" title="google">ABC</a></p>`
+        ],
+        "json" : [
+            {
+                "type": "doc",
+                "attrs": {},
+                "uid": "bd63f151aa8d402cae046c8dae440134",
+                "children": [
+                    {
+                        "type": "p",
+                        "uid": "d2949ce0e0974ce783543edd37410c71",
+                        "attrs": {},
+                        "children": [
+                            {
+                                "uid": "7a2fd904668447ca8720428cbd2b0acc",
+                                "type": "a",
+                                "attrs": {
+                                    "url": "google.in",
+                                    "target": "_blank",
+                                    "title": "google"
+                                },
+                                "children": [
+                                    {
+                                        "text": "ABC"
+                                    }
+                                ]
+                            }
+                        ]
+                    }
+                ],
+            }
+        ],
+        "jsonWithRedactorAttributes": [
+            {
+                "type": "doc",
+                "attrs": {},
+                "uid": "bd63f151aa8d402cae046c8dae440134",
+                "children": [
+                  {
+                    "type": "p",
+                    "uid": "d2949ce0e0974ce783543edd37410c71",
+                    "attrs": {},
+                    "children": [
+                      {
+                        "uid": "7a2fd904668447ca8720428cbd2b0acc",
+                        "type": "a",
+                        "attrs": {
+                          "url": "google.in",
+                          "target": "_blank",
+                          "title": "google",
+                          "style": {},
+                          "redactor-attributes": {
+                            "href": "google.in",
+                            "target": "_blank",
+                            "title": "google"
+                          }
+                        },
+                        "children": [
+                          {
+                            "text": "ABC"
+                          }
+                        ]
+                      }
+                    ]
+                  }
+                ]
+              }
+        ]
     }
 
 }

test/expectedMarkdown.ts

@@ -163,17 +163,17 @@ This is a paragraph with \`inline code\`.`
         }],
         "markdown": `
 
-#Heading 1#
+# Heading 1 #
 
-##Heading 2##
+## Heading 2 ##
 
-###Heading 3###
+### Heading 3 ###
 
-####Heading 4####
+#### Heading 4 ####
     
-#####Heading 5#####
+##### Heading 5 #####
     
-######Heading 6######`
+###### Heading 6 ######`
 }, 
 {
     "title": "Block Quote Conversion",

test/fromRedactor.test.ts

@@ -328,6 +328,13 @@ describe("Testing html to json conversion", () => {
         expect(json).toStrictEqual({"type":"doc","uid":"uid","attrs":{},"children":[{"type":"p","attrs":{},"uid":"uid","children":[{"text":"Hello","attrs":{"style":{}},"bold":true},{"text":" Hii"}]}]})
 
     })
+    test("should add title attr to anchor tag", () => {
+        const html = expectedValue["RT-501"].html[0];
+        const json =expectedValue["RT-501"].jsonWithRedactorAttributes[0];
+
+        let jsonValue = htmlToJson(html)
+        expect(omitdeep(jsonValue, "uid")).toStrictEqual(omitdeep(json, "uid"))
+    })
 })
 
 

test/toRedactor.test.ts

@@ -329,6 +329,17 @@ describe("Testing json to html conversion", () => {
       })
     })
 
+    describe("RT-501",()=>{
+      it("should add title attr to anchor tag",()=>{
+        const html = expectedValue["RT-501"].html[0];
+        const json =expectedValue["RT-501"].json[0];
+
+        let htmlValue = toRedactor(json)
+        expect(htmlValue).toBe(html);
+      })
+      
+    })
+
 })
 
 test("should add nbsp for empty blocks", () => {