Strict undefined check SelectControl (#17008)

apache · Oct 7, 2021 · 66b0877 · 66b0877
1 parent 45908ff
commit 66b0877
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/superset-frontend/src/components/Select/Select.tsx b/superset-frontend/src/components/Select/Select.tsx
@@ -627,7 +627,7 @@ const Select = ({
  selectOptions.map(opt => {
  const isOptObject = typeof opt === 'object';
  const label = isOptObject ? opt?.label || opt.value : opt;
- const value = (isOptObject && opt.value) || opt;
+ const value = isOptObject ? opt.value : opt;
  const { customLabel, ...optProps } = opt;
 
  return (

diff --git a/superset-frontend/src/explore/components/controls/SelectControl.jsx b/superset-frontend/src/explore/components/controls/SelectControl.jsx
@@ -110,10 +110,12 @@ export default class SelectControl extends React.PureComponent {
  let onChangeVal = val;
 
  if (Array.isArray(val)) {
- const values = val.map(v => v?.[valueKey] || v);
+ const values = val.map(v =>
+ v?.[valueKey] !== undefined ? v[valueKey] : v,
+ );
  onChangeVal = values;
  }
- if (typeof val === 'object' && val?.[valueKey]) {
+ if (typeof val === 'object' && val?.[valueKey] !== undefined) {
  onChangeVal = val[valueKey];
  }
  this.props.onChange(onChangeVal, []);