X-Git-Url: https://git.arvados.org/arvados-workbench2.git/blobdiff_plain/9a37cc202448e431064b247d36ac0229a6bfa9b2..96626db04a7dcb11b21d92203a6ddd81577191bf:/src/views-components/search-bar/search-bar-advanced-view.tsx diff --git a/src/views-components/search-bar/search-bar-advanced-view.tsx b/src/views-components/search-bar/search-bar-advanced-view.tsx index b001cb3e..9f9688c3 100644 --- a/src/views-components/search-bar/search-bar-advanced-view.tsx +++ b/src/views-components/search-bar/search-bar-advanced-view.tsx @@ -7,17 +7,17 @@ import { reduxForm, InjectedFormProps, reset } from 'redux-form'; import { compose, Dispatch } from 'redux'; import { Paper, StyleRulesCallback, withStyles, WithStyles, Button, Grid, IconButton, CircularProgress } from '@material-ui/core'; import { - SEARCH_BAR_ADVANCE_FORM_NAME, SEARCH_BAR_ADVANCE_FORM_PICKER_ID, - searchAdvanceData, + SEARCH_BAR_ADVANCED_FORM_NAME, SEARCH_BAR_ADVANCED_FORM_PICKER_ID, + searchAdvancedData, setSearchValueFromAdvancedData } from '~/store/search-bar/search-bar-actions'; import { ArvadosTheme } from '~/common/custom-theme'; import { CloseIcon } from '~/components/icon/icon'; -import { SearchBarAdvanceFormData } from '~/models/search-bar'; +import { SearchBarAdvancedFormData } from '~/models/search-bar'; import { SearchBarTypeField, SearchBarClusterField, SearchBarProjectField, SearchBarTrashField, SearchBarDateFromField, SearchBarDateToField, SearchBarPropertiesField, - SearchBarSaveSearchField, SearchBarQuerySearchField + SearchBarSaveSearchField, SearchBarQuerySearchField, SearchBarPastVersionsField } from '~/views-components/form-fields/search-bar-form-fields'; import { treePickerActions } from "~/store/tree-picker/tree-picker-actions"; @@ -100,15 +100,15 @@ const validate = (values: any) => { }; export const SearchBarAdvancedView = compose( - reduxForm({ - form: SEARCH_BAR_ADVANCE_FORM_NAME, + reduxForm({ + form: SEARCH_BAR_ADVANCED_FORM_NAME, validate, - onSubmit: (data: SearchBarAdvanceFormData, dispatch: Dispatch) => { - dispatch(searchAdvanceData(data)); - dispatch(reset(SEARCH_BAR_ADVANCE_FORM_NAME)); - dispatch(treePickerActions.DEACTIVATE_TREE_PICKER_NODE({ pickerId: SEARCH_BAR_ADVANCE_FORM_PICKER_ID })); + onSubmit: (data: SearchBarAdvancedFormData, dispatch: Dispatch) => { + dispatch(searchAdvancedData(data)); + dispatch(reset(SEARCH_BAR_ADVANCED_FORM_NAME)); + dispatch(treePickerActions.DEACTIVATE_TREE_PICKER_NODE({ pickerId: SEARCH_BAR_ADVANCED_FORM_PICKER_ID })); }, - onChange: (data: SearchBarAdvanceFormData, dispatch: Dispatch, props: any, prevData: SearchBarAdvanceFormData) => { + onChange: (data: SearchBarAdvancedFormData, dispatch: Dispatch, props: any, prevData: SearchBarAdvancedFormData) => { dispatch(setSearchValueFromAdvancedData(data, prevData)); }, }), @@ -141,6 +141,9 @@ export const SearchBarAdvancedView = compose( + + +