Reference JSON RTE, Asset as embedded object

Reference JSON RTE, Asset as embedded object

Author: ishaileshmishra

.talismanrc

@@ -2,6 +2,7 @@ threshold: medium
 
 fileignoreconfig:
 
-- filename: src/test/resources/issue/newline.json
-  checksum: eb075c30d3769a4ac08871d8f4affca55abb21e816726a083141e0e2b94417e6
+- filename: src/test/resources/issue/jsonfile.json
+  checksum: d67cd6db0795f8c5a5f5edf34a457720191e8894889e9f9bb4b8106c23b40799
+
 

src/main/java/com/contentstack/utils/AutomateCommon.java

@@ -176,8 +176,8 @@ private static String extractKeys(@NotNull JSONObject jsonNode, Option renderObj
                     JSONObject contentToPass = filteredContent.get();
                     return getStringOption(renderObject, metadata, contentToPass);
                 } else {
-                    if (attrType.equalsIgnoreCase(ASSET)) {
-                        return renderObject.renderNode("img", jsonNode, nodeJsonArray -> doRawProcessing(nodeJsonArray, renderObject, embedItem));
+                    if (attrType.equalsIgnoreCase("asset")) {
+                        return renderObject.renderNode("img", jsonNode, nodeJsonArray -> _doRawProcessing(nodeJsonArray, renderObject, embedItem));
                     }
                 }
 

src/main/java/com/contentstack/utils/render/DefaultOption.java

@@ -65,32 +65,15 @@ public String renderNode(String nodeType, JSONObject nodeObject, NodeCallback ca
             case "p":
                 return "<p>" + children + "</p>";
             case "a":
-                if (nodeObject.has("url")) {
-                    return "<a href=\"" + getNodeStr(nodeObject, "url") + "\">" + children + "</a>";
-                }
-                if (nodeObject.has("href")) {
-                    return "<a href=\"" + getNodeStr(nodeObject, "href") + "\">" + children + "</a>";
-                }
-                return children;
+                return "<a href=\"" + getNodeStr(nodeObject, "href") + "\">" + children + "</a>";
             case "img":
-                if (nodeObject.has("src")) {
-                    return "<img src=\"" + getNodeStr(nodeObject, "src") + "\" />" + children;
-                }
-                if (nodeObject.has("url")) {
-                    return "<img src=\"" + getNodeStr(nodeObject, "url") + "\" />" + children;
-                }
-                if (nodeObject.has("asset-link")) {
-                    return "<img src=\"" + getNodeStr(nodeObject, "asset-link") + "\" />" + children;
+                String assetLink = getNodeStr(nodeObject, "asset-link");
+                if (!assetLink.isEmpty()) {
+                    return "<img src=\"" + assetLink + "\" />" + children;
                 }
-                return children;
+                return "<img src=\"" + getNodeStr(nodeObject, "src") + "\" />" + children;
             case "embed":
-                if (nodeObject.has("src")) {
-                    return "<iframe src=\"" + getNodeStr(nodeObject, "src") + "\"" + children + "</iframe>";
-                }
-                if (nodeObject.has("url")) {
-                    return "<iframe src=\"" + getNodeStr(nodeObject, "url") + "\"" + children + "</iframe>";
-                }
-                return children;
+                return "<iframe src=\"" + getNodeStr(nodeObject, "src") + "\"" + children + "</iframe>";
             case "h1":
                 return "<h1>" + children + "</h1>";
             case "h2":
@@ -145,6 +128,7 @@ private String getNodeStr(JSONObject nodeObject, String key) {
         return herf;
     }
 
+
     /**
      * Returns Title From The Embedded Object of type entry
      *

src/test/java/com/contentstack/utils/AssetLinkTest.java

@@ -0,0 +1,31 @@
+package com.contentstack.utils;
+
+import com.contentstack.utils.render.DefaultOption;
+import org.json.JSONObject;
+import org.junit.Assert;
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+import java.io.IOException;
+
+public class AssetLinkTest {
+
+
+    private static JSONObject assetLink = null;
+
+
+    @BeforeClass
+    public static void startUtilTests() throws IOException {
+        final String ASSERT_LINK = "src/test/resources/issue/jsonfile.json";
+        assetLink = new ReadResource().readJson(ASSERT_LINK);
+    }
+
+    @Test
+    public void testRenderFunction() {
+        String[] keys = new String[1];
+        keys[0] = "assetlink";
+        Utils.jsonToHTML(assetLink, keys, new DefaultOption());
+        System.out.println(assetLink);
+        Assert.assertEquals("<img src=\"https://image.url/11.jpg\" />", assetLink.opt("assetlink").toString());
+    }
+}