From 39e262a0304848bbf9923f4c8ff8e5f0999f0dbd Mon Sep 17 00:00:00 2001
From: Maxime Beauchemin <maximebeauchemin@gmail.com>
Date: Wed, 21 Sep 2016 12:57:00 -0700
Subject: [PATCH 1/2] [FilterBox] dashboard date range filtering

---
 caravel/assets/.eslintignore                  | 13 +--
 caravel/assets/javascripts/modules/caravel.js |  2 +-
 caravel/assets/package.json                   | 16 ++--
 caravel/assets/visualizations/filter_box.css  |  3 +
 caravel/assets/visualizations/filter_box.jsx  | 87 ++++++++++++++-----
 caravel/forms.py                              |  5 ++
 caravel/viz.py                                | 45 ++++++----
 7 files changed, 119 insertions(+), 52 deletions(-)

diff --git a/caravel/assets/.eslintignore b/caravel/assets/.eslintignore
index f9657ae67c1..7b1f78cba3c 100644
--- a/caravel/assets/.eslintignore
+++ b/caravel/assets/.eslintignore
@@ -1,7 +1,10 @@
-node_modules/*
-vendor/*
+**/*{.,-}min.js
+**/*.sh
+coverage/**
 dist/*
-stylesheets/*
+images/*
+node_modules/*
+node_modules*/*
 spec/*
-coverage/**
-**/*{.,-}min.js
+stylesheets/*
+vendor/*
diff --git a/caravel/assets/javascripts/modules/caravel.js b/caravel/assets/javascripts/modules/caravel.js
index c39877e162b..f6e7e577778 100644
--- a/caravel/assets/javascripts/modules/caravel.js
+++ b/caravel/assets/javascripts/modules/caravel.js
@@ -58,7 +58,7 @@ const px = function () {
     const containerId = data.token + '_con';
     const selector = '#' + containerId;
     const container = $(selector);
-    const sliceId = data.sliceId;
+    const sliceId = data.slice_id;
     let dttm = 0;
     const stopwatch = function () {
       dttm += 10;
diff --git a/caravel/assets/package.json b/caravel/assets/package.json
index be99cc569b3..24f238dd9d0 100644
--- a/caravel/assets/package.json
+++ b/caravel/assets/package.json
@@ -12,8 +12,7 @@
     "cover": "babel-node ./node_modules/.bin/istanbul cover _mocha -- --require spec/helpers/browser.js --recursive spec/**/*_spec.*",
     "dev": "NODE_ENV=dev webpack -d --watch --colors --progress",
     "prod": "NODE_ENV=production webpack -p --colors --progress",
