mirror of
https://github.com/apache/superset.git
synced 2026-05-12 03:15:55 +00:00
bce6ca1ae0
This comprehensive architectural transformation removes all static theme imports (supersetTheme, themeObject) across the entire codebase, replacing them with proper dynamic theme access patterns that support real-time theme switching. ## What Changed **Static Exports Eliminated:** - Removed `supersetTheme` and `themeObject` exports from core theme module - Eliminated static theme dependencies across 47 files - Updated ESLint rules to reflect removed exports **Dynamic Theme Architecture:** - Functional components: Use `useTheme()` hook for reactive theme access - Class components: Use `withTheme()` HOC for theme injection - Transform functions: Access `theme` from chartProps parameter - Test infrastructure: Use `Theme.fromConfig()` for isolated testing - Singleton pattern: `DEFAULT_THEME` for efficient fallbacks **Test Architecture Cleanup:** - Removed unnecessary theme setup from 30+ test files - Eliminated legacy `dynamicTheme` cruft from logic tests - Simplified theme assertions to focus on behavior vs implementation details - Maintained theme testing only where legitimately needed **Core Infrastructure:** - ThemeController uses dynamic theme creation instead of static imports - ChartProps uses singleton DEFAULT_THEME for efficient fallbacks - Theme providers only at app root and isolated contexts (tests, storybook) ## Why This Was Needed The previous architecture had static theme imports that: - Always returned light theme values regardless of current theme mode - Broke dark mode compatibility in visualizations (fixed in previous commit) - Created performance overhead with redundant theme instance creation - Prevented real-time theme switching across components - Led to inconsistent theme access patterns ## Benefits - ✅ Perfect dark mode support - no static dependencies to break theming - ✅ True dynamic theming - all components react to theme changes - ✅ Clean architecture - minimal providers, consistent patterns - ✅ Better performance - singleton pattern eliminates waste - ✅ Future-proof - ready for theme customization and user preferences - ✅ Developer experience - clear patterns for every context This transformation enables the next generation of Superset theming with complete dynamic theme support and perfect dark mode compatibility. 🤖 Generated with [Claude Code](https://claude.ai/code) Co-Authored-By: Claude <noreply@anthropic.com>
422 lines
11 KiB
TypeScript
422 lines
11 KiB
TypeScript
/**
|
|
* Licensed to the Apache Software Foundation (ASF) under one
|
|
* or more contributor license agreements. See the NOTICE file
|
|
* distributed with this work for additional information
|
|
* regarding copyright ownership. The ASF licenses this file
|
|
* to you under the Apache License, Version 2.0 (the
|
|
* "License"); you may not use this file except in compliance
|
|
* with the License. You may obtain a copy of the License at
|
|
*
|
|
* http://www.apache.org/licenses/LICENSE-2.0
|
|
*
|
|
* Unless required by applicable law or agreed to in writing,
|
|
* software distributed under the License is distributed on an
|
|
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
|
|
* KIND, either express or implied. See the License for the
|
|
* specific language governing permissions and limitations
|
|
* under the License.
|
|
*/
|
|
import { ChartProps } from '@superset-ui/core';
|
|
import transformProps from '../../src/Tree/transformProps';
|
|
import { EchartsTreeChartProps } from '../../src/Tree/types';
|
|
|
|
describe('EchartsTree transformProps', () => {
|
|
const formData = {
|
|
colorScheme: 'bnbColors',
|
|
datasource: '3__table',
|
|
granularity_sqla: 'ds',
|
|
metric: 'count',
|
|
id: 'id_column',
|
|
parent: 'relation_column',
|
|
name: 'name_column',
|
|
rootNodeId: '1',
|
|
};
|
|
const chartPropsConfig = {
|
|
formData,
|
|
width: 800,
|
|
height: 600,
|
|
};
|
|
it('should transform when parent present before child', () => {
|
|
const queriesData = [
|
|
{
|
|
colnames: ['id_column', 'relation_column', 'name_column', 'count'],
|
|
data: [
|
|
{
|
|
id_column: '1',
|
|
relation_column: null,
|
|
name_column: 'root',
|
|
count: 10,
|
|
},
|
|
{
|
|
id_column: '2',
|
|
relation_column: '1',
|
|
name_column: 'first_child',
|
|
count: 10,
|
|
},
|
|
{
|
|
id_column: '3',
|
|
relation_column: '2',
|
|
name_column: 'second_child',
|
|
count: 10,
|
|
},
|
|
{
|
|
id_column: '4',
|
|
relation_column: '3',
|
|
name_column: 'third_child',
|
|
count: 10,
|
|
},
|
|
],
|
|
},
|
|
];
|
|
|
|
const chartProps = new ChartProps({ ...chartPropsConfig, queriesData });
|
|
expect(transformProps(chartProps as EchartsTreeChartProps)).toEqual(
|
|
expect.objectContaining({
|
|
width: 800,
|
|
height: 600,
|
|
echartOptions: expect.objectContaining({
|
|
series: expect.arrayContaining([
|
|
expect.objectContaining({
|
|
data: [
|
|
{
|
|
name: 'root',
|
|
children: [
|
|
{
|
|
name: 'first_child',
|
|
value: 10,
|
|
children: [
|
|
{
|
|
name: 'second_child',
|
|
value: 10,
|
|
children: [
|
|
{ name: 'third_child', value: 10, children: [] },
|
|
],
|
|
},
|
|
],
|
|
},
|
|
],
|
|
},
|
|
],
|
|
}),
|
|
]),
|
|
}),
|
|
}),
|
|
);
|
|
});
|
|
it('should transform when child is present before parent', () => {
|
|
const queriesData = [
|
|
{
|
|
colnames: ['id_column', 'relation_column', 'name_column', 'count'],
|
|
data: [
|
|
{
|
|
id_column: '1',
|
|
relation_column: null,
|
|
name_column: 'root',
|
|
count: 10,
|
|
},
|
|
{
|
|
id_column: '2',
|
|
relation_column: '4',
|
|
name_column: 'second_child',
|
|
count: 20,
|
|
},
|
|
{
|
|
id_column: '3',
|
|
relation_column: '4',
|
|
name_column: 'second_child',
|
|
count: 30,
|
|
},
|
|
{
|
|
id_column: '4',
|
|
relation_column: '1',
|
|
name_column: 'first_child',
|
|
count: 40,
|
|
},
|
|
],
|
|
},
|
|
];
|
|
|
|
const chartProps = new ChartProps({ ...chartPropsConfig, queriesData });
|
|
expect(transformProps(chartProps as EchartsTreeChartProps)).toEqual(
|
|
expect.objectContaining({
|
|
width: 800,
|
|
height: 600,
|
|
echartOptions: expect.objectContaining({
|
|
series: expect.arrayContaining([
|
|
expect.objectContaining({
|
|
data: [
|
|
{
|
|
name: 'root',
|
|
children: [
|
|
{
|
|
name: 'first_child',
|
|
value: 40,
|
|
children: [
|
|
{
|
|
name: 'second_child',
|
|
value: 20,
|
|
children: [],
|
|
},
|
|
{
|
|
name: 'second_child',
|
|
value: 30,
|
|
children: [],
|
|
},
|
|
],
|
|
},
|
|
],
|
|
},
|
|
],
|
|
}),
|
|
]),
|
|
}),
|
|
}),
|
|
);
|
|
});
|
|
it('ignore node if not attached to root', () => {
|
|
const formData = {
|
|
colorScheme: 'bnbColors',
|
|
datasource: '3__table',
|
|
granularity_sqla: 'ds',
|
|
metric: 'count',
|
|
id: 'id_column',
|
|
parent: 'relation_column',
|
|
name: 'name_column',
|
|
rootNodeId: '2',
|
|
};
|
|
const chartPropsConfig = {
|
|
formData,
|
|
width: 800,
|
|
height: 600,
|
|
};
|
|
const queriesData = [
|
|
{
|
|
colnames: ['id_column', 'relation_column', 'name_column', 'count'],
|
|
data: [
|
|
{
|
|
id_column: '1',
|
|
relation_column: null,
|
|
name_column: 'root',
|
|
count: 10,
|
|
},
|
|
{
|
|
id_column: '2',
|
|
relation_column: '1',
|
|
name_column: 'first_child',
|
|
count: 10,
|
|
},
|
|
{
|
|
id_column: '3',
|
|
relation_column: '2',
|
|
name_column: 'second_child',
|
|
count: 10,
|
|
},
|
|
{
|
|
id_column: '4',
|
|
relation_column: '3',
|
|
name_column: 'third_child',
|
|
count: 20,
|
|
},
|
|
],
|
|
},
|
|
];
|
|
|
|
const chartProps = new ChartProps({ ...chartPropsConfig, queriesData });
|
|
expect(transformProps(chartProps as EchartsTreeChartProps)).toEqual(
|
|
expect.objectContaining({
|
|
width: 800,
|
|
height: 600,
|
|
echartOptions: expect.objectContaining({
|
|
series: expect.arrayContaining([
|
|
expect.objectContaining({
|
|
data: [
|
|
{
|
|
name: 'first_child',
|
|
children: [
|
|
{
|
|
name: 'second_child',
|
|
value: 10,
|
|
children: [
|
|
{
|
|
name: 'third_child',
|
|
value: 20,
|
|
children: [],
|
|
},
|
|
],
|
|
},
|
|
],
|
|
},
|
|
],
|
|
}),
|
|
]),
|
|
}),
|
|
}),
|
|
);
|
|
});
|
|
it('should transform props if name column is not specified', () => {
|
|
const formData = {
|
|
colorScheme: 'bnbColors',
|
|
datasource: '3__table',
|
|
granularity_sqla: 'ds',
|
|
metric: 'count',
|
|
id: 'id_column',
|
|
parent: 'relation_column',
|
|
rootNodeId: '1',
|
|
};
|
|
const chartPropsConfig = {
|
|
formData,
|
|
width: 800,
|
|
height: 600,
|
|
};
|
|
const queriesData = [
|
|
{
|
|
colnames: ['id_column', 'relation_column', 'count'],
|
|
data: [
|
|
{
|
|
id_column: '1',
|
|
relation_column: null,
|
|
count: 10,
|
|
},
|
|
{
|
|
id_column: '2',
|
|
relation_column: '1',
|
|
count: 10,
|
|
},
|
|
{
|
|
id_column: '3',
|
|
relation_column: '2',
|
|
count: 10,
|
|
},
|
|
{
|
|
id_column: '4',
|
|
relation_column: '3',
|
|
count: 20,
|
|
},
|
|
],
|
|
},
|
|
];
|
|
|
|
const chartProps = new ChartProps({ ...chartPropsConfig, queriesData });
|
|
expect(transformProps(chartProps as EchartsTreeChartProps)).toEqual(
|
|
expect.objectContaining({
|
|
width: 800,
|
|
height: 600,
|
|
echartOptions: expect.objectContaining({
|
|
series: expect.arrayContaining([
|
|
expect.objectContaining({
|
|
data: [
|
|
{
|
|
name: '1',
|
|
children: [
|
|
{
|
|
name: '2',
|
|
value: 10,
|
|
children: [
|
|
{
|
|
name: '3',
|
|
value: 10,
|
|
children: [
|
|
{
|
|
name: '4',
|
|
value: 20,
|
|
children: [],
|
|
},
|
|
],
|
|
},
|
|
],
|
|
},
|
|
],
|
|
},
|
|
],
|
|
}),
|
|
]),
|
|
}),
|
|
}),
|
|
);
|
|
});
|
|
it('should find root node with null parent when root node name is not provided', () => {
|
|
const formData = {
|
|
colorScheme: 'bnbColors',
|
|
datasource: '3__table',
|
|
granularity_sqla: 'ds',
|
|
metric: 'count',
|
|
id: 'id_column',
|
|
parent: 'relation_column',
|
|
name: 'name_column',
|
|
};
|
|
const chartPropsConfig = {
|
|
formData,
|
|
width: 800,
|
|
height: 600,
|
|
};
|
|
const queriesData = [
|
|
{
|
|
colnames: ['id_column', 'relation_column', 'name_column', 'count'],
|
|
data: [
|
|
{
|
|
id_column: '2',
|
|
relation_column: '4',
|
|
name_column: 'second_child',
|
|
count: 20,
|
|
},
|
|
{
|
|
id_column: '3',
|
|
relation_column: '4',
|
|
name_column: 'second_child',
|
|
count: 30,
|
|
},
|
|
{
|
|
id_column: '4',
|
|
relation_column: '1',
|
|
name_column: 'first_child',
|
|
count: 40,
|
|
},
|
|
{
|
|
id_column: '1',
|
|
relation_column: null,
|
|
name_column: 'root',
|
|
count: 10,
|
|
},
|
|
],
|
|
},
|
|
];
|
|
|
|
const chartProps = new ChartProps({ ...chartPropsConfig, queriesData });
|
|
expect(transformProps(chartProps as EchartsTreeChartProps)).toEqual(
|
|
expect.objectContaining({
|
|
width: 800,
|
|
height: 600,
|
|
echartOptions: expect.objectContaining({
|
|
series: expect.arrayContaining([
|
|
expect.objectContaining({
|
|
data: [
|
|
{
|
|
name: 'root',
|
|
children: [
|
|
{
|
|
name: 'first_child',
|
|
value: 40,
|
|
children: [
|
|
{
|
|
name: 'second_child',
|
|
value: 20,
|
|
children: [],
|
|
},
|
|
{
|
|
name: 'second_child',
|
|
value: 30,
|
|
children: [],
|
|
},
|
|
],
|
|
},
|
|
],
|
|
},
|
|
],
|
|
}),
|
|
]),
|
|
}),
|
|
}),
|
|
);
|
|
});
|
|
});
|