Skip to content

Commit

Permalink
fix: missing shared color in mixed timeseries (#27403)
Browse files Browse the repository at this point in the history
(cherry picked from commit 9ced255)
  • Loading branch information
justinpark authored and michael-s-molina committed Mar 7, 2024
1 parent 2060e54 commit 5b6e5e4
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 4 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion superset/commands/base.py
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ def populate_owners(owner_ids: Optional[list[int]] = None) -> list[User]:
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]:
"""
Expand Down
6 changes: 5 additions & 1 deletion tests/unit_tests/security/api_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -28,4 +28,8 @@ def test_csrf_not_exempt(app_context: None) -> None:
"""
Test that REST API is not exempt from CSRF.
"""
assert csrf._exempt_blueprints == {"MenuApi", "SecurityApi", "OpenApi"}
assert {blueprint.name for blueprint in csrf._exempt_blueprints} == {
"MenuApi",
"SecurityApi",
"OpenApi",
}

0 comments on commit 5b6e5e4

Please sign in to comment.