X-Git-Url: https://git.arvados.org/arvados-workbench2.git/blobdiff_plain/df9ea1569dd0d4ae1c05bacc8a5e5f7695f4453b..8623f430ea556381f8681c2aea00e43e64d3f6d1:/src/views-components/search-bar/search-bar-autocomplete-view.tsx

diff --git a/src/views-components/search-bar/search-bar-autocomplete-view.tsx b/src/views-components/search-bar/search-bar-autocomplete-view.tsx
index 30da9a45..e45197dd 100644
--- a/src/views-components/search-bar/search-bar-autocomplete-view.tsx
+++ b/src/views-components/search-bar/search-bar-autocomplete-view.tsx
@@ -4,42 +4,56 @@
 
 import * as React from 'react';
 import { Paper, StyleRulesCallback, withStyles, WithStyles, List, ListItem, ListItemText } from '@material-ui/core';
-import { ArvadosTheme } from '~/common/custom-theme';
-import { RecentQueriesItem } from '~/views-components/search-bar/search-bar-view';
 import { GroupContentsResource } from '~/services/groups-service/groups-service';
 import Highlighter from "react-highlight-words";
+import { SearchBarSelectedItem } from "~/store/search-bar/search-bar-reducer";
 
-type CssRules = 'list';
+type CssRules = 'searchView' | 'list' | 'listItem';
 
-const styles: StyleRulesCallback<CssRules> = (theme: ArvadosTheme) => {
+const styles: StyleRulesCallback<CssRules> = theme => {
     return {
+        searchView: {
+            borderRadius: `0 0 ${theme.spacing.unit / 2}px ${theme.spacing.unit / 2}px`
+        },
         list: {
-            padding: '0px'
+            padding: 0
+        },
+        listItem: {
+            paddingLeft: theme.spacing.unit,
+            paddingRight: theme.spacing.unit * 2,
         }
     };
 };
 
 export interface SearchBarAutocompleteViewDataProps {
-    searchResults?: GroupContentsResource[];
+    searchResults: GroupContentsResource[];
     searchValue?: string;
+    selectedItem: SearchBarSelectedItem;
 }
 
-type SearchBarAutocompleteViewProps = SearchBarAutocompleteViewDataProps & WithStyles<CssRules>;
+export interface SearchBarAutocompleteViewActionProps {
+    navigateTo: (uuid: string) => void;
+}
+
+type SearchBarAutocompleteViewProps = SearchBarAutocompleteViewDataProps & SearchBarAutocompleteViewActionProps & WithStyles<CssRules>;
 
 export const SearchBarAutocompleteView = withStyles(styles)(
-    ({ classes, searchResults, searchValue }: SearchBarAutocompleteViewProps ) =>
-        <Paper>
-            {searchResults &&  <List component="nav" className={classes.list}>
-                {searchResults.map((item: GroupContentsResource) => {
-                    return <RecentQueriesItem key={item.uuid} text={getFormattedText(item.name, searchValue)} />;
-                })}
-            </List>}
-        </Paper>
-);
+    ({ classes, searchResults, searchValue, navigateTo, selectedItem }: SearchBarAutocompleteViewProps) => {
+        return <Paper className={classes.searchView}>
+            <List component="nav" className={classes.list}>
+                <ListItem button className={classes.listItem} selected={!selectedItem || searchValue === selectedItem.id}>
+                    <ListItemText secondary={searchValue}/>
+                </ListItem>
+                {searchResults.map((item: GroupContentsResource) =>
+                    <ListItem button key={item.uuid} className={classes.listItem} selected={item.uuid === selectedItem.id}>
+                        <ListItemText secondary={getFormattedText(item.name, searchValue)}
+                                      onClick={() => navigateTo(item.uuid)}/>
+                    </ListItem>
+                )}
+            </List>
+        </Paper>;
+    });
 
 const getFormattedText = (textToHighlight: string, searchString = '') => {
-    return <Highlighter
-                searchWords={[searchString]}
-                autoEscape={true}
-                textToHighlight={textToHighlight} />;
-};
\ No newline at end of file
+    return <Highlighter searchWords={[searchString]} autoEscape={true} textToHighlight={textToHighlight} />;
+};