diff --git a/superset-frontend/src/components/Chart/chartAction.js b/superset-frontend/src/components/Chart/chartAction.js index 7b4b70377b..d1dcfd3a00 100644 --- a/superset-frontend/src/components/Chart/chartAction.js +++ b/superset-frontend/src/components/Chart/chartAction.js @@ -226,7 +226,6 @@ export async function getChartDataRequest({ credentials: 'include', }; } - const [useLegacyApi, parseMethod] = getQuerySettings(formData); if (useLegacyApi) { return legacyChartDataRequest( diff --git a/superset-frontend/src/dashboard/components/nativeFilters/FilterBar/FilterControls/FilterValue.tsx b/superset-frontend/src/dashboard/components/nativeFilters/FilterBar/FilterControls/FilterValue.tsx index b64f1bc8d9..5235edcdc3 100644 --- a/superset-frontend/src/dashboard/components/nativeFilters/FilterBar/FilterControls/FilterValue.tsx +++ b/superset-frontend/src/dashboard/components/nativeFilters/FilterBar/FilterControls/FilterValue.tsx @@ -101,6 +101,9 @@ const FilterValue: React.FC = ({ const dependencies = useFilterDependencies(id, dataMaskSelected); const shouldRefresh = useShouldFilterRefresh(); const [state, setState] = useState([]); + const dashboardId = useSelector( + state => state.dashboardInfo.id, + ); const [error, setError] = useState(); const [formData, setFormData] = useState>({ inView: false, @@ -146,6 +149,7 @@ const FilterValue: React.FC = ({ groupby, adhoc_filters, time_range, + dashboardId, }); const filterOwnState = filter.dataMask?.ownState || {}; // TODO: We should try to improve our useEffect hooks to depend more on @@ -170,7 +174,6 @@ const FilterValue: React.FC = ({ getChartDataRequest({ formData: newFormData, force: false, - requestParams: { dashboardId: 0 }, ownState: filterOwnState, }) .then(({ response, json }) => { diff --git a/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigForm/FiltersConfigForm.tsx b/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigForm/FiltersConfigForm.tsx index dcfbf3d43d..94b336af92 100644 --- a/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigForm/FiltersConfigForm.tsx +++ b/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigForm/FiltersConfigForm.tsx @@ -354,7 +354,9 @@ const FiltersConfigForm = ( const [activeTabKey, setActiveTabKey] = useState( FilterTabs.configuration.key, ); - + const dashboardId = useSelector( + state => state.dashboardInfo.id, + ); const [undoFormValues, setUndoFormValues] = useState { if (isFeatureEnabled(FeatureFlag.GLOBAL_ASYNC_QUERIES)) { diff --git a/superset-frontend/src/dashboard/components/nativeFilters/utils.ts b/superset-frontend/src/dashboard/components/nativeFilters/utils.ts index 7086ac8512..b4284a8a63 100644 --- a/superset-frontend/src/dashboard/components/nativeFilters/utils.ts +++ b/superset-frontend/src/dashboard/components/nativeFilters/utils.ts @@ -54,7 +54,9 @@ export const getFormData = ({ time_range, granularity_sqla, type, + dashboardId, }: Partial & { + dashboardId: number; datasetId?: number; dependencies?: object; groupby?: string; @@ -91,6 +93,7 @@ export const getFormData = ({ inView: true, viz_type: filterType, type, + dashboardId, }; };