From c0ff99ef719a785d3cfe90972e2e9a42c2d71cb0 Mon Sep 17 00:00:00 2001 From: Jan Faracik <43062514+janfaracik@users.noreply.github.com> Date: Tue, 9 Sep 2025 09:50:20 +0100 Subject: [PATCH 01/28] new-run-ui --- pom.xml | 2 +- .../main/components/stages.scss | 5 - src/main/frontend/pipeline-graph-view/app.tsx | 14 +- .../PipelineConsoleViewAction.java | 14 +- .../PipelineConsoleViewActionFactory.java | 2 +- .../PipelineConsoleViewUrlProvider.java | 4 + .../ItemContent/LinkContent/description.jelly | 3 +- .../RunDetail/description.jelly | 24 +++- .../PipelineConsoleViewAction/index.jelly | 127 +++--------------- .../PipelineConsoleViewAction/summary.jelly | 12 -- .../console.jelly | 15 +++ src/main/webapp/js/style.css | 50 ++++--- 12 files changed, 99 insertions(+), 173 deletions(-) delete mode 100644 src/main/resources/io/jenkins/plugins/pipelinegraphview/consoleview/PipelineConsoleViewAction/summary.jelly create mode 100644 src/main/resources/io/jenkins/plugins/pipelinegraphview/consoleview/PipelineConsoleViewUrlProvider/console.jelly diff --git a/pom.xml b/pom.xml index 54a844962..ca270f8ef 100644 --- a/pom.xml +++ b/pom.xml @@ -34,7 +34,7 @@ jenkinsci/pipeline-graph-view-plugin 2.504 - ${jenkins.baseline}.3 + 2.527-SNAPSHOT 24.2.0 11.3.0 false diff --git a/src/main/frontend/pipeline-console-view/pipeline-console/main/components/stages.scss b/src/main/frontend/pipeline-console-view/pipeline-console/main/components/stages.scss index f87664b4e..6806f2154 100644 --- a/src/main/frontend/pipeline-console-view/pipeline-console/main/components/stages.scss +++ b/src/main/frontend/pipeline-console-view/pipeline-console/main/components/stages.scss @@ -1,9 +1,4 @@ .pgv-stages-graph { - --card-background: color-mix( - in srgb, - var(--text-color-secondary) 4%, - var(--background) - ); position: relative; background: var(--card-background); border: var(--jenkins-border); diff --git a/src/main/frontend/pipeline-graph-view/app.tsx b/src/main/frontend/pipeline-graph-view/app.tsx index 8227878ff..8a154bf06 100644 --- a/src/main/frontend/pipeline-graph-view/app.tsx +++ b/src/main/frontend/pipeline-graph-view/app.tsx @@ -16,13 +16,11 @@ export default function App() { }); return ( -
- - - -
+ + + ); } diff --git a/src/main/java/io/jenkins/plugins/pipelinegraphview/consoleview/PipelineConsoleViewAction.java b/src/main/java/io/jenkins/plugins/pipelinegraphview/consoleview/PipelineConsoleViewAction.java index 0ed25545d..4e79a28c0 100644 --- a/src/main/java/io/jenkins/plugins/pipelinegraphview/consoleview/PipelineConsoleViewAction.java +++ b/src/main/java/io/jenkins/plugins/pipelinegraphview/consoleview/PipelineConsoleViewAction.java @@ -35,9 +35,9 @@ import java.util.List; import java.util.concurrent.TimeUnit; import jenkins.model.Jenkins; +import jenkins.run.RunTab; import net.sf.json.JSONObject; import net.sf.json.JsonConfig; -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.flow.FlowExecution; @@ -53,7 +53,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -public class PipelineConsoleViewAction implements Action, IconSpec { +public class PipelineConsoleViewAction extends RunTab { public static final long LOG_THRESHOLD = 150 * 1024; // 150KB public static final String URL_NAME = "pipeline-overview"; public static final int CACHE_AGE = (int) TimeUnit.DAYS.toSeconds(1); @@ -71,6 +71,7 @@ public class PipelineConsoleViewAction implements Action, IconSpec { private final PipelineStepApi stepApi; public PipelineConsoleViewAction(WorkflowRun target) { + super(target); this.run = target; this.graphApi = new PipelineGraphApi(this.run); this.stepApi = new PipelineStepApi(this.run); @@ -78,7 +79,7 @@ public PipelineConsoleViewAction(WorkflowRun target) { @Override public String getDisplayName() { - return "Pipeline Overview"; + return "Stages"; } @Override @@ -516,13 +517,8 @@ public BallColor getIconColor() { return run.getIconColor(); } - @Override - public String getIconClassName() { - return "symbol-git-network-outline plugin-ionicons-api"; - } - @Override public String getIconFileName() { - return null; + return "symbol-git-network-outline plugin-ionicons-api"; } } diff --git a/src/main/java/io/jenkins/plugins/pipelinegraphview/consoleview/PipelineConsoleViewActionFactory.java b/src/main/java/io/jenkins/plugins/pipelinegraphview/consoleview/PipelineConsoleViewActionFactory.java index 7ba96e4ba..58c358a14 100644 --- a/src/main/java/io/jenkins/plugins/pipelinegraphview/consoleview/PipelineConsoleViewActionFactory.java +++ b/src/main/java/io/jenkins/plugins/pipelinegraphview/consoleview/PipelineConsoleViewActionFactory.java @@ -8,7 +8,7 @@ import jenkins.model.TransientActionFactory; import org.jenkinsci.plugins.workflow.job.WorkflowRun; -@Extension +@Extension(ordinal = Integer.MAX_VALUE - 1) public class PipelineConsoleViewActionFactory extends TransientActionFactory { @Override diff --git a/src/main/java/io/jenkins/plugins/pipelinegraphview/consoleview/PipelineConsoleViewUrlProvider.java b/src/main/java/io/jenkins/plugins/pipelinegraphview/consoleview/PipelineConsoleViewUrlProvider.java index 3877438e9..65b055248 100644 --- a/src/main/java/io/jenkins/plugins/pipelinegraphview/consoleview/PipelineConsoleViewUrlProvider.java +++ b/src/main/java/io/jenkins/plugins/pipelinegraphview/consoleview/PipelineConsoleViewUrlProvider.java @@ -21,6 +21,10 @@ public String getConsoleUrl(Run run) { return null; } + public PipelineConsoleViewAction getAction(Run run) { + return run.getAction(PipelineConsoleViewAction.class); + } + @Extension @Symbol("pipelineGraphView") public static class DescriptorImpl extends Descriptor { diff --git a/src/main/resources/io/jenkins/plugins/pipelinegraphview/cards/RunDetailsItem/ItemContent/LinkContent/description.jelly b/src/main/resources/io/jenkins/plugins/pipelinegraphview/cards/RunDetailsItem/ItemContent/LinkContent/description.jelly index 7418f9805..bd8d07f48 100644 --- a/src/main/resources/io/jenkins/plugins/pipelinegraphview/cards/RunDetailsItem/ItemContent/LinkContent/description.jelly +++ b/src/main/resources/io/jenkins/plugins/pipelinegraphview/cards/RunDetailsItem/ItemContent/LinkContent/description.jelly @@ -1,4 +1,5 @@ - ${it.text()} + + ${it.text()} diff --git a/src/main/resources/io/jenkins/plugins/pipelinegraphview/cards/RunDetailsItem/RunDetail/description.jelly b/src/main/resources/io/jenkins/plugins/pipelinegraphview/cards/RunDetailsItem/RunDetail/description.jelly index 776af9187..f69281eeb 100644 --- a/src/main/resources/io/jenkins/plugins/pipelinegraphview/cards/RunDetailsItem/RunDetail/description.jelly +++ b/src/main/resources/io/jenkins/plugins/pipelinegraphview/cards/RunDetailsItem/RunDetail/description.jelly @@ -1,9 +1,21 @@ -
- - - - -
+ + + + + + + +
diff --git a/src/main/resources/io/jenkins/plugins/pipelinegraphview/consoleview/PipelineConsoleViewAction/index.jelly b/src/main/resources/io/jenkins/plugins/pipelinegraphview/consoleview/PipelineConsoleViewAction/index.jelly index fafdc298a..6f810464e 100644 --- a/src/main/resources/io/jenkins/plugins/pipelinegraphview/consoleview/PipelineConsoleViewAction/index.jelly +++ b/src/main/resources/io/jenkins/plugins/pipelinegraphview/consoleview/PipelineConsoleViewAction/index.jelly @@ -1,124 +1,27 @@ - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - ${it.buildDisplayName} - - - - - - + + + +
+
- -
- -
- -
-
-
- - -