refactor: tick calculation (#1072)

apache-superset · Apr 26, 2021 · ed727cb · ed727cb · vercel · Apr 26, 2021
1 parent 158a777
commit ed727cb
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/plugins/plugin-chart-table/src/buildQuery.ts b/plugins/plugin-chart-table/src/buildQuery.ts
@@ -126,6 +126,11 @@ const buildQuery: BuildQuery<TableChartFormData> = (formData: TableChartFormData
       });
     }
 
+    const interactiveGroupBy = formData.extra_form_data?.interactive_groupby;
+    if (interactiveGroupBy && queryObject.columns && queryMode === QueryMode.aggregate) {
+      queryObject.columns = [...new Set([...queryObject.columns, ...interactiveGroupBy])];
+    }
+
     if (formData.server_pagination) {
       return [
         { ...queryObject },
@@ -134,11 +139,6 @@ const buildQuery: BuildQuery<TableChartFormData> = (formData: TableChartFormData
       ];
     }
 
-    const interactiveGroupBy = formData.extra_form_data?.interactive_groupby;
-    if (interactiveGroupBy && queryObject.columns) {
-      queryObject.columns = [...new Set([...queryObject.columns, ...interactiveGroupBy])];
-    }
-
     return [queryObject, ...extraQueries];
   });
 };