Skip to content

[7.x] [ML] add marker body (#104672) #104724

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

Merged
kibanamachine merged 1 commit into from
Jul 7, 2021
Merged

[7.x] [ML] add marker body (#104672) #104724

Show file tree
Hide file tree
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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 9 additions & 8 deletions ...ublic/application/jobs/new_job/pages/components/charts/event_rate_chart/overlay_range.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import React, { FC } from 'react';
import { EuiIcon } from '@elastic/eui';
import { RectAnnotation, LineAnnotation, AnnotationDomainType, Position } from '@elastic/charts';
import { timeFormatter } from '../../../../../../../../common/util/date_utils';
import { useCurrentEuiTheme } from '../../../../../../components/color_range_legend';

interface Props {
overlayKey: number;
Expand All @@ -19,12 +20,14 @@ interface Props {
}

export const OverlayRange: FC<Props> = ({ overlayKey, start, end, color, showMarker = true }) => {
const { euiTheme } = useCurrentEuiTheme();

return (
<>
<RectAnnotation
id={`rect_annotation_${overlayKey}`}
zIndex={1}
hideTooltips={true}
hideTooltips
dataValues={[
{
coordinates: {
Expand All @@ -50,14 +53,12 @@ export const OverlayRange: FC<Props> = ({ overlayKey, start, end, color, showMar
},
}}
markerPosition={Position.Bottom}
hideTooltips={true}
marker={
hideTooltips
marker={showMarker ? <EuiIcon type="arrowUp" /> : undefined}
markerBody={
showMarker ? (
<div>
<div style={{ textAlign: 'center' }}>
<EuiIcon type="arrowUp" />
</div>
<div style={{ fontWeight: 'normal', color: '#343741' }}>{timeFormatter(start)}</div>
<div style={{ fontWeight: 'normal', color: euiTheme.euiTextColor }}>
{timeFormatter(start)}
</div>
) : undefined
}
Expand Down
2 changes: 1 addition & 1 deletion ...blic/application/jobs/new_job/pages/components/charts/loading_wrapper/loading_wrapper.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ export const LoadingWrapper: FC<Props> = ({ hasData, loading = false, height, ch
transition: 'opacity 0.2s',
}}
>
{children}
{loading && !hasData ? null : children}
</div>
{loading === true && (
<EuiFlexGroup
Expand Down