refactor: tick calculation (#1072)

This commit is contained in:
simcha90
2021-04-26 18:08:38 +03:00
committed by Yongjie Zhao
parent 31ca397c70
commit ec45fa5f9d

View File

@@ -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];
});
};