Skip to content

Commit 4854284

Browse files
committed
chore: porting config for toasts
1 parent 98ea756 commit 4854284

File tree

5 files changed

+29
-16
lines changed

5 files changed

+29
-16
lines changed

spring-boot-admin-docs/src/site/asciidoc/server.adoc

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -135,6 +135,10 @@ In addition when the reverse proxy terminates the https connection, it may be ne
135135
| Polling duration in ms to fetch new threads data.
136136
| `2500`
137137

138+
| spring.boot.admin.ui.enable-toasts
139+
| Allows to enable toast notifications.
140+
| `false`
141+
138142
|===
139143

140144
include::_server-discovery.adoc[]

spring-boot-admin-server-ui/src/main/frontend/utils/axios.js

Lines changed: 17 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -44,19 +44,21 @@ instance.create = axios.create;
4444
export default instance;
4545

4646
export const registerErrorToastInterceptor = (axios) => {
47-
axios.interceptors.response.use(
48-
(response) => response,
49-
(error) => {
50-
const data = error.request;
51-
let message = `
52-
Request failed: ${data.statusText}<br>
53-
<small>${data.responseURL}</small>
54-
`;
55-
nc.error(message, {
56-
context: data.status ?? 'axios',
57-
title: `Error ${data.status}`,
58-
duration: 10_000,
59-
});
60-
}
61-
);
47+
if (sbaConfig.uiSettings.enableToasts === true) {
48+
axios.interceptors.response.use(
49+
(response) => response,
50+
(error) => {
51+
const data = error.request;
52+
let message = `
53+
Request failed: ${data.statusText}<br>
54+
<small>${data.responseURL}</small>
55+
`;
56+
nc.error(message, {
57+
context: data.status ?? 'axios',
58+
title: `Error ${data.status}`,
59+
duration: 10000,
60+
});
61+
}
62+
);
63+
}
6264
};

spring-boot-admin-server-ui/src/main/java/de/codecentric/boot/admin/server/ui/config/AdminServerUiAutoConfiguration.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ public UiController homeUiController(UiExtensions uiExtensions) throws IOExcepti
9797

9898
Settings uiSettings = Settings.builder().brand(this.adminUi.getBrand()).title(this.adminUi.getTitle())
9999
.loginIcon(this.adminUi.getLoginIcon()).favicon(this.adminUi.getFavicon())
100-
.faviconDanger(this.adminUi.getFaviconDanger())
100+
.faviconDanger(this.adminUi.getFaviconDanger()).enableToasts(this.adminUi.getEnableToasts())
101101
.notificationFilterEnabled(
102102
!this.applicationContext.getBeansOfType(NotificationFilterController.class).isEmpty())
103103
.routes(routes).rememberMeEnabled(this.adminUi.isRememberMeEnabled())

spring-boot-admin-server-ui/src/main/java/de/codecentric/boot/admin/server/ui/config/AdminServerUiProperties.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -127,6 +127,11 @@ public class AdminServerUiProperties {
127127
*/
128128
private List<String> additionalRouteExcludes = new ArrayList<>();
129129

130+
/**
131+
* Allows to enable toast notifications in SBA.
132+
*/
133+
private Boolean enableToasts = false;
134+
130135
private UiTheme theme = new UiTheme();
131136

132137
@lombok.Data

spring-boot-admin-server-ui/src/main/java/de/codecentric/boot/admin/server/ui/web/UiController.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -145,6 +145,8 @@ public static class Settings {
145145

146146
private final List<ViewSettings> viewSettings;
147147

148+
private final Boolean enableToasts;
149+
148150
}
149151

150152
@lombok.Data

0 commit comments

Comments
 (0)