Skip to content

Commit

Permalink
Merge 92c8282 into 9a24598
Browse files Browse the repository at this point in the history
  • Loading branch information
@x8lucas8x
x8lucas8x committed Jul 30, 2020
2 parents 9a24598 + 92c8282 commit 1fe25d3
Show file tree
Hide file tree
Showing 2 changed files with 21 additions and 19 deletions.
36 changes: 18 additions & 18 deletions fireant/tests/widgets/test_highcharts.py
View file
Expand Up @@ -379,7 +379,7 @@ def test_single_metric_with_a_split_dimension_dimx2_date_str_line_chart(self):
"visible": True,
}
],
"tooltip": {"shared": True, "useHTML": True, "enabled": True},
"tooltip": {"shared": False, "useHTML": True, "enabled": True},
"legend": {"useHTML": True},
"series": [
{
Expand Down Expand Up @@ -489,7 +489,7 @@ def test_single_metric_with_a_split_dimension_dimx2_str_str_line_chart(self):
"visible": True,
}
],
"tooltip": {"shared": True, "useHTML": True, "enabled": True},
"tooltip": {"shared": False, "useHTML": True, "enabled": True},
"legend": {"useHTML": True},
"series": [
{
Expand Down Expand Up @@ -597,7 +597,7 @@ def test_single_metric_with_a_split_dimension_dimx2_str_str_line_chart(self):
"visible": True,
}
],
"tooltip": {"shared": True, "useHTML": True, "enabled": True},
"tooltip": {"shared": False, "useHTML": True, "enabled": True},
"legend": {"useHTML": True},
"series": [
{
Expand Down Expand Up @@ -642,7 +642,7 @@ def test_single_metric_with_a_split_dimension_dimx2_str_str_line_chart(self):
"visible": True,
}
],
"tooltip": {"shared": True, "useHTML": True, "enabled": True},
"tooltip": {"shared": False, "useHTML": True, "enabled": True},
"legend": {"useHTML": True},
"series": [
{
Expand Down Expand Up @@ -764,7 +764,7 @@ def test_multi_metrics_multi_axis_line_chart(self):
"visible": True,
},
],
"tooltip": {"shared": True, "useHTML": True, "enabled": True},
"tooltip": {"shared": False, "useHTML": True, "enabled": True},
"legend": {"useHTML": True},
"series": [
{
Expand Down Expand Up @@ -990,7 +990,7 @@ def test_multi_dim_with_totals_line_chart_and_empty_data(self):
"dashStyle": "Solid",
},
],
"tooltip": {"shared": True, "useHTML": True, "enabled": True},
"tooltip": {"shared": False, "useHTML": True, "enabled": True},
"legend": {"useHTML": True},
},
)
Expand Down Expand Up @@ -1032,7 +1032,7 @@ def test_multi_dim_with_totals_line_chart(self):
"visible": True,
},
],
"tooltip": {"shared": True, "useHTML": True, "enabled": True},
"tooltip": {"shared": False, "useHTML": True, "enabled": True},
"legend": {"useHTML": True},
"series": [
{
Expand Down Expand Up @@ -1241,7 +1241,7 @@ def test_multi_dim_with_totals_on_first_dim_line_chart(self):
"visible": True,
},
],
"tooltip": {"shared": True, "useHTML": True, "enabled": True},
"tooltip": {"shared": False, "useHTML": True, "enabled": True},
"legend": {"useHTML": True},
"series": [
{
Expand Down Expand Up @@ -1869,7 +1869,7 @@ def test_single_metric_bar_chart(self):
"visible": True,
}
],
"tooltip": {"shared": True, "useHTML": True, "enabled": True},
"tooltip": {"shared": False, "useHTML": True, "enabled": True},
"legend": {"useHTML": True},
"series": [
{
Expand Down Expand Up @@ -1914,7 +1914,7 @@ def test_multi_metric_bar_chart(self):
"visible": True,
}
],
"tooltip": {"shared": True, "useHTML": True, "enabled": True},
"tooltip": {"shared": False, "useHTML": True, "enabled": True},
"legend": {"useHTML": True},
"series": [
{
Expand Down Expand Up @@ -2089,7 +2089,7 @@ def test_cont_uni_dims_single_metric_bar_chart(self):
"visible": True,
}
],
"tooltip": {"shared": True, "useHTML": True, "enabled": True},
"tooltip": {"shared": False, "useHTML": True, "enabled": True},
"legend": {"useHTML": True},
"series": [
{
Expand Down Expand Up @@ -2178,7 +2178,7 @@ def test_cont_uni_dims_multi_metric_single_axis_bar_chart(self):
"visible": True,
}
],
"tooltip": {"shared": True, "useHTML": True, "enabled": True},
"tooltip": {"shared": False, "useHTML": True, "enabled": True},
"legend": {"useHTML": True},
"series": [
{
Expand Down Expand Up @@ -2324,7 +2324,7 @@ def test_cont_uni_dims_multi_metric_multi_axis_bar_chart(self):
"visible": True,
},
],
"tooltip": {"shared": True, "useHTML": True, "enabled": True},
"tooltip": {"shared": False, "useHTML": True, "enabled": True},
"legend": {"useHTML": True},
"series": [
{
Expand Down Expand Up @@ -2633,7 +2633,7 @@ def test_cat_uni_dim_with_missing_values(self):
"yAxis": "0",
},
],
"tooltip": {"enabled": True, "shared": True, "useHTML": True},
"tooltip": {"enabled": True, "shared": False, "useHTML": True},
"annotations": [],
"colors": DEFAULT_COLORS,
},
Expand All @@ -2659,7 +2659,7 @@ def test_invisible_y_axis(self):
"visible": False,
}
],
"tooltip": {"shared": True, "useHTML": True, "enabled": True},
"tooltip": {"shared": False, "useHTML": True, "enabled": True},
"legend": {"useHTML": True},
"series": [
{
Expand Down Expand Up @@ -2733,7 +2733,7 @@ def test_pie_chart_metricx1(self):
self.assertEqual(
{
"title": {"text": "All Votes"},
"tooltip": {"shared": True, "useHTML": True, "enabled": True},
"tooltip": {"shared": False, "useHTML": True, "enabled": True},
"legend": {"useHTML": True},
"series": [
{
Expand Down Expand Up @@ -2777,7 +2777,7 @@ def test_pie_chart_metricx2(self):
self.assertEqual(
{
"title": {"text": "Votes and Wins"},
"tooltip": {"shared": True, "useHTML": True, "enabled": True},
"tooltip": {"shared": False, "useHTML": True, "enabled": True},
"legend": {"useHTML": True},
"series": [
{
Expand Down Expand Up @@ -3484,7 +3484,7 @@ def test_dimx2_timeseries_with_annotation(self):
"visible": True,
}
],
"tooltip": {"shared": True, "useHTML": True, "enabled": True},
"tooltip": {"shared": False, "useHTML": True, "enabled": True},
"legend": {"useHTML": True},
"series": [
{
Expand Down
4 changes: 3 additions & 1 deletion fireant/widgets/highcharts.py
View file
Expand Up @@ -232,9 +232,11 @@ def _render_individual_chart(
"colors": self.colors,
"series": series,
"tooltip": {
"shared": True,
"useHTML": True,
"enabled": self.tooltip_visible,
# When only a single datapoint per series is available, shared tooltips should be avoided.
# Since it looks clunky and often supersedes most of the chart.
"shared": all([len(item['data']) > 1 for item in series])
},
"legend": {"useHTML": True},
"annotations": annotations,
Expand Down

0 comments on commit 1fe25d3

Please sign in to comment.