This is an automated email from the ASF dual-hosted git repository. sbin pushed a commit to branch refactor/ColorSchemeEnum in repository https://gitbox.apache.org/repos/asf/superset.git
commit 51bf1c23c4a401a8b8ec86c1953e4eededc37ca1 Author: SBIN2010 <[email protected]> AuthorDate: Sun Feb 1 01:19:10 2026 +0300 refactor: ColorSchemeEnum --- .../packages/superset-ui-chart-controls/src/types.ts | 5 +++++ .../plugins/plugin-chart-ag-grid-table/src/controlPanel.tsx | 2 +- .../plugins/plugin-chart-ag-grid-table/src/transformProps.ts | 2 +- superset-frontend/plugins/plugin-chart-ag-grid-table/src/types.ts | 5 ----- .../plugins/plugin-chart-ag-grid-table/test/controlPanel.test.tsx | 2 +- .../src/BigNumber/BigNumberPeriodOverPeriod/controlPanel.ts | 2 +- .../src/BigNumber/BigNumberPeriodOverPeriod/types.ts | 5 ----- superset-frontend/plugins/plugin-chart-table/src/TableChart.tsx | 3 +-- superset-frontend/plugins/plugin-chart-table/src/controlPanel.tsx | 2 +- .../plugins/plugin-chart-table/src/transformProps.ts | 2 +- superset-frontend/plugins/plugin-chart-table/src/types.ts | 5 ----- .../plugins/plugin-chart-table/test/controlPanel.test.tsx | 2 +- .../FormattingPopoverContent.test.tsx | 3 +-- .../ConditionalFormattingControl/FormattingPopoverContent.tsx | 8 +------- 14 files changed, 15 insertions(+), 33 deletions(-) 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 ffb32bf9d2..972df433e4 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<T extends ControlType = ControlType> = { 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 fd549558d0..a84a466e20 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 73cee040fa..2925632468 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 d1a4cc143a..09371f20ca 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 70501b17bd..647ce938d6 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/controlPanel.ts b/superset-frontend/plugins/plugin-chart-echarts/src/BigNumber/BigNumberPeriodOverPeriod/controlPanel.ts index 51571de05d..e8557ced59 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 d2933f236d..7503de4c7d 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<string, TableColumnConfig>; }; - -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 259535d732..08f808bcf2 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 aed287d66e..3084ce69a5 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 cc92a19f85..48849e3dd2 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 85a27777f4..2ec08aa069 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<D extends DataRecord = DataRecord> { 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 70501b17bd..647ce938d6 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 1aedbf99d1..4957744b3b 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 4d8d922024..85e3624558 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%; `;
