fix: Remove double tooltip from metric label (#12736)

* Remove tooltip from AdhocMetricOption

* Lint fix

* Add tooltip for adhoc metrics

* Typo fix
This commit is contained in:
Kamil Gabryjelski
2021-01-29 16:01:58 +01:00
committed by GitHub
parent 1603e82a03
commit c6093a7469
2 changed files with 13 additions and 18 deletions

View File

@@ -18,7 +18,6 @@
*/
import React from 'react';
import PropTypes from 'prop-types';
import { Tooltip } from 'src/common/components/Tooltip';
import columnType from 'src/explore/propTypes/columnType';
import { OptionControlLabel } from 'src/explore/components/OptionControls';
import { OPTION_TYPES } from 'src/explore/components/optionTypes';
@@ -71,22 +70,17 @@ class AdhocMetricOption extends React.PureComponent {
savedMetric={savedMetric}
datasourceType={datasourceType}
>
<Tooltip
placement="top"
title={savedMetric.expression || adhocMetric.label}
>
<OptionControlLabel
savedMetric={savedMetric}
label={adhocMetric.label}
onRemove={this.onRemoveMetric}
onMoveLabel={onMoveLabel}
onDropLabel={onDropLabel}
index={index}
type={OPTION_TYPES.metric}
isAdhoc
isFunction
/>
</Tooltip>
<OptionControlLabel
savedMetric={savedMetric}
label={adhocMetric.label}
onRemove={this.onRemoveMetric}
onMoveLabel={onMoveLabel}
onDropLabel={onDropLabel}
index={index}
type={OPTION_TYPES.metric}
isAdhoc
isFunction
/>
</AdhocMetricPopoverTrigger>
);
}