Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

refactor: restructure shared-contrls modules #22224

Merged
merged 1 commit into from
Nov 25, 2022
Merged

refactor: restructure shared-contrls modules #22224

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 1 addition & 7 deletions superset-frontend/packages/superset-ui-chart-controls/src/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,12 +30,6 @@ export * from './components/ColumnOption';
export * from './components/ColumnTypeLabel/ColumnTypeLabel';
export * from './components/MetricOption';

// React control components
export { default as sharedControls, withDndFallback } from './shared-controls';
export { default as sharedControlComponents } from './shared-controls/components';
export { legacySortBy } from './shared-controls/legacySortBy';
export * from './shared-controls/emitFilterControl';
export * from './shared-controls/components';
export * from './shared-controls';
export * from './types';
export * from './shared-controls/mixins';
export * from './fixtures';
2 changes: 1 addition & 1 deletion ...rset-frontend/packages/superset-ui-chart-controls/src/sections/echartsTimeSeriesQuery.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
*/
import { ContributionType, hasGenericChartAxes, t } from '@superset-ui/core';
import { ControlPanelSectionConfig } from '../types';
import { emitFilterControl } from '../shared-controls/emitFilterControl';
import { emitFilterControl } from '../shared-controls';

export const echartsTimeSeriesQuery: ControlPanelSectionConfig = {
label: t('Query'),
Expand Down
6 changes: 3 additions & 3 deletions ...src/shared-controls/emitFilterControl.tsx → ...ls/src/shared-controls/customControls.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@

import { FeatureFlag, isFeatureEnabled, t } from '@superset-ui/core';

const enableCrossFilter = isFeatureEnabled(FeatureFlag.DASHBOARD_CROSS_FILTERS);

export const emitFilterControl = enableCrossFilter
export const emitFilterControl = isFeatureEnabled(
FeatureFlag.DASHBOARD_CROSS_FILTERS,
)
? [
{
name: 'emit_filter',
Expand Down
26 changes: 7 additions & 19 deletions ...rols/src/shared-controls/legacySortBy.tsx → ...art-controls/src/shared-controls/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,22 +16,10 @@
* specific language governing permissions and limitations
* under the License.
*/
import { t } from '@superset-ui/core';
import { ControlSetRow } from '../types';

export const legacySortBy: ControlSetRow[] = [
['legacy_order_by'],
[
{
name: 'order_desc',
config: {
type: 'CheckboxControl',
label: t('Sort descending'),
default: true,
description: t(
'Whether to sort descending or ascending. Takes effect only when "Sort by" is set',
),
},
},
],
];
export { default as sharedControls } from './sharedControls';
export { withDndFallback } from './dndControls';
// React control components
export { default as sharedControlComponents } from './components';
export * from './components';
export * from './customControls';
export * from './mixins';
0 ...rt-controls/src/shared-controls/index.tsx → ...ls/src/shared-controls/sharedControls.tsx
View file
Open in desktop
File renamed without changes.
3 changes: 1 addition & 2 deletions superset-frontend/packages/superset-ui-chart-controls/src/types.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,7 @@ import type {
QueryFormMetric,
QueryResponse,
} from '@superset-ui/core';
import sharedControls from './shared-controls';
import sharedControlComponents from './shared-controls/components';
import { sharedControls, sharedControlComponents } from './shared-controls';

export type { Metric } from '@superset-ui/core';
export type { ControlFormItemSpec } from './components/ControlForm';
Expand Down
3 changes: 1 addition & 2 deletions superset-frontend/packages/superset-ui-chart-controls/src/utils/expandControlConfig.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,7 @@
* under the License.
*/
import React, { ReactElement } from 'react';
import sharedControls from '../shared-controls';
import sharedControlComponents from '../shared-controls/components';
import { sharedControls, sharedControlComponents } from '../shared-controls';
import {
ControlType,
ControlSetItem,
Expand Down