From 6eb04b1c4f5cc4a0ea8d9e72f7272d30a12392d9 Mon Sep 17 00:00:00 2001
From: Simcha Shats <simcha.shats@nielsen.com>
Date: Tue, 13 Apr 2021 16:04:01 +0300
Subject: [PATCH 1/2] fix:fix get permission function

---
 .../src/dashboard/util/getPermissions.ts      | 37 +++++++++----------
 1 file changed, 17 insertions(+), 20 deletions(-)

diff --git a/superset-frontend/src/dashboard/util/getPermissions.ts b/superset-frontend/src/dashboard/util/getPermissions.ts
index 3e7cb19765dd..0208fd68fd65 100644
--- a/superset-frontend/src/dashboard/util/getPermissions.ts
+++ b/superset-frontend/src/dashboard/util/getPermissions.ts
@@ -18,25 +18,22 @@
  */
 import memoizeOne from 'memoize-one';
 
-export default function getPermissions(
-  perm: string,
-  view: string,
-  roles: object,
-) {
-  return memoizeOne(() => {
-    const roleList = Object.entries(roles);
-    if (roleList.length === 0) return false;
-    let bool;
+const findPermissions = (perm: string, view: string, roles: object) => {
+  const roleList = Object.entries(roles);
+  if (roleList.length === 0) return false;
+  let bool;
 
-    roleList.forEach(([role, permissions]) => {
-      bool = Boolean(
-        permissions.find(
-          (permission: Array<string>) =>
-            permission[0] === perm && permission[1] === view,
-        ),
-      );
-    });
-    console.log('bool', bool);
-    return bool;
+  roleList.forEach(([role, permissions]) => {
+    bool = Boolean(
+      permissions.find(
+        (permission: Array<string>) =>
+          permission[0] === perm && permission[1] === view,
+      ),
+    );
   });
-}
+  return bool;
+};
+
+const getPermissions = memoizeOne(findPermissions);
+
+export default getPermissions;

From c35a99ee2c41ffee399ba74750fb099a620d45ae Mon Sep 17 00:00:00 2001
From: Simcha Shats <simcha.shats@nielsen.com>
Date: Mon, 24 May 2021 13:30:06 +0300
Subject: [PATCH 2/2] fix: fix ownState for unsaved explore chart

---
 .../src/explore/components/ExploreViewContainer.jsx           | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/superset-frontend/src/explore/components/ExploreViewContainer.jsx b/superset-frontend/src/explore/components/ExploreViewContainer.jsx
index 7be486e1df3f..3aa8e6b55a8f 100644
--- a/superset-frontend/src/explore/components/ExploreViewContainer.jsx
+++ b/superset-frontend/src/explore/components/ExploreViewContainer.jsx
@@ -561,7 +561,7 @@ function mapStateToProps(state) {
   form_data.extra_form_data = mergeExtraFormData(
     { ...form_data.extra_form_data },
     {
-      ...dataMask[form_data.slice_id]?.ownState,
+      ...dataMask[form_data.slice_id ?? 0]?.ownState, // 0 - unsaved chart
     },
   );
   const chartKey = Object.keys(charts)[0];
@@ -593,7 +593,7 @@ function mapStateToProps(state) {
     forcedHeight: explore.forced_height,
     chart,
     timeout: explore.common.conf.SUPERSET_WEBSERVER_TIMEOUT,
-    ownState: dataMask[form_data.slice_id]?.ownState,
+    ownState: dataMask[form_data.slice_id ?? 0]?.ownState, // 0 - unsaved chart
     impressionId,
     userId: explore.user_id,
   };