diff --git a/superset-frontend/src/explore/components/DataTablesPane/index.tsx b/superset-frontend/src/explore/components/DataTablesPane/index.tsx index 3771c62655fb..55b11f9237d4 100644 --- a/superset-frontend/src/explore/components/DataTablesPane/index.tsx +++ b/superset-frontend/src/explore/components/DataTablesPane/index.tsx @@ -303,12 +303,12 @@ export const DataTablesPane = ({ useEffect(() => { if (queriesResponse && chartStatus === 'success') { const { colnames } = queriesResponse[0]; - setColumnNames({ - ...columnNames, + setColumnNames(prevColumnNames => ({ + ...prevColumnNames, [RESULT_TYPES.results]: colnames ? [...colnames] : [], - }); + })); } - }, [queriesResponse]); + }, [queriesResponse, chartStatus]); useEffect(() => { if (panelOpen && isRequestPending[RESULT_TYPES.results]) { diff --git a/superset/common/query_actions.py b/superset/common/query_actions.py index 76ff5c767072..6ed18d195820 100644 --- a/superset/common/query_actions.py +++ b/superset/common/query_actions.py @@ -143,6 +143,8 @@ def _get_samples( query_obj.metrics = [] query_obj.post_processing = [] query_obj.columns = [o.column_name for o in datasource.columns] + query_obj.from_dttm = None + query_obj.to_dttm = None return _get_full(query_context, query_obj, force_cached) diff --git a/superset/viz.py b/superset/viz.py index 23f2cf336d8d..c1b506e25675 100644 --- a/superset/viz.py +++ b/superset/viz.py @@ -254,6 +254,8 @@ def get_samples(self) -> List[Dict[str, Any]]: "orderby": [], "row_limit": config["SAMPLES_ROW_LIMIT"], "columns": [o.column_name for o in self.datasource.columns], + "from_dttm": None, + "to_dttm": None, } ) df = self.get_df_payload(query_obj)["df"] # leverage caching logic