From d84ef57150f166b0bb7dbf389afb8062a4456ff7 Mon Sep 17 00:00:00 2001
From: Yongjie Zhao <yongjie.zhao@gmail.com>
Date: Mon, 23 May 2022 16:41:05 +0800
Subject: [PATCH] chore: filter undefined operators

---
 .../src/query/buildQueryContext.ts            | 25 ++++++++++++-------
 .../src/MixedTimeseries/buildQuery.ts         |  2 +-
 .../src/Timeseries/buildQuery.ts              |  2 +-
 3 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/superset-frontend/packages/superset-ui-core/src/query/buildQueryContext.ts b/superset-frontend/packages/superset-ui-core/src/query/buildQueryContext.ts
index 070636f156f89..ad35434cad09d 100644
--- a/superset-frontend/packages/superset-ui-core/src/query/buildQueryContext.ts
+++ b/superset-frontend/packages/superset-ui-core/src/query/buildQueryContext.ts
@@ -61,18 +61,25 @@ export default function buildQueryContext(
   } = typeof options === 'function'
     ? { buildQuery: options, queryFields: {} }
     : options || {};
+  const queries = buildQuery(buildQueryObject(formData, queryFields), {
+    extras: {},
+    ownState,
+    hooks: {
+      setDataMask: () => {},
+      setCachedChanges: () => {},
+      ...hooks,
+    },
+  });
+  queries.forEach(query => {
+    if (Array.isArray(query.post_processing)) {
+      // eslint-disable-next-line no-param-reassign
+      query.post_processing = query.post_processing.filter(Boolean);
+    }
+  });
   return {
     datasource: new DatasourceKey(formData.datasource).toObject(),
     force: formData.force || false,
-    queries: buildQuery(buildQueryObject(formData, queryFields), {
-      extras: {},
-      ownState,
-      hooks: {
-        setDataMask: () => {},
-        setCachedChanges: () => {},
-        ...hooks,
-      },
-    }),
+    queries,
     form_data: formData,
     result_format: formData.result_format || 'json',
     result_type: formData.result_type || 'full',
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 ac3a96b2c7376..4bd4df0bcc26e 100644
--- a/superset-frontend/plugins/plugin-chart-echarts/src/MixedTimeseries/buildQuery.ts
+++ b/superset-frontend/plugins/plugin-chart-echarts/src/MixedTimeseries/buildQuery.ts
@@ -86,7 +86,7 @@ export default function buildQuery(formData: QueryFormData) {
             is_timeseries,
           }),
           flattenOperator(fd, queryObject),
-        ].filter(Boolean),
+        ],
       } as QueryObject;
       return [normalizeOrderBy(tmpQueryObject)];
     }),
diff --git a/superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/buildQuery.ts b/superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/buildQuery.ts
index 96c1d6e8e7b56..085635209ac20 100644
--- a/superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/buildQuery.ts
+++ b/superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/buildQuery.ts
@@ -100,7 +100,7 @@ export default function buildQuery(formData: QueryFormData) {
           flattenOperator(formData, baseQueryObject),
           // todo: move prophet before flatten
           prophetOperator(formData, baseQueryObject),
-        ].filter(Boolean),
+        ],
       },
     ];
   });