From 072e4949e8af4519d2a6996671f71a5c89468eb5 Mon Sep 17 00:00:00 2001 From: Kamil Gabryjelski Date: Mon, 2 Aug 2021 15:04:19 +0200 Subject: [PATCH] fix(legacy-preset-chart-nvd3): dual line dnd control missing (#1259) --- .../src/shared-controls/dndControls.tsx | 6 ++++++ .../src/shared-controls/index.tsx | 3 ++- .../legacy-preset-chart-nvd3/src/DualLine/controlPanel.ts | 4 ++-- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/superset-frontend/temporary_superset_ui/superset-ui/packages/superset-ui-chart-controls/src/shared-controls/dndControls.tsx b/superset-frontend/temporary_superset_ui/superset-ui/packages/superset-ui-chart-controls/src/shared-controls/dndControls.tsx index 6763570450ab..7fbe558a08b5 100644 --- a/superset-frontend/temporary_superset_ui/superset-ui/packages/superset-ui-chart-controls/src/shared-controls/dndControls.tsx +++ b/superset-frontend/temporary_superset_ui/superset-ui/packages/superset-ui-chart-controls/src/shared-controls/dndControls.tsx @@ -102,6 +102,12 @@ export const dnd_adhoc_metric: SharedControlConfig<'DndMetricSelect'> = { description: t('Metric'), }; +export const dnd_adhoc_metric_2: SharedControlConfig<'DndMetricSelect'> = { + ...dnd_adhoc_metric, + label: t('Right Axis Metric'), + description: t('Choose a metric for right axis'), +}; + export const dnd_sort_by: SharedControlConfig<'DndMetricSelect'> = { type: 'DndMetricSelect', label: t('Sort by'), diff --git a/superset-frontend/temporary_superset_ui/superset-ui/packages/superset-ui-chart-controls/src/shared-controls/index.tsx b/superset-frontend/temporary_superset_ui/superset-ui/packages/superset-ui-chart-controls/src/shared-controls/index.tsx index 3e5b6adb166e..33f644d9f3e3 100644 --- a/superset-frontend/temporary_superset_ui/superset-ui/packages/superset-ui-chart-controls/src/shared-controls/index.tsx +++ b/superset-frontend/temporary_superset_ui/superset-ui/packages/superset-ui-chart-controls/src/shared-controls/index.tsx @@ -78,6 +78,7 @@ import { dndEntity, dndGroupByControl, dndSeries, + dnd_adhoc_metric_2, } from './dndControls'; const categoricalSchemeRegistry = getCategoricalSchemeRegistry(); @@ -470,7 +471,7 @@ const sharedControls = { datasource: datasourceControl, viz_type, color_picker, - metric_2, + metric_2: enableExploreDnd ? dnd_adhoc_metric_2 : metric_2, linear_color_scheme, secondary_metric: enableExploreDnd ? dnd_secondary_metric : secondary_metric, groupby: enableExploreDnd ? dndGroupByControl : groupByControl, diff --git a/superset-frontend/temporary_superset_ui/superset-ui/plugins/legacy-preset-chart-nvd3/src/DualLine/controlPanel.ts b/superset-frontend/temporary_superset_ui/superset-ui/plugins/legacy-preset-chart-nvd3/src/DualLine/controlPanel.ts index 78f33e57c98d..81735361227f 100644 --- a/superset-frontend/temporary_superset_ui/superset-ui/plugins/legacy-preset-chart-nvd3/src/DualLine/controlPanel.ts +++ b/superset-frontend/temporary_superset_ui/superset-ui/plugins/legacy-preset-chart-nvd3/src/DualLine/controlPanel.ts @@ -39,12 +39,12 @@ const config: ControlPanelConfig = { { label: t('Y Axis 1'), expanded: true, - controlSetRows: [['metric', 'y_axis_format'], [yAxisShowMinmax], [yAxisBounds]], + controlSetRows: [['metric'], ['y_axis_format'], [yAxisShowMinmax], [yAxisBounds]], }, { label: t('Y Axis 2'), expanded: true, - controlSetRows: [['metric_2', yAxis2Format], [yAxis2ShowMinmax], [yAxis2Bounds]], + controlSetRows: [['metric_2'], [yAxis2Format], [yAxis2ShowMinmax], [yAxis2Bounds]], }, { label: t('Query'),