From 15567d5b8f505a9239f25ef8849d9d331215b742 Mon Sep 17 00:00:00 2001 From: Vitor Avila Date: Tue, 2 Jul 2024 16:57:49 -0300 Subject: [PATCH] chore: Support select_columns with getUserOwnedObjects and split getRecentActivityObjs --- superset-frontend/src/views/CRUD/utils.tsx | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/superset-frontend/src/views/CRUD/utils.tsx b/superset-frontend/src/views/CRUD/utils.tsx index fdfa5b82f6b5..6fee140296de 100644 --- a/superset-frontend/src/views/CRUD/utils.tsx +++ b/superset-frontend/src/views/CRUD/utils.tsx @@ -126,17 +126,17 @@ const createFetchResourceMethod = }; export const PAGE_SIZE = 5; -const getParams = (filters?: Filter[], select_columns?: string[]) => { +const getParams = (filters?: Filter[], selectColumns?: string[]) => { const params = { order_column: 'changed_on_delta_humanized', order_direction: 'desc', page: 0, page_size: PAGE_SIZE, filters, - select_columns, + select_columns: selectColumns, }; if (!filters) delete params.filters; - if (!select_columns) delete params.select_columns; + if (!selectColumns) delete params.select_columns; return rison.encode(params); }; @@ -179,10 +179,10 @@ export const getUserOwnedObjects = ( value: `${userId}`, }, ], - select_columns?: string[], + selectColumns?: string[], ) => SupersetClient.get({ - endpoint: `/api/v1/${resource}/?q=${getParams(filters, select_columns)}`, + endpoint: `/api/v1/${resource}/?q=${getParams(filters, selectColumns)}`, }).then(res => res.json?.result); export const getRecentActivityObjs = ( @@ -205,13 +205,18 @@ export const getRecentActivityObjs = ( export const getFilteredChartsandDashboards = ( addDangerToast: (arg1: string, arg2: any) => any, filters: Filter[], + dashboardSelectColumns?: string[], + chartSelectColumns?: string[], ) => { const newBatch = [ SupersetClient.get({ - endpoint: `/api/v1/chart/?q=${getParams(filters)}`, + endpoint: `/api/v1/chart/?q=${getParams(filters, chartSelectColumns)}`, }), SupersetClient.get({ - endpoint: `/api/v1/dashboard/?q=${getParams(filters)}`, + endpoint: `/api/v1/dashboard/?q=${getParams( + filters, + dashboardSelectColumns, + )}`, }), ]; return Promise.all(newBatch)