Redirect to new build on rebuild

src/main/java/io/jenkins/plugins/pipelinegraphview/consoleview/PipelineConsoleViewAction.java

@@ -1,9 +1,13 @@
 package io.jenkins.plugins.pipelinegraphview.consoleview;
 
+import static io.jenkins.plugins.pipelinegraphview.utils.PipelineGraphApi.BuildScheduleResult;
+
 import com.fasterxml.jackson.databind.ObjectMapper;
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import hudson.console.AnnotatedLargeText;
+import hudson.model.Result;
 import hudson.util.HttpResponses;
+import io.jenkins.plugins.pipelinegraphview.Messages;
 import io.jenkins.plugins.pipelinegraphview.PipelineGraphViewConfiguration;
 import io.jenkins.plugins.pipelinegraphview.cards.RunDetailsCard;
 import io.jenkins.plugins.pipelinegraphview.cards.RunDetailsItem;
@@ -24,13 +28,16 @@
 import java.util.HashMap;
 import java.util.List;
 import net.sf.json.JSONObject;
+import org.jenkinsci.plugins.workflow.cps.replay.ReplayAction;
 import org.jenkinsci.plugins.workflow.flow.FlowExecution;
 import org.jenkinsci.plugins.workflow.graph.FlowNode;
 import org.jenkinsci.plugins.workflow.job.WorkflowRun;
 import org.kohsuke.stapler.HttpResponse;
 import org.kohsuke.stapler.StaplerRequest2;
 import org.kohsuke.stapler.StaplerResponse2;
 import org.kohsuke.stapler.WebMethod;
+import org.kohsuke.stapler.bind.JavaScriptMethod;
+import org.kohsuke.stapler.interceptor.RequirePOST;
 import org.kohsuke.stapler.verb.GET;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -78,6 +85,47 @@
         return target.getUrl();
     }
 
+    /**
+     * Handles the rerun request using ReplayAction feature
+     */
+    @RequirePOST
+    @JavaScriptMethod
+    public HttpResponse doRerun() {
+        BuildScheduleResult result = api.scheduleBuild(run -> {
+            ReplayAction replayAction = run.getAction(ReplayAction.class);
+            return replayAction.run2(replayAction.getOriginalScript(), replayAction.getOriginalLoadedScripts());
+        });
+
+        if (result instanceof BuildScheduleResult.NotScheduled nope) {
+            return HttpResponses.errorJSON(nope.message());
+        }
+
+        JSONObject obj = new JSONObject();
+        BuildScheduleResult.Scheduled scheduled = (BuildScheduleResult.Scheduled) result;
+        obj.put("buildNumber", scheduled.buildNumber());
+        obj.put("message", scheduled.message());
+        return HttpResponses.okJSON(obj);
+    }
+
+    /**
+     * Handles the cancel request.
+     */
+    @RequirePOST
+    @JavaScriptMethod
+    public HttpResponse doCancel() {
+        if (run == null) {
+            return HttpResponses.errorJSON("No run to cancel");
+        }
+        run.checkPermission(getCancelPermission());
+        if (run.isBuilding()) {
+            run.doStop();
+            return HttpResponses.okJSON();
+        }
+        String message =
+                Result.ABORTED.equals(run.getResult()) ? Messages.run_alreadyCancelled() : Messages.run_isFinished();
+        return HttpResponses.errorJSON(message);
+    }
+
     // Legacy - leave in case we want to update a sub section of steps (e.g. if a stage is still
     // running).
     @GET

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

@@ -9,12 +9,8 @@
 import hudson.model.BallColor;
 import hudson.model.Item;
 import hudson.model.ParametersDefinitionProperty;
-import hudson.model.Queue;
-import hudson.model.Result;
 import hudson.security.Permission;
 import hudson.util.HttpResponses;
-import io.jenkins.plugins.pipelinegraphview.Messages;
-import java.io.IOException;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.TimeoutException;
 import java.util.logging.Level;
@@ -23,13 +19,10 @@
 import net.sf.json.JSONObject;
 import org.jenkins.ui.icon.IconSpec;
 import org.jenkinsci.plugins.pipeline.modeldefinition.actions.RestartDeclarativePipelineAction;
