You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@superset.apache.org by mi...@apache.org on 2024/03/07 18:15:34 UTC
(superset) 05/05: fix: missing shared color in mixed timeseries (#27403)
This is an automated email from the ASF dual-hosted git repository.
michaelsmolina pushed a commit to branch 3.1
in repository https://gitbox.apache.org/repos/asf/superset.git
commit c294b9d63c8af7a997534721eafd8d849758e5ea
Author: JUST.in DO IT <ju...@airbnb.com>
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 ce6969213a..8eecb6de47 100644
--- a/superset-frontend/plugins/plugin-chart-echarts/src/MixedTimeseries/transformProps.ts
+++ b/superset-frontend/plugins/plugin-chart-echarts/src/MixedTimeseries/transformProps.ts
@@ -406,8 +406,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]:
"""