-    "lint": "npm run --silent lint:js",
-    "lint:js": "eslint --ignore-path=.eslintignore --ext .js,.jsx ."
+    "lint": "eslint --ignore-path=.eslintignore --ext .js,.jsx ."
   },
   "repository": {
     "type": "git",
@@ -39,6 +38,7 @@
   "dependencies": {
     "autobind-decorator": "^1.3.3",
     "babel-cli": "^6.14.0",
+    "babel-preset-es2015": "^6.14.0",
     "bootstrap": "^3.3.6",
     "bootstrap-datepicker": "^1.6.0",
     "brace": "^0.7.0",
@@ -62,11 +62,11 @@
     "moments": "0.0.2",
     "mustache": "^2.2.1",
     "nvd3": "1.8.4",
-    "react": "^15.2.1",
+    "react": "^15.3.2",
     "react-ace": "^3.4.1",
     "react-bootstrap": "^0.30.3",
     "react-bootstrap-table": "^2.3.8",
-    "react-dom": "^0.14.8",
+    "react-dom": "^15.3.2",
     "react-draggable": "^2.1.2",
     "react-grid-layout": "^0.13.1",
     "react-map-gl": "^1.0.0-beta-10",
@@ -89,8 +89,7 @@
     "babel": "^6.3.26",
     "babel-core": "^6.10.4",
     "babel-loader": "^6.2.4",
-    "babel-preset-airbnb": "^1.1.1",
-    "babel-preset-es2015": "^6.9.0",
+    "babel-preset-airbnb": "^2.0.0",
     "babel-preset-react": "^6.11.1",
     "chai": "^3.5.0",
     "codeclimate-test-reporter": "^0.3.3",
@@ -99,7 +98,7 @@
     "eslint": "^2.13.1",
     "eslint-config-airbnb": "^9.0.1",
     "eslint-plugin-import": "^1.11.1",
-    "eslint-plugin-jsx-a11y": "^2.0.1",
+    "eslint-plugin-jsx-a11y": "^1.2.0",
     "eslint-plugin-react": "^5.2.2",
     "exports-loader": "^0.6.3",
     "istanbul": "^1.0.0-alpha",
@@ -110,8 +109,7 @@
     "less": "^2.6.1",
     "less-loader": "^2.2.2",
     "mocha": "^2.4.5",
-    "react-addons-test-utils": "^0.14.8",
-    "react-dom": "^0.14.8",
+    "react-addons-test-utils": "^15.3.2",
     "style-loader": "^0.13.0",
     "transform-loader": "^0.2.3",
     "url-loader": "^0.5.7",
diff --git a/caravel/assets/visualizations/filter_box.css b/caravel/assets/visualizations/filter_box.css
index 43b193032eb..388c13d550e 100644
--- a/caravel/assets/visualizations/filter_box.css
+++ b/caravel/assets/visualizations/filter_box.css
@@ -27,3 +27,6 @@ ul.select2-results div.filter_box{
 .filter_box:hover {
     z-index: 1000;
 }
+.m-b-5 {
+    margin-bottom: 5px;
+}
diff --git a/caravel/assets/visualizations/filter_box.jsx b/caravel/assets/visualizations/filter_box.jsx
index ca56ebb523e..322a1b309a1 100644
--- a/caravel/assets/visualizations/filter_box.jsx
+++ b/caravel/assets/visualizations/filter_box.jsx
@@ -10,6 +10,29 @@ import '../stylesheets/react-select/select.less';
 
 import './filter_box.css';
 
+const TIME_CHOICES = [
+  '1 hour ago',
+  '12 hours ago',
+  '1 day ago',
+  '7 days ago',
+  '28 days ago',
+  '90 days ago',
+  '1 year ago',
+];
+
+const propTypes = {
+  origSelectedValues: React.PropTypes.object,
+  filtersChoices: React.PropTypes.object,
+  onChange: React.PropTypes.func,
+  showDateFilter: React.PropTypes.bool,
+};
+
+const defaultProps = {
+  origSelectedValues: {},
+  onChange: () => {},
+  showDateFilter: false,
+};
+
 class FilterBox extends React.Component {
   constructor(props) {
     super(props);
@@ -17,7 +40,42 @@ class FilterBox extends React.Component {
       selectedValues: props.origSelectedValues,
     };
   }
+  changeFilter(filter, options) {
+    let vals = null;
+    if (options) {
+      if (Array.isArray(options)) {
+        vals = options.map((opt) => opt.value);
+      } else {
+        vals = options.value;
+      }
+    }
+    const selectedValues = Object.assign({}, this.state.selectedValues);
+    selectedValues[filter] = vals;
+    this.setState({ selectedValues });
+    this.props.onChange(filter, vals);
+  }
   render() {
+    let dateFilter;
+    if (this.props.showDateFilter) {
+      dateFilter = ['__from', '__to'].map((field) => {
+        const val = this.state.selectedValues[field];
+        const choices = TIME_CHOICES.slice();
+        if (!choices.includes(val)) {
+          choices.push(val);
+        }
+        const options = choices.map((s) => ({ value: s, label: s }));
+        return (
+          <div className="m-b-5">
+            {field.replace('__', '')}
+            <Select.Creatable
+              options={options}
+              value={this.state.selectedValues[field]}
+              onChange={this.changeFilter.bind(this, field)}
+            />
+          </div>
+        );
+      });
+    }
     const filters = Object.keys(this.props.filtersChoices).map((filter) => {
       const data = this.props.filtersChoices[filter];
       const maxes = {};
@@ -25,7 +83,7 @@ class FilterBox extends React.Component {
         return d.metric;
       });
       return (
-        <div>
+        <div key={filter} className="m-b-5">
           {filter}
           <Select
             placeholder={`Select [${filter}]`}
@@ -44,38 +102,21 @@ class FilterBox extends React.Component {
               };
               return { value: opt.id, label: opt.id, style };
             })}
-            onChange={(selectedOptions) => {
-              let vals;
-              if (selectedOptions) {
-                vals = selectedOptions.map((opt) => opt.value);
-              } else {
-                vals = null;
-              }
-              const selectedValues = this.state.selectedValues;
-              selectedValues[filter] = vals;
-              this.setState({ selectedValues });
-              this.props.onChange(filter, vals);
-            }}
+            onChange={this.changeFilter.bind(this, filter)}
           />
         </div>
       );
     });
     return (
       <div>
+        {dateFilter}
         {filters}
       </div>
     );
   }
 }
