diff --git a/superset-frontend/packages/superset-ui-chart-controls/src/types.ts b/superset-frontend/packages/superset-ui-chart-controls/src/types.ts index ffb32bf9d28..972df433e42 100644 --- a/superset-frontend/packages/superset-ui-chart-controls/src/types.ts +++ b/superset-frontend/packages/superset-ui-chart-controls/src/types.ts @@ -608,3 +608,8 @@ export type ControlFormItemSpec = { defaultValue?: Currency; } : {}); + +export enum ColorSchemeEnum { + Green = 'Green', + Red = 'Red', +} diff --git a/superset-frontend/plugins/plugin-chart-ag-grid-table/src/controlPanel.tsx b/superset-frontend/plugins/plugin-chart-ag-grid-table/src/controlPanel.tsx index fd549558d06..a84a466e20b 100644 --- a/superset-frontend/plugins/plugin-chart-ag-grid-table/src/controlPanel.tsx +++ b/superset-frontend/plugins/plugin-chart-ag-grid-table/src/controlPanel.tsx @@ -39,6 +39,7 @@ import { shouldSkipMetricColumn, isRegularMetric, isPercentMetric, + ColorSchemeEnum, } from '@superset-ui/chart-controls'; import { t } from '@apache-superset/core'; import { @@ -56,7 +57,6 @@ import { import { GenericDataType } from '@apache-superset/core/api/core'; import { isEmpty, last } from 'lodash'; import { PAGE_SIZE_OPTIONS, SERVER_PAGE_SIZE_OPTIONS } from './consts'; -import { ColorSchemeEnum } from './types'; /** * Generate comparison column names for a given column. diff --git a/superset-frontend/plugins/plugin-chart-ag-grid-table/src/transformProps.ts b/superset-frontend/plugins/plugin-chart-ag-grid-table/src/transformProps.ts index 73cee040fa9..2925632468e 100644 --- a/superset-frontend/plugins/plugin-chart-ag-grid-table/src/transformProps.ts +++ b/superset-frontend/plugins/plugin-chart-ag-grid-table/src/transformProps.ts @@ -40,6 +40,7 @@ import { isEmpty, isEqual, merge } from 'lodash'; import { ConditionalFormattingConfig, getColorFormatters, + ColorSchemeEnum, } from '@superset-ui/chart-controls'; import isEqualColumns from './utils/isEqualColumns'; import DateWithFormatter from './utils/DateWithFormatter'; @@ -48,7 +49,6 @@ import { TableChartProps, AgGridTableChartTransformedProps, TableColumnConfig, - ColorSchemeEnum, BasicColorFormatterType, } from './types'; diff --git a/superset-frontend/plugins/plugin-chart-ag-grid-table/src/types.ts b/superset-frontend/plugins/plugin-chart-ag-grid-table/src/types.ts index d1a4cc143a1..09371f20ca8 100644 --- a/superset-frontend/plugins/plugin-chart-ag-grid-table/src/types.ts +++ b/superset-frontend/plugins/plugin-chart-ag-grid-table/src/types.ts @@ -181,11 +181,6 @@ export interface AgGridTableChartTransformedProps< chartState?: AgGridChartState; } -export enum ColorSchemeEnum { - 'Green' = 'Green', - 'Red' = 'Red', -} - export interface SortState { colId: string; sort: 'asc' | 'desc' | null; diff --git a/superset-frontend/plugins/plugin-chart-ag-grid-table/test/controlPanel.test.tsx b/superset-frontend/plugins/plugin-chart-ag-grid-table/test/controlPanel.test.tsx index 70501b17bdd..647ce938d6c 100644 --- a/superset-frontend/plugins/plugin-chart-ag-grid-table/test/controlPanel.test.tsx +++ b/superset-frontend/plugins/plugin-chart-ag-grid-table/test/controlPanel.test.tsx @@ -24,9 +24,9 @@ import { ControlConfig, ControlPanelState, ControlState, + ColorSchemeEnum, } from '@superset-ui/chart-controls'; import config from '../src/controlPanel'; -import { ColorSchemeEnum } from '../src/types'; const findConditionalFormattingControl = (): ControlConfig | null => { for (const section of config.controlPanelSections) { diff --git a/superset-frontend/plugins/plugin-chart-echarts/src/BigNumber/BigNumberPeriodOverPeriod/PopKPI.tsx b/superset-frontend/plugins/plugin-chart-echarts/src/BigNumber/BigNumberPeriodOverPeriod/PopKPI.tsx index 170fa261907..c66e339aae4 100644 --- a/superset-frontend/plugins/plugin-chart-echarts/src/BigNumber/BigNumberPeriodOverPeriod/PopKPI.tsx +++ b/superset-frontend/plugins/plugin-chart-echarts/src/BigNumber/BigNumberPeriodOverPeriod/PopKPI.tsx @@ -25,10 +25,12 @@ import { } from '@superset-ui/core'; import { css, styled, useTheme } from '@apache-superset/core/ui'; import { Tooltip } from '@superset-ui/core/components'; -import { DEFAULT_DATE_PATTERN } from '@superset-ui/chart-controls'; +import { + DEFAULT_DATE_PATTERN, + ColorSchemeEnum, +} from '@superset-ui/chart-controls'; import { isEmpty } from 'lodash'; import { - ColorSchemeEnum, PopKPIComparisonSymbolStyleProps, PopKPIComparisonValueStyleProps, PopKPIProps, diff --git a/superset-frontend/plugins/plugin-chart-echarts/src/BigNumber/BigNumberPeriodOverPeriod/controlPanel.ts b/superset-frontend/plugins/plugin-chart-echarts/src/BigNumber/BigNumberPeriodOverPeriod/controlPanel.ts index 51571de05d6..e8557ced595 100644 --- a/superset-frontend/plugins/plugin-chart-echarts/src/BigNumber/BigNumberPeriodOverPeriod/controlPanel.ts +++ b/superset-frontend/plugins/plugin-chart-echarts/src/BigNumber/BigNumberPeriodOverPeriod/controlPanel.ts @@ -23,6 +23,7 @@ import { getStandardizedControls, sharedControls, sections, + ColorSchemeEnum, } from '@superset-ui/chart-controls'; import { noop } from 'lodash'; import { @@ -33,7 +34,6 @@ import { showMetricNameControl, metricNameFontSizeWithVisibility, } from '../sharedControls'; -import { ColorSchemeEnum } from './types'; const config: ControlPanelConfig = { controlPanelSections: [ diff --git a/superset-frontend/plugins/plugin-chart-echarts/src/BigNumber/BigNumberPeriodOverPeriod/types.ts b/superset-frontend/plugins/plugin-chart-echarts/src/BigNumber/BigNumberPeriodOverPeriod/types.ts index d2933f236d1..7503de4c7d0 100644 --- a/superset-frontend/plugins/plugin-chart-echarts/src/BigNumber/BigNumberPeriodOverPeriod/types.ts +++ b/superset-frontend/plugins/plugin-chart-echarts/src/BigNumber/BigNumberPeriodOverPeriod/types.ts @@ -79,8 +79,3 @@ export type PopKPIProps = PopKPIStylesProps & dashboardTimeRange?: string; columnConfig?: Record; }; - -export enum ColorSchemeEnum { - Green = 'Green', - Red = 'Red', -} diff --git a/superset-frontend/plugins/plugin-chart-table/src/TableChart.tsx b/superset-frontend/plugins/plugin-chart-table/src/TableChart.tsx index 259535d7325..08f808bcf23 100644 --- a/superset-frontend/plugins/plugin-chart-table/src/TableChart.tsx +++ b/superset-frontend/plugins/plugin-chart-table/src/TableChart.tsx @@ -74,9 +74,8 @@ import { TableOutlined, } from '@ant-design/icons'; import { isEmpty, debounce, isEqual } from 'lodash'; -import { ColorFormatters } from '@superset-ui/chart-controls'; +import { ColorFormatters, ColorSchemeEnum } from '@superset-ui/chart-controls'; import { - ColorSchemeEnum, DataColumnMeta, SearchOption, SortByItem, diff --git a/superset-frontend/plugins/plugin-chart-table/src/controlPanel.tsx b/superset-frontend/plugins/plugin-chart-table/src/controlPanel.tsx index aed287d66e8..3084ce69a52 100644 --- a/superset-frontend/plugins/plugin-chart-table/src/controlPanel.tsx +++ b/superset-frontend/plugins/plugin-chart-table/src/controlPanel.tsx @@ -40,6 +40,7 @@ import { isRegularMetric, isPercentMetric, ConditionalFormattingConfig, + ColorSchemeEnum, } from '@superset-ui/chart-controls'; import { t } from '@apache-superset/core'; import { @@ -57,7 +58,6 @@ import { import { GenericDataType } from '@apache-superset/core/api/core'; import { isEmpty, last } from 'lodash'; import { PAGE_SIZE_OPTIONS, SERVER_PAGE_SIZE_OPTIONS } from './consts'; -import { ColorSchemeEnum } from './types'; function getQueryMode(controls: ControlStateMapping): QueryMode { const mode = controls?.query_mode?.value; diff --git a/superset-frontend/plugins/plugin-chart-table/src/transformProps.ts b/superset-frontend/plugins/plugin-chart-table/src/transformProps.ts index cc92a19f85f..48849e3dd20 100644 --- a/superset-frontend/plugins/plugin-chart-table/src/transformProps.ts +++ b/superset-frontend/plugins/plugin-chart-table/src/transformProps.ts @@ -41,6 +41,7 @@ import { ColorFormatters, ConditionalFormattingConfig, getColorFormatters, + ColorSchemeEnum, } from '@superset-ui/chart-controls'; import { isEmpty, merge } from 'lodash'; @@ -48,7 +49,6 @@ import isEqualColumns from './utils/isEqualColumns'; import DateWithFormatter from './utils/DateWithFormatter'; import { BasicColorFormatterType, - ColorSchemeEnum, DataColumnMeta, TableChartProps, TableChartTransformedProps, diff --git a/superset-frontend/plugins/plugin-chart-table/src/types.ts b/superset-frontend/plugins/plugin-chart-table/src/types.ts index 85a27777f49..2ec08aa0695 100644 --- a/superset-frontend/plugins/plugin-chart-table/src/types.ts +++ b/superset-frontend/plugins/plugin-chart-table/src/types.ts @@ -180,9 +180,4 @@ export interface TableChartTransformedProps { slice_id: number; } -export enum ColorSchemeEnum { - 'Green' = 'Green', - 'Red' = 'Red', -} - export default {}; diff --git a/superset-frontend/plugins/plugin-chart-table/test/controlPanel.test.tsx b/superset-frontend/plugins/plugin-chart-table/test/controlPanel.test.tsx index 70501b17bdd..647ce938d6c 100644 --- a/superset-frontend/plugins/plugin-chart-table/test/controlPanel.test.tsx +++ b/superset-frontend/plugins/plugin-chart-table/test/controlPanel.test.tsx @@ -24,9 +24,9 @@ import { ControlConfig, ControlPanelState, ControlState, + ColorSchemeEnum, } from '@superset-ui/chart-controls'; import config from '../src/controlPanel'; -import { ColorSchemeEnum } from '../src/types'; const findConditionalFormattingControl = (): ControlConfig | null => { for (const section of config.controlPanelSections) { diff --git a/superset-frontend/src/explore/components/controls/ConditionalFormattingControl/FormattingPopoverContent.test.tsx b/superset-frontend/src/explore/components/controls/ConditionalFormattingControl/FormattingPopoverContent.test.tsx index 1aedbf99d16..4957744b3b8 100644 --- a/superset-frontend/src/explore/components/controls/ConditionalFormattingControl/FormattingPopoverContent.test.tsx +++ b/superset-frontend/src/explore/components/controls/ConditionalFormattingControl/FormattingPopoverContent.test.tsx @@ -22,8 +22,7 @@ import { fireEvent, waitFor, } from 'spec/helpers/testing-library'; -import { Comparator } from '@superset-ui/chart-controls'; -import { ColorSchemeEnum } from '@superset-ui/plugin-chart-table'; +import { Comparator, ColorSchemeEnum } from '@superset-ui/chart-controls'; import { GenericDataType } from '@apache-superset/core/api/core'; import { FormattingPopoverContent } from './FormattingPopoverContent'; import { ConditionalFormattingConfig } from './types'; diff --git a/superset-frontend/src/explore/components/controls/ConditionalFormattingControl/FormattingPopoverContent.tsx b/superset-frontend/src/explore/components/controls/ConditionalFormattingControl/FormattingPopoverContent.tsx index 4d8d9220246..85e3624558d 100644 --- a/superset-frontend/src/explore/components/controls/ConditionalFormattingControl/FormattingPopoverContent.tsx +++ b/superset-frontend/src/explore/components/controls/ConditionalFormattingControl/FormattingPopoverContent.tsx @@ -23,6 +23,7 @@ import { GenericDataType } from '@apache-superset/core/api/core'; import { Comparator, MultipleValueComparators, + ColorSchemeEnum, } from '@superset-ui/chart-controls'; import { Select, @@ -41,13 +42,6 @@ import { ConditionalFormattingFlag, } from './types'; -// TODO: tangled redefinition that aligns with @superset-ui/plugin-chart-table -// used to be imported but main app shouldn't depend on plugins... -export enum ColorSchemeEnum { - 'Green' = 'Green', - 'Red' = 'Red', -} - const FullWidthInputNumber = styled(InputNumber)` width: 100%; `;