Safety chek SelectControl and SelectAsyncControl

apache · Oct 8, 2021 · a5aabfb · a5aabfb
1 parent 5302d2a
commit a5aabfb
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 11 deletions.
diff --git a/superset-frontend/src/components/Select/Select.tsx b/superset-frontend/src/components/Select/Select.tsx
@@ -524,13 +524,8 @@ const Select = ({
   }, [options]);
 
   useEffect(() => {
-    let selectValue = value;
-    // special case where null is intended to be undefined
-    if (value === null && !selectOptions.find(o => o.value === null)) {
-      selectValue = undefined;
-    }
-    setSelectValue(selectValue);
-  }, [value, selectOptions]);
+    setSelectValue(value);
+  }, [value]);
 
   useEffect(() => {
     if (selectValue) {

diff --git a/superset-frontend/src/explore/components/controls/SelectAsyncControl/index.tsx b/superset-frontend/src/explore/components/controls/SelectAsyncControl/index.tsx
@@ -71,6 +71,17 @@ const SelectAsyncControl = ({
     onChange(onChangeVal);
   };
 
+  const getValue = () => {
+    const currentValue =
+      value || (props.default !== undefined ? props.default : undefined);
+
+    // safety check - the value is intended to be undefined but null was used
+    if (currentValue === null && !options.find(o => o.value === null)) {
+      return undefined;
+    }
+    return currentValue;
+  };
+
   useEffect(() => {
     const onError = (response: Response) =>
       getClientErrorObject(response).then(e => {
@@ -93,7 +104,7 @@ const SelectAsyncControl = ({
     <Select
       allowClear={allowClear}
       ariaLabel={ariaLabel || t('Select ...')}
-      value={value || (props.default !== undefined ? props.default : undefined)}
+      value={getValue()}
       header={<ControlHeader {...props} />}
       mode={multi ? 'multiple' : 'single'}
       onChange={handleOnChange}

diff --git a/superset-frontend/src/explore/components/controls/SelectControl.jsx b/superset-frontend/src/explore/components/controls/SelectControl.jsx
@@ -205,6 +205,21 @@ export default class SelectControl extends React.PureComponent {
       danger,
     };
 
+    const getValue = () => {
+      const currentValue =
+        value ||
+        (this.props.default !== undefined ? this.props.default : undefined);
+
+      // safety check - the value is intended to be undefined but null was used
+      if (
+        currentValue === null &&
+        !this.state.options.find(o => o.value === null)
+      ) {
+        return undefined;
+      }
+      return currentValue;
+    };
+
     const selectProps = {
       allowNewOptions: freeForm,
       autoFocus,
@@ -225,9 +240,7 @@ export default class SelectControl extends React.PureComponent {
       optionRenderer,
       options: this.state.options,
       placeholder,
-      value:
-        value ||
-        (this.props.default !== undefined ? this.props.default : undefined),
+      value: getValue(),
     };
 
     return (