pt
/
superset
mirror of https://github.com/apache/superset.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

chore: pass datasource to metrics control (#1438) 

* Update controlPanel.tsx

* Update index.tsx

* Update dndControls.tsx
This commit is contained in:
John Bodley 2021-10-27 21:34:09 -07:00 committed by Yongjie Zhao
parent 2029b37f2e
commit a5d5f95d38
3 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
superset-frontend/temporary_superset_ui/superset-ui/packages/superset-ui-chart-controls/src/shared-controls/dndControls.tsx
View File

@ -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,
}),
};

2
superset-frontend/temporary_superset_ui/superset-ui/packages/superset-ui-chart-controls/src/shared-controls/index.tsx
View File

@ -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,
}),
};

1
superset-frontend/temporary_superset_ui/superset-ui/plugins/plugin-chart-table/src/controlPanel.tsx
View File

@ -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, [