refs #14276 Merge branch 'origin/14276-structured-search-service-part2'

[arvados-workbench2.git] / src / views-components / search-bar / search-bar-view.tsx

diff --git a/src/views-components/search-bar/search-bar-view.tsx b/src/views-components/search-bar/search-bar-view.tsx
index 3782f8691dc10e080ff282bcb51db4dc2650b7b4..b3ec7ab71cce87aff5441acacd2de13c40b5e25b 100644 (file)
--- a/src/views-components/search-bar/search-bar-view.tsx
+++ b/src/views-components/search-bar/search-bar-view.tsx
@@ -104,7 +104,7 @@ export const SearchBarView = withStyles(styles)(
                             endAdornment={
                                 <InputAdornment position="end">
                                     <Tooltip title='Search'>
-                                        <IconButton>
+                                        <IconButton type="submit">
                                             <SearchIcon />
                                         </IconButton>
                                     </Tooltip>
@@ -121,8 +121,8 @@ export const SearchBarView = withStyles(styles)(
 );
 
 const getView = (props: SearchBarViewProps) => {
-    const { onSetView, loadRecentQueries, savedQueries, deleteSavedQuery, searchValue,
-        searchResults, saveQuery, onSearch, navigateTo, editSavedQuery, tags, currentView } = props;
+    const { onSetView, closeAdvanceView, loadRecentQueries, savedQueries, deleteSavedQuery, searchValue,
+        searchResults, onSearch, navigateTo, editSavedQuery, tags, currentView } = props;
     switch (currentView) {
         case SearchView.AUTOCOMPLETE:
             return <SearchBarAutocompleteView
@@ -131,8 +131,7 @@ const getView = (props: SearchBarViewProps) => {
                 searchValue={searchValue} />;
         case SearchView.ADVANCED:
             return <SearchBarAdvancedView
-                onSetView={onSetView}
-                saveQuery={saveQuery}
+                closeAdvanceView={closeAdvanceView}
                 tags={tags} />;
         default:
             return <SearchBarBasicView