fix(dashboard): Fix FilterWithDataMask typing and add null check (#22260

)
apache · Nov 29, 2022 · a642d12 · a642d12
1 parent fb3e717
commit a642d12
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 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
@@ -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/...ontend/src/dashboard/components/nativeFilters/FilterBar/FilterControls/FilterControls.tsx b/...ontend/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],
   );