chore(chart-controls): remove dedicated time section (apache#869)

zhaoyongjie · Nov 24, 2021 · 8cd39a8 · 8cd39a8
1 parent e0562b8
commit 8cd39a8
Show file tree

Hide file tree

Showing 46 changed files with 201 additions and 202 deletions.
diff --git a/...nd/temporary_superset_ui/superset-ui/packages/superset-ui-chart-controls/src/sections.tsx b/...nd/temporary_superset_ui/superset-ui/packages/superset-ui-chart-controls/src/sections.tsx
@@ -17,18 +17,34 @@
  * under the License.
  */
 import { t } from '@superset-ui/core';
+import { ControlPanelSectionConfig } from './types';
 
 // A few standard controls sections that are used internally.
 // Not recommended for use in third-party plugins.
 
-export const druidTimeSeries = {
+const baseTimeSection = {
   label: t('Time'),
   expanded: true,
   description: t('Time related form attributes'),
-  controlSetRows: [['time_range']],
 };
 
-export const datasourceAndVizType = {
+export const legacyTimeseriesTime: ControlPanelSectionConfig = {
+  ...baseTimeSection,
+  controlSetRows: [
+    ['granularity'],
+    ['druid_time_origin'],
+    ['granularity_sqla'],
+    ['time_grain_sqla'],
+    ['time_range'],
+  ],
+};
+
+export const legacyRegularTime: ControlPanelSectionConfig = {
+  ...baseTimeSection,
+  controlSetRows: [['granularity_sqla'], ['time_range']],
+};
+
+export const datasourceAndVizType: ControlPanelSectionConfig = {
   label: t('Datasource & Chart Type'),
   expanded: true,
   controlSetRows: [
@@ -75,19 +91,12 @@ export const datasourceAndVizType = {
   ],
 };
 
-export const colorScheme = {
+export const colorScheme: ControlPanelSectionConfig = {
   label: t('Color Scheme'),
   controlSetRows: [['color_scheme', 'label_colors']],
 };
 
-export const sqlaTimeSeries = {
-  label: t('Time'),
-  description: t('Time related form attributes'),
-  expanded: true,
-  controlSetRows: [['granularity_sqla'], ['time_range']],
-};
-
-export const annotations = {
+export const annotations: ControlPanelSectionConfig = {
   label: t('Annotations and Layers'),
   tabOverride: 'data',
   expanded: true,

diff --git a/...ontend/temporary_superset_ui/superset-ui/packages/superset-ui-chart-controls/src/types.ts b/...ontend/temporary_superset_ui/superset-ui/packages/superset-ui-chart-controls/src/types.ts
@@ -69,8 +69,8 @@ export interface DatasourceMeta {
   main_dttm_col: string;
   // eg. ['["ds", true]', 'ds [asc]']
   order_by_choices?: [string, string][] | null;
-  time_grain_sqla: [string, string][];
-  granularity_sqla: [string, string][];
+  time_grain_sqla?: string;
+  granularity_sqla?: string;
   datasource_name: string | null;
   description: string | null;
 }

diff --git a/...ry_superset_ui/superset-ui/packages/superset-ui-chart-controls/src/utils/columnChoices.ts b/...ry_superset_ui/superset-ui/packages/superset-ui-chart-controls/src/utils/columnChoices.ts
@@ -21,10 +21,10 @@ import { DatasourceMeta } from '../types';
 /**
  * Convert Dataource columns to column choices
  */
-export default function columnChoices(datasource?: DatasourceMeta | null) {
+export default function columnChoices(datasource?: DatasourceMeta | null): [string, string][] {
   return (
     datasource?.columns
-      .map(col => [col.column_name, col.verbose_name || col.column_name])
+      .map((col): [string, string] => [col.column_name, col.verbose_name || col.column_name])
       .sort((opt1, opt2) => (opt1[1].toLowerCase() > opt2[1].toLowerCase() ? 1 : -1)) || []
   );
 }
diff --git a/...rset_ui/superset-ui/packages/superset-ui-chart-controls/test/utils/columnChoices.test.tsx b/...rset_ui/superset-ui/packages/superset-ui-chart-controls/test/utils/columnChoices.test.tsx
@@ -23,6 +23,7 @@ describe('columnChoices()', () => {
   it('should convert columns to choices', () => {
     expect(
       columnChoices({
+        id: 1,
         metrics: [],
         type: DatasourceType.Table,
         main_dttm_col: 'test',
@@ -40,6 +41,10 @@ describe('columnChoices()', () => {
             verbose_name: 'bar',
           },
         ],
+        verbose_map: {},
+        column_format: { fiz: 'NUMERIC', about: 'STRING', foo: 'DATE' },
+        datasource_name: 'my_datasource',
+        description: 'this is my datasource',
       }),
     ).toEqual([
       ['foo', 'bar'],

diff --git a/...emporary_superset_ui/superset-ui/plugins/legacy-plugin-chart-calendar/src/controlPanel.js b/...emporary_superset_ui/superset-ui/plugins/legacy-plugin-chart-calendar/src/controlPanel.js
@@ -22,10 +22,11 @@ import {
   D3_TIME_FORMAT_OPTIONS,
   D3_FORMAT_DOCS,
 } from '@superset-ui/core';
-import { formatSelectOptions } from '@superset-ui/chart-controls';
+import { formatSelectOptions, sections } from '@superset-ui/chart-controls';
 
 export default {
   controlPanelSections: [
+    sections.legacyRegularTime,
     {
       label: t('Query'),
       expanded: true,

diff --git a/...d/temporary_superset_ui/superset-ui/plugins/legacy-plugin-chart-chord/src/controlPanel.js b/...d/temporary_superset_ui/superset-ui/plugins/legacy-plugin-chart-chord/src/controlPanel.js
@@ -17,9 +17,11 @@
  * under the License.
  */
 import { t, validateNonEmpty } from '@superset-ui/core';
+import { sections } from '@superset-ui/chart-controls';
 
 export default {
   controlPanelSections: [
+    sections.legacyRegularTime,
     {
       label: t('Query'),
       expanded: true,

diff --git a/...orary_superset_ui/superset-ui/plugins/legacy-plugin-chart-country-map/src/controlPanel.ts b/...orary_superset_ui/superset-ui/plugins/legacy-plugin-chart-country-map/src/controlPanel.ts
@@ -17,10 +17,16 @@
  * under the License.
  */
 import { t } from '@superset-ui/core';
-import { D3_FORMAT_OPTIONS, D3_FORMAT_DOCS } from '@superset-ui/chart-controls';
+import {
+  ControlPanelConfig,
+  D3_FORMAT_OPTIONS,
+  D3_FORMAT_DOCS,
+  sections,
+} from '@superset-ui/chart-controls';
 
-export default {
+const config: ControlPanelConfig = {
   controlPanelSections: [
+    sections.legacyRegularTime,
     {
       label: t('Query'),
       expanded: true,
@@ -103,3 +109,5 @@ export default {
     },
   },
 };
+
+export default config;
diff --git a/...orary_superset_ui/superset-ui/plugins/legacy-plugin-chart-event-flow/src/controlPanel.tsx b/...orary_superset_ui/superset-ui/plugins/legacy-plugin-chart-event-flow/src/controlPanel.tsx
@@ -23,12 +23,14 @@ import {
   ColumnOption,
   columnChoices,
   ControlPanelConfig,
+  sections,
   SelectControlConfig,
   ColumnMeta,
 } from '@superset-ui/chart-controls';
 
 const config: ControlPanelConfig = {
   controlPanelSections: [
+    sections.legacyRegularTime,
     {
       label: t('Event definition'),
       controlSetRows: [

diff --git a/...ry_superset_ui/superset-ui/plugins/legacy-plugin-chart-force-directed/src/controlPanel.js b/...ry_superset_ui/superset-ui/plugins/legacy-plugin-chart-force-directed/src/controlPanel.js
@@ -17,10 +17,11 @@
  * under the License.
  */
 import { t } from '@superset-ui/core';
-import { formatSelectOptions } from '@superset-ui/chart-controls';
+import { formatSelectOptions, sections } from '@superset-ui/chart-controls';
 
 export default {
   controlPanelSections: [
+    sections.legacyRegularTime,
     {
       label: t('Query'),
       expanded: true,

diff --git a/...temporary_superset_ui/superset-ui/plugins/legacy-plugin-chart-heatmap/src/controlPanel.js b/...temporary_superset_ui/superset-ui/plugins/legacy-plugin-chart-heatmap/src/controlPanel.js
@@ -21,6 +21,7 @@ import {
   formatSelectOptions,
   columnChoices,
   formatSelectOptionsForRange,
+  sections,
 } from '@superset-ui/chart-controls';
 
 const sortAxisChoices = [
@@ -32,6 +33,7 @@ const sortAxisChoices = [
 
 export default {
   controlPanelSections: [
+    sections.legacyRegularTime,
     {
       label: t('Query'),
       expanded: true,

diff --git a/...mporary_superset_ui/superset-ui/plugins/legacy-plugin-chart-histogram/src/controlPanel.js b/...mporary_superset_ui/superset-ui/plugins/legacy-plugin-chart-histogram/src/controlPanel.js
@@ -17,14 +17,15 @@
  * under the License.
  */
 import { t, validateNonEmpty } from '@superset-ui/core';
-import { formatSelectOptions, columnChoices } from '@superset-ui/chart-controls';
+import { formatSelectOptions, columnChoices, sections } from '@superset-ui/chart-controls';
 
 export default {
   controlPanelSections: [
     {
       label: t('Query'),
       expanded: true,
       controlSetRows: [
+        sections.legacyRegularTime,
         [
           {
             name: 'all_columns_x',

diff --git a/...temporary_superset_ui/superset-ui/plugins/legacy-plugin-chart-horizon/src/controlPanel.js b/...temporary_superset_ui/superset-ui/plugins/legacy-plugin-chart-horizon/src/controlPanel.js
@@ -17,10 +17,11 @@
  * under the License.
  */
 import { t } from '@superset-ui/core';
-import { formatSelectOptions } from '@superset-ui/chart-controls';
+import { formatSelectOptions, sections } from '@superset-ui/chart-controls';
 
 export default {
   controlPanelSections: [
+    sections.legacyRegularTime,
     {
       label: t('Query'),
       expanded: true,

diff --git a/...temporary_superset_ui/superset-ui/plugins/legacy-plugin-chart-map-box/src/controlPanel.js b/...temporary_superset_ui/superset-ui/plugins/legacy-plugin-chart-map-box/src/controlPanel.js
@@ -17,10 +17,11 @@
  * under the License.
  */
 import { t } from '@superset-ui/core';
-import { formatSelectOptions, columnChoices } from '@superset-ui/chart-controls';
+import { formatSelectOptions, columnChoices, sections } from '@superset-ui/chart-controls';
 
 export default {
   controlPanelSections: [
+    sections.legacyRegularTime,
     {
       label: t('Query'),
       expanded: true,

diff --git a/...ary_superset_ui/superset-ui/plugins/legacy-plugin-chart-paired-t-test/src/controlPanel.ts b/...ary_superset_ui/superset-ui/plugins/legacy-plugin-chart-paired-t-test/src/controlPanel.ts
@@ -17,9 +17,11 @@
  * under the License.
  */
 import { t } from '@superset-ui/core';
+import { ControlPanelConfig, sections } from '@superset-ui/chart-controls';
 
-export default {
+const config: ControlPanelConfig = {
   controlPanelSections: [
+    sections.legacyRegularTime,
     {
       label: t('Query'),
       expanded: true,
@@ -92,3 +94,5 @@ export default {
     },
   ],
 };
+
+export default config;
diff --git a/...erset_ui/superset-ui/plugins/legacy-plugin-chart-parallel-coordinates/src/controlPanel.ts b/...erset_ui/superset-ui/plugins/legacy-plugin-chart-parallel-coordinates/src/controlPanel.ts
@@ -17,9 +17,11 @@
  * under the License.
  */
 import { t } from '@superset-ui/core';
+import { ControlPanelConfig, sections } from '@superset-ui/chart-controls';
 
-export default {
+const config: ControlPanelConfig = {
   controlPanelSections: [
+    sections.legacyRegularTime,
     {
       label: t('Query'),
       expanded: true,
@@ -62,3 +64,5 @@ export default {
     },
   ],
 };
+
+export default config;
diff --git a/...porary_superset_ui/superset-ui/plugins/legacy-plugin-chart-partition/src/controlPanel.jsx b/...porary_superset_ui/superset-ui/plugins/legacy-plugin-chart-partition/src/controlPanel.jsx
@@ -23,11 +23,13 @@ import {
   D3_TIME_FORMAT_OPTIONS,
   D3_FORMAT_DOCS,
   D3_FORMAT_OPTIONS,
+  sections,
 } from '@superset-ui/chart-controls';
 import OptionDescription from './OptionDescription';
 
 export default {
   controlPanelSections: [
+    sections.legacyRegularTime,
     {
       label: t('Query'),
       expanded: true,

diff --git a/...orary_superset_ui/superset-ui/plugins/legacy-plugin-chart-pivot-table/src/controlPanel.js b/...orary_superset_ui/superset-ui/plugins/legacy-plugin-chart-pivot-table/src/controlPanel.js
@@ -22,10 +22,12 @@ import {
   D3_FORMAT_DOCS,
   formatSelectOptions,
   D3_TIME_FORMAT_OPTIONS,
+  sections,
 } from '@superset-ui/chart-controls';
 
 export default {
   controlPanelSections: [
+    sections.legacyTimeseriesTime,
     {
       label: t('Query'),
       expanded: true,
@@ -132,12 +134,4 @@ export default {
     groupby: { includeTime: true },
     columns: { includeTime: true },
   },
-  sectionOverrides: {
-    druidTimeSeries: {
-      controlSetRows: [['granularity', 'druid_time_origin'], ['time_range']],
-    },
-    sqlaTimeSeries: {
-      controlSetRows: [['granularity_sqla', 'time_grain_sqla'], ['time_range']],
-    },
-  },
 };
diff --git a/...d/temporary_superset_ui/superset-ui/plugins/legacy-plugin-chart-rose/src/controlPanel.jsx b/...d/temporary_superset_ui/superset-ui/plugins/legacy-plugin-chart-rose/src/controlPanel.jsx
@@ -23,10 +23,12 @@ import {
   D3_TIME_FORMAT_OPTIONS,
   D3_FORMAT_DOCS,
   D3_FORMAT_OPTIONS,
+  sections,
 } from '@superset-ui/chart-controls';
 
 export default {
   controlPanelSections: [
+    sections.legacyTimeseriesTime,
     {
       label: t('Query'),
       expanded: true,
@@ -248,12 +250,4 @@ export default {
       ],
     },
   ],
-  sectionOverrides: {
-    druidTimeSeries: {
-      controlSetRows: [['granularity', 'druid_time_origin'], ['time_range']],
-    },
-    sqlaTimeSeries: {
-      controlSetRows: [['granularity_sqla', 'time_grain_sqla'], ['time_range']],
-    },
-  },
 };
diff --git a/...orary_superset_ui/superset-ui/plugins/legacy-plugin-chart-sankey-loop/src/controlPanel.js b/...orary_superset_ui/superset-ui/plugins/legacy-plugin-chart-sankey-loop/src/controlPanel.js
@@ -17,9 +17,11 @@
  * under the License.
  */
 import { t } from '@superset-ui/core';
+import { sections } from '@superset-ui/chart-controls';
 
 export default {
   controlPanelSections: [
+    sections.legacyRegularTime,
     {
       label: t('Query'),
       expanded: true,

diff --git a/.../temporary_superset_ui/superset-ui/plugins/legacy-plugin-chart-sankey/src/controlPanel.ts b/.../temporary_superset_ui/superset-ui/plugins/legacy-plugin-chart-sankey/src/controlPanel.ts
@@ -17,10 +17,11 @@
  * under the License.
  */
 import { t } from '@superset-ui/core';
-import { ControlPanelConfig } from '@superset-ui/chart-controls';
+import { ControlPanelConfig, sections } from '@superset-ui/chart-controls';
 
 const config: ControlPanelConfig = {
   controlPanelSections: [
+    sections.legacyRegularTime,
     {
       label: t('Query'),
       expanded: true,

diff --git a/...emporary_superset_ui/superset-ui/plugins/legacy-plugin-chart-sunburst/src/controlPanel.ts b/...emporary_superset_ui/superset-ui/plugins/legacy-plugin-chart-sunburst/src/controlPanel.ts
@@ -17,9 +17,11 @@
  * under the License.
  */
 import { t } from '@superset-ui/core';
+import { ControlPanelConfig, sections } from '@superset-ui/chart-controls';
 
-export default {
+const config: ControlPanelConfig = {
   controlPanelSections: [
+    sections.legacyRegularTime,
     {
       label: t('Query'),
       expanded: true,
@@ -63,3 +65,5 @@ export default {
     },
   },
 };
+
+export default config;