You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@superset.apache.org by mi...@apache.org on 2022/05/26 13:29:08 UTC

[superset] 06/10: fix(generic-axes): apply contribution before flatten (#20077)

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

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

commit 97c6af196e919cd2d7c1a7ebe31fb34325261a3f
Author: Ville Brofeldt <33...@users.noreply.github.com>
AuthorDate: Mon May 16 16:26:31 2022 +0300

    fix(generic-axes): apply contribution before flatten (#20077)
    
    (cherry picked from commit d5802f78964a5027184ff9e7f6b78c14b04fd988)
---
 .../plugins/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 c2f603bfc4..24c96b9202 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),
       },
     ];
   });