Fix tree representation for scripted parallel stages (#73)

Author: mikedld

src/main/java/io/jenkins/plugins/pipelinegraphview/utils/PipelineGraphApi.java

@@ -177,8 +177,9 @@ public PipelineGraph createTree() {
             // If a node encloses another node, it means it's a tree parent, so the first ancestor
             // ID we find
             // which matches an enclosing node then it's the stages tree parent.
+            List<String> enclosingIds = stageNode.getAllEnclosingIds();
             for (String ancestorId : ancestors) {
-              if (stageNode.getAllEnclosingIds().contains(ancestorId)) {
+              if (enclosingIds.contains(ancestorId)) {
                 treeParentId = ancestorId;
                 break;
               }

src/main/java/io/jenkins/plugins/pipelinegraphview/utils/PipelineNodeGraphVisitor.java

@@ -735,18 +735,20 @@ private void captureOrphanParallelBranches() {
               firstBranch.getId(), (parallel == null ? "(none)" : parallel.getId())));
     }
 
-    String firstNodeId = firstBranch.getId();
+    String syntheticNodeId =
+        firstBranch.getNode().getParents().stream()
+            .map((node) -> node.getId())
+            .findFirst()
+            .orElseGet(
+                () -> createSyntheticStageId(firstBranch.getId(), PARALLEL_SYNTHETIC_STAGE_NAME));
     List<FlowNode> parents;
     if (parallel != null) {
       parents = parallel.getNode().getParents();
     } else {
       parents = new ArrayList<>();
     }
     FlowNode syntheticNode =
-        new FlowNode(
-            firstBranch.getNode().getExecution(),
-            createSyntheticStageId(firstNodeId, PARALLEL_SYNTHETIC_STAGE_NAME),
-            parents) {
+        new FlowNode(firstBranch.getNode().getExecution(), syntheticNodeId, parents) {
           @Override
           public void save() throws IOException {
             // no-op to avoid JENKINS-45892 violations from serializing the synthetic FlowNode.

src/test/java/io/jenkins/plugins/pipelinegraphview/utils/PipelineGraphApiTest.java

@@ -132,4 +132,18 @@ public void createTree_complexSmokes() throws Exception {
                 "Skipped stage,",
                 "Parallel Stage 2[Branch A,Branch B,Branch C[Nested 1,Nested 2]]")));
   }
+
+  @Test
+  public void createTree_scriptedParallel() throws Exception {
+    WorkflowRun run =
+        TestUtils.createAndRunJob(
+            j, "scriptedParallel", "scriptedParallel.jenkinsfile", Result.SUCCESS);
+    PipelineGraphApi api = new PipelineGraphApi(run);
+    PipelineGraph graph = api.createTree();
+
+    List<PipelineStage> stages = graph.getStages();
+
+    String stagesString = TestUtils.collectStagesAsString(stages, PipelineStage::getName);
+    assertThat(stagesString, is("A,Parallel[B[BA,BB],C[CA,CB]],D[E[EA,EB],F[FA,FB]],G"));
+  }
 }

src/test/resources/io/jenkins/plugins/pipelinegraphview/utils/scriptedParallel.jenkinsfile

@@ -0,0 +1,44 @@
+stage('A') {
+    echo ''
+}
+parallel(
+    B: {
+        stage('BA') {
+            echo ''
+        }
+        stage('BB') {
+            echo ''
+        }
+    },
+    C: {
+        stage('CA') {
+            echo ''
+        }
+        stage('CB') {
+            echo ''
+        }
+    },
+)
+stage('D') {
+    parallel(
+        E: {
+            stage('EA') {
+                echo ''
+            }
+            stage('EB') {
+                echo ''
+            }
+        },
+        F: {
+            stage('FA') {
+                echo ''
+            }
+            stage('FB') {
+                echo ''
+            }
+        },
+    )
+}
+stage('G') {
+    echo ''
+}