IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

LogRow: ensure scrollIntoView is called only once with shortlinks (#72291)

Browse Source
This commit is contained in:
Matias Chomicki 2023-07-25 18:00:10 +02:00 committed by GitHub
parent b71117393b
commit ec5650cc82
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
public/app/features/logs/components/LogRow.test.tsx
View File

@ -66,6 +66,7 @@ describe('LogRow', () => {
logRowUid: 'log-row-id', logRowUid: 'log-row-id',
datasourceType: 'unknown', datasourceType: 'unknown',
}); });
expect(scrollIntoView).toHaveBeenCalledTimes(1);
}); });
it('highlights row with same permalink-id', () => { it('highlights row with same permalink-id', () => {
@ -104,11 +105,18 @@ describe('LogRow', () => {
expect(scrollIntoView).toHaveBeenCalled(); expect(scrollIntoView).toHaveBeenCalled();
}); });
it('not calls `scrollIntoView` if permalink does not match', () => { it('does not call `scrollIntoView` if permalink does not match', () => {
const scrollIntoView = jest.fn(); const scrollIntoView = jest.fn();
setup({ permalinkedRowId: 'wrong-log-row-id', scrollIntoView }); setup({ permalinkedRowId: 'wrong-log-row-id', scrollIntoView });
expect(scrollIntoView).not.toHaveBeenCalled(); expect(scrollIntoView).not.toHaveBeenCalled();
}); });
it('calls `scrollIntoView` once', async () => {
const scrollIntoView = jest.fn();
setup({ permalinkedRowId: 'log-row-id', scrollIntoView });
await userEvent.hover(screen.getByText('test123'));
expect(scrollIntoView).toHaveBeenCalledTimes(1);
});
}); });
it('should render the menu cell on mouse over', async () => { it('should render the menu cell on mouse over', async () => {

8
public/app/features/logs/components/LogRow.tsx
View File

@ -143,11 +143,11 @@ class UnThemedLogRow extends PureComponent<Props, State> {
return; return;
} }
// at this point this row is the permalinked row, so we need to scroll to it and highlight it if possible.
if (this.logLineRef.current && scrollIntoView) {
scrollIntoView(this.logLineRef.current);
}
if (!this.state.highlightBackround) { if (!this.state.highlightBackround) {
// at this point this row is the permalinked row, so we need to scroll to it and highlight it if possible.
if (this.logLineRef.current && scrollIntoView) {
scrollIntoView(this.logLineRef.current);
}
reportInteraction('grafana_explore_logs_permalink_opened', { reportInteraction('grafana_explore_logs_permalink_opened', {
datasourceType: row.datasourceType ?? 'unknown', datasourceType: row.datasourceType ?? 'unknown',
logRowUid: row.uid, logRowUid: row.uid,