feat(chart-controls): dnd version of time column (apache#1226)

zhaoyongjie · Nov 25, 2021 · 744a2c0 · 744a2c0
1 parent c6c9eed
commit 744a2c0
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 2 deletions.
diff --git a/...et_ui/superset-ui/packages/superset-ui-chart-controls/src/shared-controls/dndControls.tsx b/...et_ui/superset-ui/packages/superset-ui-chart-controls/src/shared-controls/dndControls.tsx
@@ -19,7 +19,7 @@
  */
 import { t, validateNonEmpty } from '@superset-ui/core';
 import { ExtraControlProps, SharedControlConfig } from '../types';
-import { TIME_COLUMN_OPTION } from '../constants';
+import { TIME_COLUMN_OPTION, TIME_FILTER_LABELS } from '../constants';
 
 export const dndGroupByControl: SharedControlConfig<'DndColumnSelect'> = {
   type: 'DndColumnSelect',
@@ -138,3 +138,25 @@ export const dnd_secondary_metric: SharedControlConfig<'DndMetricSelect'> = {
   validators: [],
   description: t('A metric to use for color'),
 };
+
+export const dnd_granularity_sqla: typeof dndGroupByControl = {
+  ...dndSeries,
+  label: TIME_FILTER_LABELS.granularity_sqla,
+  description: t(
+    'The time column for the visualization. Note that you ' +
+      'can define arbitrary expression that return a DATETIME ' +
+      'column in the table. Also note that the ' +
+      'filter below is applied against this column or ' +
+      'expression',
+  ),
+  canDelete: false,
+  ghostButtonText: t('Drop temporal column'),
+  mapStateToProps: ({ datasource }) => {
+    const temporalColumns = datasource?.columns.filter(c => c.is_dttm) ?? [];
+    const options = Object.fromEntries(temporalColumns.map(option => [option.column_name, option]));
+    return {
+      options,
+      default: datasource?.main_dttm_col || temporalColumns[0]?.column_name || null,
+    };
+  },
+};
diff --git a/...superset_ui/superset-ui/packages/superset-ui-chart-controls/src/shared-controls/index.tsx b/...superset_ui/superset-ui/packages/superset-ui-chart-controls/src/shared-controls/index.tsx
@@ -68,6 +68,7 @@ import {
   dnd_adhoc_filters,
   dnd_adhoc_metric,
   dnd_adhoc_metrics,
+  dnd_granularity_sqla,
   dnd_sort_by,
   dnd_secondary_metric,
   dnd_size,
@@ -476,7 +477,7 @@ const sharedControls = {
   columns: enableExploreDnd ? dndColumnsControl : columnsControl,
   druid_time_origin,
   granularity,
-  granularity_sqla,
+  granularity_sqla: enableExploreDnd ? dnd_granularity_sqla : granularity_sqla,
   time_grain_sqla,
   time_range,
   row_limit,