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

[ML] Fix Single Metric Viewer annotation tooltip hard to trigger #98233

Merged
merged 9 commits into from
Apr 29, 2021
Merged

[ML] Fix Single Metric Viewer annotation tooltip hard to trigger #98233

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
4021c0b
[ML] Make mlAnnotationTextRect show tooltip upon hover, make mlAnnota…
qn895 Apr 23, 2021
646e728
[ML] Fix random focus border around flyout
qn895 Apr 23, 2021
eba2464
[ML] Make text clickable as well
qn895 Apr 23, 2021
58bde4e
Merge remote-tracking branch 'upstream/master' into ml-fix-annotation…
qn895 Apr 26, 2021
b2c3dab
Merge branch 'master' into ml-fix-annotation-marker-tooltip
kibanamachine Apr 27, 2021
dc9798b
[ML] Get rid of redundant function
qn895 Apr 27, 2021
baea0c3
[ML] Remove scss overrides, autoprefix
qn895 Apr 28, 2021
08da994
[ML] Update wording
qn895 Apr 28, 2021
f192c0e
Merge branch 'master' into ml-fix-annotation-marker-tooltip
kibanamachine Apr 29, 2021
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
1 change: 1 addition & 0 deletions x-pack/plugins/ml/public/application/components/annotations/annotation_flyout/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -435,6 +435,7 @@ export const AnnotationFlyout: FC<any> = (props) => {
size="m"
aria-labelledby="Add annotation"
data-test-subj={'mlAnnotationFlyout'}
className={'mlAnnotationFlyout'}
>
<EuiFlyoutHeader hasBorder>
<EuiTitle size="s">
Expand Down
3 changes: 3 additions & 0 deletions x-pack/plugins/ml/public/application/timeseriesexplorer/_timeseriesexplorer_annotations.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,9 @@ $mlAnnotationRectDefaultFillOpacity: .05;

fill: $euiColorFullShade;
transition: fill $euiAnimSpeedFast;

user-select: none;

}

.mlAnnotationText-isBlur {
Expand Down
41 changes: 27 additions & 14 deletions ...pplication/timeseriesexplorer/components/timeseries_chart/timeseries_chart_annotations.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,6 +132,19 @@ export function renderAnnotations(
const levelHeight = ANNOTATION_LEVEL_HEIGHT;
const levels = getAnnotationLevels(focusAnnotationData);

const onAnnotationMouseOver = function (this: object, d: Annotation) {
Copy link
Contributor

Choose a reason for hiding this comment

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

Is there any type of 'mouseover' cotext (this) available?

showFocusChartTooltip(d, this);
};

const onAnnotationClick = (d: Annotation) => {
// clear a possible existing annotation previously set for editing before setting the new one.
// this needs to be done explicitly here because a new annotation created using the brush tool
// could still be present in the chart.
annotationUpdatesService.setValue(null);
// set the actual annotation and trigger the flyout
annotationUpdatesService.setValue(d);
darnautov marked this conversation as resolved.
Show resolved Hide resolved
};

const annotations = focusChart
.select('.mlAnnotations')
.selectAll('g.mlAnnotation')
Expand All @@ -148,18 +161,9 @@ export function renderAnnotations(
.attr('ry', ANNOTATION_RECT_BORDER_RADIUS)
.classed('mlAnnotationRect', true)
.attr('mask', `url(#${ANNOTATION_MASK_ID})`)
.on('mouseover', function (this: object, d: Annotation) {
showFocusChartTooltip(d, this);
})
.on('mouseout', () => hideFocusChartTooltip())
.on('click', (d: Annotation) => {
// clear a possible existing annotation set up for editing before setting the new one.
// this needs to be done explicitly here because a new annotation created using the brush tool
// could still be present in the chart.
annotationUpdatesService.setValue(null);
// set the actual annotation and trigger the flyout
annotationUpdatesService.setValue(d);
});
.on('mouseover', onAnnotationMouseOver)
.on('mouseout', hideFocusChartTooltip)
.on('click', onAnnotationClick);

rects
.attr('x', (d: Annotation) => {
Expand Down Expand Up @@ -196,9 +200,18 @@ export function renderAnnotations(
.attr('width', ANNOTATION_TEXT_RECT_WIDTH)
.attr('height', ANNOTATION_TEXT_RECT_HEIGHT)
.attr('rx', ANNOTATION_RECT_BORDER_RADIUS)
.attr('ry', ANNOTATION_RECT_BORDER_RADIUS);
.attr('ry', ANNOTATION_RECT_BORDER_RADIUS)
.on('mouseover', onAnnotationMouseOver)
.on('mouseout', hideFocusChartTooltip)
.on('click', onAnnotationClick);

texts.enter().append('text').classed('mlAnnotationText', true);
texts
.enter()
.append('text')
.classed('mlAnnotationText', true)
.on('mouseover', onAnnotationMouseOver)
.on('mouseout', hideFocusChartTooltip)
.on('click', onAnnotationClick);

function labelXOffset(ts: number) {
const earliestMs = focusXScale.domain()[0];
Expand Down