From a642d126f8019d8f96cc206abfeda7ddc19eda7f Mon Sep 17 00:00:00 2001
From: Cody Leff <cody@preset.io>
Date: Tue, 29 Nov 2022 11:40:09 -0700
Subject: [PATCH] fix(dashboard): Fix FilterWithDataMask typing and add null
 check (#22260)

---
 .../packages/superset-ui-core/src/query/types/Dashboard.ts      | 2 +-
 .../nativeFilters/FilterBar/FilterControls/FilterControls.tsx   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/superset-frontend/packages/superset-ui-core/src/query/types/Dashboard.ts b/superset-frontend/packages/superset-ui-core/src/query/types/Dashboard.ts
index 90c1e5856e..b7ac546993 100644
--- a/superset-frontend/packages/superset-ui-core/src/query/types/Dashboard.ts
+++ b/superset-frontend/packages/superset-ui-core/src/query/types/Dashboard.ts
@@ -91,7 +91,7 @@ export type Filter = {
   description: string;
 };
 
-export type FilterWithDataMask = Filter & { dataMask: DataMaskWithId };
+export type FilterWithDataMask = Filter & { dataMask?: DataMaskWithId };
 
 export type Divider = Partial<Omit<Filter, 'id' | 'type'>> & {
   id: string;
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 5c0ce9f902..e1c3cc6c65 100644
--- a/superset-frontend/src/dashboard/components/nativeFilters/FilterBar/FilterControls/FilterControls.tsx
+++ b/superset-frontend/src/dashboard/components/nativeFilters/FilterBar/FilterControls/FilterControls.tsx
@@ -128,7 +128,7 @@ const FilterControls: FC<FilterControlsProps> = ({
   const activeOverflowedFiltersInScope = useMemo(
     () =>
       overflowedFiltersInScope.filter(
-        filter => isNativeFilter(filter) && filter.dataMask.filterState?.value,
+        filter => isNativeFilter(filter) && filter.dataMask?.filterState?.value,
       ).length,
     [overflowedFiltersInScope],
   );