Fix nested layout for parallel block with only skipped children (#1314)

Author: das7pad

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

@@ -131,6 +131,18 @@ describe("NestedPipelineGraphLayout", () => {
       });
     });
 
+    describe("gh1286_wrapped_two_parallel_last_all_skipped.jenkinsfile", () => {
+      const raw =
+        '[{"name":"Wrapper","state":"success","id":"4","type":"STAGE","children":[{"name":"one","state":"success","id":"6","type":"STAGE","children":[{"name":"nested 1","state":"success","id":"9","type":"PARALLEL","children":[]},{"name":"nested 2","state":"success","id":"10","type":"PARALLEL","children":[]}]},{"name":"two","state":"success","id":"17","type":"STAGE","children":[{"name":"Skipped 1","state":"skipped","id":"20","type":"PARALLEL","children":[]},{"name":"Skipped 2","state":"skipped","id":"21","type":"PARALLEL","children":[]}]}]},{"name":"Next","state":"success","id":"38","type":"STAGE","children":[]}]';
+
+      it("should render layout", () => {
+        shouldMatchSnapshot(raw, false);
+      });
+      it("should render collapsed layout", () => {
+        shouldMatchSnapshot(raw, true);
+      });
+    });
+
     describe("selective collapse", () => {
       const raw =
         '[{"name":"Non-Parallel Stage","state":"success","id":"6","type":"STAGE","children":[]},{"name":"Parallel Stage","state":"success","id":"12","type":"STAGE","children":[{"name":"Branch A","state":"success","id":"16","type":"PARALLEL","children":[]},{"name":"Branch B","state":"success","id":"17","type":"PARALLEL","children":[]},{"name":"Branch C","state":"success","id":"18","type":"PARALLEL","children":[{"name":"Nested 1","state":"success","id":"26","type":"STAGE","children":[]},{"name":"Nested 2","state":"success","id":"42","type":"STAGE","children":[]}]}]},{"name":"Skipped stage","state":"skipped","id":"54","type":"STAGE","children":[]}]';
@@ -155,12 +167,10 @@ function leanEdge(full: ConnectionEdge): ConnectionEdge {
     x: full.x,
     y: full.y,
     key: full.key,
-    type: full.type,
   };
   // Cherry-pick truthy fields that are relevant for connections.
   if (full.firstChildIsSkipped) lean.firstChildIsSkipped = true;
   if (full.isHidden) lean.isHidden = true;
-  if (full.isParallel) lean.isParallel = true;
   if (full.isPlaceholder) lean.isPlaceholder = true;
   if (full.isSkipped) lean.isSkipped = true;
   return lean;

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

@@ -263,6 +263,8 @@ function buildGraphNested(
       childNode.shiftX += layout.nodeSpacingH;
       childNode.width += layout.nodeSpacingH;
     }
+    childNode.allChildrenSkipped =
+      childNode.hasParallel && !childNode.children.some((c) => !c.isSkipped);
     node.children.push(childNode);
   }
   if (node.hasParallel) {
@@ -375,6 +377,15 @@ function computeTailNodes(
     return [node];
   }
   if (node.hasParallel) {
+    if (node.allChildrenSkipped) {
+      // Special case: a regular connection will be added around all the children.
+      connections.push({
+        sourceNodes: [node],
+        destinationNodes: [],
+        skippedNodes: [],
+        hasBranchLabels: false,
+      });
+    }
     return node.children.flatMap((child) =>
       computeTailNodes(connections, child),
     );
@@ -388,7 +399,7 @@ function computeTailNodes(
     ignoreSkipped?: boolean,
   ) => {
     for (const node of tailNodes) {
-      if (ignoreSkipped || !node.isSkipped) {
+      if (ignoreSkipped || !node.isSkipped || node.isParallel) {
         sourceNodes.add(node);
       } else {
         skippedNodes.add(node);
@@ -398,7 +409,7 @@ function computeTailNodes(
     const destinationNodes = destination.hasParallel
       ? destination.children
       : [destination];
-    if (!destinationNodes.some((n) => !n.isSkipped)) {
+    if (!destinationNodes.some((n) => !n.isSkipped || n.isParallel)) {
       for (const node of destinationNodes) skippedNodes.add(node);
       return;
     }
@@ -583,6 +594,7 @@ function printDebugInfo(
 }
 
 export function removeFalseOptionalGraphNodeFlags(node: GraphNode) {
+  if (!node.allChildrenSkipped) delete node.allChildrenSkipped;
   if (!node.firstChildIsSkipped) delete node.firstChildIsSkipped;
   if (!node.hasBigLabel) delete node.hasBigLabel;
   if (!node.hasBranchLabel) delete node.hasBranchLabel;

src/main/frontend/pipeline-graph-view/pipeline-graph/main/PipelineGraphModel.tsx

@@ -107,6 +107,7 @@ export type GraphNode = {
   width: number;
   shiftY: number;
   height: number;
+  allChildrenSkipped?: boolean;
   isHidden?: boolean;
   isParallel?: boolean;
   isSkipped?: boolean;
@@ -131,12 +132,14 @@ export interface ConnectionEdge {
   x: number;
   y: number;
   key: string;
-  type: NodeInfo["type"];
   firstChildIsSkipped?: boolean;
   isHidden?: boolean;
-  isParallel?: boolean;
   isPlaceholder?: boolean;
   isSkipped?: boolean;
+
+  allChildrenSkipped?: boolean;
+  height?: number;
+  width?: number;
 }
 
 export interface CompositeConnection {