superset-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From johnbod...@apache.org
Subject [incubator-superset] branch master updated: integrating dashboard filters with adhoc filters (#5056)
Date Wed, 23 May 2018 18:46:05 GMT
This is an automated email from the ASF dual-hosted git repository.

johnbodley 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 fa3e4e2  integrating dashboard filters with adhoc filters (#5056)
fa3e4e2 is described below

commit fa3e4e23b331dad2682a8a005facb0a55229cb72
Author: Gabe Lyons <gabe.lyons@airbnb.com>
AuthorDate: Wed May 23 11:46:00 2018 -0700

    integrating dashboard filters with adhoc filters (#5056)
---
 .../assets/src/dashboard/components/Dashboard.jsx  |  3 +-
 superset/utils.py                                  | 41 ++++++++++++++
 superset/views/core.py                             |  1 +
 superset/viz.py                                    | 64 +++++-----------------
 4 files changed, 56 insertions(+), 53 deletions(-)

diff --git a/superset/assets/src/dashboard/components/Dashboard.jsx b/superset/assets/src/dashboard/components/Dashboard.jsx
index 2a6a227..2cb08c3 100644
--- a/superset/assets/src/dashboard/components/Dashboard.jsx
+++ b/superset/assets/src/dashboard/components/Dashboard.jsx
@@ -144,8 +144,7 @@ class Dashboard extends React.PureComponent {
 
   getFormDataExtra(slice) {
     const formDataExtra = Object.assign({}, slice.formData);
-    const extraFilters = this.effectiveExtraFilters(slice.slice_id);
-    formDataExtra.extra_filters = formDataExtra.filters.concat(extraFilters);
+    formDataExtra.extra_filters = this.effectiveExtraFilters(slice.slice_id);
     return formDataExtra;
   }
 
diff --git a/superset/utils.py b/superset/utils.py
index 25d4ef3..08ce0d2 100644
--- a/superset/utils.py
+++ b/superset/utils.py
@@ -841,3 +841,44 @@ def ensure_path_exists(path):
     except OSError as exc:
         if not (os.path.isdir(path) and exc.errno == errno.EEXIST):
             raise
+
+
+def split_adhoc_filters_into_base_filters(fd):
+    """
+    Mutates form data to restructure the adhoc filters in the form of the four base
+    filters, `where`, `having`, `filters`, and `having_filters` which represent
+    free form where sql, free form having sql, structured where clauses and structured
+    having clauses.
+    """
+    adhoc_filters = fd.get('adhoc_filters', None)
+    if isinstance(adhoc_filters, list):
+        simple_where_filters = []
+        simple_having_filters = []
+        sql_where_filters = []
+        sql_having_filters = []
+        for adhoc_filter in adhoc_filters:
+            expression_type = adhoc_filter.get('expressionType')
+            clause = adhoc_filter.get('clause')
+            if expression_type == 'SIMPLE':
+                if clause == 'WHERE':
+                    simple_where_filters.append({
+                        'col': adhoc_filter.get('subject'),
+                        'op': adhoc_filter.get('operator'),
+                        'val': adhoc_filter.get('comparator'),
+                    })
+                elif clause == 'HAVING':
+                    simple_having_filters.append({
+                        'col': adhoc_filter.get('subject'),
+                        'op': adhoc_filter.get('operator'),
+                        'val': adhoc_filter.get('comparator'),
+                    })
+            elif expression_type == 'SQL':
+                if clause == 'WHERE':
+                    sql_where_filters.append(adhoc_filter.get('sqlExpression'))
+                elif clause == 'HAVING':
+                    sql_having_filters.append(adhoc_filter.get('sqlExpression'))
+        fd['where'] = ' AND '.join(['({})'.format(sql) for sql in sql_where_filters])
+        fd['having'] = ' AND '.join(['({})'.format(sql) for sql in sql_having_filters])
+        fd['having_filters'] = simple_having_filters
+        fd['filters'] = simple_where_filters
+        del fd['adhoc_filters']
diff --git a/superset/views/core.py b/superset/views/core.py
index e8fc43f..40d24b2 100755
--- a/superset/views/core.py
+++ b/superset/views/core.py
@@ -1279,6 +1279,7 @@ class Superset(BaseSupersetView):
         form_data['datasource'] = str(datasource_id) + '__' + datasource_type
 
         # On explore, merge extra filters into the form data
+        utils.split_adhoc_filters_into_base_filters(form_data)
         merge_extra_filters(form_data)
 
         # merge request url params
diff --git a/superset/viz.py b/superset/viz.py
index 5565993..f3db31c 100644
--- a/superset/viz.py
+++ b/superset/viz.py
@@ -235,7 +235,11 @@ class BaseViz(object):
             groupby.remove(DTTM_ALIAS)
             is_timeseries = True
 
-        # Add extra filters into the query form data
+        # extras are used to query elements specific to a datasource type
+        # for instance the extra where clause that applies only to Tables
+
+        utils.split_adhoc_filters_into_base_filters(form_data)
+
         merge_extra_filters(form_data)
 
         granularity = (
@@ -272,57 +276,15 @@ class BaseViz(object):
         self.from_dttm = from_dttm
         self.to_dttm = to_dttm
 
-        # extras are used to query elements specific to a datasource type
-        # for instance the extra where clause that applies only to Tables
+        filters = form_data.get('filters', [])
 
-        extras = {}
-        filters = []
-        adhoc_filters = form_data.get('adhoc_filters', None)
-        if adhoc_filters is None:
-            extras = {
-                'where': form_data.get('where', ''),
-                'having': form_data.get('having', ''),
-                'having_druid': form_data.get('having_filters', []),
-                'time_grain_sqla': form_data.get('time_grain_sqla', ''),
-                'druid_time_origin': form_data.get('druid_time_origin', ''),
-            }
-            filters = form_data.get('filters', [])
-        elif isinstance(adhoc_filters, list):
-            simple_where_filters = []
-            simple_having_filters = []
-            sql_where_filters = []
-            sql_having_filters = []
-            for adhoc_filter in adhoc_filters:
-                expression_type = adhoc_filter.get('expressionType')
-                clause = adhoc_filter.get('clause')
-                if expression_type == 'SIMPLE':
-                    if clause == 'WHERE':
-                        simple_where_filters.append({
-                            'col': adhoc_filter.get('subject'),
-                            'op': adhoc_filter.get('operator'),
-                            'val': adhoc_filter.get('comparator'),
-                        })
-                    elif clause == 'HAVING':
-                        simple_having_filters.append({
-                            'col': adhoc_filter.get('subject'),
-                            'op': adhoc_filter.get('operator'),
-                            'val': adhoc_filter.get('comparator'),
-                        })
-                elif expression_type == 'SQL':
-                    if clause == 'WHERE':
-                        sql_where_filters.append(adhoc_filter.get('sqlExpression'))
-                    elif clause == 'HAVING':
-                        sql_having_filters.append(adhoc_filter.get('sqlExpression'))
-            extras = {
-                'where': ' AND '.join(['({})'.format(sql) for sql in sql_where_filters]),
-                'having': ' AND '.join(
-                    ['({})'.format(sql) for sql in sql_having_filters],
-                ),
-                'having_druid': simple_having_filters,
-                'time_grain_sqla': form_data.get('time_grain_sqla', ''),
-                'druid_time_origin': form_data.get('druid_time_origin', ''),
-            }
-            filters = simple_where_filters
+        extras = {
+            'where': form_data.get('where', ''),
+            'having': form_data.get('having', ''),
+            'having_druid': form_data.get('having_filters', []),
+            'time_grain_sqla': form_data.get('time_grain_sqla', ''),
+            'druid_time_origin': form_data.get('druid_time_origin', ''),
+        }
 
         d = {
             'granularity': granularity,

-- 
To stop receiving notification emails like this one, please contact
johnbodley@apache.org.

Mime
View raw message