Merge pull request #73 from contentstack/next

Fix: Empty string in case td or th node had void:true
contentstack · Jun 5, 2024 · fb43398 · fb43398
2 parents 1f6b9ee + 2e72a5b
commit fb43398
Show file tree

Hide file tree

Showing 4 changed files with 121 additions and 5 deletions.
diff --git a/Changelog.md b/Changelog.md
@@ -3,6 +3,12 @@
 A brief description of what changes project contains
 ## May 28, 2024
 
+#### v1.2.11
+
+- Fix: ignore td/th in case of attrs has void:true 
+
+## May 14, 2024
+
 #### v1.2.10
 
 -Enhancement: Update Asset url method added for GQL

diff --git a/pom.xml b/pom.xml
@@ -4,7 +4,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.contentstack.sdk</groupId>
     <artifactId>utils</artifactId>
-    <version>1.2.10</version>
+    <version>1.2.11</version>
     <packaging>jar</packaging>
     <name>Contentstack-utils</name>
     <description>Java Utils SDK for Contentstack Content Delivery API, Contentstack is a headless CMS</description>

diff --git a/src/main/java/com/contentstack/utils/render/DefaultOption.java b/src/main/java/com/contentstack/utils/render/DefaultOption.java
@@ -14,6 +14,7 @@
 
 public class DefaultOption implements Option {
 
+
     /**
      * The function `renderOptions` takes in a JSON object and metadata and returns a string based on the
      * style type of the metadata.
@@ -153,10 +154,19 @@ public String renderNode(String nodeType, JSONObject nodeObject, NodeCallback ca
                 return "<tfoot" + strAttrs + ">" + cleanChildren + "</tfoot>";
             case "tr":
                 return "<tr" + strAttrs + ">" + cleanChildren + "</tr>";
-            case "th":
-                return "<th" + strAttrs + ">" + cleanChildren + "</th>";
-            case "td":
-                return "<td" + strAttrs + ">" + cleanChildren + "</td>";
+            case "th":{
+                if (nodeObject.has("attrs") && nodeObject.optJSONObject("attrs").has("void") && 
+                    nodeObject.optJSONObject("attrs").optBoolean("void")) {
+                  return "";
+                }else{
+                return "<th" + strAttrs + ">" + cleanChildren + "</th>";}}
+            case "td":{
+                if (nodeObject.has("attrs") && nodeObject.optJSONObject("attrs").has("void") && 
+                    nodeObject.optJSONObject("attrs").optBoolean("void")) {
+                  return "";
+                }else{
+                return "<td" + strAttrs + ">" + cleanChildren + "</td>";}}
+
             case "blockquote":
                 return "<blockquote" + strAttrs + ">" + cleanChildren + "</blockquote>";
             case "code":

diff --git a/src/test/java/com/contentstack/utils/DefaultOptionTests.java b/src/test/java/com/contentstack/utils/DefaultOptionTests.java
@@ -1,15 +1,21 @@
 package com.contentstack.utils;
 
 import com.contentstack.utils.helper.Metadata;
+import com.contentstack.utils.interfaces.NodeCallback;
 import com.contentstack.utils.render.DefaultOption;
+
+
 import org.json.JSONObject;
+import org.json.JSONArray;
 import org.jsoup.nodes.Attributes;
 import org.junit.Assert;
 import org.junit.BeforeClass;
 import org.junit.FixMethodOrder;
 import org.junit.Test;
 import org.junit.runners.MethodSorters;
 
+import static org.junit.Assert.assertEquals;
+
 import java.io.IOException;
 import java.util.logging.Level;
 import java.util.logging.Logger;
@@ -82,5 +88,99 @@ public void testEmbeddedDefaultDisplayable() {
         String result = defaultOptions.renderOptions(localJsonObj.optJSONObject("_embedded_items"), metadata);
         Assert.assertEquals("<img src=\"\" alt=\"\" />", result);
     }
+     @Test
+    public void testRenderNodeWithVoidTd() {
+        DefaultOption defaultOptions = new DefaultOption();
+        JSONObject nodeObject = new JSONObject();
+        JSONObject attrs = new JSONObject();
+        attrs.put("void", true);
+        nodeObject.put("attrs", attrs);
+        nodeObject.put("children", new JSONArray());
+
+        NodeCallback callback = children -> {
+            // Simple callback implementation for testing purposes
+            StringBuilder sb = new StringBuilder();
+            for (int i = 0; i < children.length(); i++) {
+                sb.append(children.getJSONObject(i).getString("type"));
+            }
+            return sb.toString();
+        };
+
+        String result = defaultOptions.renderNode("td", nodeObject, callback);
+        Assert.assertEquals("", result);
+    }
+    @Test
+    public void testRenderNodeWithVoidTh() {
+        DefaultOption defaultOptions = new DefaultOption();
+        JSONObject nodeObject = new JSONObject();
+        JSONObject attrs = new JSONObject();
+        attrs.put("void", true);
+        nodeObject.put("attrs", attrs);
+        nodeObject.put("children", new JSONArray());
+
+        NodeCallback callback = children -> {
+            // Simple callback implementation for testing purposes
+            StringBuilder sb = new StringBuilder();
+            for (int i = 0; i < children.length(); i++) {
+                sb.append(children.getJSONObject(i).getString("type"));
+            }
+            return sb.toString();
+        };
+
+        String result = defaultOptions.renderNode("th", nodeObject, callback);
+        Assert.assertEquals("", result);
+    }
+
+    @Test
+    public void testRenderNodeWithoutVoidTd() {
+        DefaultOption defaultOptions = new DefaultOption();
+        JSONObject nodeObject = new JSONObject();
+        JSONObject attrs = new JSONObject();
+        attrs.put("class", "example");
+        nodeObject.put("attrs", attrs);
+        JSONArray children = new JSONArray();
+        JSONObject child = new JSONObject();
+        child.put("type", "text");
+        child.put("content", "example content");
+        children.put(child);
+        nodeObject.put("children", children);
+
+        NodeCallback callback = childrenArray -> {
+            StringBuilder sb = new StringBuilder();
+            for (int i = 0; i < childrenArray.length(); i++) {
+                sb.append(childrenArray.getJSONObject(i).getString("content"));
+            }
+            return sb.toString();
+        };
+
+        String result = defaultOptions.renderNode("td", nodeObject, callback);
+        Assert.assertEquals("<td class=\"example\">example content</td>", result);
+    }
+
+    @Test
+    public void testRenderNodeWithoutVoidTh() {
+        DefaultOption defaultOptions = new DefaultOption();
+        JSONObject nodeObject = new JSONObject();
+        JSONObject attrs = new JSONObject();
+        attrs.put("class", "example");
+        nodeObject.put("attrs", attrs);
+        JSONArray children = new JSONArray();
+        JSONObject child = new JSONObject();
+        child.put("type", "text");
+        child.put("content", "example content");
+        children.put(child);
+        nodeObject.put("children", children);
+
+        NodeCallback callback = childrenArray -> {
+            StringBuilder sb = new StringBuilder();
+            for (int i = 0; i < childrenArray.length(); i++) {
+                sb.append(childrenArray.getJSONObject(i).getString("content"));
+            }
+            return sb.toString();
+        };
+
+        String result = defaultOptions.renderNode("th", nodeObject, callback);
+        Assert.assertEquals("<th class=\"example\">example content</th>", result);
+    }
 
 }