-
Notifications
You must be signed in to change notification settings - Fork 14k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
fix(explore): pie chart label bugs #13052
Merged
villebro
merged 1 commit into
apache:master
from
preset-io:villebro/bump-superset-ui-0.17.8
Feb 11, 2021
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
102 changes: 102 additions & 0 deletions
102
superset/migrations/versions/41ce8799acc3_rename_pie_label_type.py
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,102 @@ | ||
| # 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. | ||
| """rename pie label type | ||
|
|
||
| Revision ID: 41ce8799acc3 | ||
| Revises: e11ccdd12658 | ||
| Create Date: 2021-02-10 12:32:27.385579 | ||
|
|
||
| """ | ||
|
|
||
| # revision identifiers, used by Alembic. | ||
| revision = "41ce8799acc3" | ||
| down_revision = "e11ccdd12658" | ||
|
|
||
| import json | ||
|
|
||
| from alembic import op | ||
| from sqlalchemy import and_, Column, Integer, String, Text | ||
| from sqlalchemy.ext.declarative import declarative_base | ||
|
|
||
| from superset import db | ||
|
|
||
| Base = declarative_base() | ||
|
|
||
|
|
||
| class Slice(Base): | ||
| """Declarative class to do query in upgrade""" | ||
|
|
||
| __tablename__ = "slices" | ||
| id = Column(Integer, primary_key=True) | ||
| viz_type = Column(String(250)) | ||
| params = Column(Text) | ||
|
|
||
|
|
||
| def upgrade(): | ||
| bind = op.get_bind() | ||
| session = db.Session(bind=bind) | ||
|
|
||
| slices = ( | ||
| session.query(Slice) | ||
| .filter(and_(Slice.viz_type == "pie", Slice.params.like("%pie_label_type%"))) | ||
| .all() | ||
| ) | ||
| changes = 0 | ||
| for slc in slices: | ||
| try: | ||
| params = json.loads(slc.params) | ||
| pie_label_type = params.pop("pie_label_type", None) | ||
| if pie_label_type: | ||
| changes += 1 | ||
| params["label_type"] = pie_label_type | ||
| slc.params = json.dumps(params, sort_keys=True) | ||
| except Exception as e: | ||
| print(e) | ||
| print(f"Parsing params for slice {slc.id} failed.") | ||
| pass | ||
|
|
||
| session.commit() | ||
| session.close() | ||
| print(f"Updated {changes} pie chart labels.") | ||
|
|
||
|
|
||
| def downgrade(): | ||
| bind = op.get_bind() | ||
| session = db.Session(bind=bind) | ||
|
|
||
| slices = ( | ||
| session.query(Slice) | ||
| .filter(and_(Slice.viz_type == "pie", Slice.params.like("%label_type%"))) | ||
| .all() | ||
| ) | ||
| changes = 0 | ||
| for slc in slices: | ||
| try: | ||
| params = json.loads(slc.params) | ||
| label_type = params.pop("label_type", None) | ||
| if label_type: | ||
| changes += 1 | ||
| params["pie_label_type"] = label_type | ||
| slc.params = json.dumps(params, sort_keys=True) | ||
| except Exception as e: | ||
| print(e) | ||
| print(f"Parsing params for slice {slc.id} failed.") | ||
| pass | ||
|
|
||
| session.commit() | ||
| session.close() | ||
| print(f"Updated {changes} pie chart labels.") |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
may be move it to some utils like