-import org.jenkinsci.plugins.workflow.cps.replay.ReplayAction;
 import org.jenkinsci.plugins.workflow.job.WorkflowRun;
 import org.kohsuke.stapler.HttpResponse;
 import org.kohsuke.stapler.StaplerRequest2;
 import org.kohsuke.stapler.WebMethod;
-import org.kohsuke.stapler.bind.JavaScriptMethod;
-import org.kohsuke.stapler.interceptor.RequirePOST;
 
 public abstract class AbstractPipelineViewAction implements Action, IconSpec {
     private static final ObjectMapper OBJECT_MAPPER = new ObjectMapper();
@@ -88,47 +81,6 @@ public boolean isRestartFromStageAvailable() {
         return false;
     }
 
-    /**
-     * Handles the rerun request using ReplayAction feature
-     */
-    @RequirePOST
-    @JavaScriptMethod
-    public boolean doRerun() throws IOException, ExecutionException {
-        if (run != null) {
-            run.checkAnyPermission(Item.BUILD);
-            ReplayAction replayAction = run.getAction(ReplayAction.class);
-            Queue.Item item =
-                    replayAction.run2(replayAction.getOriginalScript(), replayAction.getOriginalLoadedScripts());
-
-            if (item == null) {
-                return false;
-            }
-            return true;
-        }
-        return false;
-    }
-
-    /**
-     * Handles the cancel request.
-     */
-    @RequirePOST
-    @JavaScriptMethod
-    public HttpResponse doCancel() throws IOException, ExecutionException {
-        if (run != null) {
-            run.checkPermission(getCancelPermission());
-            if (run.isBuilding()) {
-                run.doStop();
-                return HttpResponses.okJSON();
-            } else {
-                String message = Result.ABORTED.equals(run.getResult())
-                        ? Messages.run_alreadyCancelled()
-                        : Messages.run_isFinished();
-                return HttpResponses.errorJSON(message);
-            }
-        }
-        return HttpResponses.errorJSON("No run to cancel");
-    }
-
     public String getFullBuildDisplayName() {
         return run.getFullDisplayName();
     }

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

@@ -2,10 +2,12 @@
 
 import static java.util.Collections.emptyList;
 
+import edu.umd.cs.findbugs.annotations.NonNull;
 import hudson.model.Cause;
 import hudson.model.CauseAction;
 import hudson.model.Item;
 import hudson.model.Queue;
+import io.jenkins.plugins.pipelinegraphview.Messages;
 import io.jenkins.plugins.pipelinegraphview.treescanner.PipelineNodeGraphAdapter;
 import java.io.IOException;
 import java.util.*;
@@ -23,28 +25,57 @@
 
 public class PipelineGraphApi {
     private static final Logger logger = LoggerFactory.getLogger(PipelineGraphApi.class);
+    private static final BuildScheduleResult NOT_SCHEDULED =
+            new BuildScheduleResult.NotScheduled(Messages.scheduled_failure());
+
     private final transient WorkflowRun run;
 
     public PipelineGraphApi(WorkflowRun run) {
         this.run = run;
     }
 
     public Integer replay() throws ExecutionException, InterruptedException, TimeoutException {
-        run.checkPermission(Item.BUILD);
+        BuildScheduleResult result = scheduleBuild(run -> {
+            CauseAction causeAction = new CauseAction(new Cause.UserIdCause());
+            return Queue.getInstance()
+                    .schedule2(run.getParent(), 0, causeAction)
+                    .getItem();
+        });
+        // when java 21+ we can use switch expression
+        if (result instanceof BuildScheduleResult.Scheduled s) {
+            return s.buildNumber();
+        }
+        return null;
+    }
 
-        CauseAction causeAction = new CauseAction(new Cause.UserIdCause());
+    public @NonNull BuildScheduleResult scheduleBuild(Function<WorkflowRun, Queue.Item> scheduler) {
+        if (run == null) {
+            return NOT_SCHEDULED;
+        }
+
+        run.checkPermission(Item.BUILD);
 
         if (!run.getParent().isBuildable()) {
-            return null;
+            return NOT_SCHEDULED;
         }
 
-        Queue.Item item =
-                Queue.getInstance().schedule2(run.getParent(), 0, causeAction).getItem();
+        Queue.Item item = scheduler.apply(run);
+
         if (item == null) {
-            return null;
+            return NOT_SCHEDULED;
         }
 
-        return run.getParent().getNextBuildNumber();
+        return new BuildScheduleResult.Scheduled(run.getParent().getNextBuildNumber());
+    }
+
+    public sealed interface BuildScheduleResult {
+        record NotScheduled(String message) implements BuildScheduleResult {}
+
+        record Scheduled(int buildNumber) implements BuildScheduleResult {
+            public String message() {
+                return Messages.scheduled_success(buildNumber);
+            }
+        }
     }
 
     private List<PipelineStageInternal> getPipelineNodes(PipelineGraphBuilderApi builder) {

src/main/resources/io/jenkins/plugins/pipelinegraphview/Messages.properties

@@ -34,6 +34,9 @@ FlowNodeWrapper.noStage=System Generated
 run.alreadyCancelled=Run was already cancelled
 run.isFinished=Run is already finished
 
+scheduled.success=Build scheduled - #{0}
+scheduled.failure=Could not schedule rebuild
+
 # Settings
 settings=Settings
 settings.showStageName=Show stage names

src/main/resources/io/jenkins/plugins/pipelinegraphview/consoleview/PipelineConsoleViewAction/index.jelly

@@ -88,11 +88,18 @@
                     </a>
                 </j:if>
                 ${it.buildDisplayName}
-                <j:if test="${it.nextBuildNumber!=null}">
-                    <a href="../../${it.nextBuildNumber}/pipeline-overview" class="jenkins-button jenkins-button--tertiary app-details__prev_next" tooltip="${%Next Build}">
-                        <l:icon class="symbol-chevron-forward-outline plugin-ionicons-api icon-md" />
-                    </a>
-                </j:if>
+                <j:choose>
+                    <j:when test="${it.nextBuildNumber!=null}">
+                        <a href="../../${it.nextBuildNumber}/pipeline-overview" class="jenkins-button jenkins-button--tertiary app-details__prev_next" tooltip="${%Next Build}">
+                            <l:icon class="symbol-chevron-forward-outline plugin-ionicons-api icon-md" />
+                        </a>
+                    </j:when>
+                    <j:otherwise>
+                        <a data-module="next-build" data-url-pattern="../../NEXT_BUILD_NUMBER/pipeline-overview" class="jenkins-button jenkins-button--tertiary app-details__prev_next jenkins-hidden" tooltip="${%Next Build}">
+                            <l:icon class="symbol-chevron-forward-outline plugin-ionicons-api icon-md" />
+                        </a>
+                    </j:otherwise>
+                </j:choose>
             </t:buildCaption>
 
             <div class="pgv-details">

src/main/webapp/js/build.js

@@ -1,13 +1,29 @@
+/* global notificationBar */
+
 const rerunButton = document.getElementById('pgv-rerun');
 
 if (rerunButton) {
   rerunButton.addEventListener('click', event => {
     event.preventDefault();
     const rerunAction = window[`${rerunButton.dataset.proxyName}`];
+    function updateNextBuildButton(buildNumber) {
+      const nextBuild = document.querySelector("[data-module='next-build']");
+      if (nextBuild) {
+        nextBuild.classList.remove("jenkins-hidden");
+        nextBuild.href = nextBuild.dataset.urlPattern.replace("NEXT_BUILD_NUMBER", buildNumber);
+        nextBuild.removeAttribute("data-module");
+        nextBuild.removeAttribute("data-url-pattern");
+      }
+    }
+
     rerunAction.doRerun(function (success) {
       const result = success.responseJSON;
-      if (result) {
-        notificationBar.show(rerunButton.dataset.successMessage, notificationBar.SUCCESS);
+      if (result?.status === "ok") {
+        notificationBar.show(result.data.message, notificationBar.SUCCESS);
+        updateNextBuildButton(result.data.buildNumber);
+      } else {
+        const failMessage = result?.status === "error" && result.data.message ? result.data.message : "Unknown error occurred while trying to rerun the build.";
+        notificationBar.show(failMessage, notificationBar.WARNING);
       }
     });
   })