Skip to content

refactor(color-schemes): refactor setting of color schemes #12857

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

Merged
villebro merged 2 commits into from
Feb 2, 2021
Merged

refactor(color-schemes): refactor setting of color schemes #12857

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0a4d35e
refactor(color-schemes): refactor setting of color schemes
simcha90 Feb 1, 2021
129e983
refactor: fix TS types
simcha90 Feb 1, 2021
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
25 changes: 4 additions & 21 deletions superset-frontend/src/preamble.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ import { setConfig as setHotLoaderConfig } from 'react-hot-loader';
import 'abortcontroller-polyfill/dist/abortcontroller-polyfill-only';
import moment from 'moment';
import { configure } from '@superset-ui/core';
import ColorScheme from '@superset-ui/core/lib/color/ColorScheme';
import setupClient from './setup/setupClient';
import setupColors from './setup/setupColors';
import setupFormatters from './setup/setupFormatters';
Expand Down Expand Up @@ -51,26 +50,10 @@ if (typeof window !== 'undefined') {
// Setup SupersetClient
setupClient();

// Setup color palettes
let extraCategoricalColorSchemes: ColorScheme[] = [];
let extraSequentialColorSchemes: ColorScheme[] = [];

if (
bootstrapData.common &&
bootstrapData.common.extra_categorical_color_schemes
) {
extraCategoricalColorSchemes =
bootstrapData.common.extra_categorical_color_schemes;
}
if (
bootstrapData.common &&
bootstrapData.common.extra_sequential_color_schemes
) {
extraSequentialColorSchemes =
bootstrapData.common.extra_sequential_color_schemes;
}

setupColors(extraCategoricalColorSchemes, extraSequentialColorSchemes);
setupColors(
bootstrapData?.common?.extra_categorical_color_schemes,
bootstrapData?.common?.extra_sequential_color_schemes,
);

// Setup number formatters
setupFormatters();
28 changes: 15 additions & 13 deletions superset-frontend/src/setup/setupColors.js → superset-frontend/src/setup/setupColors.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,28 +16,30 @@
* specific language governing permissions and limitations
* under the License.
*/
import airbnb from '@superset-ui/core/esm/color/colorSchemes/categorical/airbnb';
import categoricalD3 from '@superset-ui/core/esm/color/colorSchemes/categorical/d3';
import echarts from '@superset-ui/core/esm/color/colorSchemes/categorical/echarts';
import google from '@superset-ui/core/esm/color/colorSchemes/categorical/google';
import lyft from '@superset-ui/core/esm/color/colorSchemes/categorical/lyft';
import preset from '@superset-ui/core/esm/color/colorSchemes/categorical/preset';
import sequentialCommon from '@superset-ui/core/esm/color/colorSchemes/sequential/common';
import sequentialD3 from '@superset-ui/core/esm/color/colorSchemes/sequential/d3';
import airbnb from '@superset-ui/core/lib/color/colorSchemes/categorical/airbnb';
import categoricalD3 from '@superset-ui/core/lib/color/colorSchemes/categorical/d3';
import echarts from '@superset-ui/core/lib/color/colorSchemes/categorical/echarts';
import google from '@superset-ui/core/lib/color/colorSchemes/categorical/google';
import lyft from '@superset-ui/core/lib/color/colorSchemes/categorical/lyft';
import preset from '@superset-ui/core/lib/color/colorSchemes/categorical/preset';
import sequentialCommon from '@superset-ui/core/lib/color/colorSchemes/sequential/common';
import sequentialD3 from '@superset-ui/core/lib/color/colorSchemes/sequential/d3';
import {
CategoricalScheme,
getCategoricalSchemeRegistry,
getSequentialSchemeRegistry,
SequentialScheme,
} from '@superset-ui/core';
import superset from '@superset-ui/core/esm/color/colorSchemes/categorical/superset';
import superset from '@superset-ui/core/lib/color/colorSchemes/categorical/superset';

export default function setupColors(
extraCategoricalColorSchemas,
extraSequentialColorSchemes,
extraCategoricalColorSchemas: CategoricalScheme[] = [],
extraSequentialColorSchemes: SequentialScheme[] = [],
) {
// Register color schemes
const categoricalSchemeRegistry = getCategoricalSchemeRegistry();

if (extraCategoricalColorSchemas && extraCategoricalColorSchemas.length > 0) {
if (extraCategoricalColorSchemas?.length > 0) {
extraCategoricalColorSchemas.forEach(scheme => {
categoricalSchemeRegistry.registerValue(scheme.id, scheme);
});
Expand All @@ -54,7 +56,7 @@ export default function setupColors(

const sequentialSchemeRegistry = getSequentialSchemeRegistry();

if (extraSequentialColorSchemes && extraSequentialColorSchemes.length > 0) {
if (extraSequentialColorSchemes?.length > 0) {
extraSequentialColorSchemes.forEach(scheme => {
categoricalSchemeRegistry.registerValue(scheme.id, scheme);
});
Expand Down