From 28f63edc40c11c076607a34f636c957d2c987977 Mon Sep 17 00:00:00 2001
From: Ville Brofeldt <33317356+villebro@users.noreply.github.com>
Date: Mon, 16 May 2022 16:26:31 +0300
Subject: [PATCH] fix(generic-axes): apply contribution before flatten (#20077)

---
 .../plugin-chart-echarts/src/Timeseries/buildQuery.ts       | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

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 3478c73470fc7..3c2d66175bc21 100644
--- a/superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/buildQuery.ts
+++ b/superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/buildQuery.ts
@@ -96,11 +96,11 @@ export default function buildQuery(formData: QueryFormData) {
             ...baseQueryObject,
             ...{ is_timeseries },
           }),
-          flattenOperator(formData, baseQueryObject),
-          // todo: move contribution and prophet before flatten
           contributionOperator(formData, baseQueryObject),
+          flattenOperator(formData, baseQueryObject),
+          // todo: move prophet before flatten
           prophetOperator(formData, baseQueryObject),
-        ],
+        ].filter(op => op),
       },
     ];
   });