From 096bbf78267545c0bb75a43892d752fca50cf00d Mon Sep 17 00:00:00 2001
From: "Michael S. Molina" <michael.s.molina@gmail.com>
Date: Fri, 8 Jul 2022 09:30:10 -0300
Subject: [PATCH] Removes column_types

---
 .../packages/superset-ui-chart-controls/src/types.ts   |  2 --
 .../FiltersConfigModal/FiltersConfigForm/utils.ts      | 10 +++-------
 superset-frontend/src/dashboard/constants.ts           |  1 -
 3 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/superset-frontend/packages/superset-ui-chart-controls/src/types.ts b/superset-frontend/packages/superset-ui-chart-controls/src/types.ts
index 85efddb2b8f81..d23d662b80534 100644
--- a/superset-frontend/packages/superset-ui-chart-controls/src/types.ts
+++ b/superset-frontend/packages/superset-ui-chart-controls/src/types.ts
@@ -28,7 +28,6 @@ import type {
   QueryFormData,
   QueryFormMetric,
   QueryResponse,
-  GenericDataType,
 } from '@superset-ui/core';
 import { sharedControls } from './shared-controls';
 import sharedControlComponents from './shared-controls/components';
@@ -67,7 +66,6 @@ export interface Dataset {
   id: number;
   type: DatasourceType;
   columns: ColumnMeta[];
-  column_types?: GenericDataType[];
   metrics: Metric[];
   column_format: Record<string, string>;
   verbose_map: Record<string, string>;
diff --git a/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigForm/utils.ts b/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigForm/utils.ts
index 1d13d0606ad90..5b3f2184afcd3 100644
--- a/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigForm/utils.ts
+++ b/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigForm/utils.ts
@@ -86,14 +86,10 @@ export const datasetToSelectOption = (
   label: item.table_name,
 });
 
-// TODO: add column_types field to Dataset
-// We return true if column_types is undefined or empty as a precaution against backend failing to return column_types
-export const hasTemporalColumns = (dataset: Dataset) => {
-  const columnTypes = ensureIsArray(dataset?.column_types);
-  return (
-    columnTypes.length === 0 || columnTypes.includes(GenericDataType.TEMPORAL)
+export const hasTemporalColumns = (dataset: Dataset) =>
+  ensureIsArray(dataset.columns).some(
+    column => column.type_generic === GenericDataType.TEMPORAL,
   );
-};
 
 export const doesColumnMatchFilterType = (filterType: string, column: Column) =>
   !column.type_generic ||
diff --git a/superset-frontend/src/dashboard/constants.ts b/superset-frontend/src/dashboard/constants.ts
index 30d2cca719804..7b0e4f8fcbd27 100644
--- a/superset-frontend/src/dashboard/constants.ts
+++ b/superset-frontend/src/dashboard/constants.ts
@@ -26,7 +26,6 @@ export const PLACEHOLDER_DATASOURCE: Dataset = {
   datasource_name: '',
   table_name: '',
   columns: [],
-  column_types: [],
   metrics: [],
   column_format: {},
   verbose_map: {},