From 667d56c0d1ebb1c1474ee6a9c09b3a23eb50a3a2 Mon Sep 17 00:00:00 2001
From: Jesse Yang <jesse.yang@airbnb.com>
Date: Fri, 11 Dec 2020 17:02:26 -0800
Subject: [PATCH] fix: missing groupby/dimension select options (#21)

---
 .../src/utilities/Shared_DeckGL.jsx           | 42 ++-----------------
 1 file changed, 3 insertions(+), 39 deletions(-)

diff --git a/superset-frontend/temporary_superset_ui/superset-ui-plugins-deckgl/packages/superset-ui-legacy-preset-chart-deckgl/src/utilities/Shared_DeckGL.jsx b/superset-frontend/temporary_superset_ui/superset-ui-plugins-deckgl/packages/superset-ui-legacy-preset-chart-deckgl/src/utilities/Shared_DeckGL.jsx
index dbf8bfdc048a..7e7b89e362cc 100644
--- a/superset-frontend/temporary_superset_ui/superset-ui-plugins-deckgl/packages/superset-ui-legacy-preset-chart-deckgl/src/utilities/Shared_DeckGL.jsx
+++ b/superset-frontend/temporary_superset_ui/superset-ui-plugins-deckgl/packages/superset-ui-legacy-preset-chart-deckgl/src/utilities/Shared_DeckGL.jsx
@@ -21,16 +21,9 @@
 
 import React from 'react';
 import { t, validateNonEmpty } from '@superset-ui/core';
-import { ColumnOption } from '@superset-ui/chart-controls';
+import { sharedControls } from '@superset-ui/chart-controls';
 import { D3_FORMAT_OPTIONS, columnChoices, PRIMARY_COLOR } from './controls';
 
-const timeColumnOption = {
-  verbose_name: 'Time',
-  column_name: '__timestamp',
-  // eslint-disable-next-line no-useless-concat
-  description: t('A reference to the [Time] configuration, taking granularity into ' + 'account'),
-};
-
 const DEFAULT_VIEWPORT = {
   longitude: 6.85236157047845,
   latitude: 31.222656842808707,
@@ -39,35 +32,6 @@ const DEFAULT_VIEWPORT = {
   pitch: 0,
 };
 
-const groupByControl = {
-  type: 'SelectControl',
-  multi: true,
-  freeForm: true,
-  label: t('Group by'),
-  default: [],
-  includeTime: false,
-  description: t('One or many controls to group by'),
-  optionRenderer: c => <ColumnOption showType column={c} />,
-  valueRenderer: c => <ColumnOption column={c} />,
-  valueKey: 'column_name',
-  allowAll: true,
-  filterOption: (opt, text) =>
-    (opt.column_name && opt.column_name.toLowerCase().includes(text.toLowerCase())) ||
-    (opt.verbose_name && opt.verbose_name.toLowerCase().includes(text.toLowerCase())),
-  promptTextCreator: label => label,
-  mapStateToProps: (state, control) => {
-    const newState = {};
-    if (state.datasource) {
-      newState.options = state.datasource.columns.filter(c => c.groupby);
-      if (control && control.includeTime) {
-        newState.options.push(timeColumnOption);
-      }
-    }
-    return newState;
-  },
-  commaChoosesOption: false,
-};
-
 const sandboxUrl =
   'https://github.com/apache/incubator-superset/' +
   'blob/master/superset-frontend/src/modules/sandbox.js';
@@ -129,7 +93,7 @@ export const autozoom = {
 export const dimension = {
   name: 'dimension',
   config: {
-    ...groupByControl,
+    ...sharedControls.groupby,
     label: t('Dimension'),
     description: t('Select a dimension'),
     multi: false,
@@ -140,7 +104,7 @@ export const dimension = {
 export const jsColumns = {
   name: 'js_columns',
   config: {
-    ...groupByControl,
+    ...sharedControls.groupby,
     label: t('Extra data for JS'),
     default: [],
     description: t('List of extra columns made available in Javascript functions'),