This is an automated email from the ASF dual-hosted git repository. michaelsmolina pushed a commit to branch 4.0 in repository https://gitbox.apache.org/repos/asf/superset.git
commit ba6b86bbc4a5e23789b6e4889a306f064c65fc06 Author: JUST.in DO IT <[email protected]> AuthorDate: Thu Mar 7 10:04:49 2024 -0800 fix: missing shared color in mixed timeseries (#27403) (cherry picked from commit 9ced2552dbeeaf60217b385d4c40cbaf4372c787) --- .../plugin-chart-echarts/src/MixedTimeseries/transformProps.ts | 5 +++-- superset/commands/base.py | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/superset-frontend/plugins/plugin-chart-echarts/src/MixedTimeseries/transformProps.ts b/superset-frontend/plugins/plugin-chart-echarts/src/MixedTimeseries/transformProps.ts index bb719c23e1..7488d49dba 100644 --- a/superset-frontend/plugins/plugin-chart-echarts/src/MixedTimeseries/transformProps.ts +++ b/superset-frontend/plugins/plugin-chart-echarts/src/MixedTimeseries/transformProps.ts @@ -410,8 +410,9 @@ export default function transformProps( rawSeriesB.forEach(entry => { const entryName = String(entry.name || ''); - const seriesName = `${inverted[entryName] || entryName} (1)`; - const colorScaleKey = getOriginalSeries(seriesName, array); + const seriesEntry = inverted[entryName] || entryName; + const seriesName = `${seriesEntry} (1)`; + const colorScaleKey = getOriginalSeries(seriesEntry, array); const seriesFormatter = getFormatter( customFormattersSecondary, diff --git a/superset/commands/base.py b/superset/commands/base.py index 8b330d0669..d2efcda4fe 100644 --- a/superset/commands/base.py +++ b/superset/commands/base.py @@ -58,7 +58,7 @@ class CreateMixin: # pylint: disable=too-few-public-methods return populate_owner_list(owner_ids, default_to_user=True) -class UpdateMixin: # pylint: disable=too-few-public-methods +class UpdateMixin: @staticmethod def populate_owners(owner_ids: Optional[list[int]] = None) -> list[User]: """
