You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@superset.apache.org by yo...@apache.org on 2022/04/21 07:20:26 UTC
[superset] branch master updated: fix: lost renameOperator in mixed timeseries chart (#19802)
This is an automated email from the ASF dual-hosted git repository.
yongjiezhao 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 108a2a4eaf fix: lost renameOperator in mixed timeseries chart (#19802)
108a2a4eaf is described below
commit 108a2a4eafc3150f7b7c33ed734e843a5d5c9f62
Author: Yongjie Zhao <yo...@gmail.com>
AuthorDate: Thu Apr 21 15:20:09 2022 +0800
fix: lost renameOperator in mixed timeseries chart (#19802)
---
.../src/MixedTimeseries/buildQuery.ts | 18 +++++++++++++++---
1 file changed, 15 insertions(+), 3 deletions(-)
diff --git a/superset-frontend/plugins/plugin-chart-echarts/src/MixedTimeseries/buildQuery.ts b/superset-frontend/plugins/plugin-chart-echarts/src/MixedTimeseries/buildQuery.ts
index b85feb1eee..9adc149489 100644
--- a/superset-frontend/plugins/plugin-chart-echarts/src/MixedTimeseries/buildQuery.ts
+++ b/superset-frontend/plugins/plugin-chart-echarts/src/MixedTimeseries/buildQuery.ts
@@ -22,7 +22,11 @@ import {
QueryObject,
normalizeOrderBy,
} from '@superset-ui/core';
-import { flattenOperator, pivotOperator } from '@superset-ui/chart-controls';
+import {
+ pivotOperator,
+ renameOperator,
+ flattenOperator,
+} from '@superset-ui/chart-controls';
export default function buildQuery(formData: QueryFormData) {
const {
@@ -66,7 +70,11 @@ export default function buildQuery(formData: QueryFormData) {
is_timeseries: true,
post_processing: [
pivotOperator(formData1, { ...baseQueryObject, is_timeseries: true }),
- flattenOperator(formData1, { ...baseQueryObject, is_timeseries: true }),
+ renameOperator(formData1, {
+ ...baseQueryObject,
+ ...{ is_timeseries: true },
+ }),
+ flattenOperator(formData1, baseQueryObject),
],
} as QueryObject;
return [normalizeOrderBy(queryObjectA)];
@@ -78,7 +86,11 @@ export default function buildQuery(formData: QueryFormData) {
is_timeseries: true,
post_processing: [
pivotOperator(formData2, { ...baseQueryObject, is_timeseries: true }),
- flattenOperator(formData2, { ...baseQueryObject, is_timeseries: true }),
+ renameOperator(formData2, {
+ ...baseQueryObject,
+ ...{ is_timeseries: true },
+ }),
+ flattenOperator(formData2, baseQueryObject),
],
} as QueryObject;
return [normalizeOrderBy(queryObjectB)];