From 06bf6ebe0459fee52cd540f75c97a03ecd709850 Mon Sep 17 00:00:00 2001
From: Ajay Mancheery <ajay.m@outlook.com>
Date: Fri, 15 Oct 2021 05:08:59 -0400
Subject: [PATCH] Fix broken scope

---
 .../FilterBar/FilterControls/FilterControls.tsx  | 16 ++--------------
 .../dashboard/components/nativeFilters/state.ts  |  1 -
 2 files changed, 2 insertions(+), 15 deletions(-)

diff --git a/superset-frontend/src/dashboard/components/nativeFilters/FilterBar/FilterControls/FilterControls.tsx b/superset-frontend/src/dashboard/components/nativeFilters/FilterBar/FilterControls/FilterControls.tsx
index 7ff084425f7eb..613bc4ab89cfa 100644
--- a/superset-frontend/src/dashboard/components/nativeFilters/FilterBar/FilterControls/FilterControls.tsx
+++ b/superset-frontend/src/dashboard/components/nativeFilters/FilterBar/FilterControls/FilterControls.tsx
@@ -103,13 +103,7 @@ const FilterControls: FC<FilterControlsProps> = ({
         ))}
       {filtersInScope.map(filter => {
         const index = filterValues.findIndex(f => f.id === filter.id);
-        return (
-          <OutPortal
-            key={`filters-inscope-${index}`}
-            node={portalNodes[index]}
-            inView
-          />
-        );
+        return <OutPortal node={portalNodes[index]} inView />;
       })}
       {showCollapsePanel && (
         <Collapse
@@ -147,13 +141,7 @@ const FilterControls: FC<FilterControlsProps> = ({
           >
             {filtersOutOfScope.map(filter => {
               const index = cascadeFilters.findIndex(f => f.id === filter.id);
-              return (
-                <OutPortal
-                  key={`filters-outofscope-${index}`}
-                  node={portalNodes[index]}
-                  inView
-                />
-              );
+              return <OutPortal node={portalNodes[index]} inView />;
             })}
           </Collapse.Panel>
         </Collapse>
diff --git a/superset-frontend/src/dashboard/components/nativeFilters/state.ts b/superset-frontend/src/dashboard/components/nativeFilters/state.ts
index 433ee9355d78b..280a203da7b39 100644
--- a/superset-frontend/src/dashboard/components/nativeFilters/state.ts
+++ b/superset-frontend/src/dashboard/components/nativeFilters/state.ts
@@ -90,7 +90,6 @@ function useIsFilterInScope() {
   // Chart is visible if it's placed in an active tab tree or if it's not attached to any tab.
   // Chart is in an active tab tree if all of it's ancestors of type TAB are active
   return (filter: CascadeFilter) =>
-    filter.chartsInScope === undefined ||
     filter.chartsInScope?.some((chartId: number) => {
       const tabParents = selectChartTabParents(chartId);
       return (