From 90e2d82a38508938c7dcc92bad0087b529489fce Mon Sep 17 00:00:00 2001
From: Kamil Gabryjelski <kamil.gabryjelski@gmail.com>
Date: Mon, 1 Aug 2022 13:39:42 +0200
Subject: [PATCH] fix(dashboard): Incorrect scopes of cross filters (#20927)

---
 .../src/dashboard/actions/hydrate.js          | 31 ++++++++++++-------
 1 file changed, 19 insertions(+), 12 deletions(-)

diff --git a/superset-frontend/src/dashboard/actions/hydrate.js b/superset-frontend/src/dashboard/actions/hydrate.js
index 94001767fa..221d8507d4 100644
--- a/superset-frontend/src/dashboard/actions/hydrate.js
+++ b/superset-frontend/src/dashboard/actions/hydrate.js
@@ -337,6 +337,25 @@ export const hydrateDashboard =
         if (!metadata.chart_configuration) {
           metadata.chart_configuration = {};
         }
+        if (behaviors.includes(Behavior.INTERACTIVE_CHART)) {
+          if (!metadata.chart_configuration[chartId]) {
+            metadata.chart_configuration[chartId] = {
+              id: chartId,
+              crossFilters: {
+                scope: {
+                  rootPath: [DASHBOARD_ROOT_ID],
+                  excluded: [chartId], // By default it doesn't affects itself
+                },
+              },
+            };
+          }
+          metadata.chart_configuration[chartId].crossFilters.chartsInScope =
+            getChartIdsInFilterScope(
+              metadata.chart_configuration[chartId].crossFilters.scope,
+              chartQueries,
+              dashboardLayout.present,
+            );
+        }
         if (
           behaviors.includes(Behavior.INTERACTIVE_CHART) &&
           !metadata.chart_configuration[chartId]
@@ -348,21 +367,9 @@ export const hydrateDashboard =
                 rootPath: [DASHBOARD_ROOT_ID],
                 excluded: [chartId], // By default it doesn't affects itself
               },
-              chartsInScope: Array.from(sliceIds),
             },
           };
         }
-        if (
-          behaviors.includes(Behavior.INTERACTIVE_CHART) &&
-          !metadata.chart_configuration[chartId].crossFilters?.chartsInScope
-        ) {
-          metadata.chart_configuration[chartId].crossFilters.chartsInScope =
-            getChartIdsInFilterScope(
-              metadata.chart_configuration[chartId].crossFilters.scope,
-              charts,
-              dashboardLayout.present,
-            );
-        }
       });
     }