From 93ebe3d963c857ccc4185ef3ca5c6175397e17c9 Mon Sep 17 00:00:00 2001 From: Youkyoung Cha <37649640+yougyoung94@users.noreply.github.com> Date: Tue, 5 Oct 2021 22:00:22 +0900 Subject: [PATCH] fix: handle mixed time-series error (#16928) * rebase to master * Fix line 402 Co-authored-by: yougyoung --- 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 5410caa5a52..af5ae0ca6e2 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(