From 8235694348bdd3521b06671d03ce43926e175dfe Mon Sep 17 00:00:00 2001 From: Ville Brofeldt Date: Fri, 24 Jul 2020 08:38:31 +0300 Subject: [PATCH 1/6] fix: equals operator in filter box --- .../src/dashboard/util/charts/getEffectiveExtraFilters.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/superset-frontend/src/dashboard/util/charts/getEffectiveExtraFilters.ts b/superset-frontend/src/dashboard/util/charts/getEffectiveExtraFilters.ts index 0327d56cf059..7f56c77d1673 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); From 3071b6618135976b7af992f41d770f0d1d60055a Mon Sep 17 00:00:00 2001 From: Ville Brofeldt Date: Fri, 24 Jul 2020 11:45:10 +0300 Subject: [PATCH 2/6] fix time range endpoint schema --- superset/charts/schemas.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/superset/charts/schemas.py b/superset/charts/schemas.py index 0449f65da2c0..96fc7b520a78 100644 --- a/superset/charts/schemas.py +++ b/superset/charts/schemas.py @@ -659,7 +659,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.", ) From cd7940410d5893ef98bb5bef0bc617e5a9872a82 Mon Sep 17 00:00:00 2001 From: Ville Brofeldt Date: Fri, 24 Jul 2020 13:18:52 +0300 Subject: [PATCH 3/6] fix test --- .../javascripts/dashboard/util/getEffectiveExtraFilters_spec.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/superset-frontend/spec/javascripts/dashboard/util/getEffectiveExtraFilters_spec.js b/superset-frontend/spec/javascripts/dashboard/util/getEffectiveExtraFilters_spec.js index e8b277191526..5c2ad11c9225 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', }, ]); From f2d0d6b698ce657231213f5b96ace09541f203de Mon Sep 17 00:00:00 2001 From: Ville Brofeldt Date: Fri, 24 Jul 2020 14:34:54 +0300 Subject: [PATCH 4/6] bump packages --- superset-frontend/package-lock.json | 6 +++--- superset-frontend/package.json | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/superset-frontend/package-lock.json b/superset-frontend/package-lock.json index a6e0b208e634..ddcd24c02e95 100644 --- a/superset-frontend/package-lock.json +++ b/superset-frontend/package-lock.json @@ -8694,9 +8694,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 c6a35caec2aa..e1535cc89a2b 100644 --- a/superset-frontend/package.json +++ b/superset-frontend/package.json @@ -98,7 +98,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", From 14d78d5750f5c6dfd8316855e7bcd5a12d94d791 Mon Sep 17 00:00:00 2001 From: Ville Brofeldt Date: Fri, 24 Jul 2020 15:47:03 +0300 Subject: [PATCH 5/6] fix tests --- tests/fixtures/query_context.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/fixtures/query_context.py b/tests/fixtures/query_context.py index e886fda74f94..b273d00fca05 100644 --- 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, From ed3bf972c0b80e05403db53107ace076c606e351 Mon Sep 17 00:00:00 2001 From: Ville Brofeldt Date: Fri, 24 Jul 2020 16:19:33 +0300 Subject: [PATCH 6/6] lint --- tests/fixtures/query_context.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/fixtures/query_context.py b/tests/fixtures/query_context.py index b273d00fca05..fc1b8ce9ca25 100644 --- 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,