(superset) branch 3.1 updated (c294b9d63c -> 7b3d289a9f)

[mi...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

michaelsmolina pushed a change to branch 3.1
in repository https://gitbox.apache.org/repos/asf/superset.git


 discard c294b9d63c fix: missing shared color in mixed timeseries (#27403)
     new 7b3d289a9f fix: missing shared color in mixed timeseries (#27403)

This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version.  This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:

 * -- * -- B -- O -- O -- O   (c294b9d63c)
            \
             N -- N -- N   refs/heads/3.1 (7b3d289a9f)

You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.

Any revisions marked "omit" are not gone; other references still
refer to them.  Any revisions marked "discard" are gone forever.

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 tests/integration_tests/datasets/api_tests.py | 6 ++++++
 1 file changed, 6 insertions(+)

(superset) 01/01: fix: missing shared color in mixed timeseries (#27403)

[mi...@apache.org]

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 7b3d289a9ff7312df602fb51db85457c7f7d1e84
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 +-
 tests/integration_tests/datasets/api_tests.py                       | 6 ++++++
 3 files changed, 10 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]:
         """
diff --git a/tests/integration_tests/datasets/api_tests.py b/tests/integration_tests/datasets/api_tests.py
index 9b264a7eb6..8033f2fd9c 100644
--- a/tests/integration_tests/datasets/api_tests.py
+++ b/tests/integration_tests/datasets/api_tests.py
@@ -889,6 +889,8 @@ class TestDatasetApi(SupersetTestCase):
         """
         Dataset API: Test update dataset preserves owner list (if un-changed)
         """
+        if backend() == "sqlite":
+            return
 
         dataset = self.insert_default_dataset()
         current_owners = dataset.owners
@@ -907,6 +909,8 @@ class TestDatasetApi(SupersetTestCase):
         """
         Dataset API: Test update dataset admin can clear ownership config
         """
+        if backend() == "sqlite":
+            return
 
         dataset = self.insert_default_dataset()
         self.login(username="admin")
@@ -925,6 +929,8 @@ class TestDatasetApi(SupersetTestCase):
         Dataset API: Test update admin can update dataset with
         no owners to a different owner
         """
+        if backend() == "sqlite":
+            return
         self.login(username="admin")
         gamma = self.get_user("gamma")
         dataset = self.insert_dataset("ab_permission", [], get_main_database())