This is an automated email from the ASF dual-hosted git repository.
villebro pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/superset.git
The following commit(s) were added to refs/heads/master by this push:
new 93ebe3d fix: handle mixed time-series error (#16928)
93ebe3d is described below
commit 93ebe3d963c857ccc4185ef3ca5c6175397e17c9
Author: Youkyoung Cha <[email protected]>
AuthorDate: Tue Oct 5 22:00:22 2021 +0900
fix: handle mixed time-series error (#16928)
* rebase to master
* Fix line 402
Co-authored-by: yougyoung <[email protected]>
---
superset-frontend/src/chart/chartAction.js | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/superset-frontend/src/chart/chartAction.js
b/superset-frontend/src/chart/chartAction.js
index 5410caa..af5ae0c 100644
--- a/superset-frontend/src/chart/chartAction.js
+++ b/superset-frontend/src/chart/chartAction.js
@@ -395,13 +395,16 @@ export function exploreJSON(
.then(({ response, json }) => {
if (isFeatureEnabled(FeatureFlag.GLOBAL_ASYNC_QUERIES)) {
// deal with getChartDataRequest transforming the response data
- const result = 'result' in json ? json.result[0] : json;
+ const result = 'result' in json ? json.result : json;
switch (response.status) {
case 200:
// Query results returned synchronously, meaning query was
already cached.
- return Promise.resolve([result]);
+ return Promise.resolve(result);
case 202:
// Query is running asynchronously and we must await the results
+ if (shouldUseLegacyApi(formData)) {
+ return waitForAsyncData(result[0]);
+ }
return waitForAsyncData(result);
default:
throw new Error(
