Skip to content

Commit 4e81fe4

Browse files
committed
[ui-admin] Improve server log formatting
1 parent 4781ba6 commit 4e81fe4

File tree

3 files changed

+14
-8
lines changed

3 files changed

+14
-8
lines changed

desktop/core/src/desktop/js/apps/admin/ServerLogs/ServerLogsTab.scss

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,11 +32,16 @@
3232
background-color: $fluidx-white;
3333
margin: 0;
3434
padding: 2px;
35-
}
36-
}
35+
white-space: nowrap;
36+
font-family: 'Roboto Mono', monospace;
37+
font-size: 12px;
3738

38-
.server_wrap {
39-
white-space: nowrap;
39+
&--wrap {
40+
word-break: break-all;
41+
word-wrap: break-word;
42+
white-space: pre-wrap;
43+
}
44+
}
4045
}
4146

4247
.server__no-logs-found {

desktop/core/src/desktop/js/apps/admin/ServerLogs/ServerLogsTab.test.tsx

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -94,10 +94,11 @@ describe('ServerLogs Component', () => {
9494

9595
render(<ServerLogs />);
9696

97-
expect(screen.getByText('Log entry 1')).toHaveClass('server_wrap');
97+
expect(screen.getByLabelText('Wrap logs')).toBeChecked();
98+
expect(screen.getByText('Log entry 1')).toHaveClass('server__log-line--wrap');
9899

99100
fireEvent.click(screen.getByLabelText('Wrap logs'));
100-
101-
expect(screen.getByText('Log entry 1')).not.toHaveClass('server_wrap');
101+
expect(screen.getByLabelText('Wrap logs')).not.toBeChecked();
102+
expect(screen.getByText('Log entry 1')).not.toHaveClass('server__log-line--wrap');
102103
});
103104
});

desktop/core/src/desktop/js/apps/admin/ServerLogs/ServerLogsTab.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ const ServerLogs: React.FC = (): JSX.Element => {
7272
<div className="server__display-logs">
7373
{logsData.logs.map((line, index) => (
7474
<div
75-
className={`server__log-line ${wrapLogs ? 'server_wrap' : ''}`}
75+
className={`server__log-line ${wrapLogs ? 'server__log-line--wrap' : ''}`}
7676
key={'logs_' + index}
7777
>
7878
<HighlightText text={line} searchValue={filter} />

0 commit comments

Comments
 (0)