Refine spacing for nested parallel with sibling that has branch label (#1316)

Author: das7pad

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

@@ -218,7 +218,7 @@ function buildGraphNested(
       };
       hasParallel = false;
     }
-    const isChainedParallel =
+    const isNestedParallel =
       isParallel &&
       stage.children.length > 0 &&
       stage.children[0].children.length > 0 &&
@@ -232,8 +232,8 @@ function buildGraphNested(
       isParallel &&
       hasChildren &&
       // Do not add a branch label on the parent of a nested parallel. Instead, show a big label on the nested parallel block.
-      !isChainedParallel;
-    const isHidden = hasBranchLabel || hasChildren || isChainedParallel;
+      !isNestedParallel;
+    const isHidden = hasBranchLabel || hasChildren || isNestedParallel;
     const hasBigLabel =
       hasParallel ||
       (stage.type === "STAGE" && hasChildren && !hasBranchLabel) ||
@@ -242,6 +242,7 @@ function buildGraphNested(
     const hasSmallLabel = !isHidden && !hasBigLabel;
     const childNode: GraphNode = {
       ...makeNodeForStage(stage, layout),
+      isNestedParallel,
       isParallel,
       isSkipped,
       isHidden,
@@ -253,19 +254,24 @@ function buildGraphNested(
     };
     buildGraphNested(childNode, stage.children, layout, isLast);
     if (hasBigLabel) childNode.shiftY += layout.labelOffsetV;
+    childNode.allChildrenSkipped =
+      childNode.hasParallel && !childNode.children.some((c) => !c.isSkipped);
+    node.children.push(childNode);
+  }
+  // Two phased approach as we need to detect if any sibling has a branch label -> node will need to make space.
+  const anyChildHasBranchLabel =
+    node.hasParallel && node.children.some((c) => c.hasBranchLabel);
+  for (const childNode of node.children) {
     if (
-      isChainedParallel ||
+      (childNode.isNestedParallel && !anyChildHasBranchLabel) ||
       (childNode.hasParallel &&
         childNode.children.some((c) => c.hasBranchLabel))
     ) {
-      // - Nested parallel children, avoid collapsing curves.
-      // - Any child has branch label, make space for branch label.
+      // - Nested parallel children (unless a sibling already added spacing on the parent), avoid collapsing curves.
+      // - Any of its children has branch label, make space for branch labels.
       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) {
     // Move shiftY from first parallel child up one level.
@@ -603,6 +609,7 @@ export function removeFalseOptionalGraphNodeFlags(node: GraphNode) {
   if (!node.hasStageEnd) delete node.hasStageEnd;
   if (!node.hasTiming) delete node.hasTiming;
   if (!node.isHidden) delete node.isHidden;
+  if (!node.isNestedParallel) delete node.isNestedParallel;
   if (!node.isParallel) delete node.isParallel;
   if (!node.isSkipped) delete node.isSkipped;
 

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

@@ -109,6 +109,7 @@ export type GraphNode = {
   height: number;
   allChildrenSkipped?: boolean;
   isHidden?: boolean;
+  isNestedParallel?: boolean;
   isParallel?: boolean;
   isSkipped?: boolean;
   firstChildIsSkipped?: boolean;

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

@@ -10239,6 +10239,7 @@ exports[`NestedPipelineGraphLayout > nestedGraphLayout > gh1155_nestedParallel.j
                       "height": 140,
                       "id": -16,
                       "isHidden": true,
+                      "isNestedParallel": true,
                       "isParallel": true,
                       "isPlaceholder": false,
                       "key": "n_-16",
@@ -10731,6 +10732,7 @@ exports[`NestedPipelineGraphLayout > nestedGraphLayout > gh1155_nestedParallel.j
                   "height": 140,
                   "id": -16,
                   "isHidden": true,
+                  "isNestedParallel": true,
                   "isParallel": true,
                   "isPlaceholder": false,
                   "key": "n_-16",
@@ -11177,6 +11179,7 @@ exports[`NestedPipelineGraphLayout > nestedGraphLayout > gh1155_nestedParallel.j
               "height": 140,
               "id": -16,
               "isHidden": true,
+              "isNestedParallel": true,
               "isParallel": true,
               "isPlaceholder": false,
               "key": "n_-16",
@@ -11375,6 +11378,7 @@ exports[`NestedPipelineGraphLayout > nestedGraphLayout > gh1155_nestedParallel.j
           "height": 140,
           "id": -16,
           "isHidden": true,
+          "isNestedParallel": true,
           "isParallel": true,
           "isPlaceholder": false,
           "key": "n_-16",
@@ -11532,6 +11536,7 @@ exports[`NestedPipelineGraphLayout > nestedGraphLayout > gh1155_nestedParallel.j
       "height": 140,
       "id": -16,
       "isHidden": true,
+      "isNestedParallel": true,
       "isParallel": true,
       "isPlaceholder": false,
       "key": "n_-16",