Fix connections for sequential nested stages (#1291)

Author: das7pad

src/main/frontend/pipeline-graph-view/pipeline-graph/main/NestedPipelineGraphLayout.spec.ts

@@ -74,6 +74,18 @@ describe("NestedPipelineGraphLayout", () => {
         shouldMatchSnapshot(raw, true);
       });
     });
+
+    describe("gh1286_wrapped_all_skipped.jenkinsfile", () => {
+      const raw =
+        '[{"name":"Wrapper","state":"success","id":"4","type":"STAGE","children":[{"name":"Skipped 1","state":"skipped","id":"6","type":"STAGE","children":[]},{"name":"Skipped 2","state":"skipped","id":"10","type":"STAGE","children":[]}]},{"name":"Next","state":"success","id":"16","type":"STAGE","children":[]}]';
+
+      it("should render layout", () => {
+        shouldMatchSnapshot(raw, false);
+      });
+      it("should render collapsed layout", () => {
+        shouldMatchSnapshot(raw, true);
+      });
+    });
   });
 });
 

src/main/frontend/pipeline-graph-view/pipeline-graph/main/NestedPipelineGraphLayout.ts

@@ -363,6 +363,17 @@ function computeTailNodes(
   // Collect nodes in a Set. With two skipped nodes next to each other, we need to deduplicate them.
   const sourceNodes = new Set<GraphNode>();
   const skippedNodes = new Set<GraphNode>();
+  const resolveDestination = (node: GraphNode): GraphNode[] => {
+    if (node.hasParallel) {
+      // Connect directly to parallel children
+      return node.children;
+    }
+    if (node.children.length > 0) {
+      // Connect directly to 1st child, recusively resolve it.
+      return resolveDestination(node.children[0]);
+    }
+    return [node];
+  };
   const connect = (
     tailNodes: GraphNode[],
     destination: GraphNode,
@@ -375,9 +386,7 @@ function computeTailNodes(
         skippedNodes.add(node);
       }
     }
-    const destinationNodes = destination.hasParallel
-      ? destination.children // Connect directly to parallel children
-      : [destination];
+    const destinationNodes = resolveDestination(destination);
     if (!destinationNodes.some((n) => !n.isSkipped)) {
       for (const node of destinationNodes) skippedNodes.add(node);
       return;
@@ -391,7 +400,8 @@ function computeTailNodes(
     sourceNodes.clear();
     skippedNodes.clear();
   };
-  if (node.type !== "root") {
+  if (node.isParallel) {
+    // Non-parallel stages will have been connected already via resolveDestination.
     connect([node], node.children[0], true);
   }
   for (let i = 0; i < node.children.length - 1; i++) {
@@ -405,7 +415,10 @@ function computeTailNodes(
     );
   }
   const last = node.children[node.children.length - 1];
-  if (last.isSkipped || skippedNodes.size > 0 || sourceNodes.size > 0) {
+  if (last.isSkipped) {
+    return [...sourceNodes, ...skippedNodes, last];
+  }
+  if (skippedNodes.size > 0 || sourceNodes.size > 0) {
     throw new Error("bug: buildGraphNested did not add trailing dummy node");
   }
   return computeTailNodes(connections, last);