feat: implement Metrics dnd (apache#1004)

zhaoyongjie · Nov 24, 2021 · 7273a5b · 7273a5b
1 parent 0d3537c
commit 7273a5b
Show file tree

Hide file tree

Showing 3 changed files with 37 additions and 3 deletions.
diff --git a/...et_ui/superset-ui/packages/superset-ui-chart-controls/src/shared-controls/dndControls.tsx b/...et_ui/superset-ui/packages/superset-ui-chart-controls/src/shared-controls/dndControls.tsx
@@ -17,10 +17,16 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import { t, validateNonEmpty } from '@superset-ui/core';
+import { Metric, t, validateNonEmpty } from '@superset-ui/core';
 import { ExtraControlProps, SharedControlConfig } from '../types';
+import { mainMetric } from '../utils';
 import { TIME_COLUMN_OPTION } from '../constants';
 
+type Control = {
+  savedMetrics?: Metric[] | null;
+  default?: unknown;
+};
+
 export const dndGroupByControl: SharedControlConfig<'DndColumnSelect'> = {
   type: 'DndColumnSelect',
   label: t('Group by'),
@@ -80,3 +86,28 @@ export const dnd_adhoc_filters: SharedControlConfig<'DndFilterSelect'> = {
   }),
   provideFormDataToProps: true,
 };
+
+export const dnd_adhoc_metrics: SharedControlConfig<'DndMetricSelect'> = {
+  type: 'DndMetricSelect',
+  multi: true,
+  label: t('Metrics'),
+  validators: [validateNonEmpty],
+  default: (c: Control) => {
+    const metric = mainMetric(c.savedMetrics);
+    return metric ? [metric] : null;
+  },
+  mapStateToProps: ({ datasource }) => ({
+    columns: datasource ? datasource.columns : [],
+    savedMetrics: datasource ? datasource.metrics : [],
+    datasourceType: datasource?.type,
+  }),
+  description: t('One or many metrics to display'),
+};
+
+export const dnd_adhoc_metric: SharedControlConfig<'DndMetricSelect'> = {
+  ...dnd_adhoc_metrics,
+  multi: false,
+  label: t('Metric'),
+  description: t('Metric'),
+  default: (c: Control) => mainMetric(c.savedMetrics),
+};
diff --git a/...superset_ui/superset-ui/packages/superset-ui-chart-controls/src/shared-controls/index.tsx b/...superset_ui/superset-ui/packages/superset-ui-chart-controls/src/shared-controls/index.tsx
@@ -58,6 +58,8 @@ import {
 import { ColumnOption } from '../components/ColumnOption';
 import {
   dnd_adhoc_filters,
+  dnd_adhoc_metric,
+  dnd_adhoc_metrics,
   dndColumnsControl,
   dndEntity,
   dndGroupByControl,
@@ -482,8 +484,8 @@ const label_colors: SharedControlConfig<'ColorMapControl'> = {
 const enableExploreDnd = isFeatureEnabled(FeatureFlag.ENABLE_EXPLORE_DRAG_AND_DROP);
 
 const sharedControls = {
-  metrics,
-  metric,
+  metrics: enableExploreDnd ? dnd_adhoc_metrics : metrics,
+  metric: enableExploreDnd ? dnd_adhoc_metric : metric,
   datasource: datasourceControl,
   viz_type,
   color_picker,

diff --git a/...ontend/temporary_superset_ui/superset-ui/packages/superset-ui-chart-controls/src/types.ts b/...ontend/temporary_superset_ui/superset-ui/packages/superset-ui-chart-controls/src/types.ts
@@ -137,6 +137,7 @@ export type InternalControlType =
   | 'FilterBoxItemControl'
   | 'DndColumnSelect'
   | 'DndFilterSelect'
+  | 'DndMetricSelect'
   | keyof SharedControlComponents; // expanded in `expandControlConfig`
 
 // eslint-disable-next-line @typescript-eslint/no-explicit-any