[superset] 11/14: fix: lost renameOperator in mixed timeseries chart (#19802)

[villebro]

This is an automated email from the ASF dual-hosted git repository.

villebro pushed a commit to branch 1.5
in repository https://gitbox.apache.org/repos/asf/superset.git

commit 4fa96d3a3b98a464e9371283fcc12da3f7066608
Author: Yongjie Zhao <yongjie.z...@gmail.com>
AuthorDate: Thu Apr 21 15:20:09 2022 +0800

    fix: lost renameOperator in mixed timeseries chart (#19802)
    
    (cherry picked from commit 108a2a4eafc3150f7b7c33ed734e843a5d5c9f62)
---
 .../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)];