This is an automated email from the ASF dual-hosted git repository.
villebro pushed a commit to branch 0.37
in repository https://gitbox.apache.org/repos/asf/incubator-superset.git
commit 7b6f88a2729dda7f6c2fc863bc22581ad6aa3e23
Author: Ville Brofeldt <33317356+ville...@users.noreply.github.com>
AuthorDate: Sun Jul 26 12:40:03 2020 +0300
fix: incorrect filter operator emitted by Filter Box (#10421)
* fix: equals operator in filter box
* fix time range endpoint schema
* fix test
* bump packages
* fix tests
* lint
---
superset-frontend/package-lock.json | 6 +++---
superset-frontend/package.json | 2 +-
.../javascripts/dashboard/util/getEffectiveExtraFilters_spec.js | 2 +-
.../src/dashboard/util/charts/getEffectiveExtraFilters.ts | 2 +-
superset/charts/schemas.py | 2 +-
tests/fixtures/query_context.py | 2 +-
6 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/superset-frontend/package-lock.json
b/superset-frontend/package-lock.json
index 6ceccb9..9189030 100644
--- a/superset-frontend/package-lock.json
+++ b/superset-frontend/package-lock.json
@@ -6336,9 +6336,9 @@
}
},
"@superset-ui/query": {
- "version": "0.14.12",
- "resolved":
"https://registry.npmjs.org/@superset-ui/query/-/query-0.14.12.tgz";,
- "integrity":
"sha512-mCs9qg7z4GWlMuImrAfqEdVcwPFaSZ2EwbC8H4rdiiRy3duhJGO81Wnvk8J4S1+8L1PwXx+nLVPDjh/Mg7u65g=="
+ "version": "0.14.15",
+ "resolved":
"https://registry.npmjs.org/@superset-ui/query/-/query-0.14.15.tgz";,
+ "integrity":
"sha512-k89EuCkXp3LmbBSm8yYpmykeoJNy1HvMj3jNRwYS0kvV7nNd267oAdXl8UnFzl+htxqwLUIidcXN9vzydB4Whw=="
},
"@superset-ui/style": {
"version": "0.14.9",
diff --git a/superset-frontend/package.json b/superset-frontend/package.json
index b07854c..fe07884 100644
--- a/superset-frontend/package.json
+++ b/superset-frontend/package.json
@@ -94,7 +94,7 @@
"@superset-ui/plugin-chart-table": "^0.14.11",
"@superset-ui/plugin-chart-word-cloud": "^0.14.9",
"@superset-ui/preset-chart-xy": "^0.14.9",
- "@superset-ui/query": "^0.14.12",
+ "@superset-ui/query": "^0.14.15",
"@superset-ui/style": "^0.14.9",
"@superset-ui/superset-ui": "^0.14.9",
"@superset-ui/time-format": "^0.14.9",
diff --git
a/superset-frontend/spec/javascripts/dashboard/util/getEffectiveExtraFilters_spec.js
b/superset-frontend/spec/javascripts/dashboard/util/getEffectiveExtraFilters_spec.js
index e8b2771..5c2ad11 100644
---
a/superset-frontend/spec/javascripts/dashboard/util/getEffectiveExtraFilters_spec.js
+++
b/superset-frontend/spec/javascripts/dashboard/util/getEffectiveExtraFilters_spec.js
@@ -33,7 +33,7 @@ describe('getEffectiveExtraFilters', () => {
},
{
col: '__time_range',
- op: '=',
+ op: '==',
val: ' : 2020-07-17T00:00:00',
},
]);
diff --git
a/superset-frontend/src/dashboard/util/charts/getEffectiveExtraFilters.ts
b/superset-frontend/src/dashboard/util/charts/getEffectiveExtraFilters.ts
index 0327d56..7f56c77 100644
--- a/superset-frontend/src/dashboard/util/charts/getEffectiveExtraFilters.ts
+++ b/superset-frontend/src/dashboard/util/charts/getEffectiveExtraFilters.ts
@@ -22,7 +22,7 @@ export default function getEffectiveExtraFilters(filters:
DataRecordFilters) {
return Object.entries(filters)
.map(([column, values]) => ({
col: column,
- op: Array.isArray(values) ? 'in' : '=',
+ op: Array.isArray(values) ? 'in' : '==',
val: values,
}))
.filter(filter => filter.val !== null);
diff --git a/superset/charts/schemas.py b/superset/charts/schemas.py
index 942c895..cdea43c 100644
--- a/superset/charts/schemas.py
+++ b/superset/charts/schemas.py
@@ -561,7 +561,7 @@ class ChartDataExtrasSchema(Schema):
time_range_endpoints = fields.List(
fields.String(
- validate=validate.OneOf(choices=("INCLUSIVE", "EXCLUSIVE")),
+ validate=validate.OneOf(choices=("unknown", "inclusive",
"exclusive")),
description="A list with two values, stating if start/end should
be "
"inclusive/exclusive.",
)
diff --git a/tests/fixtures/query_context.py b/tests/fixtures/query_context.py
index e886fda..fc1b8ce 100644
--- a/tests/fixtures/query_context.py
+++ b/tests/fixtures/query_context.py
@@ -19,7 +19,7 @@ from typing import Any, Dict, List
QUERY_OBJECTS = {
"birth_names": {
- "extras": {"where": "", "time_range_endpoints": ["INCLUSIVE",
"EXCLUSIVE"],},
+ "extras": {"where": "", "time_range_endpoints": ["inclusive",
"exclusive"]},
"granularity": "ds",
"groupby": ["name"],
"is_timeseries": False,
