iop
/
superset
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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
This commit is contained in:
Ville Brofeldt 2020-07-26 12:40:03 +03:00 committed by GitHub
parent ea3c3bbae4
commit 5b6ff4944c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
superset-frontend/package-lock.json generated
View File

@ -8694,9 +8694,9 @@
} }
}, },
"@superset-ui/query": { "@superset-ui/query": {
"version": "0.14.12", "version": "0.14.15",
"resolved": "https://registry.npmjs.org/@superset-ui/query/-/query-0.14.12.tgz", "resolved": "https://registry.npmjs.org/@superset-ui/query/-/query-0.14.15.tgz",
"integrity": "sha512-mCs9qg7z4GWlMuImrAfqEdVcwPFaSZ2EwbC8H4rdiiRy3duhJGO81Wnvk8J4S1+8L1PwXx+nLVPDjh/Mg7u65g==" "integrity": "sha512-k89EuCkXp3LmbBSm8yYpmykeoJNy1HvMj3jNRwYS0kvV7nNd267oAdXl8UnFzl+htxqwLUIidcXN9vzydB4Whw=="
}, },
"@superset-ui/style": { "@superset-ui/style": {
"version": "0.14.9", "version": "0.14.9",

2
superset-frontend/package.json
View File

@ -98,7 +98,7 @@
"@superset-ui/plugin-chart-table": "^0.14.11", "@superset-ui/plugin-chart-table": "^0.14.11",
"@superset-ui/plugin-chart-word-cloud": "^0.14.9", "@superset-ui/plugin-chart-word-cloud": "^0.14.9",
"@superset-ui/preset-chart-xy": "^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/style": "^0.14.9",
"@superset-ui/superset-ui": "^0.14.9", "@superset-ui/superset-ui": "^0.14.9",
"@superset-ui/time-format": "^0.14.9", "@superset-ui/time-format": "^0.14.9",

2
superset-frontend/spec/javascripts/dashboard/util/getEffectiveExtraFilters_spec.js
View File

@ -33,7 +33,7 @@ describe('getEffectiveExtraFilters', () => {
}, },
{ {
col: '__time_range', col: '__time_range',
op: '=', op: '==',
val: ' : 2020-07-17T00:00:00', val: ' : 2020-07-17T00:00:00',
}, },
]); ]);

2
superset-frontend/src/dashboard/util/charts/getEffectiveExtraFilters.ts
View File

@ -22,7 +22,7 @@ export default function getEffectiveExtraFilters(filters: DataRecordFilters) {
return Object.entries(filters) return Object.entries(filters)
.map(([column, values]) => ({ .map(([column, values]) => ({
col: column, col: column,
op: Array.isArray(values) ? 'in' : '=', op: Array.isArray(values) ? 'in' : '==',
val: values, val: values,
})) }))
.filter(filter => filter.val !== null); .filter(filter => filter.val !== null);

2
superset/charts/schemas.py
View File

@ -659,7 +659,7 @@ class ChartDataExtrasSchema(Schema):
time_range_endpoints = fields.List( time_range_endpoints = fields.List(
fields.String( 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 " description="A list with two values, stating if start/end should be "
"inclusive/exclusive.", "inclusive/exclusive.",
) )

2
tests/fixtures/query_context.py vendored
View File

@ -19,7 +19,7 @@ from typing import Any, Dict, List
QUERY_OBJECTS = { QUERY_OBJECTS = {
"birth_names": { "birth_names": {
"extras": {"where": "", "time_range_endpoints": ["INCLUSIVE", "EXCLUSIVE"],}, "extras": {"where": "", "time_range_endpoints": ["inclusive", "exclusive"]},
"granularity": "ds", "granularity": "ds",
"groupby": ["name"], "groupby": ["name"],
"is_timeseries": False, "is_timeseries": False,