From 528bd9bfb9f7e9e689e711f20e795b294b8c54e1 Mon Sep 17 00:00:00 2001
From: Maxime Beauchemin <maximebeauchemin@gmail.com>
Date: Mon, 27 Feb 2017 13:58:05 -0800
Subject: [PATCH] [table viz] allow showing time granularity in table (#2284)

The time granularity currently does not show up in table viz. Now
defining a granularity will add an extra ISO-formatted time column in
the table. The column will be added for both grouped by and not grouped
by.
---
 .../explorev2/components/controls/Filter.jsx   | 18 +++++++++++++++---
 superset/models.py                             | 15 +++++++++++----
 2 files changed, 26 insertions(+), 7 deletions(-)

diff --git a/superset/assets/javascripts/explorev2/components/controls/Filter.jsx b/superset/assets/javascripts/explorev2/components/controls/Filter.jsx
index 225c832a1f64b..a06e528fc0bbd 100644
--- a/superset/assets/javascripts/explorev2/components/controls/Filter.jsx
+++ b/superset/assets/javascripts/explorev2/components/controls/Filter.jsx
@@ -4,6 +4,9 @@ import Select from 'react-select';
 import { Button, Row, Col } from 'react-bootstrap';
 import SelectControl from './SelectControl';
 
+const arrayFilterOps = ['in', 'not in'];
+const strFilterOps = ['==', '!=', '>', '<', '>=', '<=', 'regex'];
+
 const propTypes = {
   choices: PropTypes.array,
   changeFilter: PropTypes.func,
@@ -55,6 +58,15 @@ export default class Filter extends React.Component {
     if (event && event.value) {
       value = event.value;
     }
+    if (control === 'op') {
+      if (arrayFilterOps.indexOf(this.props.filter.op) !== -1
+        && strFilterOps.indexOf(value) !== -1) {
+        this.props.changeFilter('val', this.props.filter.val[0]);
+      } else if (strFilterOps.indexOf(this.props.filter.op) !== -1
+        && arrayFilterOps.indexOf(value) !== -1) {
+        this.props.changeFilter('val', [this.props.filter.val]);
+      }
+    }
     this.props.changeFilter(control, value);
     if (control === 'col' && value !== null && this.props.datasource.filter_select) {
       this.fetchFilterValues(value);
@@ -70,13 +82,13 @@ export default class Filter extends React.Component {
         this.fetchFilterValues(filter.col);
       }
     }
-    if (this.props.having) {
-      // druid having filter
+    if (this.props.having || StrFilterOps.indexOf(filter.op) !== -1) {
+      // druid having filter or regex/==/!= filters
       return (
         <input
           type="text"
           onChange={this.changeFilter.bind(this, 'val')}
-          value={filter.value}
+          value={filter.val}
           className="form-control input-sm"
           placeholder="Filter value"
         />
diff --git a/superset/models.py b/superset/models.py
index cf6b1658b39d7..139a7b0776329 100644
--- a/superset/models.py
+++ b/superset/models.py
@@ -1403,7 +1403,8 @@ def visit_column(element, compiler, **kw):
             col_obj = cols.get(col)
             if col_obj and op in ('in', 'not in'):
                 values = [types.strip("'").strip('"') for types in eq]
-                values = [utils.js_string_to_num(s) for s in values]
+                if col_obj.is_num:
+                    values = [utils.js_string_to_num(s) for s in values]
                 cond = col_obj.sqla_col.in_(values)
                 if op == 'not in':
                     cond = ~cond
@@ -2567,8 +2568,7 @@ def increment_timestamp(ts):
             query=query_str,
             duration=datetime.now() - qry_start_dttm)
 
-    @staticmethod
-    def get_filters(raw_filters):
+    def get_filters(self, raw_filters):
         filters = None
         for flt in raw_filters:
             if not all(f in flt for f in ['col', 'op', 'val']):
@@ -2577,6 +2577,11 @@ def get_filters(raw_filters):
             op = flt['op']
             eq = flt['val']
             cond = None
+            if col in self.num_cols:
+                if op in ('in', 'not in'):
+                    eq = [utils.js_string_to_num(v) for v in eq]
+                else:
+                    eq = utils.js_string_to_num(eq)
             if op == '==':
                 cond = Dimension(col) == eq
             elif op == '!=':
@@ -2585,7 +2590,9 @@ def get_filters(raw_filters):
                 fields = []
                 # Distinguish quoted values with regular value types
                 values = [types.replace("'", '') for types in eq]
-                values = [utils.js_string_to_num(s) for s in values]
+                for val in eq:
+                    if col in self.num_cols:
+                        val = utils.js_string_to_num(val)
                 if len(values) > 1:
                     for s in values:
                         s = s.strip()