This is an automated email from the ASF dual-hosted git repository. amitmiran pushed a commit to branch 1.2 in repository https://gitbox.apache.org/repos/asf/superset.git
commit 845d99abc27a403f27e170cbcfb4885dce851fcc Author: Ville Brofeldt <[email protected]> AuthorDate: Sat Apr 24 08:26:24 2021 +0300 feat(native-filters): add option to create value in select filter (#14314) * feat(native-filters): add option to create value in select filter * address comments (cherry picked from commit e392e2ed398b3e6ad15ed95934ba430c2efcafa8) --- .../filters/components/Select/SelectFilterPlugin.tsx | 20 ++++++++++++++++++-- .../src/filters/components/Select/transformProps.ts | 2 +- 2 files changed, 19 insertions(+), 3 deletions(-) diff --git a/superset-frontend/src/filters/components/Select/SelectFilterPlugin.tsx b/superset-frontend/src/filters/components/Select/SelectFilterPlugin.tsx index 6f777ef..8efcaea 100644 --- a/superset-frontend/src/filters/components/Select/SelectFilterPlugin.tsx +++ b/superset-frontend/src/filters/components/Select/SelectFilterPlugin.tsx @@ -72,6 +72,11 @@ export default function PluginFilterSelect(props: PluginFilterSelectProps) { ? firstItem : initSelectValue, ); + const [currentSuggestionSearch, setCurrentSuggestionSearch] = useState(''); + + const clearSuggestionSearch = () => { + setCurrentSuggestionSearch(''); + }; const [col] = groupby; const datatype: GenericDataType = coltypeMap[col]; @@ -137,7 +142,7 @@ export default function PluginFilterSelect(props: PluginFilterSelectProps) { ]); const placeholderText = - (data || []).length === 0 + data.length === 0 ? t('No data') : tn('%s option', '%s options', data.length, data.length); return ( @@ -150,11 +155,14 @@ export default function PluginFilterSelect(props: PluginFilterSelectProps) { showSearch={showSearch} mode={multiSelect ? 'multiple' : undefined} placeholder={placeholderText} + onSearch={setCurrentSuggestionSearch} + onSelect={clearSuggestionSearch} + onBlur={clearSuggestionSearch} // @ts-ignore onChange={handleChange} ref={inputRef} > - {(data || []).map(row => { + {data.map(row => { const [value] = groupby.map(col => row[col]); return ( // @ts-ignore @@ -163,6 +171,14 @@ export default function PluginFilterSelect(props: PluginFilterSelectProps) { </Option> ); })} + {currentSuggestionSearch && + !ensureIsArray(values).some( + suggestion => suggestion === currentSuggestionSearch, + ) && ( + <Option value={currentSuggestionSearch}> + {currentSuggestionSearch} + </Option> + )} </StyledSelect> </Styles> ); diff --git a/superset-frontend/src/filters/components/Select/transformProps.ts b/superset-frontend/src/filters/components/Select/transformProps.ts index 4c57e86..c72239b 100644 --- a/superset-frontend/src/filters/components/Select/transformProps.ts +++ b/superset-frontend/src/filters/components/Select/transformProps.ts @@ -35,7 +35,7 @@ export default function transformProps( const newFormData = { ...DEFAULT_FORM_DATA, ...formData }; const { setDataMask = () => {} } = hooks; const [queryData] = queriesData; - const { colnames = [], coltypes = [], data } = queryData || []; + const { colnames = [], coltypes = [], data = [] } = queryData || {}; const coltypeMap: Record<string, GenericDataType> = colnames.reduce( (accumulator, item, index) => ({ ...accumulator, [item]: coltypes[index] }), {},
