chore: pass datasource to metrics control (apache#1438)

* Update controlPanel.tsx * Update index.tsx * Update dndControls.tsx
zhaoyongjie · Nov 25, 2021 · 4778142 · 4778142
1 parent 3377b90
commit 4778142
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 0 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
@@ -90,6 +90,7 @@ export const dnd_adhoc_metrics: SharedControlConfig<'DndMetricSelect'> = {
   mapStateToProps: ({ datasource }) => ({
     columns: datasource ? datasource.columns : [],
     savedMetrics: datasource ? datasource.metrics : [],
+    datasource,
     datasourceType: datasource?.type,
   }),
   description: t('One or many metrics to display'),
@@ -116,6 +117,7 @@ export const dnd_sort_by: SharedControlConfig<'DndMetricSelect'> = {
   mapStateToProps: ({ datasource }) => ({
     columns: datasource?.columns || [],
     savedMetrics: datasource?.metrics || [],
+    datasource,
     datasourceType: datasource?.type,
   }),
 };

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
@@ -134,6 +134,7 @@ const metrics: SharedControlConfig<'MetricsControl'> = {
   mapStateToProps: ({ datasource }) => ({
     columns: datasource ? datasource.columns : [],
     savedMetrics: datasource ? datasource.metrics : [],
+    datasource,
     datasourceType: datasource?.type,
   }),
   description: t('One or many metrics to display'),
@@ -362,6 +363,7 @@ const sort_by: SharedControlConfig<'MetricsControl'> = {
   mapStateToProps: ({ datasource }) => ({
     columns: datasource?.columns || [],
     savedMetrics: datasource?.metrics || [],
+    datasource,
     datasourceType: datasource?.type,
   }),
 };

diff --git a/...rontend/temporary_superset_ui/superset-ui/plugins/plugin-chart-table/src/controlPanel.tsx b/...rontend/temporary_superset_ui/superset-ui/plugins/plugin-chart-table/src/controlPanel.tsx
@@ -146,6 +146,7 @@ const percent_metrics: typeof sharedControls.metrics = {
   mapStateToProps: ({ datasource, controls }, controlState) => ({
     columns: datasource?.columns || [],
     savedMetrics: datasource?.metrics || [],
+    datasource,
     datasourceType: datasource?.type,
     queryMode: getQueryMode(controls),
     externalValidationErrors: validateAggControlValues(controls, [