iop
/
superset
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: Null values on Explore filter (#19341)

This commit is contained in:
Michael S. Molina 2022-03-23 18:23:57 -03:00 committed by GitHub
parent 3340f05dd3
commit 65c204b288
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 21 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
superset-frontend/src/components/Select/Select.tsx
View File

@ -42,7 +42,7 @@ import Icons from 'src/components/Icons';
import { getClientErrorObject } from 'src/utils/getClientErrorObject';
import { SLOW_DEBOUNCE } from 'src/constants';
import { rankedSearchCompare } from 'src/utils/rankedSearchCompare';
import { getValue, hasOption } from './utils';
import { getValue, hasOption, isObject } from './utils';
const { Option } = AntdSelect;
@ -385,18 +385,20 @@ const Select = (
const hasCustomLabels = fullSelectOptions.some(opt => !!opt?.customLabel);
const handleOnSelect = (selectedItem: string | number | AntdLabeledValue) => {
const handleOnSelect = (
selectedItem: string | number | AntdLabeledValue | undefined,
) => {
if (isSingleMode) {
setSelectValue(selectedItem);
} else {
setSelectValue(previousState => {
const array = ensureIsArray(previousState);
const isObject = typeof selectedItem === 'object';
const value = isObject ? selectedItem.value : selectedItem;
const isLabeledValue = isObject(selectedItem);
const value = isLabeledValue ? selectedItem.value : selectedItem;
// Tokenized values can contain duplicated values
if (!hasOption(value, array)) {
const result = [...array, selectedItem];
return isObject
return isLabeledValue
? (result as AntdLabeledValue[])
: (result as (string | number)[]);
}
@ -406,9 +408,11 @@ const Select = (
setInputValue('');
};
const handleOnDeselect = (value: string | number | AntdLabeledValue) => {
const handleOnDeselect = (
value: string | number | AntdLabeledValue | undefined,
) => {
if (Array.isArray(selectValue)) {
if (typeof value === 'number' || typeof value === 'string') {
if (typeof value === 'number' || typeof value === 'string' || !value) {
const array = selectValue as (string | number)[];
setSelectValue(array.filter(element => element !== value));
} else {

2
superset-frontend/src/components/Select/utils.ts
View File

@ -25,7 +25,7 @@ import {
GroupedOptionsType,
} from 'react-select';
function isObject(value: unknown): value is Record<string, unknown> {
export function isObject(value: unknown): value is Record<string, unknown> {
return (
value !== null &&
typeof value === 'object' &&

14
superset-frontend/src/explore/components/controls/FilterControl/AdhocFilterEditPopoverSimpleTabContent/index.tsx
View File

@ -406,11 +406,15 @@ const AdhocFilterEditPopoverSimpleTabContent: React.FC<Props> = props => {
{...operatorSelectProps}
/>
{MULTI_OPERATORS.has(operatorId) || suggestions.length > 0 ? (
<SelectWithLabel
labelText={labelText}
options={suggestions}
{...comparatorSelectProps}
/>
// We need to delay rendering the select because we can't pass a primitive value without options
// We can't pass value = [null] and options=[]
comparatorSelectProps.value && suggestions.length === 0 ? null : (
<SelectWithLabel
labelText={labelText}
options={suggestions}
{...comparatorSelectProps}
/>
)
) : (
<StyledInput
data-test="adhoc-filter-simple-value"