Skip to content

[ML] Remove encoding for scheduled events labels #75973

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
merged 4 commits into from
Aug 27, 2020
Merged

[ML] Remove encoding for scheduled events labels #75973

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
78bac32
[ML] fix tooltip content for scheduled events
darnautov Aug 26, 2020
4ae259b
Merge remote-tracking branch 'upstream/master' into ML-74938-fix-spac…
darnautov Aug 26, 2020
b715d51
Merge branch 'master' into ML-74938-fix-spaces-encoding
elasticmachine Aug 26, 2020
dcf14d4
Merge branch 'master' into ML-74938-fix-spaces-encoding
elasticmachine Aug 26, 2020
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
7 changes: 6 additions & 1 deletion x-pack/plugins/ml/public/application/components/chart_tooltip/chart_tooltip.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,11 @@ const Tooltip: FC<{ service: ChartTooltipService }> = React.memo(({ service }) =
// eslint-disable-next-line @typescript-eslint/naming-convention
echTooltip__rowHighlighted: isHighlighted,
});

const renderValue = Array.isArray(value)
? value.map((v) => <div key={v}>{v}</div>)
: value;

return (
<div
key={`${seriesIdentifier.key}__${valueAccessor}`}
Expand All @@ -88,7 +93,7 @@ const Tooltip: FC<{ service: ChartTooltipService }> = React.memo(({ service }) =
{label}
</EuiFlexItem>
<EuiFlexItem className="eui-textBreakAll mlChartTooltip__value">
{value}
{renderValue}
</EuiFlexItem>
</EuiFlexGroup>
</div>
Expand Down
3 changes: 1 addition & 2 deletions ...ck/plugins/ml/public/application/explorer/explorer_charts/explorer_chart_single_metric.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@ import {
} from '../../util/chart_utils';
import { LoadingIndicator } from '../../components/loading_indicator/loading_indicator';
import { getTimeBucketsFromCache } from '../../util/time_buckets';
import { mlEscape } from '../../util/string_utils';
import { mlFieldFormatService } from '../../services/field_format_service';

const CONTENT_WRAPPER_HEIGHT = 215;
Expand Down Expand Up @@ -486,7 +485,7 @@ export class ExplorerChartSingleMetric extends React.Component {
label: i18n.translate('xpack.ml.explorer.singleMetricChart.scheduledEventsLabel', {
defaultMessage: 'Scheduled events',
}),
value: marker.scheduledEvents.map(mlEscape).join('<br/>'),
value: marker.scheduledEvents,
seriesIdentifier: {
key: seriesKey,
},
Expand Down