Set the step display name to only the label if set (#164)

Co-authored-by: Stuart Rowe <stuartr@ea.com>

Author: stuartrowe

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

@@ -12,6 +12,7 @@
 import java.util.Collections;
 import java.util.List;
 import org.jenkinsci.plugins.workflow.actions.ErrorAction;
+import org.jenkinsci.plugins.workflow.actions.LabelAction;
 import org.jenkinsci.plugins.workflow.graph.AtomNode;
 import org.jenkinsci.plugins.workflow.graph.FlowNode;
 import org.jenkinsci.plugins.workflow.job.WorkflowRun;
@@ -106,6 +107,14 @@ public WorkflowRun getRun() {
     return displayName;
   }
 
+  public @CheckForNull String getLabelDisplayName() {
+    LabelAction labelAction = node.getAction(LabelAction.class);
+    if (labelAction != null) {
+      return labelAction.getDisplayName();
+    }
+    return null;
+  }
+
   private static NodeType getNodeType(FlowNode node) {
     if (PipelineNodeUtil.isStage(node)) {
       return NodeType.STAGE;

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

@@ -38,6 +38,12 @@ private List<PipelineStep> parseSteps(List<FlowNodeWrapper> stepNodes, String st
                   if (stepArguments != null && !stepArguments.isEmpty()) {
                     displayName = stepArguments + " - " + displayName;
                   }
+
+                  // Use the step label as the displayName if set
+                  String labelDisplayName = flowNodeWrapper.getLabelDisplayName();
+                  if (labelDisplayName != null && !labelDisplayName.isEmpty()) {
+                    displayName = labelDisplayName;
+                  }
                   // Remove non-printable chars (e.g. ANSI color codes).
                   logger.debug("DisplayName Before: '" + displayName + "'.");
                   displayName = cleanTextContent(displayName);