Skip to content
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

Jump to bottom

Explore: Fixes loading more logs in logs context view #24135

Merged
merged 11 commits into from May 14, 2020
Merged

Explore: Fixes loading more logs in logs context view #24135

Changes from 2 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
56fc9a3
Chore: fixes LogRowContextProvider show more context
Apr 30, 2020
5853daa
Chore: changes array flattening to simple multidimensional array subs…
Apr 30, 2020
87642fd
Chore: fixes the case where there are no logs after/before the first/…
May 4, 2020
c53a839
Chore: refactors result variables in LogRowContextProvider to make it…
May 4, 2020
b1bca24
Merge branch 'master' into lukas/fix_show_context
May 6, 2020
6ede506
Merge branch 'master' into lukas/fix_show_context
May 7, 2020
5e7b2ee
Merge changes
May 11, 2020
390049a
Merge branch 'master' into lukas/fix_show_context
May 12, 2020
83fb9b8
Chore: adds an additional explanation about having more log rows in a…
May 12, 2020
9e2e2fa
Chore: adds LogRowContextProvider test checking if there are more log…
May 12, 2020
85c780a
Chore: fixes an unnecessary long expression
May 12, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions packages/grafana-ui/src/components/Logs/LogRowContextProvider.tsx
View file
Open in desktop
Expand Up @@ -160,11 +160,11 @@ export const LogRowContextProvider: React.FunctionComponent<LogRowContextProvide
let hasMoreLogsBefore = true,
hasMoreLogsAfter = true;

if (currentResult && currentResult.data[0].length === value.data[0].length) {
if (currentResult && currentResult.data[0][0].length === value.data[0][0].length) {
hasMoreLogsBefore = false;
}

if (currentResult && currentResult.data[1].length === value.data[1].length) {
if (currentResult && currentResult.data[1][0].length === value.data[1][0].length) {
hasMoreLogsAfter = false;
}

Expand Down