You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@superset.apache.org by di...@apache.org on 2022/08/22 18:00:08 UTC
[superset] 04/19: Update getDatasourceSamples signature.
This is an automated email from the ASF dual-hosted git repository.
diegopucci pushed a commit to branch chore/e2e-tests-drilltodetail-modal
in repository https://gitbox.apache.org/repos/asf/superset.git
commit e20dc8be3c952e9fd50e5387f729bbf9612090d7
Author: Cody Leff <co...@preset.io>
AuthorDate: Fri Aug 5 17:13:38 2022 -0400
Update getDatasourceSamples signature.
---
.../src/components/Chart/chartAction.js | 28 +++++++++++++++-------
.../components/DrillDetailPane/DrillDetailPane.tsx | 12 ++++++----
2 files changed, 28 insertions(+), 12 deletions(-)
diff --git a/superset-frontend/src/components/Chart/chartAction.js b/superset-frontend/src/components/Chart/chartAction.js
index f45c5f42cc..dea41497b8 100644
--- a/superset-frontend/src/components/Chart/chartAction.js
+++ b/superset-frontend/src/components/Chart/chartAction.js
@@ -19,7 +19,7 @@
/* eslint no-undef: 'error' */
/* eslint no-param-reassign: ["error", { "props": false }] */
import moment from 'moment';
-import { t, SupersetClient } from '@superset-ui/core';
+import { t, SupersetClient, isDefined } from '@superset-ui/core';
import { getControlsState } from 'src/explore/store';
import { isFeatureEnabled, FeatureFlag } from 'src/featureFlags';
import {
@@ -603,15 +603,27 @@ export const getDatasourceSamples = async (
datasourceId,
force,
jsonPayload,
- pagination,
+ perPage,
+ page,
) => {
- let endpoint = `/datasource/samples?force=${force}&datasource_type=${datasourceType}&datasource_id=${datasourceId}`;
- if (pagination) {
- endpoint += `&page=${pagination.page}&per_page=${pagination.perPage}`;
- }
-
try {
- const response = await SupersetClient.post({ endpoint, jsonPayload });
+ const searchParams = {
+ force,
+ datasource_type: datasourceType,
+ datasource_id: datasourceId,
+ };
+
+ if (isDefined(perPage) && isDefined(page)) {
+ searchParams.per_page = perPage;
+ searchParams.page = page;
+ }
+
+ const response = await SupersetClient.post({
+ endpoint: '/datasource/samples',
+ jsonPayload,
+ searchParams,
+ });
+
return response.json.result;
} catch (err) {
const clientError = await getClientErrorObject(err);
diff --git a/superset-frontend/src/dashboard/components/DrillDetailPane/DrillDetailPane.tsx b/superset-frontend/src/dashboard/components/DrillDetailPane/DrillDetailPane.tsx
index a09494d98a..94f0ee0749 100644
--- a/superset-frontend/src/dashboard/components/DrillDetailPane/DrillDetailPane.tsx
+++ b/superset-frontend/src/dashboard/components/DrillDetailPane/DrillDetailPane.tsx
@@ -121,10 +121,14 @@ export default function DrillDetailPane({
if (!resultsPages.has(pageIndex)) {
setIsLoading(true);
const jsonPayload = getDrillPayload(queryFormData, drillFilters);
- getDatasourceSamples(datasourceType, datasourceId, true, jsonPayload, {
- page: pageIndex + 1,
- perPage: PAGE_SIZE,
- })
+ getDatasourceSamples(
+ datasourceType,
+ datasourceId,
+ true,
+ jsonPayload,
+ pageIndex + 1,
+ PAGE_SIZE,
+ )
.then(response => {
setResultsPages(
new Map([