Clean up chart-control exports

packages/superset-ui-core/src/chart-controls/index.ts

@@ -1,25 +1,29 @@
-import * as constantsModule from './constants';
-import * as sharedControlsModule from './shared-controls';
-import * as sectionModules from './sections';
-
-// explore all available shared controls
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+export * from './utils';
 export { default as sharedControls } from './shared-controls';
 
-// `export * as x from 'y'` doesn't work for some reason
-export const constants = constantsModule;
-export const internalSharedControls = sharedControlsModule;
-export const sections = sectionModules;
-export { D3_FORMAT_DOCS, D3_FORMAT_OPTIONS, D3_TIME_FORMAT_OPTIONS } from './utils/D3Formatting';
-export { formatSelectOptions, formatSelectOptionsForRange } from './utils/selectOptions';
-export { default as mainMetric } from './utils/mainMetric';
-export * from './utils/expandControlConfig';
-
 export * from './components/InfoTooltipWithTrigger';
 export * from './components/ColumnOption';
 export * from './components/ColumnTypeLabel';
 export * from './components/MetricOption';
 
 // React control components
 export * from './components/RadioButtonControl';
-
 export * from './types';

packages/superset-ui-core/src/chart-controls/shared-controls/index.tsx

@@ -43,14 +43,12 @@ import {
   validateNonEmpty,
 } from '../..';
 
-import { formatSelectOptions } from '../utils/selectOptions';
-import mainMetric from '../utils/mainMetric';
+import { mainMetric, formatSelectOptions } from '../utils';
 import { TIME_FILTER_LABELS } from '../constants';
 import {
   Metric,
   SharedControlConfig,
   ColumnMeta,
-  DatasourceMeta,
   ExtraControlProps,
   SelectControlConfig,
 } from '../types';
@@ -165,15 +163,6 @@ const metric: SharedControlConfig<'MetricsControl'> = {
   default: (c: Control) => mainMetric(c.savedMetrics),
 };
 
-export function columnChoices(datasource: DatasourceMeta) {
-  if (datasource?.columns) {
-    return datasource.columns
-      .map(col => [col.column_name, col.verbose_name || col.column_name])
-      .sort((opt1, opt2) => (opt1[1].toLowerCase() > opt2[1].toLowerCase() ? 1 : -1));
-  }
-  return [];
-}
-
 const datasourceControl: SharedControlConfig<'DatasourceControl'> = {
   type: 'DatasourceControl',
   label: t('Datasource'),
@@ -477,7 +466,7 @@ const label_colors: SharedControlConfig<'ColorMapControl'> = {
   }),
 };
 
-export default {
+const sharedControls = {
   metrics,
   metric,
   datasource: datasourceControl,
@@ -506,3 +495,5 @@ export default {
   color_scheme,
   label_colors,
 };
+
+export default sharedControls;

packages/superset-ui-core/src/chart-controls/utils/columnChoices.ts

@@ -0,0 +1,31 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+import { DatasourceMeta } from '../types';
+
+/**
+ * Convert Dataource columns to column choices
+ */
+export default function columnChoices(datasource: DatasourceMeta) {
+  if (datasource?.columns) {
+    return datasource.columns
+      .map(col => [col.column_name, col.verbose_name || col.column_name])
+      .sort((opt1, opt2) => (opt1[1].toLowerCase() > opt2[1].toLowerCase() ? 1 : -1));
+  }
+  return [];
+}

packages/superset-ui-core/src/chart-controls/utils/index.ts

@@ -0,0 +1,23 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+export * from './selectOptions';
+export * from './D3Formatting';
+export * from './expandControlConfig';
+export { default as mainMetric } from './mainMetric';
+export { default as columnChoices } from './columnChoices';

plugins/legacy-plugin-chart-event-flow/src/controlPanel.jsx

@@ -21,12 +21,10 @@ import {
   t,
   validateNonEmpty,
   ColumnOption,
-  internalSharedControls,
   formatSelectOptionsForRange,
+  columnChoices,
 } from '@superset-ui/core';
 
-const { columnChoices } = internalSharedControls;
-
 export default {
   controlPanelSections: [
     {

plugins/legacy-plugin-chart-heatmap/src/controlPanel.js

@@ -19,13 +19,11 @@
 import {
   t,
   validateNonEmpty,
-  internalSharedControls,
   formatSelectOptionsForRange,
   formatSelectOptions,
+  columnChoices,
 } from '@superset-ui/core';
 
-const { columnChoices } = internalSharedControls;
-
 const sortAxisChoices = [
   ['alpha_asc', t('Axis ascending')],
   ['alpha_desc', t('Axis descending')],

plugins/legacy-plugin-chart-histogram/src/controlPanel.js

@@ -16,14 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import {
-  t,
-  validateNonEmpty,
-  formatSelectOptions,
-  internalSharedControls,
-} from '@superset-ui/core';
-
-const { columnChoices } = internalSharedControls;
+import { t, validateNonEmpty, formatSelectOptions, columnChoices } from '@superset-ui/core';
 
 export default {
   controlPanelSections: [

plugins/legacy-plugin-chart-map-box/src/controlPanel.js

@@ -16,9 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import { t, formatSelectOptions, internalSharedControls } from '@superset-ui/core';
-
-const { columnChoices } = internalSharedControls;
+import { t, formatSelectOptions, columnChoices } from '@superset-ui/core';
 
 export default {
   controlPanelSections: [

test/setup.ts

@@ -1,7 +1,21 @@
-import { configure } from '@superset-ui/core';
-
-configure();
-
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 const caches = {};
 
 class Cache {