refactor: remove useless groupby from QueryObject (#21643)
This commit is contained in:
parent
f3465f5b22
commit
9dd102f383
|
|
@ -23,7 +23,6 @@ export default function buildQuery(formData: QueryFormData) {
|
|||
return buildQueryContext(formData, baseQueryObject => [
|
||||
{
|
||||
...baseQueryObject,
|
||||
groupby: formData.groupby || [],
|
||||
...(sort_by_metric && { orderby: [[metric, false]] }),
|
||||
},
|
||||
]);
|
||||
|
|
|
|||
|
|
@ -29,20 +29,20 @@ describe('Gauge buildQuery', () => {
|
|||
const formData = { ...baseFormData, groupby: undefined };
|
||||
const queryContext = buildQuery(formData);
|
||||
const [query] = queryContext.queries;
|
||||
expect(query.groupby).toEqual([]);
|
||||
expect(query.columns).toEqual([]);
|
||||
});
|
||||
|
||||
it('should build query fields with single group by column', () => {
|
||||
const formData = { ...baseFormData, groupby: ['foo'] };
|
||||
const queryContext = buildQuery(formData);
|
||||
const [query] = queryContext.queries;
|
||||
expect(query.groupby).toEqual(['foo']);
|
||||
expect(query.columns).toEqual(['foo']);
|
||||
});
|
||||
|
||||
it('should build query fields with multiple group by columns', () => {
|
||||
const formData = { ...baseFormData, groupby: ['foo', 'bar'] };
|
||||
const queryContext = buildQuery(formData);
|
||||
const [query] = queryContext.queries;
|
||||
expect(query.groupby).toEqual(['foo', 'bar']);
|
||||
expect(query.columns).toEqual(['foo', 'bar']);
|
||||
});
|
||||
});
|
||||
|
|
|
|||
|
|
@ -23,13 +23,10 @@ import {
|
|||
} from '@superset-ui/core';
|
||||
|
||||
export default function buildQuery(formData: QueryFormData) {
|
||||
const { groupby } = formData;
|
||||
|
||||
return buildQueryContext(formData, baseQueryObject => [
|
||||
{
|
||||
...baseQueryObject,
|
||||
orderby: normalizeOrderBy(baseQueryObject).orderby,
|
||||
...(groupby && { groupby }),
|
||||
},
|
||||
]);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -32,6 +32,6 @@ describe('Handlebars buildQuery', () => {
|
|||
it('should build groupby with series in form data', () => {
|
||||
const queryContext = buildQuery(formData);
|
||||
const [query] = queryContext.queries;
|
||||
expect(query.groupby).toEqual(['foo']);
|
||||
expect(query.columns).toEqual(['foo']);
|
||||
});
|
||||
});
|
||||
|
|
|
|||
Loading…
Reference in New Issue