From a6abcd9ea8fac4a477b824adb367b4b5206a5d27 Mon Sep 17 00:00:00 2001 From: John Bodley <4567245+john-bodley@users.noreply.github.com> Date: Thu, 14 Jul 2022 23:51:03 -0700 Subject: [PATCH] fix: Address regression in main_dttm_col for non-dnd (#20712) Co-authored-by: John Bodley --- .../superset-ui-chart-controls/src/shared-controls/index.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/superset-frontend/packages/superset-ui-chart-controls/src/shared-controls/index.tsx b/superset-frontend/packages/superset-ui-chart-controls/src/shared-controls/index.tsx index b67b4a5d2a72..1d99fa77ea8a 100644 --- a/superset-frontend/packages/superset-ui-chart-controls/src/shared-controls/index.tsx +++ b/superset-frontend/packages/superset-ui-chart-controls/src/shared-controls/index.tsx @@ -289,14 +289,14 @@ const granularity_sqla: SharedControlConfig<'SelectControl', ColumnMeta> = { mapStateToProps: state => { const props: Partial> = {}; const { datasource } = state; - if (datasource?.columns[0]?.hasOwnProperty('main_dttm_col')) { + if (datasource?.hasOwnProperty('main_dttm_col')) { const dataset = datasource as Dataset; props.options = dataset.columns.filter((c: ColumnMeta) => c.is_dttm); props.default = null; if (dataset.main_dttm_col) { props.default = dataset.main_dttm_col; } else if (props?.options) { - props.default = (props.options[0] as ColumnMeta).column_name; + props.default = (props.options[0] as ColumnMeta)?.column_name; } } else { const sortedQueryColumns = (datasource as QueryResponse)?.columns?.sort(