Merge pull request #223 from refactorfirst/render-node-names-in-force-graph-correctly

Render Node Names in Force Graphs with Correct Name

Author: jimbethancourt

report/src/main/java/org/hjug/refactorfirst/report/HtmlReport.java

@@ -154,6 +154,7 @@ function createForceGraph(popupId, containerName, dot) {
                             var nodeData = graphlibGraph.node(node);
                             nodes.push({
                                 id: node,
+                                label: graphlibGraph.node(node).label || node,
                                 color: nodeData.color || 'white',
                             });
                         });
@@ -189,7 +190,7 @@ function createForceGraph(popupId, containerName, dot) {
 
                         const Graph = new ForceGraph3D(container)
                             .graphData(gData)
-                            .nodeLabel('id')
+                            .nodeLabel('label')
                             .width(container.clientWidth)
                             .height(container.clientHeight);
 
@@ -199,7 +200,7 @@ function createForceGraph(popupId, containerName, dot) {
 
                             // use node labels instead of spheres
                             Graph.nodeThreeObject(node => {
-                                const sprite = new SpriteText(node.id);
+                                const sprite = new SpriteText(node.label);
                                 sprite.material.depthWrite = false; // make sprite background transparent
                                 sprite.color = node.color;
                                 sprite.textHeight = 4;
@@ -612,14 +613,15 @@ private void renderClassVertices(
 
             dot.append(" [");
             dot.append(hyperlinkClassForDot(vertex, repoUrl, codebaseGraphDTO));
-            if (className.contains("$")) {
-                dot.append(" label=\"").append(escapeDotQuoted(className)).append("\"");
-            } else if (isAnonymousFqn(vertex)) {
+
+            if (isAnonymousFqn(vertex)) {
                 // Kotlin "<anonymous>" renders under the enclosing source file's base name as the
                 // owner with $ as the enclosing-class separator (escaped for DOT).
                 dot.append(" label=\"")
                         .append(escapeDotQuoted(anonymousOwnerLabel(vertex, codebaseGraphDTO)))
                         .append("\"");
+            } else {
+                dot.append(" label=\"").append(escapeDotQuoted(className)).append("\"");
             }
 
             if (classesToRemove.contains(vertex)) {

report/src/test/java/org/hjug/refactorfirst/report/HtmlReportKotlinTest.java

@@ -95,9 +95,9 @@ void buildClassCycleDot_kotlinSourcePaths() {
                 KotlinCycleA -\\u003E KotlinCycleB [ label = "2" weight = "2" ];
                 KotlinCycleB -\\u003E KotlinCycleC [ label = "1" weight = "1" ];
                 KotlinCycleC -\\u003E KotlinCycleA [ label = "1" weight = "1" ];
-                KotlinCycleA [URL="https://github.com/refactorfirst/RefactorFirst/blob/src/main/kotlin/com/kotlin/cycles/KotlinCycleA.kt" target="_blank"];
-                KotlinCycleB [URL="https://github.com/refactorfirst/RefactorFirst/blob/src/main/kotlin/com/kotlin/cycles/KotlinCycleB.kt" target="_blank"];
-                KotlinCycleC [URL="https://github.com/refactorfirst/RefactorFirst/blob/src/main/kotlin/com/kotlin/cycles/KotlinCycleC.kt" target="_blank"];
+                KotlinCycleA [URL="https://github.com/refactorfirst/RefactorFirst/blob/src/main/kotlin/com/kotlin/cycles/KotlinCycleA.kt" target="_blank" label="KotlinCycleA"];
+                KotlinCycleB [URL="https://github.com/refactorfirst/RefactorFirst/blob/src/main/kotlin/com/kotlin/cycles/KotlinCycleB.kt" target="_blank" label="KotlinCycleB"];
+                KotlinCycleC [URL="https://github.com/refactorfirst/RefactorFirst/blob/src/main/kotlin/com/kotlin/cycles/KotlinCycleC.kt" target="_blank" label="KotlinCycleC"];
                 }`;\
                 """;
 

report/src/test/java/org/hjug/refactorfirst/report/HtmlReportTest.java

@@ -66,9 +66,9 @@ void buildClassCycleDot() {
                 + "A -\\u003E B [ label = \"2\" weight = \"2\" ];\n"
                 + "B -\\u003E C [ label = \"1\" weight = \"1\" ];\n"
                 + "C -\\u003E A [ label = \"1\" weight = \"1\" ];\n"
-                + "A [URL=\"https://github.com/refactorfirst/RefactorFirst/blob/src/main/java/org/hjug/refactorfirst/A.java\" target=\"_blank\"];\n"
-                + "B [URL=\"https://github.com/refactorfirst/RefactorFirst/blob/src/main/java/org/hjug/refactorfirst/B.java\" target=\"_blank\"];\n"
-                + "C [URL=\"https://github.com/refactorfirst/RefactorFirst/blob/src/main/java/org/hjug/refactorfirst/C.java\" target=\"_blank\"];\n"
+                + "A [URL=\"https://github.com/refactorfirst/RefactorFirst/blob/src/main/java/org/hjug/refactorfirst/A.java\" target=\"_blank\" label=\"A\"];\n"
+                + "B [URL=\"https://github.com/refactorfirst/RefactorFirst/blob/src/main/java/org/hjug/refactorfirst/B.java\" target=\"_blank\" label=\"B\"];\n"
+                + "C [URL=\"https://github.com/refactorfirst/RefactorFirst/blob/src/main/java/org/hjug/refactorfirst/C.java\" target=\"_blank\" label=\"C\"];\n"
                 + "}`;";
 
         assertEquals(expectedDot, dot);