From b468168567647f696d0cf39f9523fbb6ca8309b0 Mon Sep 17 00:00:00 2001
From: stephenLYZ <750188453@qq.com>
Date: Sun, 13 Feb 2022 22:40:41 +0800
Subject: [PATCH 1/2] fix(native-filter): fix required Filters of a Dashboard
 won't load properly

---
 .../src/dashboard/components/nativeFilters/FilterBar/index.tsx | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/superset-frontend/src/dashboard/components/nativeFilters/FilterBar/index.tsx b/superset-frontend/src/dashboard/components/nativeFilters/FilterBar/index.tsx
index 6b07c2c7234a..df6b26ab1d62 100644
--- a/superset-frontend/src/dashboard/components/nativeFilters/FilterBar/index.tsx
+++ b/superset-frontend/src/dashboard/components/nativeFilters/FilterBar/index.tsx
@@ -238,6 +238,9 @@ const FilterBar: React.FC<FiltersBarProps> = ({
         const currentTargets = currentFilter.targets;
         const currentDataMask = currentFilter.defaultDataMask;
         const previousFilter = previousFilters?.[currentFilter.id];
+        if (!previousFilter) {
+          return;
+        }
         const previousType = previousFilter?.filterType;
         const previousTargets = previousFilter?.targets;
         const previousDataMask = previousFilter?.defaultDataMask;

From 5768fce85cf3cc96909241f630037e1898a49905 Mon Sep 17 00:00:00 2001
From: stephenLYZ <750188453@qq.com>
Date: Tue, 22 Feb 2022 23:54:27 +0800
Subject: [PATCH 2/2] rm to top

---
 .../dashboard/components/nativeFilters/FilterBar/index.tsx  | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/superset-frontend/src/dashboard/components/nativeFilters/FilterBar/index.tsx b/superset-frontend/src/dashboard/components/nativeFilters/FilterBar/index.tsx
index df6b26ab1d62..5d3ab5637a40 100644
--- a/superset-frontend/src/dashboard/components/nativeFilters/FilterBar/index.tsx
+++ b/superset-frontend/src/dashboard/components/nativeFilters/FilterBar/index.tsx
@@ -234,13 +234,13 @@ const FilterBar: React.FC<FiltersBarProps> = ({
     if (previousFilters) {
       const updates = {};
       Object.values(filters).forEach(currentFilter => {
-        const currentType = currentFilter.filterType;
-        const currentTargets = currentFilter.targets;
-        const currentDataMask = currentFilter.defaultDataMask;
         const previousFilter = previousFilters?.[currentFilter.id];
         if (!previousFilter) {
           return;
         }
+        const currentType = currentFilter.filterType;
+        const currentTargets = currentFilter.targets;
+        const currentDataMask = currentFilter.defaultDataMask;
         const previousType = previousFilter?.filterType;
         const previousTargets = previousFilter?.targets;
         const previousDataMask = previousFilter?.defaultDataMask;