Wrap pod logs #6217

aleksfront · 2022-09-09T08:44:09Z

Adding a way to wrap log lines for better logs readability.

This made possible by replacing react-window virtualisation library to tanstack/virtual (https://github.com/tanstack/virtual) which supports undetermined height rows.

wrapping.logs.mov

Fixes #1077

Signed-off-by: Alex Andreev <alex.andreev.email@gmail.com>

Signed-off-by: alexfront <alex.andreev.email@gmail.com>

Signed-off-by: Alex Andreev <alex.andreev.email@gmail.com>

jim-docker · 2022-12-06T13:41:55Z

Should the highlighted search selection stay in view when toggling wrapped?

Screen.Recording.2022-12-05.at.6.38.21.PM.mov

Also, when at the very bottom of the logs with Wrap logs checked, unchecking then rechecking leaves the view not at the bottom of the logs.

jim-docker · 2022-12-07T01:12:44Z

src/features/pod-logs/download-logs.test.tsx

@@ -29,6 +29,17 @@ import showErrorNotificationInjectable from "../../renderer/components/notificat
 import type { DiContainer } from "@ogre-tools/injectable";
 import type { Container } from "../../common/k8s-api/endpoints";

+const observe = jest.fn();


nit: set it inline below?

jim-docker · 2022-12-07T01:23:19Z

src/renderer/components/dock/logs/__test__/log-search.test.tsx

    userEvent.click(await screen.findByPlaceholderText("Search..."));
    userEvent.keyboard("o");
    userEvent.click(await screen.findByText("keyboard_arrow_up"));
-    expect(scrollToOverlay).toBeCalled();
+    expect(setPrevOverlayActiveMock).toHaveBeenCalled();


nit

Suggested change

expect(setPrevOverlayActiveMock).toHaveBeenCalled();

expect(setPrevOverlayActiveMock).toBeCalled();

jim-docker · 2022-12-07T01:44:41Z

src/renderer/components/dock/logs/use-scroll-to-bottom.ts

+ */
+import { useState } from "react";
+
+export function useJumpToBottomButton(scrolledParent: HTMLDivElement | null): [isVisible: boolean, setVisibility: () => void] {


nit

Suggested change

export function useJumpToBottomButton(scrolledParent: HTMLDivElement | null): [isVisible: boolean, setVisibility: () => void] {

export function useScrollToBottomButton(scrolledParent: HTMLDivElement | null): [isVisible: boolean, setVisibility: () => void] {

or change file name?

github-actions · 2022-12-15T15:09:45Z

This pull request has conflicts, please resolve those before we can evaluate the pull request.

kitsirota · 2022-12-16T15:59:45Z

@aleksfront Thanks for working on this! I cant wait to see this get merged and shipped. Even on a 4k screen, scrolling horizontally just to get the details you need is a massive pain.

matter-it-does · 2023-01-03T13:58:46Z

thanks for working on this

haunt98 · 2023-01-04T17:14:41Z

Thanks for working on this man 👍

amit-mahendrakar · 2023-03-03T07:02:23Z

Thanks @aleksfront , it is a much needed feature.

kitsirota · 2023-04-26T19:20:43Z

@aleksfront or @Nokel81 could one of you rebase this so it can get merged? Its a badly needed feature at this point and it would be great to finally see it in the 6.5.0 release

bitroniq · 2024-01-16T12:06:52Z

Please help on this feature, highly requested

aleksfront added 30 commits August 29, 2022 15:53

Create functional LogList component

da39984

Signed-off-by: Alex Andreev <alex.andreev.email@gmail.com>

Add tanstack/react-virtual dependency

d51c327

Signed-off-by: Alex Andreev <alex.andreev.email@gmail.com>

Using new <LogList/>

6f91071

Signed-off-by: Alex Andreev <alex.andreev.email@gmail.com>

Remove overflow from the LogControls

843c0f7

Signed-off-by: Alex Andreev <alex.andreev.email@gmail.com>

Set some list onScroll events

85fadc7

Signed-off-by: Alex Andreev <alex.andreev.email@gmail.com>

Load more logs when scrolled to top

88678f6

Signed-off-by: Alex Andreev <alex.andreev.email@gmail.com>

Merge branch 'master' into wrap-pod-logs

e02278d

Remove overflow from the LogControls

e16fcf2

Signed-off-by: Alex Andreev <alex.andreev.email@gmail.com>

Show logs regarding to showTimestamps flag

af8f39f

Signed-off-by: Alex Andreev <alex.andreev.email@gmail.com>

Keep scrolling position when loaded more logs

62cc0d7

Signed-off-by: Alex Andreev <alex.andreev.email@gmail.com>

Merge branch 'master' into wrap-pod-logs

6d0d524

Fix scroll position when more logs loaded

968621f

Signed-off-by: Alex Andreev <alex.andreev.email@gmail.com>

Scroll to bottom on pod id change

c4538e9

Signed-off-by: Alex Andreev <alex.andreev.email@gmail.com>

Scroll to bottom on tab change

1679ba1

Signed-off-by: Alex Andreev <alex.andreev.email@gmail.com>

Add LogList external styles

2e0b4d1

Signed-off-by: Alex Andreev <alex.andreev.email@gmail.com>

Add more styles

da8570d

Signed-off-by: Alex Andreev <alex.andreev.email@gmail.com>

Move LogRow to its own file

f09974f

Signed-off-by: Alex Andreev <alex.andreev.email@gmail.com>

Scroll to overlay from the search

f90ede1

Signed-off-by: Alex Andreev <alex.andreev.email@gmail.com>

Add wrapper switch

c4ae074

Signed-off-by: Alex Andreev <alex.andreev.email@gmail.com>

Highlight log row on hover

5443f40

Signed-off-by: Alex Andreev <alex.andreev.email@gmail.com>

Refresh rows measurement by refreshing their keys

b989340

Signed-off-by: Alex Andreev <alex.andreev.email@gmail.com>

Create useScrollToBottomButton hook

8ed40ff

Signed-off-by: Alex Andreev <alex.andreev.email@gmail.com>

Add useInitialScrollToBottom() hook

4c74d5a

Signed-off-by: Alex Andreev <alex.andreev.email@gmail.com>

Show Jump to bottom button

b8f4fa1

Signed-off-by: Alex Andreev <alex.andreev.email@gmail.com>

Restyling Jump to bottom button

6ec7618

Signed-off-by: Alex Andreev <alex.andreev.email@gmail.com>

Give more room to the LogRows content

51c059f

Signed-off-by: Alex Andreev <alex.andreev.email@gmail.com>

Hook function renaming

7b53650

Signed-off-by: Alex Andreev <alex.andreev.email@gmail.com>

Fix scrolling to items on search

05a3ed0

Signed-off-by: Alex Andreev <alex.andreev.email@gmail.com>

Add useIntersectionObserver() hook

dadd69e

Signed-off-by: alexfront <alex.andreev.email@gmail.com>

Remove unused code

1898a4d

Signed-off-by: alexfront <alex.andreev.email@gmail.com>

aleksfront added 13 commits December 1, 2022 12:30

Fix click .wrap-logs click event

d19e65b

Signed-off-by: Alex Andreev <alex.andreev.email@gmail.com>

Adding hard wait for debugging

2c2266e

Signed-off-by: Alex Andreev <alex.andreev.email@gmail.com>

Test for white-space rule changing

a49c947

Signed-off-by: Alex Andreev <alex.andreev.email@gmail.com>

Search for element using getByTestId

5921098

Signed-off-by: Alex Andreev <alex.andreev.email@gmail.com>

Using asElement() for assertions

8566ae8

Signed-off-by: Alex Andreev <alex.andreev.email@gmail.com>

Use getByText from frame selector

4fbaa7f

Signed-off-by: Alex Andreev <alex.andreev.email@gmail.com>

Testing bounding boxes

59d0790

Signed-off-by: Alex Andreev <alex.andreev.email@gmail.com>

More testing of bounding box

178c1f0

Signed-off-by: Alex Andreev <alex.andreev.email@gmail.com>

Testing check() instead of click()

f957eb0

Signed-off-by: Alex Andreev <alex.andreev.email@gmail.com>

Use click instead of check

5f660bb

Signed-off-by: Alex Andreev <alex.andreev.email@gmail.com>

Check if .wrap class applied properly

1af76e1

Signed-off-by: Alex Andreev <alex.andreev.email@gmail.com>

Remove e2e wrap logs test case

be2cb63

Signed-off-by: Alex Andreev <alex.andreev.email@gmail.com>

Linter fixes

a38fdc7

Signed-off-by: Alex Andreev <alex.andreev.email@gmail.com>

jim-docker reviewed Dec 7, 2022

View reviewed changes

github-actions bot added the PR: needs rebase label Dec 15, 2022

Nokel81 modified the milestones: 6.3.0, 6.4.0 Dec 21, 2022

Nokel81 modified the milestones: 6.4.0, 6.5.0 Jan 26, 2023

Nokel81 modified the milestones: 6.5.0, 6.6.0 May 26, 2023

k8ieone mentioned this pull request Jun 20, 2023

Add some enhancements to the pod log? #4447

Open

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Wrap pod logs #6217

Wrap pod logs #6217

aleksfront commented Sep 9, 2022

jim-docker commented Dec 6, 2022 •

edited

jim-docker Dec 7, 2022

jim-docker Dec 7, 2022

jim-docker Dec 7, 2022

github-actions bot commented Dec 15, 2022

kitsirota commented Dec 16, 2022

matter-it-does commented Jan 3, 2023

haunt98 commented Jan 4, 2023

amit-mahendrakar commented Mar 3, 2023

kitsirota commented Apr 26, 2023

bitroniq commented Jan 16, 2024

	expect(setPrevOverlayActiveMock).toHaveBeenCalled();
	expect(setPrevOverlayActiveMock).toBeCalled();

	export function useJumpToBottomButton(scrolledParent: HTMLDivElement \| null): [isVisible: boolean, setVisibility: () => void] {
	export function useScrollToBottomButton(scrolledParent: HTMLDivElement \| null): [isVisible: boolean, setVisibility: () => void] {

Wrap pod logs #6217

Are you sure you want to change the base?

Wrap pod logs #6217

Conversation

aleksfront commented Sep 9, 2022

jim-docker commented Dec 6, 2022 • edited

jim-docker Dec 7, 2022

Choose a reason for hiding this comment

jim-docker Dec 7, 2022

Choose a reason for hiding this comment

jim-docker Dec 7, 2022

Choose a reason for hiding this comment

github-actions bot commented Dec 15, 2022

kitsirota commented Dec 16, 2022

matter-it-does commented Jan 3, 2023

haunt98 commented Jan 4, 2023

amit-mahendrakar commented Mar 3, 2023

kitsirota commented Apr 26, 2023

bitroniq commented Jan 16, 2024

jim-docker commented Dec 6, 2022 •

edited