From 14456526946e71f8c66a68be75f08bd6be95e7c6 Mon Sep 17 00:00:00 2001 From: Kamil Gabryjelski Date: Mon, 28 Feb 2022 14:20:33 +0100 Subject: [PATCH 1/2] fix(native-filters): Default value not shown in native filters --- .../dashboard/components/nativeFilters/FilterBar/index.tsx | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/superset-frontend/src/dashboard/components/nativeFilters/FilterBar/index.tsx b/superset-frontend/src/dashboard/components/nativeFilters/FilterBar/index.tsx index 6aef6e3069a7..a89de4f5b943 100644 --- a/superset-frontend/src/dashboard/components/nativeFilters/FilterBar/index.tsx +++ b/superset-frontend/src/dashboard/components/nativeFilters/FilterBar/index.tsx @@ -288,6 +288,10 @@ const FilterBar: React.FC = ({ } }, [JSON.stringify(filters), JSON.stringify(previousFilters)]); + useEffect(() => { + setDataMaskSelected(() => dataMaskApplied); + }, [JSON.stringify(dataMaskApplied), setDataMaskSelected]); + const dataMaskAppliedText = JSON.stringify(dataMaskApplied); useEffect(() => { publishDataMask(history, dashboardId, updateKey, dataMaskApplied, tabId); From d968fe87d135ffea6e7e2a881719e71aee2cd04e Mon Sep 17 00:00:00 2001 From: Kamil Gabryjelski Date: Mon, 28 Feb 2022 14:50:50 +0100 Subject: [PATCH 2/2] Reuse stringified datamask --- .../dashboard/components/nativeFilters/FilterBar/index.tsx | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/superset-frontend/src/dashboard/components/nativeFilters/FilterBar/index.tsx b/superset-frontend/src/dashboard/components/nativeFilters/FilterBar/index.tsx index a89de4f5b943..cb5e3e80a7ae 100644 --- a/superset-frontend/src/dashboard/components/nativeFilters/FilterBar/index.tsx +++ b/superset-frontend/src/dashboard/components/nativeFilters/FilterBar/index.tsx @@ -288,11 +288,12 @@ const FilterBar: React.FC = ({ } }, [JSON.stringify(filters), JSON.stringify(previousFilters)]); + const dataMaskAppliedText = JSON.stringify(dataMaskApplied); + useEffect(() => { setDataMaskSelected(() => dataMaskApplied); - }, [JSON.stringify(dataMaskApplied), setDataMaskSelected]); + }, [dataMaskAppliedText, setDataMaskSelected]); - const dataMaskAppliedText = JSON.stringify(dataMaskApplied); useEffect(() => { publishDataMask(history, dashboardId, updateKey, dataMaskApplied, tabId); // eslint-disable-next-line react-hooks/exhaustive-deps