diff --git a/superset-frontend/plugins/plugin-chart-echarts/src/BigNumber/BigNumberTotal/controlPanel.ts b/superset-frontend/plugins/plugin-chart-echarts/src/BigNumber/BigNumberTotal/controlPanel.ts index aa07a0ccc32e..94dd45830556 100644 --- a/superset-frontend/plugins/plugin-chart-echarts/src/BigNumber/BigNumberTotal/controlPanel.ts +++ b/superset-frontend/plugins/plugin-chart-echarts/src/BigNumber/BigNumberTotal/controlPanel.ts @@ -101,7 +101,7 @@ export default { metric: formData.standardizedFormData.standardizedState.metrics[0], }), updateStandardizedState: (prevState, currState) => ({ - ...prevState, + ...currState, metrics: [currState.metrics[0], ...prevState.metrics.slice(1)], }), } as ControlPanelConfig; diff --git a/superset-frontend/plugins/plugin-chart-echarts/src/BigNumber/BigNumberWithTrendline/controlPanel.tsx b/superset-frontend/plugins/plugin-chart-echarts/src/BigNumber/BigNumberWithTrendline/controlPanel.tsx index ea85f02e060f..0ea0a96229e8 100644 --- a/superset-frontend/plugins/plugin-chart-echarts/src/BigNumber/BigNumberWithTrendline/controlPanel.tsx +++ b/superset-frontend/plugins/plugin-chart-echarts/src/BigNumber/BigNumberWithTrendline/controlPanel.tsx @@ -275,7 +275,7 @@ const config: ControlPanelConfig = { metric: formData.standardizedFormData.standardizedState.metrics[0], }), updateStandardizedState: (prevState, currState) => ({ - ...prevState, + ...currState, metrics: [currState.metrics[0], ...prevState.metrics.slice(1)], }), }; diff --git a/superset-frontend/plugins/plugin-chart-echarts/src/Funnel/controlPanel.tsx b/superset-frontend/plugins/plugin-chart-echarts/src/Funnel/controlPanel.tsx index 974e24e5e23a..b23cf2ed9793 100644 --- a/superset-frontend/plugins/plugin-chart-echarts/src/Funnel/controlPanel.tsx +++ b/superset-frontend/plugins/plugin-chart-echarts/src/Funnel/controlPanel.tsx @@ -149,7 +149,7 @@ const config: ControlPanelConfig = { groupby: formData.standardizedFormData.standardizedState.columns, }), updateStandardizedState: (prevState, currState) => ({ - ...prevState, + ...currState, metrics: [currState.metrics[0], ...prevState.metrics.slice(1)], }), }; diff --git a/superset-frontend/plugins/plugin-chart-echarts/src/Gauge/controlPanel.tsx b/superset-frontend/plugins/plugin-chart-echarts/src/Gauge/controlPanel.tsx index 5401810d25b0..bb727888e59a 100644 --- a/superset-frontend/plugins/plugin-chart-echarts/src/Gauge/controlPanel.tsx +++ b/superset-frontend/plugins/plugin-chart-echarts/src/Gauge/controlPanel.tsx @@ -314,7 +314,7 @@ const config: ControlPanelConfig = { groupby: formData.standardizedFormData.standardizedState.columns, }), updateStandardizedState: (prevState, currState) => ({ - ...prevState, + ...currState, metrics: [currState.metrics[0], ...prevState.metrics.slice(1)], }), }; diff --git a/superset-frontend/plugins/plugin-chart-echarts/src/Graph/controlPanel.tsx b/superset-frontend/plugins/plugin-chart-echarts/src/Graph/controlPanel.tsx index bd644feed8c8..218b1d0335ea 100644 --- a/superset-frontend/plugins/plugin-chart-echarts/src/Graph/controlPanel.tsx +++ b/superset-frontend/plugins/plugin-chart-echarts/src/Graph/controlPanel.tsx @@ -325,7 +325,7 @@ const controlPanel: ControlPanelConfig = { metric: formData.standardizedFormData.standardizedState.metrics[0], }), updateStandardizedState: (prevState, currState) => ({ - ...prevState, + ...currState, metrics: [currState.metrics[0], ...prevState.metrics.slice(1)], }), }; diff --git a/superset-frontend/plugins/plugin-chart-echarts/src/Pie/controlPanel.tsx b/superset-frontend/plugins/plugin-chart-echarts/src/Pie/controlPanel.tsx index 753228107350..7b948208a457 100644 --- a/superset-frontend/plugins/plugin-chart-echarts/src/Pie/controlPanel.tsx +++ b/superset-frontend/plugins/plugin-chart-echarts/src/Pie/controlPanel.tsx @@ -261,7 +261,7 @@ const config: ControlPanelConfig = { ensureIsInt(formData.row_limit, 100) >= 100 ? 100 : formData.row_limit, }), updateStandardizedState: (prevState, currState) => ({ - ...prevState, + ...currState, metrics: [currState.metrics[0], ...prevState.metrics.slice(1)], }), }; diff --git a/superset-frontend/plugins/plugin-chart-echarts/src/Tree/controlPanel.tsx b/superset-frontend/plugins/plugin-chart-echarts/src/Tree/controlPanel.tsx index f35af3f7b643..c115f5c5c20d 100644 --- a/superset-frontend/plugins/plugin-chart-echarts/src/Tree/controlPanel.tsx +++ b/superset-frontend/plugins/plugin-chart-echarts/src/Tree/controlPanel.tsx @@ -290,7 +290,7 @@ const controlPanel: ControlPanelConfig = { metric: formData.standardizedFormData.standardizedState.metrics[0], }), updateStandardizedState: (prevState, currState) => ({ - ...prevState, + ...currState, metrics: [currState.metrics[0], ...prevState.metrics.slice(1)], }), }; diff --git a/superset-frontend/plugins/plugin-chart-echarts/src/Treemap/controlPanel.tsx b/superset-frontend/plugins/plugin-chart-echarts/src/Treemap/controlPanel.tsx index d34e89c76710..e7cca1af263d 100644 --- a/superset-frontend/plugins/plugin-chart-echarts/src/Treemap/controlPanel.tsx +++ b/superset-frontend/plugins/plugin-chart-echarts/src/Treemap/controlPanel.tsx @@ -143,7 +143,7 @@ const config: ControlPanelConfig = { groupby: formData.standardizedFormData.standardizedState.columns, }), updateStandardizedState: (prevState, currState) => ({ - ...prevState, + ...currState, metrics: [currState.metrics[0], ...prevState.metrics.slice(1)], }), };