pt/superset
1
0
Fork 0
mirror of https://github.com/apache/superset.git synced 2024-09-06 22:07:34 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix: allow to select <NULL> in a native filter single mode (#19076)

Browse Source 
* fix: allow to select <NULL> in a native filter single mode

* fix lint issue

* Update superset-frontend/src/components/Select/utils.ts

Co-authored-by: Michael S. Molina <70410625+michael-s-molina@users.noreply.github.com>

* fix

Co-authored-by: Michael S. Molina <70410625+michael-s-molina@users.noreply.github.com>
This commit is contained in:
Diego Medina 2022-03-17 13:05:32 -04:00 committed by GitHub
parent d099f5ed4a
commit 19fcd03c89
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 33 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -60,8 +60,10 @@ export function findValue<OptionType extends OptionTypeBase>(
return (Array.isArray(value) ? value : [value]).map(find);
}
export function getValue(option: string | number | { value: string | number }) {
return typeof option === 'object' ? option.value : option;
export function getValue(
option: string | number | { value: string | number | null } | null,
) {
return option && typeof option === 'object' ? option.value : option;
}
type LabeledValue<V> = { label?: ReactNode; value?: V };

27
superset-frontend/src/filters/components/Select/SelectFilterPlugin.test.tsx
View File

@ -20,6 +20,7 @@ import userEvent from '@testing-library/user-event';
import { AppSection } from '@superset-ui/core';
import React from 'react';
import { render, screen } from 'spec/helpers/testing-library';
import { NULL_STRING } from 'src/utils/common';
import SelectFilterPlugin from './SelectFilterPlugin';
import transformProps from './transformProps';
@ -55,7 +56,7 @@ const selectMultipleProps = {
rowcount: 2,
colnames: ['gender'],
coltypes: [1],
data: [{ gender: 'boy' }, { gender: 'girl' }],
data: [{ gender: 'boy' }, { gender: 'girl' }, { gender: null }],
applied_filters: [{ column: 'gender' }],
rejected_filters: [],
},
@ -195,6 +196,30 @@ describe('SelectFilterPlugin', () => {
});
});
it('Select single null (empty) value', () => {
getWrapper();
userEvent.click(screen.getByRole('combobox'));
userEvent.click(screen.getByTitle(NULL_STRING));
expect(setDataMask).toHaveBeenLastCalledWith({
__cache: {
value: ['boy'],
},
extraFormData: {
filters: [
{
col: 'gender',
op: 'IN',
val: ['boy', null],
},
],
},
filterState: {
label: `boy, ${NULL_STRING}`,
value: ['boy', null],
},
});
});
it('Add ownState with column types when search all options', () => {
getWrapper({ searchAllOptions: true, multiSelect: false });
userEvent.click(screen.getByRole('combobox'));

3
superset-frontend/src/filters/components/Select/SelectFilterPlugin.tsx
View File

@ -209,7 +209,8 @@ export default function PluginFilterSelect(props: PluginFilterSelectProps) {
const handleChange = useCallback(
(value?: SelectValue | number | string) => {
const values = ensureIsArray(value);
const values = value === null ? [null] : ensureIsArray(value);
if (values.length === 0) {
updateDataMask(null);
} else {

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

@ -29,7 +29,7 @@ import {
import { RefObject } from 'react';
import { PluginFilterHooks, PluginFilterStylesProps } from '../types';
export type SelectValue = (number | string)[] | null | undefined;
export type SelectValue = (number | string | null)[] | null | undefined;
export interface PluginFilterSelectCustomizeProps {
defaultValue?: SelectValue;