Clean up comments and fix build errors

Author: wenli-cai

workflow-trace-viewer/api/workflow-trace-viewer.api

@@ -14,25 +14,15 @@ public final class com/squareup/workflow1/traceviewer/MainKt {
 	public static synthetic fun main ([Ljava/lang/String;)V
 }
 
-public final class com/squareup/workflow1/traceviewer/SandboxState {
-	public static final field $stable I
-	public fun <init> ()V
-	public final fun getOffset-F1C5BW0 ()J
-	public final fun getScale ()F
-	public final fun reset ()V
-	public final fun setOffset-k-4lQ0M (J)V
-	public final fun setScale (F)V
-}
-
 public final class com/squareup/workflow1/traceviewer/util/ComposableSingletons$UploadFileKt {
 	public static final field INSTANCE Lcom/squareup/workflow1/traceviewer/util/ComposableSingletons$UploadFileKt;
 	public static field lambda-1 Lkotlin/jvm/functions/Function3;
 	public fun <init> ()V
 	public final fun getLambda-1$wf1_workflow_trace_viewer ()Lkotlin/jvm/functions/Function3;
 }
 
-public final class com/squareup/workflow1/traceviewer/util/SandboxBackgroundKt {
-	public static final fun SandboxBackground (Lcom/squareup/workflow1/traceviewer/SandboxState;Landroidx/compose/ui/Modifier;Lkotlin/jvm/functions/Function2;Landroidx/compose/runtime/Composer;II)V
+public final class com/squareup/workflow1/traceviewer/util/JsonParserKt {
+	public static final field ROOT_ID Ljava/lang/String;
 }
 
 public final class com/squareup/workflow1/traceviewer/util/UploadFileKt {

workflow-trace-viewer/build.gradle.kts

@@ -27,7 +27,6 @@ kotlin {
         implementation(libs.filekit.dialogs.compose)
       }
     }
-    
     jvmTest {
       dependencies {
         implementation(kotlin("test"))
@@ -60,8 +59,8 @@ compose {
 }
 
 tasks.named<Test>("jvmTest") {
-    useJUnitPlatform()
-    testLogging {
-        events("passed", "skipped", "failed")
-    }
+  useJUnitPlatform()
+  testLogging {
+    events("passed", "skipped", "failed")
+  }
 }

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

@@ -68,7 +68,7 @@ public fun App(
 
     // The states are reset when a new file is selected.
     UploadFile(
-      onFileSelect = {
+      resetOnFileSelect = {
         selectedTraceFile = it
         selectedNode = null
         frameIndex = 0

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

@@ -40,7 +40,6 @@ internal fun RightInfoPanel(
   selectedNode: Node?,
   modifier: Modifier = Modifier
 ) {
-  // This row is aligned to the right of the screen.
   Row(
     modifier = modifier
   ) {

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

@@ -67,7 +67,6 @@ internal fun RenderDiagram(
   }
 
   if (!isLoading) {
-    // DrawTree(frames[frameInd], affectedNodes[frameInd], onNodeSelect)
     DrawTree(fullTree[frameInd], affectedNodes[frameInd], onNodeSelect)
   }
 }

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

@@ -30,7 +30,7 @@ internal suspend fun parseTrace(
   val workflowAdapter = createMoshiAdapter()
   val parsedRenderPasses = try {
     workflowAdapter.fromJson(jsonString) ?: return ParseResult.Failure(
-      IllegalArgumentException("The provided file does not contain a valid trace.")
+      IllegalArgumentException("Provided trace file is empty or malformed.")
     )
     /*
       this parsing method can never be called without a provided file, so we can assume that there
@@ -73,6 +73,7 @@ private fun createMoshiAdapter(): JsonAdapter<List<List<Node>>> {
  */
 private fun getFrameFromRenderPass(renderPass: List<Node>): Node {
   val childrenByParent: Map<String, List<Node>> = renderPass.groupBy { it.parentId }
+  println(childrenByParent)
   val root = childrenByParent[ROOT_ID]?.single()
   return buildTree(root!!, childrenByParent)
 }
@@ -94,8 +95,11 @@ private fun buildTree(node: Node, childrenByParent: Map<String, List<Node>>): No
 }
 
 /**
- * Every new frame starts with the same roots as the main tree, so we can do a simple traversal to
- * add any missing child nodes from the frame.
+ * Every new frame starts with the same roots as the main tree, so we can fold each frame into the
+ * current tree, add all the missing children or replace any new ones, and then store the newly
+ * merged tree.
+ *
+ * @return Node the newly formed tree with the frame merged into it.
  */
 internal fun mergeFrameIntoMainTree(
   frame: Node,

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

@@ -20,14 +20,14 @@ import io.github.vinceglb.filekit.dialogs.compose.rememberFilePickerLauncher
  */
 @Composable
 public fun UploadFile(
-  onFileSelect: (PlatformFile?) -> Unit,
+  resetOnFileSelect: (PlatformFile?) -> Unit,
   modifier: Modifier = Modifier,
 ) {
   val launcher = rememberFilePickerLauncher(
     type = FileKitType.File(listOf("json", "txt")),
     title = "Select Workflow Trace File"
   ) {
-    onFileSelect(it)
+    resetOnFileSelect(it)
   }
 
   Button(

workflow-trace-viewer/src/jvmTest/kotlin/com/squareup/workflow1/traceviewer/util/JsonParserTest.kt

@@ -1,6 +1,7 @@
 package com.squareup.workflow1.traceviewer.util
 
 import com.squareup.workflow1.traceviewer.model.Node
+import com.squareup.workflow1.traceviewer.util.ROOT_ID
 import kotlin.test.Test
 import kotlin.test.assertEquals
 import kotlin.test.assertTrue
@@ -11,12 +12,12 @@ class JsonParserTest {
     fun `test mergeFrameIntoMainTree with new children`() {
         // Create main tree with one child
         val mainChild = createNode("child1", "root", "1")
-        val mainTree = createNode("root", "root", "0", mutableListOf(mainChild))
+        val mainTree = createNode("root", "root", "0", "0", listOf(mainChild))
 
         // Create frame with a new child
         val frameChild1 = createNode("child1", "root", "1")
         val frameChild2 = createNode("child2", "root", "2")
-        val frame = createNode("root", "root", "0", mutableListOf(frameChild1, frameChild2))
+        val frame = createNode("root", "root", "0", "0", listOf(frameChild1, frameChild2))
 
         // Merge frame into main tree
         val mergedTree = mergeFrameIntoMainTree(frame, mainTree)
@@ -31,15 +32,15 @@ class JsonParserTest {
     fun `test mergeFrameIntoMainTree with nested children`() {
         // Create main tree with nested structure
         val nestedChild = createNode("nested1", "child1", "2")
-        val mainChild = createNode("child1", "root", "1", mutableListOf(nestedChild))
-        val mainTree = createNode("root", "root", "0", mutableListOf(mainChild))
+        val mainChild = createNode("child1", "root", "1", "0", listOf(nestedChild))
+        val mainTree = createNode("root", "root", "0", "0", listOf(mainChild))
 
         // Create frame with new nested child
         val frameNestedChild1 = createNode("nested1", "child1", "2")
         val frameNestedChild2 = createNode("nested2", "child1", "3")
-        val frameChild = createNode("child1", "root", "1", 
+        val frameChild = createNode("child1", "root", "1", "0",
             mutableListOf(frameNestedChild1, frameNestedChild2))
-        val frame = createNode("root", "root", "0", mutableListOf(frameChild))
+        val frame = createNode("root", "root", "0", "0", listOf(frameChild))
 
         // Merge frame into main tree
         val mergedTree = mergeFrameIntoMainTree(frame, mainTree)
@@ -59,7 +60,7 @@ class JsonParserTest {
 
         // Create frame with children
         val frameChild = createNode("child1", "root", "1")
-        val frame = createNode("root", "root", "0", mutableListOf(frameChild))
+        val frame = createNode("root", "root", "0", "0", listOf(frameChild))
 
         // Merge frame into main tree
         val mergedTree = mergeFrameIntoMainTree(frame, mainTree)
@@ -73,7 +74,7 @@ class JsonParserTest {
     fun `test mergeFrameIntoMainTree with empty frame children`() {
         // Create main tree with children
         val mainChild = createNode("child1", "root", "1")
-        val mainTree = createNode("root", "root", "0", mutableListOf(mainChild))
+        val mainTree = createNode("root", "root", "0", "0", listOf(mainChild))
 
         // Create empty frame
         val frame = createNode("root", "root", "0")
@@ -90,16 +91,18 @@ class JsonParserTest {
         name: String,
         parent: String,
         id: String,
-        children: MutableList<Node> = mutableListOf()
+        parentId: String = "0",
+        children: List<Node> = emptyList()
     ): Node {
         return Node(
             name = name,
+            id = id,
             parent = parent,
+            parentId = parentId,
             props = "",
             state = "",
             rendering = "",
             children = children,
-            id = id
         )
     }
 }