Move URL to api

Author: janfaracik

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

@@ -164,29 +164,7 @@ export class PipelineGraph extends React.Component {
     for (const column of nodeColumns) {
       for (const row of column.rows) {
         for (const node of row) {
-          const currentPath = this.props.path;
-          let nodeUrl = "";
-
-          if (currentPath) {
-            const runId = currentPath.split("=")[1];
-            if (currentPath.startsWith("multi-pipeline-graph/")) {
-              nodeUrl = `${runId}/pipeline-console?selected-node=${node.id}`
-            } else {
-              nodeUrl = `../${runId}/pipeline-console?selected-node=${node.id}`
-            }
-
-            nodes.push({...node, url: nodeUrl});
-            continue;
-          }
-
-          const newPath = this.getTreePath();
-          if (newPath.startsWith("pipeline-graph/tree")) {
-            nodeUrl = `pipeline-console?selected-node=${node.id}`
-          } else {
-            nodeUrl = `../pipeline-console?selected-node=${node.id}`
-          }
-
-          nodes.push({...node, url: nodeUrl});
+          nodes.push(node);
         }
       }
     }

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

@@ -63,6 +63,7 @@ export interface StageInfo {
   startTimeMillis: string;
   totalDurationMillis: string;
   agent: string;
+  url: string;
 }
 
 interface BaseNodeInfo {
@@ -83,7 +84,6 @@ export interface StageNodeInfo extends BaseNodeInfo {
   // -- Unique
   stage: StageInfo;
   seqContainerName?: string; // Used within a parallel branch to denote the name of the container of the parallel sequential stages
-  url?: string;
 }
 
 export interface PlaceholderNodeInfo extends BaseNodeInfo {

src/main/frontend/pipeline-graph-view/pipeline-graph/main/support/nodes.tsx

@@ -6,7 +6,7 @@ import {
   LayoutInfo,
   NodeColumn,
   NodeInfo,
-  StageInfo,
+  StageInfo, StageNodeInfo
 } from "../PipelineGraphModel";
 
 type SVGChildren = Array<any>; // Fixme: Maybe refine this? Not sure what should go here, we have working code I can't make typecheck
@@ -36,7 +36,7 @@ export function Node({ node }: NodeProps) {
     return React.createElement("div", groupProps, ...groupChildren);
   }
 
-  const { title, state } = node.stage ?? {};
+  const { title, state, url } = node.stage ?? {};
   const resultClean = decodeResultValue(state);
 
   groupChildren.push(getSymbolForResult(resultClean));
@@ -50,7 +50,7 @@ export function Node({ node }: NodeProps) {
   // Most of the nodes are in shared code, so they're rendered at 0,0. We transform with a <g> to position them
   const groupProps = {
     key,
-    href: clickable ? node.url : null,
+    href: clickable ? document.head.dataset.rooturl + url : null,
     style: {
       position: "absolute",
       top: node.y,

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

@@ -76,12 +76,12 @@ private List<PipelineStageInternal> getPipelineNodes(PipelineGraphBuilderApi bui
 
     private Function<String, PipelineStage> mapper(
             Map<String, PipelineStageInternal> stageMap, Map<String, List<String>> stageToChildrenMap) {
-
+        String runUrl = run.getUrl();
         return id -> {
             List<String> orDefault = stageToChildrenMap.getOrDefault(id, emptyList());
             List<PipelineStage> children =
                     orDefault.stream().map(mapper(stageMap, stageToChildrenMap)).collect(Collectors.toList());
-            return stageMap.get(id).toPipelineStage(children);
+            return stageMap.get(id).toPipelineStage(children, runUrl);
         };
     }
 
@@ -117,14 +117,15 @@ private PipelineGraph createTree(PipelineGraphBuilderApi builder) {
                 stageToChildrenMap.put(stage.getParents().get(0), parentChildren);
             }
         });
+        String runUrl = run.getUrl();
         List<PipelineStage> stageResults = stageMap.values().stream()
                 .map(pipelineStageInternal -> {
                     List<PipelineStage> children =
                             stageToChildrenMap.getOrDefault(pipelineStageInternal.getId(), emptyList()).stream()
                                     .map(mapper(stageMap, stageToChildrenMap))
                                     .collect(Collectors.toList());
 
-                    return pipelineStageInternal.toPipelineStage(children);
+                    return pipelineStageInternal.toPipelineStage(children, runUrl);
                 })
                 .filter(stage -> !childNodes.contains(stage.getId()))
                 .collect(Collectors.toList());
@@ -205,14 +206,15 @@ private PipelineGraph createShallowTree(PipelineGraphBuilderApi builder) {
             }
         });
 
+        String runUrl = run.getUrl();
         List<PipelineStage> stageResults = stageMap.values().stream()
                 .map(pipelineStageInternal -> {
                     List<PipelineStage> children =
                             stageToChildrenMap.getOrDefault(pipelineStageInternal.getId(), emptyList()).stream()
                                     .map(mapper(stageMap, stageToChildrenMap))
                                     .collect(Collectors.toList());
 
-                    return pipelineStageInternal.toPipelineStage(children);
+                    return pipelineStageInternal.toPipelineStage(children, runUrl);
                 })
                 .filter(stage -> topLevelStageIds.contains(stage.getId()))
                 .collect(Collectors.toList());

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

@@ -11,6 +11,7 @@ public class PipelineStage extends AbstractPipelineNode {
     private boolean sequential;
     private boolean synthetic;
     private String agent;
+    private String url;
 
     public PipelineStage(
             String id,
@@ -25,14 +26,16 @@ public PipelineStage(
             boolean sequential,
             boolean synthetic,
             TimingInfo timingInfo,
-            String agent) {
+            String agent,
+            String runUrl) {
         super(id, name, state, completePercent, type, title, timingInfo);
         this.children = children;
         this.seqContainerName = seqContainerName;
         this.nextSibling = nextSibling;
         this.sequential = sequential;
         this.synthetic = synthetic;
         this.agent = agent;
+        this.url = "/" + runUrl + "pipeline-console?selected-node=" + id;
     }
 
     public PipelineStage getNextSibling() {
@@ -60,4 +63,8 @@ public boolean isSynthetic() {
     public String getAgent() {
         return agent;
     }
+
+    public String getUrl() {
+        return url;
+    }
 }

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

@@ -3,6 +3,8 @@
 import java.util.Collections;
 import java.util.List;
 import java.util.Locale;
+
+import hudson.model.Run;
 import org.jenkinsci.plugins.workflow.pipelinegraphanalysis.TimingInfo;
 
 public class PipelineStageInternal {
@@ -132,7 +134,7 @@ public void setAgent(String aAgent) {
         this.agent = aAgent;
     }
 
-    public PipelineStage toPipelineStage(List<PipelineStage> children) {
+    public PipelineStage toPipelineStage(List<PipelineStage> children, String runUrl) {
         return new PipelineStage(
                 id,
                 name,
@@ -142,10 +144,11 @@ public PipelineStage toPipelineStage(List<PipelineStage> children) {
                 type,
                 title,
                 seqContainerName,
-                nextSibling != null ? nextSibling.toPipelineStage(Collections.emptyList()) : null,
+                nextSibling != null ? nextSibling.toPipelineStage(Collections.emptyList(), runUrl) : null,
                 sequential,
                 synthetic,
                 timingInfo,
-                agent);
+                agent,
+                runUrl);
     }
 }