You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@superset.apache.org by ma...@apache.org on 2018/03/14 23:38:50 UTC
[incubator-superset] branch master updated: Show "Range Filter" by
default (#4604)
This is an automated email from the ASF dual-hosted git repository.
maximebeauchemin pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-superset.git
The following commit(s) were added to refs/heads/master by this push:
new 86a03d1 Show "Range Filter" by default (#4604)
86a03d1 is described below
commit 86a03d1dc8d82ee3db10888cfab47019f556158c
Author: Beto Dealmeida <ro...@dealmeida.net>
AuthorDate: Wed Mar 14 16:38:47 2018 -0700
Show "Range Filter" by default (#4604)
* Show Range Filter by default
* Auto show brush
* Backwards compat
* Small fix
---
superset/assets/javascripts/explore/stores/controls.jsx | 12 +++++++++---
superset/assets/visualizations/nvd3_vis.js | 9 +++++++--
2 files changed, 16 insertions(+), 5 deletions(-)
diff --git a/superset/assets/javascripts/explore/stores/controls.jsx b/superset/assets/javascripts/explore/stores/controls.jsx
index 641aaae..e9d7301 100644
--- a/superset/assets/javascripts/explore/stores/controls.jsx
+++ b/superset/assets/javascripts/explore/stores/controls.jsx
@@ -1261,10 +1261,16 @@ export const controls = {
},
show_brush: {
- type: 'CheckboxControl',
- label: t('Range Filter'),
+ type: 'SelectControl',
+ label: t('Show Range Filter'),
renderTrigger: true,
- default: false,
+ clearable: false,
+ default: 'auto',
+ choices: [
+ ['yes', 'Yes'],
+ ['no', 'No'],
+ ['auto', 'Auto'],
+ ],
description: t('Whether to display the time range interactive selector'),
},
diff --git a/superset/assets/visualizations/nvd3_vis.js b/superset/assets/visualizations/nvd3_vis.js
index 8bd7229..be73433 100644
--- a/superset/assets/visualizations/nvd3_vis.js
+++ b/superset/assets/visualizations/nvd3_vis.js
@@ -22,6 +22,7 @@ const minBarWidth = 15;
// Limit on how large axes margins can grow as the chart window is resized
const maxMarginPad = 30;
const animationTime = 1000;
+const minHeightForBrush = 480;
const BREAKPOINTS = {
small: 340,
@@ -158,9 +159,14 @@ function nvd3Vis(slice, payload) {
if (svg.empty()) {
svg = d3.select(slice.selector).append('svg');
}
+ let height = slice.height();
switch (vizType) {
case 'line':
- if (fd.show_brush) {
+ if (
+ fd.show_brush === true ||
+ fd.show_brush === 'yes' ||
+ (fd.show_brush === 'auto' && height >= minHeightForBrush)
+ ) {
chart = nv.models.lineWithFocusChart();
chart.focus.xScale(d3.time.scale.utc());
chart.x2Axis.staggerLabels(false);
@@ -332,7 +338,6 @@ function nvd3Vis(slice, payload) {
}
}
- let height = slice.height();
if (vizType === 'bullet') {
height = Math.min(height, 50);
}
--
To stop receiving notification emails like this one, please contact
maximebeauchemin@apache.org.