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

Query Browser: Replace tooltip datum prop with datumX and datumY #4747

Merged
merged 1 commit into from
Mar 17, 2020
Merged

Query Browser: Replace tooltip datum prop with datumX and datumY #4747

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 8 additions & 6 deletions frontend/public/components/monitoring/query-browser.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,8 @@ const tooltipStateToProps = ({ UI }: RootState, { seriesIndex }) => {
};

const TooltipInner_: React.FC<TooltipInnerProps> = ({
datum,
datumX,
datumY,
labels,
query,
seriesIndex,
Expand Down Expand Up @@ -188,15 +189,15 @@ const TooltipInner_: React.FC<TooltipInnerProps> = ({
className="query-browser__series-btn"
style={{ backgroundColor: colors[seriesIndex % colors.length] }}
/>
{datum.x && (
{datumX && (
<div className="query-browser__tooltip-time">
{twentyFourHourTimeWithSeconds(datum.x)}
{twentyFourHourTimeWithSeconds(datumX)}
</div>
)}
</div>
<div className="query-browser__tooltip-group">
<div className="co-nowrap co-truncate">{query}</div>
<div className="query-browser__tooltip-value">{formatValue(datum.y)}</div>
<div className="query-browser__tooltip-value">{formatValue(datumY)}</div>
</div>
{_.map(labels, (v, k) => (
<div className="co-nowrap co-truncate" key={k}>
Expand All @@ -215,7 +216,7 @@ const TooltipInner = connect(tooltipStateToProps)(TooltipInner_);

const Tooltip_: React.FC<TooltipProps> = ({ datum, x, y }) =>
datum && _.isFinite(datum.y) && _.isFinite(x) && _.isFinite(y) ? (
<TooltipInner datum={datum} seriesIndex={datum._stack - 1} x={x} y={y} />
<TooltipInner datumX={datum.x} datumY={datum.y} seriesIndex={datum._stack - 1} x={x} y={y} />
) : null;
const Tooltip = withFallback(Tooltip_);

Expand Down Expand Up @@ -809,7 +810,8 @@ type SpanControlsProps = {
type TooltipDatum = { _stack: number; x: Date; y: number };

type TooltipInnerProps = {
datum: TooltipDatum;
datumX: Date;
datumY: number;
labels?: PrometheusLabels;
query?: string;
seriesIndex: number;
Expand Down