Skip to content

Commit

Permalink
fix: dedup groupby in viz.py while preserving order (apache#10633)
Browse files Browse the repository at this point in the history
  • Loading branch information
mistercrunch authored and Ofeknielsen committed Oct 5, 2020
1 parent a97cee7 commit d2fd7be
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
5 changes: 2 additions & 3 deletions superset/tasks/slack_util.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,15 +18,13 @@
from io import IOBase
from typing import cast, Optional, Union

from flask import current_app
from retry.api import retry
from slack import WebClient
from slack.errors import SlackApiError
from slack.web.slack_response import SlackResponse

from superset import app

# Globals
config = app.config
logger = logging.getLogger("tasks.slack_util")


Expand All @@ -37,6 +35,7 @@ def deliver_slack_msg(
body: str,
file: Optional[Union[str, IOBase, bytes]],
) -> None:
config = current_app.config
client = WebClient(token=config["SLACK_API_TOKEN"], proxy=config["SLACK_PROXY"])
# files_upload returns SlackResponse as we run it in sync mode.
if file:
Expand Down
3 changes: 2 additions & 1 deletion superset/viz.py
Original file line number Diff line number Diff line change
Expand Up @@ -323,7 +323,8 @@ def query_obj(self) -> QueryObjectDict:
gb = self.groupby
metrics = self.all_metrics or []
columns = form_data.get("columns") or []
groupby = list(set(gb + columns))
# merge list and dedup while preserving order
groupby = list(OrderedDict.fromkeys(gb + columns))

is_timeseries = self.is_timeseries
if DTTM_ALIAS in groupby:
Expand Down

0 comments on commit d2fd7be

Please sign in to comment.