Skip to content

Commit 998752b

Browse files
janfaraciktimja
andauthored
Adjust for experimental tabs UI (#1009)
Co-authored-by: Tim Jacomb <21194782+timja@users.noreply.github.com>
1 parent 4b51cfd commit 998752b

File tree

25 files changed

+226
-513
lines changed

25 files changed

+226
-513
lines changed

pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@
3333
<changelist>999999-SNAPSHOT</changelist>
3434
<gitHubRepo>jenkinsci/pipeline-graph-view-plugin</gitHubRepo>
3535
<!-- Baseline Jenkins version you use to build the plugin. Users must have this version or newer to run. -->
36-
<jenkins.baseline>2.504</jenkins.baseline>
37-
<jenkins.version>${jenkins.baseline}.3</jenkins.version>
36+
<jenkins.baseline>2.516</jenkins.baseline>
37+
<jenkins.version>2.532</jenkins.version>
3838
<node.version>24.2.0</node.version>
3939
<npm.version>11.3.0</npm.version>
4040
<spotless.check.skip>false</spotless.check.skip>

src/main/frontend/pipeline-console-view/pipeline-console/main/PipelineConsole.tsx

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,12 @@ export default function PipelineConsole() {
5252
container={document.getElementById("console-pipeline-overflow-root")}
5353
>
5454
<Dropdown
55+
className={
56+
rootElement?.closest(".app-build-content")
57+
? "jenkins-details__button"
58+
: ""
59+
}
60+
icon={SETTINGS}
5561
items={[
5662
showSplitView ? (
5763
<StagesCustomization key="visibility-select" />

src/main/frontend/pipeline-console-view/pipeline-console/main/components/stages.scss

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,7 @@
11
.pgv-stages-graph {
2-
--card-background: color-mix(
3-
in srgb,
4-
var(--text-color-secondary) 4%,
5-
var(--background)
6-
);
72
position: relative;
83
background: var(--card-background);
9-
border: var(--jenkins-border);
4+
border: var(--card-border-width) solid var(--card-border-color);
105
border-radius: var(--form-input-border-radius);
116
overflow: hidden;
127
height: 100%;

src/main/frontend/pipeline-console-view/pipeline-console/main/data-tree-view.scss

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ $pgv-item-padding-inline: 0.7rem;
1111
content: "";
1212
position: absolute;
1313
inset: 0;
14+
background: var(--input-color);
1415
border-radius: var(--form-input-border-radius);
1516
// TODO - var fallback can removed after baseline is moved >= 2.496
1617
border: var(

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

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,12 @@ export default function App() {
1616
});
1717

1818
return (
19-
<div>
20-
<UserPreferencesProvider>
21-
<Stages
22-
stages={run.stages}
23-
stageViewPosition={StageViewPosition.TOP}
24-
onRunPage
25-
/>
26-
</UserPreferencesProvider>
27-
</div>
19+
<UserPreferencesProvider>
20+
<Stages
21+
stages={run.stages}
22+
stageViewPosition={StageViewPosition.TOP}
23+
onRunPage
24+
/>
25+
</UserPreferencesProvider>
2826
);
2927
}

src/main/java/io/jenkins/plugins/pipelinegraphview/cards/Card.java

Lines changed: 0 additions & 5 deletions
This file was deleted.

src/main/java/io/jenkins/plugins/pipelinegraphview/cards/RunDetailsCard.java

Lines changed: 0 additions & 21 deletions
This file was deleted.

src/main/java/io/jenkins/plugins/pipelinegraphview/cards/RunDetailsItem.java

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,6 @@
77

88
public sealed interface RunDetailsItem {
99

10-
RunDetailsItem SEPARATOR = new Separator();
11-
12-
record Separator() implements RunDetailsItem {}
13-
1410
final class RunDetail implements RunDetailsItem {
1511
private final @NonNull Icon icon;
1612
private final @NonNull ItemContent content;
@@ -45,12 +41,6 @@ public String icon() {
4541
sealed interface Icon {
4642
String value();
4743

48-
record SimpleIcon(@NonNull String value) implements Icon {
49-
public SimpleIcon {
50-
requireNonNull(value);
51-
}
52-
}
53-
5444
record Ionicon(@NonNull String value) implements Icon {
5545
public Ionicon(@NonNull String value) {
5646
requireNonNull(value);

src/main/java/io/jenkins/plugins/pipelinegraphview/cards/items/TimingRunDetailsItems.java

Lines changed: 0 additions & 42 deletions
This file was deleted.

src/main/java/io/jenkins/plugins/pipelinegraphview/cards/items/UpstreamCauseRunDetailsItem.java

Lines changed: 0 additions & 35 deletions
This file was deleted.

0 commit comments

Comments
 (0)