You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@superset.apache.org by gr...@apache.org on 2018/06/27 18:00:56 UTC
[incubator-superset] branch master updated: [dashobard fix]: fix
validation check for default_filters (#5297)
This is an automated email from the ASF dual-hosted git repository.
graceguo 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 17b4298 [dashobard fix]: fix validation check for default_filters (#5297)
17b4298 is described below
commit 17b4298401eecf4ef33036e1508a950ac8205f4a
Author: Grace Guo <gr...@airbnb.com>
AuthorDate: Wed Jun 27 11:00:50 2018 -0700
[dashobard fix]: fix validation check for default_filters (#5297)
---
superset/views/core.py | 14 +++++++++-----
tests/dashboard_tests.py | 25 +++++++++++++++++++++++++
2 files changed, 34 insertions(+), 5 deletions(-)
diff --git a/superset/views/core.py b/superset/views/core.py
index be951a1..7c39f1c 100755
--- a/superset/views/core.py
+++ b/superset/views/core.py
@@ -1637,7 +1637,11 @@ class Superset(BaseSupersetView):
if 'filter_immune_slice_fields' not in md:
md['filter_immune_slice_fields'] = {}
md['expanded_slices'] = data['expanded_slices']
- md['default_filters'] = data.get('default_filters', '')
+ default_filters_data = json.loads(data.get('default_filters', '{}'))
+ applicable_filters =\
+ {key: v for key, v in default_filters_data.items()
+ if int(key) in slice_ids}
+ md['default_filters'] = json.dumps(applicable_filters)
dashboard.json_metadata = json.dumps(md, indent=4)
return
@@ -1681,10 +1685,10 @@ class Superset(BaseSupersetView):
md['filter_immune_slice_fields'] = {}
md['expanded_slices'] = data['expanded_slices']
default_filters_data = json.loads(data.get('default_filters', '{}'))
- for key in default_filters_data.keys():
- if int(key) not in slice_ids:
- del default_filters_data[key]
- md['default_filters'] = json.dumps(default_filters_data)
+ applicable_filters = \
+ {key: v for key, v in default_filters_data.items()
+ if int(key) in slice_ids}
+ md['default_filters'] = json.dumps(applicable_filters)
dashboard.json_metadata = json.dumps(md, indent=4)
@api
diff --git a/tests/dashboard_tests.py b/tests/dashboard_tests.py
index 671c07d..6cc5753 100644
--- a/tests/dashboard_tests.py
+++ b/tests/dashboard_tests.py
@@ -98,6 +98,31 @@ class DashboardTests(SupersetTestCase):
resp = self.get_resp(new_url)
self.assertIn('North America', resp)
+ def test_save_dash_with_invalid_filters(self, username='admin'):
+ self.login(username=username)
+ dash = db.session.query(models.Dashboard).filter_by(
+ slug='world_health').first()
+
+ # add an invalid filter slice
+ filters = {str(99999): {'region': ['North America']}}
+ default_filters = json.dumps(filters)
+ data = {
+ 'css': '',
+ 'expanded_slices': {},
+ 'positions': dash.position_array,
+ 'dashboard_title': dash.dashboard_title,
+ 'default_filters': default_filters,
+ }
+
+ url = '/superset/save_dash/{}/'.format(dash.id)
+ resp = self.get_resp(url, data=dict(data=json.dumps(data)))
+ self.assertIn('SUCCESS', resp)
+
+ updatedDash = db.session.query(models.Dashboard).filter_by(
+ slug='world_health').first()
+ new_url = updatedDash.url
+ self.assertNotIn('region', new_url)
+
def test_save_dash_with_dashboard_title(self, username='admin'):
self.login(username=username)
dash = (