Skip to content

Commit 4afaad9

Browse files
authored
Merge branch 'master' into renovate/major-eslint-monorepo
2 parents 04c2f42 + f965cd0 commit 4afaad9

File tree

25 files changed

+142
-187
lines changed

25 files changed

+142
-187
lines changed

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
<spring-boot.version>3.5.4</spring-boot.version>
4848
<spring-cloud.version>2025.0.0</spring-cloud.version>
4949

50-
<jolokia-support-spring.version>2.2.9</jolokia-support-spring.version>
50+
<jolokia-support-spring.version>2.3.0</jolokia-support-spring.version>
5151

5252
<checkstyle.version>10.26.1</checkstyle.version>
5353
<findbugs-jsr305.version>3.0.2</findbugs-jsr305.version>

spring-boot-admin-server-ui/README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@ spring-boot-admin-server-ui
22
================================
33

44
### Building this module
5-
The jar **can be build with Maven** with the maven-exec-plugin. To do this node.js and npm must be installed on your machine and be on your `$PATH`.
5+
The jar **can be built with Maven** with the maven-exec-plugin. To do this node.js and npm must be installed on your machine and be on your `$PATH`.
66
If you don't want to use the maven exec run the following commands:
77

88
### Running Spring Boot Admin Server for development
9-
To develop the ui on an running server the best to do is
9+
To develop the ui on a running server the best to do is
1010

1111
1. Running the ui build in watch mode so the resources get updated:
1212
```shell
@@ -23,7 +23,7 @@ Or just start the [spring-boot-admin-sample-servlet](../spring-boot-admin-sample
2323
project using the `dev` profile. You also might want to use the `insecure` profile so you don't need to login.
2424

2525
If you are using hierarchical projects (like the samples here), you have to point "Working directory" in your run config to the Project you are running.
26-
In IDEA you can simply use "$MODULE_DIR$".
26+
In IntelliJ IDEA you can simply use "$MODULE_DIR$".
2727

2828
### Build
2929
```shell

spring-boot-admin-server-ui/package-lock.json

Lines changed: 38 additions & 38 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

spring-boot-admin-server-ui/package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -67,9 +67,9 @@
6767
"devDependencies": {
6868
"@storybook/addon-actions": "9.0.8",
6969
"@storybook/addon-essentials": "8.6.14",
70-
"@storybook/addon-links": "9.1.0",
70+
"@storybook/addon-links": "9.1.1",
7171
"@storybook/addon-mdx-gfm": "^8.0.0",
72-
"@storybook/vue3": "9.1.0",
72+
"@storybook/vue3": "9.1.1",
7373
"@storybook/vue3-vite": "^9.0.0",
7474
"@testing-library/jest-dom": "6.6.4",
7575
"@testing-library/user-event": "14.6.1",
@@ -87,7 +87,7 @@
8787
"eslint": "^9.0.0",
8888
"eslint-config-prettier": "^10.0.0",
8989
"eslint-plugin-prettier": "^5.0.0",
90-
"eslint-plugin-storybook": "9.1.0",
90+
"eslint-plugin-storybook": "9.1.1",
9191
"eslint-plugin-vue": "^10.0.0",
9292
"happy-dom": "^14.12.3",
9393
"jsdom": "^26.0.0",
@@ -97,7 +97,7 @@
9797
"prettier": "^3.0.3",
9898
"rollup-plugin-visualizer": "6.0.3",
9999
"sass": "^1.57.1",
100-
"storybook": "9.1.0",
100+
"storybook": "9.1.1",
101101
"storybook-vue3-router": "^6.0.0",
102102
"tailwindcss": "3.4.17",
103103
"ts-node-dev": "^2.0.0",

spring-boot-admin-server-ui/src/main/frontend/views/instances/httpexchanges/exchanges-chart.vue

Lines changed: 32 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -173,18 +173,27 @@ export default {
173173
},
174174
},
175175
watch: {
176-
chartData: 'drawChart',
177-
hovered(newVal) {
178-
if (newVal) {
179-
this.hover
180-
.attr('opacity', 1)
181-
.attr('d', `M${this.x(newVal)},${this.height} ${this.x(newVal)},0`);
182-
} else {
183-
this.hover.attr('opacity', 0);
184-
}
176+
chartData: {
177+
handler: 'drawChart',
178+
deep: true,
179+
},
180+
hovered: {
181+
handler(newVal) {
182+
if (newVal) {
183+
this.hover
184+
.attr('opacity', 1)
185+
.attr('d', `M${this.x(newVal)},${this.height} ${this.x(newVal)},0`);
186+
} else {
187+
this.hover.attr('opacity', 0);
188+
}
189+
},
190+
immediate: true,
185191
},
186-
brushSelection(newVal) {
187-
this.$emit('selected', newVal);
192+
brushSelection: {
193+
handler(newVal) {
194+
this.$emit('selected', newVal);
195+
},
196+
immediate: true,
188197
},
189198
},
190199
mounted() {
@@ -317,7 +326,6 @@ export default {
317326
Math.floor(x.invert(event.selection[0]) / interval) * interval;
318327
const ceil =
319328
Math.ceil(x.invert(event.selection[1]) / interval) * interval;
320-
d3.select(this).call(event.target.move, [floor, ceil].map(x));
321329
this.brushSelection = [floor, ceil];
322330
}
323331
})
@@ -358,10 +366,12 @@ export default {
358366
height: 200px;
359367
width: 100%;
360368
}
369+
361370
.exchange-chart__hover {
362371
stroke: #b5b5b5;
363372
stroke-width: 1px;
364373
}
374+
365375
.exchange-chart__tooltip {
366376
position: absolute;
367377
background: #000;
@@ -371,41 +381,51 @@ export default {
371381
padding: 0.825em;
372382
width: 200px;
373383
}
384+
374385
.exchange-chart__tooltip table th,
375386
.exchange-chart__tooltip table td {
376387
border: none;
377388
color: #b5b5b5;
378389
padding: 0.25em 0.75em;
379390
}
391+
380392
.exchange-chart__tooltip table td {
381393
text-align: right;
382394
}
395+
383396
.exchange-chart__tooltip--left {
384397
left: 5px;
385398
}
399+
386400
.exchange-chart__tooltip--right {
387401
right: 5px;
388402
}
403+
389404
.exchange-chart .selection {
390405
stroke: none;
391406
fill: rgba(0, 0, 0, 0.2);
392407
fill-opacity: 1;
393408
}
409+
394410
.exchange-chart__axis-y .domain {
395411
stroke: none;
396412
}
413+
397414
.exchange-chart__axis-y .tick:not(:first-of-type) line {
398415
stroke-dasharray: 2, 2;
399416
stroke: #b5b5b5;
400417
}
418+
401419
.exchange-chart__area--totalSuccess {
402420
fill: #48c78e;
403421
opacity: 0.8;
404422
}
423+
405424
.exchange-chart__area--totalClientErrors {
406425
fill: #ffe08a;
407426
opacity: 0.8;
408427
}
428+
409429
.exchange-chart__area--totalServerErrors {
410430
fill: #f14668;
411431
opacity: 0.8;

0 commit comments

Comments
 (0)