Skip to content

feat(#5238): Disable by default the text wrapping in the logfile view and fix typo for the 'scrollSubcription' data variable #5241

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
cdprete wants to merge 1 commit into
base: master
Choose a base branch
from
+35 −6
Open

feat(#5238): Disable by default the text wrapping in the logfile view and fix typo for the 'scrollSubcription' data variable #5241

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 29 additions & 0 deletions spring-boot-admin-server-ui/src/main/frontend/views/instances/logfile/index.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
import { screen, waitFor } from '@testing-library/vue';
import { beforeEach, describe, expect, it } from 'vitest';

import { applications } from '@/mocks/applications/data';
import Application from '@/services/application';
import { render } from '@/test-utils';
import LogFile from '@/views/instances/logfile/index.vue';

describe('LogFile', () => {
beforeEach(async () => {
const application = new Application(applications[0]);
const instance = application.instances[0];

render(LogFile, {
props: {
instance,
},
});
});

it('disables the wrap lines by default', async () => {
const checkbox = await screen.findByRole('checkbox', {
name: 'instances.logfile.wrap_lines',
});
await waitFor(() => {
expect(checkbox).not.toBeChecked();
});
});
});
12 changes: 6 additions & 6 deletions spring-boot-admin-server-ui/src/main/frontend/views/instances/logfile/index.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,8 +130,8 @@ export default {
atBottom: false,
atTop: true,
skippedBytes: null,
wrapLines: true,
scrollSubcription: null,
wrapLines: false,
scrollSubscription: null,
}),
computed: {
skippedBytesString() {
Expand All @@ -143,7 +143,7 @@ export default {
},
created() {
this.ansiUp = new AnsiUp();
this.scrollSubcription = fromEvent(window, 'scroll')
this.scrollSubscription = fromEvent(window, 'scroll')
.pipe(
debounceTime(25),
map((event) => event.target.scrollingElement.scrollTop),
Expand All @@ -157,11 +157,11 @@ export default {
});
},
beforeUnmount() {
if (this.scrollSubcription && !this.scrollSubcription.closed) {
if (this.scrollSubscription && !this.scrollSubscription.closed) {
try {
this.scrollSubcription.unsubscribe();
this.scrollSubscription.unsubscribe();
} finally {
this.scrollSubcription = null;
this.scrollSubscription = null;
}
}
},
Expand Down