fix: incorrect filter operator emitted by Filter Box (apache#10421)

* fix: equals operator in filter box * fix time range endpoint schema * fix test * bump packages * fix tests * lint
CybercentreCanada · Jul 26, 2020 · 9e0f584 · 9e0f584
1 parent 5d77378
commit 9e0f584
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 8 deletions.
diff --git a/superset-frontend/package-lock.json b/superset-frontend/package-lock.json
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -19,7 +19,7 @@
 
 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,