pt
/
superset
mirror of https://github.com/apache/superset.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix: process color scheme configs correctly (#17786)

This commit is contained in:
David Aaron Suddjian 2022-01-04 15:27:10 -08:00 committed by GitHub
parent cac704d43b
commit de3d3973a2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
superset-frontend/packages/superset-ui-core/src/color/index.ts
View File

@ -22,9 +22,13 @@ import * as CategoricalColorNamespace from './CategoricalColorNamespace';
export { CategoricalColorNamespace }; export { CategoricalColorNamespace };
export { default as CategoricalColorScale } from './CategoricalColorScale'; export { default as CategoricalColorScale } from './CategoricalColorScale';
export { default as CategoricalScheme } from './CategoricalScheme'; export { default as CategoricalScheme } from './CategoricalScheme';
export * from './CategoricalScheme';
export { default as getCategoricalSchemeRegistry } from './CategoricalSchemeRegistrySingleton'; export { default as getCategoricalSchemeRegistry } from './CategoricalSchemeRegistrySingleton';
export { default as ColorScheme } from './ColorScheme';
export * from './ColorScheme';
export { default as getSequentialSchemeRegistry } from './SequentialSchemeRegistrySingleton'; export { default as getSequentialSchemeRegistry } from './SequentialSchemeRegistrySingleton';
export { default as SequentialScheme } from './SequentialScheme'; export { default as SequentialScheme } from './SequentialScheme';
export * from './SequentialScheme';
export { default as ColorSchemeRegistry } from './ColorSchemeRegistry'; export { default as ColorSchemeRegistry } from './ColorSchemeRegistry';
export * from './colorSchemes'; export * from './colorSchemes';
export * from './utils'; export * from './utils';

19
superset-frontend/src/setup/setupColors.ts
View File

@ -18,9 +18,12 @@
*/ */
import { import {
CategoricalScheme, CategoricalScheme,
ColorScheme,
ColorSchemeConfig,
getCategoricalSchemeRegistry, getCategoricalSchemeRegistry,
getSequentialSchemeRegistry, getSequentialSchemeRegistry,
SequentialScheme, SequentialScheme,
SequentialSchemeConfig,
CategoricalAirbnb, CategoricalAirbnb,
CategoricalD3, CategoricalD3,
CategoricalEcharts, CategoricalEcharts,
@ -33,9 +36,9 @@ import {
ColorSchemeRegistry, ColorSchemeRegistry,
} from '@superset-ui/core'; } from '@superset-ui/core';
function registerColorSchemes( function registerColorSchemes<T extends ColorScheme>(
registry: ColorSchemeRegistry<unknown>, registry: ColorSchemeRegistry<T>,
colorSchemes: (CategoricalScheme | SequentialScheme)[], colorSchemes: T[],
standardDefaultKey: string, standardDefaultKey: string,
) { ) {
colorSchemes.forEach(scheme => { colorSchemes.forEach(scheme => {
@ -48,9 +51,15 @@ function registerColorSchemes(
} }
export default function setupColors( export default function setupColors(
extraCategoricalColorSchemes: CategoricalScheme[] = [], extraCategoricalColorSchemeConfigs: ColorSchemeConfig[] = [],
extraSequentialColorSchemes: SequentialScheme[] = [], extraSequentialColorSchemeConfigs: SequentialSchemeConfig[] = [],
) { ) {
const extraCategoricalColorSchemes = extraCategoricalColorSchemeConfigs.map(
config => new CategoricalScheme(config),
);
const extraSequentialColorSchemes = extraSequentialColorSchemeConfigs.map(
config => new SequentialScheme(config),
);
registerColorSchemes( registerColorSchemes(
// @ts-ignore // @ts-ignore
getCategoricalSchemeRegistry(), getCategoricalSchemeRegistry(),