This is an automated email from the ASF dual-hosted git repository. amitmiran pushed a commit to branch 1.2 in repository https://gitbox.apache.org/repos/asf/superset.git
commit 7ef76636637a1e35f520cbd824d70e5ff1063427 Author: Ville Brofeldt <[email protected]> AuthorDate: Thu Apr 29 09:09:47 2021 +0300 fix(native-filters): default value not populated on second opening (#14401) (cherry picked from commit 4410fd047e149008addb5c2eeba44614940ce30c) --- .../FiltersConfigForm/FiltersConfigForm.tsx | 14 +------------- .../FiltersConfigModal/FiltersConfigForm/state.ts | 7 ------- 2 files changed, 1 insertion(+), 20 deletions(-) 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 f118809..a1226a3 100644 --- a/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigForm/FiltersConfigForm.tsx +++ b/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigForm/FiltersConfigForm.tsx @@ -124,19 +124,7 @@ export const FiltersConfigForm: React.FC<FiltersConfigFormProps> = ({ const forceUpdate = useForceUpdate(); const [datasetDetails, setDatasetDetails] = useState<Record<string, any>>(); - // make sure the formFilter is populated - if (!form.getFieldValue('filters')) { - setNativeFilterFieldValues(form, filterId, filterToEdit || {}); - forceUpdate(); - } - const formFilter = form.getFieldValue('filters')[filterId]; - - useEffect(() => { - setNativeFilterFieldValues(form, filterId, { - defaultValue: filterToEdit?.defaultValue, - }); - forceUpdate(); - }, [form, forceUpdate, filterId, filterToEdit?.defaultValue]); + const formFilter = form.getFieldValue('filters')?.[filterId] || {}; const nativeFilterItems = getChartMetadataRegistry().items; const nativeFilterVizTypes = Object.entries(nativeFilterItems) diff --git a/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigForm/state.ts b/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigForm/state.ts index 2ade134..70749d6 100644 --- a/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigForm/state.ts +++ b/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigForm/state.ts @@ -45,11 +45,4 @@ export const useBackendFormUpdate = ( forceUpdate, filterId, ]); - - useEffect(() => { - setNativeFilterFieldValues(form, filterId, { - defaultValue: formFilter?.defaultValue, - }); - forceUpdate(); - }, [form, formFilter?.defaultValue, forceUpdate, filterId]); };