-FilterBox.propTypes = {
-  origSelectedValues: React.PropTypes.objectOf(React.PropTypes.array),
-  filtersChoices: React.PropTypes.objectOf(React.PropTypes.array),
-  onChange: React.PropTypes.function,
-};
-FilterBox.defaultProps = {
-  origSelectedValues: {},
-  onChange() {},
-};
+FilterBox.propTypes = propTypes;
+FilterBox.defaultProps = defaultProps;
 
 function filterBox(slice) {
   const d3token = d3.select(slice.selector);
@@ -86,6 +127,7 @@ function filterBox(slice) {
     // filter box should ignore the dashboard's filters
     const url = slice.jsonEndpoint({ extraFilters: false });
     $.getJSON(url, (payload) => {
+      const fd = payload.form_data;
       const filtersChoices = {};
       // Making sure the ordering of the fields matches the setting in the
       // dropdown as it may have been shuffled while serialized to json
@@ -96,6 +138,7 @@ function filterBox(slice) {
         <FilterBox
           filtersChoices={filtersChoices}
           onChange={slice.setFilter}
+          showDateFilter={fd.date_filter}
           origSelectedValues={slice.getFilters() || {}}
         />,
         document.getElementById(slice.containerId)
diff --git a/caravel/forms.py b/caravel/forms.py
index 767a31e4346..638d9f53441 100755
--- a/caravel/forms.py
+++ b/caravel/forms.py
@@ -749,6 +749,11 @@ def __init__(self, viz):
                 "description": _(
                     "Whether to display the time range interactive selector")
             }),
+            'date_filter': (BetterBooleanField, {
+                "label": _("Date Filter"),
+                "default": False,
+                "description": _("Whether to include a time filter")
+            }),
             'show_datatable': (BetterBooleanField, {
                 "label": _("Data Table"),
                 "default": False,
diff --git a/caravel/viz.py b/caravel/viz.py
index 181c87efbf7..ec48ce78068 100755
--- a/caravel/viz.py
+++ b/caravel/viz.py
@@ -192,6 +192,17 @@ def form(self):
     def form_class(self):
         return FormFactory(self).get_form()
 
+    def get_extra_filters(self):
+        extra_filters = self.form_data.get('extra_filters')
+        if not extra_filters:
+            return {}
+        extra_filters = json.loads(extra_filters)
+        # removing per-slice details
+        summary = {}
+        for flt in extra_filters.values():
+            summary.update(flt)
+        return summary
+
     def query_filters(self, is_having_filter=False):
         """Processes the filters for the query"""
         form_data = self.form_data
@@ -205,18 +216,17 @@ def query_filters(self, is_having_filter=False):
             if col and op and eq is not None:
                 filters.append((col, op, eq))
 
+        if is_having_filter:
+            return filters
+
         # Extra filters (coming from dashboard)
-        extra_filters = form_data.get('extra_filters')
-        if extra_filters and not is_having_filter:
-            extra_filters = json.loads(extra_filters)
-            for slice_filters in extra_filters.values():
-                for col, vals in slice_filters.items():
-                    if not (col and vals):
-                        continue
-                    elif col in self.datasource.filterable_column_names:
-                        # Quote values with comma to avoid conflict
-                        vals = ["'%s'" % x if "," in x else x for x in vals]
-                        filters += [(col, 'in', ",".join(vals))]
+        for col, vals in self.get_extra_filters().items():
+            if not (col and vals):
+                continue
+            elif col in self.datasource.filterable_column_names:
+                # Quote values with comma to avoid conflict
+                vals = ["'{}'".format(x) if "," in x else x for x in vals]
+                filters += [(col, 'in', ",".join(vals))]
         return filters
 
     def query_obj(self):
@@ -224,17 +234,21 @@ def query_obj(self):
         form_data = self.form_data
         groupby = form_data.get("groupby") or []
         metrics = form_data.get("metrics") or ['count']
-        granularity = \
+        extra_filters = self.get_extra_filters()
+        granularity = (
             form_data.get("granularity") or form_data.get("granularity_sqla")
+        )
         limit = int(form_data.get("limit", 0))
         row_limit = int(
             form_data.get("row_limit", config.get("ROW_LIMIT")))
-        since = form_data.get("since", "1 year ago")
+        since = (
+            extra_filters.get('__from') or form_data.get("since", "1 year ago")
+        )
         from_dttm = utils.parse_human_datetime(since)
         now = datetime.now()
         if from_dttm > now:
             from_dttm = now - (from_dttm - now)
-        until = form_data.get("until", "now")
+        until = extra_filters.get('__to') or form_data.get("until", "now")
         to_dttm = utils.parse_human_datetime(until)
         if from_dttm > to_dttm:
             flasher("The date range doesn't seem right.", "danger")
@@ -245,7 +259,7 @@ def query_obj(self):
         extras = {
             'where': form_data.get("where", ''),
             'having': form_data.get("having", ''),
-            'having_druid': self.query_filters(True),
+            'having_druid': self.query_filters(is_having_filter=True),
             'time_grain_sqla': form_data.get("time_grain_sqla", ''),
             'druid_time_origin': form_data.get("druid_time_origin", ''),
         }
@@ -1634,6 +1648,7 @@ class FilterBoxViz(BaseViz):
     fieldsets = ({
         'label': None,
         'fields': (
+            ('date_filter', None),
             'groupby',
             'metric',
         )

From d3c6dcde061bdec1bc68e33db4b5e609b38c2137 Mon Sep 17 00:00:00 2001
From: Maxime Beauchemin <maximebeauchemin@gmail.com>
Date: Thu, 22 Sep 2016 14:28:57 -0700
Subject: [PATCH 2/2] Addressing comments

---
 caravel/assets/visualizations/constants.js   | 10 ++++++++++
 caravel/assets/visualizations/filter_box.jsx | 16 ++++------------
 2 files changed, 14 insertions(+), 12 deletions(-)
 create mode 100644 caravel/assets/visualizations/constants.js

diff --git a/caravel/assets/visualizations/constants.js b/caravel/assets/visualizations/constants.js
new file mode 100644
index 00000000000..8cddc0a7ead
--- /dev/null
+++ b/caravel/assets/visualizations/constants.js
@@ -0,0 +1,10 @@
+export const TIME_CHOICES = [
+  '1 hour ago',
+  '12 hours ago',
+  '1 day ago',
+  '7 days ago',
+  '28 days ago',
+  '90 days ago',
+  '1 year ago',
+];
+
diff --git a/caravel/assets/visualizations/filter_box.jsx b/caravel/assets/visualizations/filter_box.jsx
index 322a1b309a1..2cd06955756 100644
--- a/caravel/assets/visualizations/filter_box.jsx
+++ b/caravel/assets/visualizations/filter_box.jsx
@@ -9,27 +9,19 @@ import Select from 'react-select';
 import '../stylesheets/react-select/select.less';
 
 import './filter_box.css';
-
-const TIME_CHOICES = [
-  '1 hour ago',
-  '12 hours ago',
-  '1 day ago',
-  '7 days ago',
-  '28 days ago',
-  '90 days ago',
-  '1 year ago',
-];
+import { TIME_CHOICES } from './constants.js';
 
 const propTypes = {
-  origSelectedValues: React.PropTypes.object,
   filtersChoices: React.PropTypes.object,
   onChange: React.PropTypes.func,
+  origSelectedValues: React.PropTypes.object,
   showDateFilter: React.PropTypes.bool,
 };
 
 const defaultProps = {
-  origSelectedValues: {},
+  filtersChoices: {},
   onChange: () => {},
+  origSelectedValues: {},
   showDateFilter: false,
 };