QT/superset2
1
0
Fork 0
mirror of https://github.com/apache/superset.git synced 2026-05-07 08:54:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(explore): add current savedMetric to dropdown (#12835)

Browse Source
This commit is contained in:
Ville Brofeldt
2021-01-29 22:51:35 +02:00
committed by Ville Brofeldt
parent 8d44afe6ea
commit ad41e6d973
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
superset-frontend/src/explore/components/controls/MetricControl/MetricsControl.jsx
View File

@@ -64,11 +64,16 @@ const defaultProps = {
columns: [],
};
function getOptionsForSavedMetrics(savedMetrics, currentMetricValues) {
function getOptionsForSavedMetrics(
savedMetrics,
currentMetricValues,
currentMetric,
) {
return (
savedMetrics?.filter(savedMetric =>
Array.isArray(currentMetricValues)
? !currentMetricValues.includes(savedMetric.metric_name)
? !currentMetricValues.includes(savedMetric.metric_name) ||
savedMetric.metric_name === currentMetric
: savedMetric,
) ?? []
);
@@ -144,6 +149,7 @@ class MetricsControl extends React.PureComponent {
savedMetricsOptions={getOptionsForSavedMetrics(
this.props.savedMetrics,
this.props.value,
this.props.value?.[index],
)}
datasourceType={this.props.datasourceType}
onMoveLabel={this.moveLabel}
@@ -285,6 +291,7 @@ class MetricsControl extends React.PureComponent {
savedMetricsOptions={getOptionsForSavedMetrics(
this.props.savedMetrics,
this.props.value,
null,
)}
savedMetric={{}}
datasourceType={this.props.datasourceType}