From 11a52ea0fc6421dee67ecee282939c1e0eef8ad7 Mon Sep 17 00:00:00 2001 From: Kamil Gabryjelski Date: Sat, 24 Jul 2021 11:06:27 +0200 Subject: [PATCH] chore(chart-controls): improve typing for mapStateToProps (#1171) --- .../packages/superset-ui-chart-controls/src/types.ts | 2 +- .../superset-ui/plugins/plugin-chart-table/src/controlPanel.tsx | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/superset-frontend/temporary_superset_ui/superset-ui/packages/superset-ui-chart-controls/src/types.ts b/superset-frontend/temporary_superset_ui/superset-ui/packages/superset-ui-chart-controls/src/types.ts index 62dd0fd0b61..5a98ee8cba1 100644 --- a/superset-frontend/temporary_superset_ui/superset-ui/packages/superset-ui-chart-controls/src/types.ts +++ b/superset-frontend/temporary_superset_ui/superset-ui/packages/superset-ui-chart-controls/src/types.ts @@ -190,7 +190,7 @@ export interface BaseControlConfig< */ mapStateToProps?: ( state: ControlPanelState, - controlState: this & ExtraControlProps, + controlState: ControlState, // TODO: add strict `chartState` typing (see superset-frontend/src/explore/types) chartState?: AnyDict, ) => ExtraControlProps; diff --git a/superset-frontend/temporary_superset_ui/superset-ui/plugins/plugin-chart-table/src/controlPanel.tsx b/superset-frontend/temporary_superset_ui/superset-ui/plugins/plugin-chart-table/src/controlPanel.tsx index ff54f778f15..bbb06e97377 100644 --- a/superset-frontend/temporary_superset_ui/superset-ui/plugins/plugin-chart-table/src/controlPanel.tsx +++ b/superset-frontend/temporary_superset_ui/superset-ui/plugins/plugin-chart-table/src/controlPanel.tsx @@ -184,7 +184,6 @@ const config: ControlPanelConfig = { mapStateToProps: (state: ControlPanelState, controlState: ControlState) => { const { controls } = state; const originalMapStateToProps = sharedControls?.groupby?.mapStateToProps; - // @ts-ignore const newState = originalMapStateToProps?.(state, controlState) ?? {}; newState.externalValidationErrors = validateAggControlValues(controls, [ controls.metrics?.value,