Generate full tree diagrams

Author: wenli-cai

workflow-trace-viewer/src/jvmMain/kotlin/com/squareup/workflow1/traceviewer/model/Node.kt

@@ -18,19 +18,6 @@ internal data class Node(
   val children: List<Node>,
 ) {
 
-  fun copy(): Node {
-    return Node(
-      name = name,
-      id = id,
-      parent = parent,
-      parentId = parentId,
-      props = props,
-      state = state,
-      rendering = rendering,
-      children = children,
-    )
-  }
-
   override fun toString(): String {
     return "Node(name='$name', parent='$parent', children=${children})"
   }

workflow-trace-viewer/src/jvmMain/kotlin/com/squareup/workflow1/traceviewer/ui/WorkflowTree.kt

@@ -40,6 +40,7 @@ internal fun RenderDiagram(
   var isLoading by remember(traceFile) { mutableStateOf(true) }
   var error by remember(traceFile) { mutableStateOf<Throwable?>(null) }
   var mainTree by remember { mutableStateOf<Node?>(null) }
+  var fullTree by remember { mutableStateOf<List<Node>>(emptyList()) }
 
   LaunchedEffect(traceFile) {
     val parseResult = parseTrace(traceFile)
@@ -52,6 +53,7 @@ internal fun RenderDiagram(
         val parsedFrames = parseResult.trace ?: emptyList()
         frames = parsedFrames
         mainTree = parseResult.trees.first()
+        fullTree = parseResult.trees
         onFileParse(parsedFrames)
         isLoading = false
       }
@@ -65,7 +67,7 @@ internal fun RenderDiagram(
 
   if (!isLoading) {
     // DrawTree(frames[frameInd], onNodeSelect)
-    DrawTree(mainTree!!, onNodeSelect)
+    DrawTree(fullTree[frameInd], onNodeSelect)
   }
 }
 

workflow-trace-viewer/src/jvmMain/kotlin/com/squareup/workflow1/traceviewer/util/JsonParser.kt

@@ -41,31 +41,13 @@ internal suspend fun parseTrace(
     return ParseResult.Failure(e)
   }
 
-  var mainWorkflowTree: Node? = null
-  // var parsedTrace = mutableListOf<Node>()
-  val frameTrees = mutableListOf<Node>()
-  // unParsedTrace.forEach { renderPass ->
-  //   val parsed = getFrameFromRenderPass(renderPass)
-  //   if (mainWorkflowTree == null) {
-  //     mainWorkflowTree = parsed
-  //   } else {
-  //     mergeFrameIntoMainTree(parsed, mainWorkflowTree!!)
-  //   }
-  //   parsedTrace.add(parsed)
-  //   frameTrees.add(mainWorkflowTree!!.copy())
-  // }
-
   val parsedTrace = parsedRenderPasses.map { renderPass -> getFrameFromRenderPass(renderPass)}
-
+  val frameTrees = mutableListOf<Node>()
   parsedTrace.fold(parsedTrace[0]) { tree, frame ->
-    // We assume that the first render pass is the main workflow tree.
-    // val parsedFrame = getFrameFromRenderPass(unParsedRenderPass)
     val mergedTree = mergeFrameIntoMainTree(frame, tree)
-    // parsedTrace.add(parsedFrame)
     frameTrees.add(mergedTree)
     mergedTree
   }
-
   return ParseResult.Success(parsedTrace, frameTrees)
 }
 
@@ -124,18 +106,13 @@ internal fun mergeFrameIntoMainTree(
   }
 
   return frame.children.fold(main) { mergedTree, child ->
-    // println(mergedTree)
-      val parent = mergedTree.children.singleOrNull() { it.id == child.id }
-
-      if (parent != null) {
-        // println("Merging child ${child.id} into parent ${parent.id}")
-        mergedTree.replaceChild(mergeFrameIntoMainTree(child, parent))
-      } else {
-        // println("Adding child ${child.id} to merged tree ${mergedTree.id}")
-        mergedTree.addChild(child)
-      }
+    val parent = mergedTree.children.singleOrNull { it.id == child.id }
+    if (parent != null) {
+      mergedTree.replaceChild(mergeFrameIntoMainTree(child, parent))
+    } else {
+      mergedTree.addChild(child)
+    }
   }
-    // println("Merged tree: $it")}
 }
 
 internal sealed interface ParseResult {