Skip to content

Commit

Permalink
feat(plugin-chart-horizon): Add sort by & Add no default sorting if c…
Browse files Browse the repository at this point in the history
…heckbox is not selected
  • Loading branch information
maloun96 committed Feb 12, 2021
1 parent 078bf97 commit 61349b9
Showing 1 changed file with 24 additions and 6 deletions.
30 changes: 24 additions & 6 deletions superset/viz.py
Original file line number Diff line number Diff line change
Expand Up @@ -870,7 +870,8 @@ def query_obj(self) -> QueryObjectDict:
sort_by_label = utils.get_metric_name(sort_by)
if sort_by_label not in d["metrics"]:
d["metrics"].append(sort_by)
d["orderby"] = [(sort_by, not self.form_data.get("order_desc", True))]
if self.form_data.get("order_desc"):
d["orderby"] = [(sort_by, not self.form_data.get("order_desc", True))]
return d

@staticmethod
Expand Down Expand Up @@ -977,7 +978,8 @@ def query_obj(self) -> QueryObjectDict:
sort_by_label = utils.get_metric_name(sort_by)
if sort_by_label not in d["metrics"]:
d["metrics"].append(sort_by)
d["orderby"] = [(sort_by, not self.form_data.get("order_desc", True))]
if self.form_data.get("order_desc"):
d["orderby"] = [(sort_by, not self.form_data.get("order_desc", True))]
return d

def _nest(self, metric: str, df: pd.DataFrame) -> List[Dict[str, Any]]:
Expand Down Expand Up @@ -1646,7 +1648,8 @@ def query_obj(self) -> QueryObjectDict:
sort_by_label = utils.get_metric_name(sort_by)
if sort_by_label not in d["metrics"]:
d["metrics"].append(sort_by)
d["orderby"] = [(sort_by, not self.form_data.get("order_desc", True))]
if self.form_data.get("order_desc"):
d["orderby"] = [(sort_by, not self.form_data.get("order_desc", True))]
return d


Expand Down Expand Up @@ -2113,7 +2116,8 @@ def query_obj(self) -> QueryObjectDict:
sort_by_label = utils.get_metric_name(sort_by)
if sort_by_label not in d["metrics"]:
d["metrics"].append(sort_by)
d["orderby"] = [(sort_by, not self.form_data.get("order_desc", True))]
if self.form_data.get("order_desc"):
d["orderby"] = [(sort_by, not self.form_data.get("order_desc", True))]
return d

def get_data(self, df: pd.DataFrame) -> VizData:
Expand Down Expand Up @@ -2187,6 +2191,18 @@ class HorizonViz(NVD3TimeSeriesViz):
"d3-horizon-chart</a>"
)

def query_obj(self) -> QueryObjectDict:
d = super().query_obj()
metrics = self.form_data.get("metrics")
sort_by = self.form_data.get("timeseries_limit_metric")
if sort_by:
sort_by_label = utils.get_metric_name(sort_by)
if sort_by_label not in d["metrics"]:
d["metrics"].append(sort_by)
if self.form_data.get("order_desc"):
d["orderby"] = [(sort_by, not self.form_data.get("order_desc", True))]
return d


class MapboxViz(BaseViz):

Expand Down Expand Up @@ -2811,7 +2827,8 @@ def query_obj(self) -> QueryObjectDict:
sort_by_label = utils.get_metric_name(sort_by)
if sort_by_label not in d["metrics"]:
d["metrics"].append(sort_by)
d["orderby"] = [(sort_by, not self.form_data.get("order_desc", True))]
if self.form_data.get("order_desc"):
d["orderby"] = [(sort_by, not self.form_data.get("order_desc", True))]
return d

def get_data(self, df: pd.DataFrame) -> VizData:
Expand Down Expand Up @@ -2877,7 +2894,8 @@ def query_obj(self) -> QueryObjectDict:
sort_by_label = utils.get_metric_name(sort_by)
if sort_by_label not in d["metrics"]:
d["metrics"].append(sort_by)
d["orderby"] = [(sort_by, not self.form_data.get("order_desc", True))]
if self.form_data.get("order_desc"):
d["orderby"] = [(sort_by, not self.form_data.get("order_desc", True))]
return d

def get_data(self, df: pd.DataFrame) -> VizData:
Expand Down

0 comments on commit 61349b9

Please sign in to comment.