From cdd01f4851d39d8d03dcd92653252cbbba52b6ed Mon Sep 17 00:00:00 2001
From: Kamil Gabryjelski <kamil.gabryjelski@gmail.com>
Date: Thu, 19 Nov 2020 23:10:34 +0100
Subject: [PATCH] fix: Null error when deleting the last owner label in
 DatasourceEditor/settings (#11752)

* Fix null error when deleting the last owner in SelectAsyncControl

* Replace "||" with "??"
---
 .../src/explore/components/controls/SelectAsyncControl.jsx  | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/superset-frontend/src/explore/components/controls/SelectAsyncControl.jsx b/superset-frontend/src/explore/components/controls/SelectAsyncControl.jsx
index 75dbbd482..8ccb81f67 100644
--- a/superset-frontend/src/explore/components/controls/SelectAsyncControl.jsx
+++ b/superset-frontend/src/explore/components/controls/SelectAsyncControl.jsx
@@ -60,11 +60,9 @@ const SelectAsyncControl = props => {
   const onSelectionChange = options => {
     let val;
     if (multi) {
-      val = options.map(option => option.value);
-    } else if (options) {
-      val = options.value;
+      val = options?.map(option => option.value) ?? null;
     } else {
-      val = null;
+      val = options?.value ?? null;
     }
     onChange(val);
   };