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

[Logs] Fix Logs stream minimap after changes to use @emotion #203620

Closed
wants to merge 4 commits into from
Closed

[Logs] Fix Logs stream minimap after changes to use @emotion #203620

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e18b655
Fix Logs stream minimap after changes to use @emotion
crespocarlos Dec 10, 2024
5706db0
keep fidelity with refactored class component
crespocarlos Dec 12, 2024
3e133e8
Merge branch 'main' into 203597-fix-logs-stream-minimap
elasticmachine Dec 13, 2024
8088845
Merge branch 'main' into 203597-fix-logs-stream-minimap
elasticmachine Dec 18, 2024
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
218 changes: 106 additions & 112 deletions ...lugins/observability_solution/infra/public/components/logging/log_minimap/log_minimap.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
* 2.0.
*/

import styled from '@emotion/styled';
import {
LogEntriesSummaryBucket,
LogEntriesSummaryHighlightsBucket,
Expand All @@ -14,6 +13,9 @@ import {
import { scaleLinear } from 'd3-scale';
import moment from 'moment';
import * as React from 'react';
import { css } from '@emotion/react';
import { useEuiTheme } from '@elastic/eui';
import { useState } from 'react';
import { DensityChart } from './density_chart';
import { HighlightedInterval } from './highlighted_interval';
import { SearchMarkers } from './search_markers';
Expand All @@ -37,11 +39,6 @@ interface LogMinimapProps {
width: number;
}

interface LogMinimapState {
target: number | null;
timeCursorY: number;
}

// Wide enough to fit "September"
const TIMERULER_WIDTH = 50;

Expand All @@ -51,133 +48,130 @@ function calculateYScale(start: number | null, end: number | null, height: numbe
.range([0, height]);
}

export class LogMinimap extends React.Component<LogMinimapProps, LogMinimapState> {
constructor(props: LogMinimapProps) {
super(props);
this.state = {
timeCursorY: 0,
target: props.target,
};
}

public handleClick: React.MouseEventHandler<SVGSVGElement> = (event) => {
export const LogMinimap = ({
start,
end,
className,
height,
highlightedInterval,
jumpToTarget,
summaryBuckets,
summaryHighlightBuckets,
width,
target,
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

For a faithful conversion of the original class component we would have to capture the initial target in a useState so it doesn't update after the first render. I'm not sure about the reason anymore, but I think it has something to do with deep links to specific points in time.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I was confused about that and really didn't see any difference with storing target in a useState, that's why I didn't do it here. target isn't changed in this component.

I'll change it because I don't whether this will have other implications I'm not aware of.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, I felt the same. Sorry that I can't say for certain. Better safe than sorry, since it's a trivial change.

}: LogMinimapProps) => {
const [timeCursorY, setTimeCursorY] = useState<number>(0);
const theme = useEuiTheme();

const handleClick: React.MouseEventHandler<SVGSVGElement> = (event) => {
const minimapTop = event.currentTarget.getBoundingClientRect().top;
const clickedYPosition = event.clientY - minimapTop;

const clickedTime = Math.floor(this.getYScale().invert(clickedYPosition));
const clickedTime = Math.floor(getYScale().invert(clickedYPosition));

this.props.jumpToTarget({
jumpToTarget({
tiebreaker: 0,
time: moment(clickedTime).toISOString(),
});
};

public getYScale = () => {
const { start, end, height } = this.props;
const getYScale = () => {
return calculateYScale(start, end, height);
};

public getPositionOfTime = (time: number) => {
return this.getYScale()(time) ?? 0;
const getPositionOfTime = (time: number) => {
return getYScale()(time) ?? 0;
};

private updateTimeCursor: React.MouseEventHandler<SVGSVGElement> = (event) => {
const updateTimeCursor: React.MouseEventHandler<SVGSVGElement> = (event) => {
const svgPosition = event.currentTarget.getBoundingClientRect();
const timeCursorY = event.clientY - svgPosition.top;

this.setState({ timeCursorY });
setTimeCursorY(event.clientY - svgPosition.top);
};

public render() {
const {
start,
end,
className,
height,
highlightedInterval,
jumpToTarget,
summaryBuckets,
summaryHighlightBuckets,
width,
} = this.props;
const { timeCursorY, target } = this.state;
const [minTime, maxTime] = calculateYScale(start, end, height).domain();
const tickCount = height ? Math.floor(height / 50) : 12;

return (
<MinimapWrapper
className={className}
const [minTime, maxTime] = calculateYScale(start, end, height).domain();
const tickCount = height ? Math.floor(height / 50) : 12;

return (
<svg
className={className}
height={height}
preserveAspectRatio="none"
viewBox={`0 0 ${width} ${height}`}
width={width}
onClick={handleClick}
onMouseMove={updateTimeCursor}
css={css`
cursor: pointer;
fill: ${theme.euiTheme.colors.emptyShade};
& line.logs-time-cursor {
visibility: hidden;
}
&:hover line.logs-time-cursor {
visibility: visible;
}
`}
>
<line
x1={TIMERULER_WIDTH}
x2={TIMERULER_WIDTH}
y1={0}
y2={height}
css={css`
stroke: ${theme.euiTheme.colors.mediumShade};
stroke-width: 1px;
`}
/>
<TimeRuler
start={minTime}
end={maxTime}
width={TIMERULER_WIDTH}
height={height}
preserveAspectRatio="none"
viewBox={`0 0 ${width} ${height}`}
width={width}
onClick={this.handleClick}
onMouseMove={this.updateTimeCursor}
>
<MinimapBorder x1={TIMERULER_WIDTH} x2={TIMERULER_WIDTH} y1={0} y2={height} />
<TimeRuler
tickCount={tickCount}
/>
<g transform={`translate(${TIMERULER_WIDTH}, 0)`}>
<DensityChart
buckets={summaryBuckets}
start={minTime}
end={maxTime}
width={TIMERULER_WIDTH}
width={width - TIMERULER_WIDTH}
height={height}
tickCount={tickCount}
/>
<g transform={`translate(${TIMERULER_WIDTH}, 0)`}>
<DensityChart
buckets={summaryBuckets}
start={minTime}
end={maxTime}
width={width - TIMERULER_WIDTH}
height={height}
/>

<SearchMarkers
buckets={summaryHighlightBuckets || []}
start={minTime}
end={maxTime}
width={width - TIMERULER_WIDTH}
height={height}
jumpToTarget={jumpToTarget}
/>
</g>

{highlightedInterval ? (
<HighlightedInterval
end={moment(highlightedInterval.end).valueOf()}
getPositionOfTime={this.getPositionOfTime}
start={moment(highlightedInterval.start).valueOf()}
targetWidth={TIMERULER_WIDTH}
width={width}
target={target}
/>
) : null}
<TimeCursor x1={TIMERULER_WIDTH} x2={width} y1={timeCursorY} y2={timeCursorY} />
</MinimapWrapper>
);
}
}

const MinimapBorder = styled.line`
stroke: ${(props) => props.theme.euiTheme.colors.mediumShade};
stroke-width: 1px;
`;

const TimeCursor = styled.line`
pointer-events: none;
stroke-width: 1px;
stroke: ${(props) =>
props.theme.colorMode === 'DARK'
? props.theme.euiTheme.colors.darkestShade
: props.theme.euiTheme.colors.darkShade};
`;

const MinimapWrapper = styled.svg`
cursor: pointer;
fill: ${(props) => props.theme.euiTheme.colors.emptyShade};
& ${TimeCursor} {
visibility: hidden;
}
&:hover ${TimeCursor} {
visibility: visible;
}
`;
<SearchMarkers
buckets={summaryHighlightBuckets || []}
start={minTime}
end={maxTime}
width={width - TIMERULER_WIDTH}
height={height}
jumpToTarget={jumpToTarget}
/>
</g>

{highlightedInterval ? (
<HighlightedInterval
end={moment(highlightedInterval.end).valueOf()}
getPositionOfTime={getPositionOfTime}
start={moment(highlightedInterval.start).valueOf()}
targetWidth={TIMERULER_WIDTH}
width={width}
target={target}
/>
) : null}
<line
className="logs-time-cursor"
x1={TIMERULER_WIDTH}
x2={width}
y1={timeCursorY}
y2={timeCursorY}
css={css`
pointer-events: none;
stroke-width: 1px;
stroke: ${theme.colorMode === 'DARK'
? theme.euiTheme.colors.darkestShade
: theme.euiTheme.colors.darkShade};
`}
/>
</svg>
);
};
Loading