From c0f766a84d756908f9a28e7fabdb79c8e69a7b6f Mon Sep 17 00:00:00 2001 From: Erik Ritter Date: Wed, 22 Apr 2020 13:09:28 -0700 Subject: [PATCH 1/2] fix: unset row_limit when it's not a number --- packages/superset-ui-query/src/buildQueryObject.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/superset-ui-query/src/buildQueryObject.ts b/packages/superset-ui-query/src/buildQueryObject.ts index bed181bd21..61a64e93a1 100644 --- a/packages/superset-ui-query/src/buildQueryObject.ts +++ b/packages/superset-ui-query/src/buildQueryObject.ts @@ -42,7 +42,7 @@ export default function buildQueryObject(formData: T): metrics: processMetrics(formData), order_desc: typeof order_desc === 'undefined' ? true : order_desc, orderby: [], - row_limit: Number(row_limit), + row_limit: !Number(row_limit) && row_limit !== 0 ? undefined : Number(row_limit), since, time_range, timeseries_limit: limit ? Number(limit) : 0, From 6ede46d2ffcba7054aec6c48b1e0ec74128fa9d1 Mon Sep 17 00:00:00 2001 From: Erik Ritter Date: Wed, 22 Apr 2020 13:31:25 -0700 Subject: [PATCH 2/2] fix: address comments --- packages/superset-ui-query/src/buildQueryObject.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/superset-ui-query/src/buildQueryObject.ts b/packages/superset-ui-query/src/buildQueryObject.ts index 61a64e93a1..ff7a4fe3ad 100644 --- a/packages/superset-ui-query/src/buildQueryObject.ts +++ b/packages/superset-ui-query/src/buildQueryObject.ts @@ -33,6 +33,7 @@ export default function buildQueryObject(formData: T): } = formData; const groupbySet = new Set([...columns, ...groupby]); + const numericRowLimit = Number(row_limit); const queryObject: QueryObject = { extras: processExtras(formData), @@ -42,7 +43,7 @@ export default function buildQueryObject(formData: T): metrics: processMetrics(formData), order_desc: typeof order_desc === 'undefined' ? true : order_desc, orderby: [], - row_limit: !Number(row_limit) && row_limit !== 0 ? undefined : Number(row_limit), + row_limit: row_limit == null || isNaN(numericRowLimit) ? undefined : numericRowLimit, since, time_range, timeseries_limit: limit ? Number(limit) : 0,