Skip to content

Commit fb6cdd2

Browse files
committed
fix: audit events error
1 parent 77de9ec commit fb6cdd2

File tree

2 files changed

+3
-32
lines changed

2 files changed

+3
-32
lines changed

spring-boot-admin-server-ui/src/main/frontend/views/instances/auditevents/index.spec.js

Lines changed: 1 addition & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import {render} from '@/test-utils';
22
import Auditevents from '@/views/instances/auditevents/index';
33
import Instance from '@/services/instance.js';
4-
import {screen, waitFor} from '@testing-library/vue';
4+
import {getByText, screen, waitFor} from '@testing-library/vue';
55
import userEvent from '@testing-library/user-event';
66

77
describe('Auditevents', () => {
@@ -59,22 +59,6 @@ describe('Auditevents', () => {
5959
await screen.findByText('Fetching of data failed.');
6060
});
6161

62-
it('handles error when fetching data from Spring 1 services', async () => {
63-
await render(Auditevents, {
64-
props: {
65-
instance: createInstance(jest.fn().mockRejectedValue({
66-
response: {
67-
headers: {
68-
'content-type': ''
69-
}
70-
}
71-
}))
72-
}
73-
});
74-
75-
await screen.findByText('instances.auditevents.audit_log_not_supported_spring_boot_1');
76-
});
77-
7862
function createInstance(fetchAuditevents) {
7963
let instance = new Instance({id: 4711});
8064
instance.fetchAuditevents = fetchAuditevents;

spring-boot-admin-server-ui/src/main/frontend/views/instances/auditevents/index.vue

Lines changed: 2 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -53,15 +53,6 @@
5353
</template>
5454

5555
<sba-panel :seamless="true">
56-
<div
57-
v-if="isOldAuditevents"
58-
class="message is-warning"
59-
>
60-
<div
61-
class="message-body"
62-
v-html="$t('instances.auditevents.audit_log_not_supported_spring_boot_1')"
63-
/>
64-
</div>
6556
<auditevents-list
6657
:instance="instance"
6758
:events="events"
@@ -83,6 +74,7 @@ import SbaInstanceSection from "../shell/sba-instance-section.vue";
8374
import SbaStickySubnav from "../../../components/sba-sticky-subnav.vue";
8475
import SbaPanel from "../../../components/sba-panel.vue";
8576
import SbaInput from "../../../components/sba-input.vue";
77+
import SbaAlert from "../../../components/sba-alert.vue";
8678
8779
class Auditevent {
8880
constructor({timestamp, ...event}) {
@@ -130,7 +122,6 @@ export default {
130122
type: null,
131123
principal: null
132124
},
133-
isOldAuditevents: false
134125
}),
135126
watch: {
136127
filter: {
@@ -176,11 +167,7 @@ export default {
176167
},
177168
error: error => {
178169
console.warn('Fetching audit events failed:', error);
179-
if (error.response.headers['content-type'].includes('application/vnd.spring-boot.actuator.v2')) {
180-
vm.error = error;
181-
} else {
182-
vm.isOldAuditevents = true;
183-
}
170+
vm.error = error;
184171
}
185172
});
186173
},

0 commit comments

Comments
 (0)