From 598b650cf4809233db005c8421dd48049a6f5e5e Mon Sep 17 00:00:00 2001 From: Sonia Zorba <sonia.zorba@inaf.it> Date: Mon, 8 Nov 2021 18:41:18 +0100 Subject: [PATCH] Minor change to NodeInfo for supporting external links icon --- .../src/main/java/it/inaf/ia2/vospace/ui/service/NodeInfo.java | 3 +++ .../it/inaf/ia2/vospace/ui/service/NodesHtmlGeneratorTest.java | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/vospace-ui-backend/src/main/java/it/inaf/ia2/vospace/ui/service/NodeInfo.java b/vospace-ui-backend/src/main/java/it/inaf/ia2/vospace/ui/service/NodeInfo.java index 2108e33..cb7cc33 100644 --- a/vospace-ui-backend/src/main/java/it/inaf/ia2/vospace/ui/service/NodeInfo.java +++ b/vospace-ui-backend/src/main/java/it/inaf/ia2/vospace/ui/service/NodeInfo.java @@ -61,6 +61,9 @@ public class NodeInfo { String prefix = "vos://" + authority; this.target = decodePath(((LinkNode) node).getTarget(), prefix); this.type = linkedNode.getType(); + } else if (node instanceof LinkNode) { + this.target = ((LinkNode) node).getTarget(); + this.type = "vos:DataNode"; // data link } } diff --git a/vospace-ui-backend/src/test/java/it/inaf/ia2/vospace/ui/service/NodesHtmlGeneratorTest.java b/vospace-ui-backend/src/test/java/it/inaf/ia2/vospace/ui/service/NodesHtmlGeneratorTest.java index 568ed14..b9d22fa 100644 --- a/vospace-ui-backend/src/test/java/it/inaf/ia2/vospace/ui/service/NodesHtmlGeneratorTest.java +++ b/vospace-ui-backend/src/test/java/it/inaf/ia2/vospace/ui/service/NodesHtmlGeneratorTest.java @@ -65,7 +65,7 @@ public class NodesHtmlGeneratorTest { assertTrue(html.contains("<input type=\"checkbox\" data-node=\"/mynode/file1\" class=\"deletable\">")); assertTrue(html.contains("<span class=\"icon folder-link-icon\"></span> <a href=\"#/nodes/mynode\">link1</a>")); assertTrue(html.contains("<span class=\"icon link-icon\"></span> <a target=\"blank_\" href=\"download/mynode/link2\">link2</a>")); - assertTrue(html.contains("<span class=\"icon file-icon\"></span> <a target=\"blank_\" href=\"download/mynode/link3\">link3</a>")); + assertTrue(html.contains("<span class=\"icon link-icon\"></span> <a target=\"blank_\" href=\"download/mynode/link3\">link3</a>")); } private void setGroups(Node node, String groupRead, String groupWrite) { -- GitLab