From 42fa54881a11c7bb5fcc216c319032a54cd8d6b4 Mon Sep 17 00:00:00 2001
From: Ville Brofeldt <33317356+villebro@users.noreply.github.com>
Date: Mon, 27 Sep 2021 07:34:39 +0200
Subject: [PATCH] fix(native-filters): filter indicator stale state (#16831)

---
 .../components/FiltersBadge/selectors.ts          | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/superset-frontend/src/dashboard/components/FiltersBadge/selectors.ts b/superset-frontend/src/dashboard/components/FiltersBadge/selectors.ts
index a6aec8ea59..ea850ae214 100644
--- a/superset-frontend/src/dashboard/components/FiltersBadge/selectors.ts
+++ b/superset-frontend/src/dashboard/components/FiltersBadge/selectors.ts
@@ -212,7 +212,7 @@ export const selectIndicatorsForChart = (
 };
 
 const cachedNativeIndicatorsForChart = {};
-let cachedNativeFilterDataForChart: any = {};
+const cachedNativeFilterDataForChart: any = {};
 const defaultChartConfig = {};
 export const selectNativeIndicatorsForChart = (
   nativeFilters: Filters,
@@ -230,10 +230,10 @@ export const selectNativeIndicatorsForChart = (
     cachedNativeIndicatorsForChart[chartId] &&
     areObjectsEqual(cachedFilterData?.appliedColumns, appliedColumns) &&
     areObjectsEqual(cachedFilterData?.rejectedColumns, rejectedColumns) &&
-    cachedNativeFilterDataForChart?.nativeFilters === nativeFilters &&
-    cachedNativeFilterDataForChart?.dashboardLayout === dashboardLayout &&
-    cachedNativeFilterDataForChart?.chartConfiguration === chartConfiguration &&
-    cachedNativeFilterDataForChart?.dataMask === dataMask
+    cachedFilterData?.nativeFilters === nativeFilters &&
+    cachedFilterData?.dashboardLayout === dashboardLayout &&
+    cachedFilterData?.chartConfiguration === chartConfiguration &&
+    cachedFilterData?.dataMask === dataMask
   ) {
     return cachedNativeIndicatorsForChart[chartId];
   }
@@ -326,14 +326,11 @@ export const selectNativeIndicatorsForChart = (
   }
   const indicators = crossFilterIndicators.concat(nativeFilterIndicators);
   cachedNativeIndicatorsForChart[chartId] = indicators;
-  cachedNativeFilterDataForChart = {
-    ...cachedNativeFilterDataForChart,
+  cachedNativeFilterDataForChart[chartId] = {
     nativeFilters,
     dashboardLayout,
     chartConfiguration,
     dataMask,
-  };
-  cachedNativeFilterDataForChart[chartId] = {
     appliedColumns,
     rejectedColumns,
   };