Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(Explore): Pivot table V2 sort by failure with D&D enabled #18835

Merged
merged 4 commits into from
Feb 28, 2022
Merged

fix(Explore): Pivot table V2 sort by failure with D&D enabled #18835

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0c9ed6a
wip
geido Feb 21, 2022
aabba33
Add tests and clean up
geido Feb 21, 2022
22b89d1
Clean up
geido Feb 21, 2022
6e72937
Remove unused import
geido Feb 21, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 13 additions & 1 deletion superset-frontend/packages/superset-ui-core/src/query/buildQueryObject.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,11 @@

/* eslint-disable camelcase */
import {
AdhocColumn,
AdhocFilter,
PhysicalColumn,
QueryFieldAliases,
QueryFormColumn,
QueryFormData,
QueryObject,
QueryObjectFilterClause,
Expand Down Expand Up @@ -89,6 +92,14 @@ export default function buildQueryObject<T extends QueryFormData>(
...extras,
...filterFormData,
});
const isAdhocColumn = (v?: AdhocColumn | PhysicalColumn) =>
geido marked this conversation as resolved.
Show resolved Hide resolved
(v as AdhocColumn)?.sqlExpression !== undefined;
const normalizeSeriesLimitMetric = (v: QueryFormColumn | undefined) => {
if (isAdhocColumn(v) || (v as PhysicalColumn)?.length) {
geido marked this conversation as resolved.
Show resolved Hide resolved
return v;
}
return undefined;
};

let queryObject: QueryObject = {
// fallback `null` to `undefined` so they won't be sent to the backend
Expand All @@ -113,13 +124,14 @@ export default function buildQueryObject<T extends QueryFormData>(
: numericRowOffset,
series_columns,
series_limit,
series_limit_metric,
series_limit_metric: normalizeSeriesLimitMetric(series_limit_metric),
timeseries_limit: limit ? Number(limit) : 0,
timeseries_limit_metric: timeseries_limit_metric || undefined,
order_desc: typeof order_desc === 'undefined' ? true : order_desc,
url_params: url_params || undefined,
custom_params,
};

// override extra form data used by native and cross filters
queryObject = overrideExtraFormData(queryObject, overrides);

Expand Down
22 changes: 22 additions & 0 deletions superset-frontend/packages/superset-ui-core/test/query/buildQueryObject.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,6 +152,28 @@ describe('buildQueryObject', () => {
expect(query.timeseries_limit_metric).toEqual(metric);
});

it('should build series_limit_metric', () => {
const metric = 'country';
query = buildQueryObject({
datasource: '5__table',
granularity_sqla: 'ds',
viz_type: 'pivot_table_v2',
series_limit_metric: metric,
});
expect(query.series_limit_metric).toEqual(metric);
});

it('should build series_limit_metric as undefined when empty array', () => {
const metric: any = [];
query = buildQueryObject({
datasource: '5__table',
granularity_sqla: 'ds',
viz_type: 'pivot_table_v2',
series_limit_metric: metric,
});
expect(query.series_limit_metric).toEqual(undefined);
});

it('should handle null and non-numeric row_limit and row_offset', () => {
const baseQuery = {
datasource: '5__table',
Expand Down