From f42aae843cfacdfdf5dc876d698aa4ac45c77e32 Mon Sep 17 00:00:00 2001
From: Grace Guo <grace.guo@airbnb.com>
Date: Mon, 18 Nov 2019 20:49:28 -0800
Subject: [PATCH] [dashboard scoped filter] Reduce calls to expensive
 safeStringify (#8595)

* [dashboard scoped filter] Reduce calls to expensive safeStringify

* better handle empty or null scope settings
---
 .../src/dashboard/components/Dashboard.jsx    | 20 ++++++-------------
 .../components/gridComponents/Chart.jsx       |  5 +----
 2 files changed, 7 insertions(+), 18 deletions(-)

diff --git a/superset/assets/src/dashboard/components/Dashboard.jsx b/superset/assets/src/dashboard/components/Dashboard.jsx
index 333580bc9..b48c24ea8 100644
--- a/superset/assets/src/dashboard/components/Dashboard.jsx
+++ b/superset/assets/src/dashboard/components/Dashboard.jsx
@@ -31,7 +31,7 @@ import {
 } from '../util/propShapes';
 import { LOG_ACTIONS_MOUNT_DASHBOARD } from '../../logger/LogUtils';
 import OmniContainer from '../../components/OmniContainer';
-import { safeStringify } from '../../utils/safeStringify';
+import { areObjectsEqual } from '../../reduxUtils';
 
 import '../stylesheets/index.less';
 
@@ -117,10 +117,7 @@ class Dashboard extends React.PureComponent {
     const appliedFilters = this.appliedFilters;
     const { activeFilters } = this.props;
     // do not apply filter when dashboard in edit mode
-    if (
-      !editMode &&
-      safeStringify(appliedFilters) !== safeStringify(activeFilters)
-    ) {
+    if (!editMode && !areObjectsEqual(appliedFilters, activeFilters)) {
       // refresh charts if a filter was removed, added, or changed
       const currFilterKeys = Object.keys(activeFilters);
       const appliedFilterKeys = Object.keys(appliedFilters);
@@ -134,15 +131,10 @@ class Dashboard extends React.PureComponent {
         } else if (!appliedFilterKeys.includes(filterKey)) {
           // added filter?
           [].push.apply(affectedChartIds, activeFilters[filterKey].scope);
-        } else if (
-          safeStringify(activeFilters[filterKey].values) !==
-            safeStringify(appliedFilters[filterKey].values) ||
-          safeStringify(activeFilters[filterKey].scope) !==
-            safeStringify(appliedFilters[filterKey].scope)
-        ) {
-          // changed filter field value?
-          const affectedScope = activeFilters[filterKey].scope.concat(
-            appliedFilters[filterKey].scope,
+        } else {
+          // changed filter field value or scope?
+          const affectedScope = (activeFilters[filterKey].scope || []).concat(
+            appliedFilters[filterKey].scope || [],
           );
           [].push.apply(affectedChartIds, affectedScope);
         }
diff --git a/superset/assets/src/dashboard/components/gridComponents/Chart.jsx b/superset/assets/src/dashboard/components/gridComponents/Chart.jsx
index d50c24cf7..521371d14 100644
--- a/superset/assets/src/dashboard/components/gridComponents/Chart.jsx
+++ b/superset/assets/src/dashboard/components/gridComponents/Chart.jsx
@@ -30,7 +30,6 @@ import {
   LOG_ACTIONS_EXPORT_CSV_DASHBOARD_CHART,
   LOG_ACTIONS_FORCE_REFRESH_CHART,
 } from '../../../logger/LogUtils';
-import { safeStringify } from '../../../utils/safeStringify';
 import { isFilterBox } from '../../util/activeDashboardFilters';
 import getFilterValuesByFilterId from '../../util/getFilterValuesByFilterId';
 
@@ -119,9 +118,7 @@ class Chart extends React.Component {
 
       for (let i = 0; i < SHOULD_UPDATE_ON_PROP_CHANGES.length; i += 1) {
         const prop = SHOULD_UPDATE_ON_PROP_CHANGES[i];
-        if (
-          safeStringify(nextProps[prop]) !== safeStringify(this.props[prop])
-        ) {
+        if (nextProps[prop] !== this.props[prop]) {
           return true;
         }
       }