Merge branch 'master' into bugfix/5286-health-info-events

Author: ulischulte

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

@@ -64,7 +64,6 @@
     "resize-observer-polyfill": "1.5.1",
     "rxjs": "7.8.2",
     "sanitize-html": "^2.17.0",
-    "uuid": "13.0.0",
     "v3-infinite-loading": "1.3.2",
     "vue": "3.5.32",
     "vue-i18n": "11.3.2",

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

@@ -1,6 +1,9 @@
 import { AxiosError } from 'axios';
-import { describe, expect, test, vi } from 'vitest';
+import { http } from 'msw';
+import { firstValueFrom } from 'rxjs';
+import { describe, expect, it, test, vi } from 'vitest';
 
+import { server } from '@/mocks/server';
 import Instance from '@/services/instance';
 
 const { useSbaConfig } = vi.hoisted(() => ({
@@ -181,4 +184,38 @@ describe('Instance', () => {
       );
     });
   });
+
+  describe('streamLogFile', () => {
+    const instance = new Instance({
+      id: 'test-id',
+      registration: {
+        name: 'test',
+        healthUrl: '',
+        source: '',
+      },
+    });
+
+    it('should handle single JSON log line correctly', async () => {
+      const payload = '{"foo":"bar"}';
+      server.use(
+        http.get(
+          '/instances/:instanceId/actuator/logfile',
+          () =>
+            // As per Spring Boot definition: https://docs.spring.io/spring-boot/api/rest/actuator/logfile.html
+            new Response(payload, {
+              headers: {
+                'Accept-Ranges': 'bytes',
+                'Content-Type': 'text/plain;charset=UTF-8',
+                'Content-Length': payload.length.toString(),
+              },
+            }),
+        ),
+      );
+
+      const source = instance.streamLogfile(0);
+      const { addendum } = await firstValueFrom(source);
+
+      expect(addendum).toEqual(payload);
+    });
+  });
 });

spring-boot-admin-server-ui/src/main/frontend/services/instance.spec.ts

@@ -15,7 +15,12 @@
   -->
 
 <template>
-  <sba-instance-section :error="error" :loading="!hasLoaded">
+  <sba-instance-section
+    :error="error"
+    :loading="!hasLoaded"
+    :layout-options="{ isFlex: true, noMargin: true }"
+    class="logfile-section"
+  >
     <template #before>
       <sba-sticky-subnav>
         <div class="flex items-center justify-end gap-1">
@@ -86,6 +91,7 @@
     </template>
 
     <div
+      ref="scrollContainer"
       :class="{ 'wrap-lines': wrapLines }"
       class="log-viewer overflow-x-auto text-sm -mx-6 -my-20 pt-14"
     >
@@ -143,17 +149,20 @@ export default {
   },
   created() {
     this.ansiUp = new AnsiUp();
-    this.scrollSubscription = fromEvent(window, 'scroll')
+  },
+  mounted() {
+    const element = this.$refs.scrollContainer;
+    this.scrollSubscription = fromEvent(element, 'scroll')
       .pipe(
         debounceTime(25),
-        map((event) => event.target.scrollingElement.scrollTop),
+        map(() => element.scrollTop),
       )
       .subscribe((scrollTop) => {
         this.atTop = scrollTop === 0;
         this.atBottom =
-          document.scrollingElement.clientHeight ===
-          document.scrollingElement.scrollHeight -
-            document.scrollingElement.scrollTop;
+          Math.abs(
+            element.clientHeight - (element.scrollHeight - element.scrollTop),
+          ) <= 1;
       });
   },
   beforeUnmount() {
@@ -204,11 +213,11 @@ export default {
         });
     },
     scrollToTop() {
-      document.scrollingElement.scrollTop = 0;
+      this.$refs.scrollContainer.scrollTop = 0;
     },
     scrollToBottom() {
-      document.scrollingElement.scrollTop =
-        document.scrollingElement.scrollHeight;
+      this.$refs.scrollContainer.scrollTop =
+        this.$refs.scrollContainer.scrollHeight;
     },
     downloadLogfile() {
       window.open(`instances/${this.instance.id}/actuator/logfile`, '_blank');
@@ -231,6 +240,35 @@ export default {
 
 <style lang="css">
 @reference "../../../index.css";
+.logfile-section {
+  display: flex;
+  flex-direction: column;
+  max-height: 100%;
+}
+
+.logfile-section #subnavigation {
+  flex: 0 0 auto;
+}
+
+.logfile-section .sba-instance-section-content {
+  min-height: 0;
+  padding: 0;
+  overflow: hidden;
+  flex-direction: column;
+}
+
+.logfile-section .sba-instance-section-content [role='alert'] {
+  margin: 0;
+}
+
+.log-viewer {
+  overflow: auto;
+  margin: 0;
+  padding: 0;
+  width: 100%;
+  max-height: 100%;
+}
+
 .log-viewer pre {
   padding: 0 0.75em;
   margin-bottom: 1px;
@@ -242,6 +280,7 @@ export default {
 
 .log-viewer.wrap-lines pre {
   @apply whitespace-pre-wrap;
+  word-break: break-all;
 }
 
 .log-viewer {

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

@@ -5,6 +5,7 @@
     <div
       :class="
         classNames({
+          'sba-instance-section-content': true,
           'flex-1': true,
           flex: layoutOptions.isFlex,
           'px-2 md:px-6 py-6': !layoutOptions.noMargin,