X-Git-Url: https://git.arvados.org/arvados-workbench2.git/blobdiff_plain/e5696ae072134453e8a0845a4cc58288e3b3163c..2a92ec7492e5c040f8f04bb62818a2c2ec34bd35:/src/views-components/search-bar/search-bar-view.tsx?ds=sidebyside

diff --git a/src/views-components/search-bar/search-bar-view.tsx b/src/views-components/search-bar/search-bar-view.tsx
index 7680516a..1a19b47d 100644
--- a/src/views-components/search-bar/search-bar-view.tsx
+++ b/src/views-components/search-bar/search-bar-view.tsx
@@ -11,128 +11,131 @@ import {
     WithStyles,
     Tooltip,
     InputAdornment, Input,
-    ListItem, ListItemText, ListItemSecondaryAction,
     ClickAwayListener
 } from '@material-ui/core';
 import SearchIcon from '@material-ui/icons/Search';
-import { RemoveIcon } from '~/components/icon/icon';
-import { SearchView } from '~/store/search-bar/search-bar-reducer';
-import { SearchBarBasicView } from '~/views-components/search-bar/search-bar-basic-view';
-import { SearchBarAdvancedView } from '~/views-components/search-bar/search-bar-advanced-view';
-import { SearchBarAutocompleteView, SearchBarAutocompleteViewDataProps } from '~/views-components/search-bar/search-bar-autocomplete-view';
 import { ArvadosTheme } from '~/common/custom-theme';
+import { SearchView } from '~/store/search-bar/search-bar-reducer';
+import {
+    SearchBarBasicView,
+    SearchBarBasicViewDataProps,
+    SearchBarBasicViewActionProps
+} from '~/views-components/search-bar/search-bar-basic-view';
+import {
+    SearchBarAutocompleteView,
+    SearchBarAutocompleteViewDataProps,
+    SearchBarAutocompleteViewActionProps
+} from '~/views-components/search-bar/search-bar-autocomplete-view';
+import {
+    SearchBarAdvancedView,
+    SearchBarAdvancedViewDataProps,
+    SearchBarAdvancedViewActionProps
+} from '~/views-components/search-bar/search-bar-advanced-view';
+import { KEY_CODE_DOWN, KEY_CODE_ESC, KEY_CODE_UP, KEY_ENTER } from "~/common/codes";
 
-type CssRules = 'container' | 'containerSearchViewOpened' | 'input' | 'searchBar' | 'view';
+type CssRules = 'container' | 'containerSearchViewOpened' | 'input' | 'view';
 
 const styles: StyleRulesCallback<CssRules> = (theme: ArvadosTheme) => {
     return {
         container: {
             position: 'relative',
             width: '100%',
-            borderRadius: theme.spacing.unit / 4
+            borderRadius: theme.spacing.unit / 2
         },
         containerSearchViewOpened: {
             position: 'relative',
             width: '100%',
-            borderRadius: `${theme.spacing.unit / 4}px ${theme.spacing.unit / 4}px 0 0`
+            borderRadius: `${theme.spacing.unit / 2}px ${theme.spacing.unit / 2}px 0 0`
         },
         input: {
             border: 'none',
             padding: `0px ${theme.spacing.unit}px`
         },
-        searchBar: {
-            height: '30px'
-        },
         view: {
             position: 'absolute',
             width: '100%',
-            zIndex: 10000
+            zIndex: 1
         }
     };
 };
 
-type SearchBarDataProps = {
+export type SearchBarDataProps = SearchBarViewDataProps
+    & SearchBarAutocompleteViewDataProps
+    & SearchBarAdvancedViewDataProps
+    & SearchBarBasicViewDataProps;
+
+interface SearchBarViewDataProps {
     searchValue: string;
     currentView: string;
     isPopoverOpen: boolean;
-    savedQueries: string[];
-} & SearchBarAutocompleteViewDataProps;
-
-interface SearchBarActionProps {
-    onSearch: (value: string) => any;
     debounce?: number;
-    onSetView: (currentView: string) => void;
-    openView: () => void;
-    closeView: () => void;
-    saveRecentQuery: (query: string) => void;
-    loadRecentQueries: () => string[];
-    saveQuery: (query: string) => void;
-    deleteSavedQuery: (id: number) => void;
 }
 
-type SearchBarProps = SearchBarDataProps & SearchBarActionProps & WithStyles<CssRules>;
+export type SearchBarActionProps = SearchBarViewActionProps
+    & SearchBarAutocompleteViewActionProps
+    & SearchBarAdvancedViewActionProps
+    & SearchBarBasicViewActionProps;
 
-interface SearchBarState {
-    value: string;
-}
-
-interface RenderSavedQueriesProps {
-    text: string | JSX.Element;
-    id: number;
-    deleteSavedQuery: (id: number) => void;
+interface SearchBarViewActionProps {
+    onChange: (event: React.ChangeEvent<HTMLInputElement>) => void;
+    onSubmit: (event: React.FormEvent<HTMLFormElement>) => void;
+    onSetView: (currentView: string) => void;
+    closeView: () => void;
+    openSearchView: () => void;
+    loadRecentQueries: () => string[];
+    moveUp: () => void;
+    moveDown: () => void;
 }
 
-interface RenderRecentQueriesProps {
-    text: string | JSX.Element;
-}
+type SearchBarViewProps = SearchBarDataProps & SearchBarActionProps & WithStyles<CssRules>;
 
-export const RecentQueriesItem = (props: RenderRecentQueriesProps) => {
-    return <ListItem button>
-        <ListItemText secondary={props.text} />
-    </ListItem>;
-};
-
-
-export const RenderSavedQueries = (props: RenderSavedQueriesProps) => {
-    return <ListItem button>
-        <ListItemText secondary={props.text} />
-        <ListItemSecondaryAction>
-            <Tooltip title="Remove">
-                <IconButton aria-label="Remove" onClick={() => props.deleteSavedQuery(props.id)}>
-                    <RemoveIcon />
-                </IconButton>
-            </Tooltip>
-        </ListItemSecondaryAction>
-    </ListItem>;
+const handleKeyDown = (e: React.KeyboardEvent, props: SearchBarViewProps) => {
+    if (e.keyCode === KEY_CODE_DOWN) {
+        e.preventDefault();
+        if (!props.isPopoverOpen) {
+            props.openSearchView();
+        } else {
+            props.moveDown();
+        }
+    } else if (e.keyCode === KEY_CODE_UP) {
+        e.preventDefault();
+        props.moveUp();
+    } else if (e.keyCode === KEY_CODE_ESC) {
+        e.preventDefault();
+        props.closeView();
+    } else if (e.keyCode === KEY_ENTER) {
+        if (props.currentView === SearchView.BASIC) {
+            e.preventDefault();
+            props.onSearch(props.selectedItem.query);
+        } else if (props.currentView === SearchView.AUTOCOMPLETE) {
+            if (props.selectedItem.id !== props.searchValue) {
+                e.preventDefault();
+                props.navigateTo(props.selectedItem.id);
+            }
+        }
+    }
 };
 
-export const DEFAULT_SEARCH_DEBOUNCE = 1000;
-
 export const SearchBarView = withStyles(styles)(
-    class extends React.Component<SearchBarProps> {
-        state: SearchBarState = {
-            value: ""
-        };
-
-        timeout: number;
-
-        render() {
-            const { classes, currentView, openView, closeView, isPopoverOpen } = this.props;
-            return <ClickAwayListener onClickAway={() => closeView()}>
+    (props : SearchBarViewProps) => {
+        const { classes, isPopoverOpen } = props;
+        return (
+            <ClickAwayListener onClickAway={props.closeView}>
                 <Paper className={isPopoverOpen ? classes.containerSearchViewOpened : classes.container} >
-                    <form onSubmit={this.handleSubmit} className={classes.searchBar}>
+                    <form onSubmit={props.onSubmit}>
                         <Input
                             className={classes.input}
-                            onChange={this.handleChange}
+                            onChange={props.onChange}
                             placeholder="Search"
-                            value={this.state.value}
+                            value={props.searchValue}
                             fullWidth={true}
                             disableUnderline={true}
-                            onClick={() => openView()}
+                            onClick={props.openSearchView}
+                            onKeyDown={e => handleKeyDown(e, props)}
                             endAdornment={
                                 <InputAdornment position="end">
                                     <Tooltip title='Search'>
-                                        <IconButton>
+                                        <IconButton type="submit">
                                             <SearchIcon />
                                         </IconButton>
                                     </Tooltip>
@@ -140,63 +143,34 @@ export const SearchBarView = withStyles(styles)(
                             } />
                     </form>
                     <div className={classes.view}>
-                        {isPopoverOpen && this.getView(currentView)}
+                        {isPopoverOpen && getView({...props})}
                     </div>
                 </Paper >
-            </ClickAwayListener>;
-        }
-
-        componentDidMount() {
-            this.setState({ value: this.props.searchValue });
-        }
-
-        componentWillReceiveProps(nextProps: SearchBarProps) {
-            if (nextProps.searchValue !== this.props.searchValue) {
-                this.setState({ value: nextProps.searchValue });
-            }
-        }
-
-        componentWillUnmount() {
-            clearTimeout(this.timeout);
-        }
-
-        getView = (currentView: string) => {
-            const { onSetView, loadRecentQueries, savedQueries, deleteSavedQuery, searchValue, searchResults } = this.props;
-            switch (currentView) {
-                case SearchView.BASIC:
-                    return <SearchBarBasicView setView={onSetView} recentQueries={loadRecentQueries} savedQueries={savedQueries} deleteSavedQuery={deleteSavedQuery} />;
-                case SearchView.ADVANCED:
-                    return <SearchBarAdvancedView setView={onSetView} />;
-                case SearchView.AUTOCOMPLETE:
-                    return <SearchBarAutocompleteView
-                        searchResults={searchResults}
-                        searchValue={searchValue} />;
-                default:
-                    return <SearchBarBasicView setView={onSetView} recentQueries={loadRecentQueries} savedQueries={savedQueries} deleteSavedQuery={deleteSavedQuery} />;
-            }
-        }
-
-        handleSubmit = (event: React.FormEvent<HTMLFormElement>) => {
-            event.preventDefault();
-            clearTimeout(this.timeout);
-            this.props.saveRecentQuery(this.state.value);
-            this.props.saveQuery(this.state.value);
-            this.props.onSearch(this.state.value);
-            this.props.loadRecentQueries();
-        }
-
-        handleChange = (event: React.ChangeEvent<HTMLInputElement>) => {
-            clearTimeout(this.timeout);
-            this.setState({ value: event.target.value });
-            this.timeout = window.setTimeout(
-                () => this.props.onSearch(this.state.value),
-                this.props.debounce || DEFAULT_SEARCH_DEBOUNCE
-            );
-            if (event.target.value.length > 0) {
-                this.props.onSetView(SearchView.AUTOCOMPLETE);
-            } else {
-                this.props.onSetView(SearchView.BASIC);
-            }
-        }
+            </ClickAwayListener>
+        );
     }
 );
+
+const getView = (props: SearchBarViewProps) => {
+    switch (props.currentView) {
+        case SearchView.AUTOCOMPLETE:
+            return <SearchBarAutocompleteView
+                navigateTo={props.navigateTo}
+                searchResults={props.searchResults}
+                searchValue={props.searchValue}
+                selectedItem={props.selectedItem} />;
+        case SearchView.ADVANCED:
+            return <SearchBarAdvancedView
+                closeAdvanceView={props.closeAdvanceView}
+                tags={props.tags} />;
+        default:
+            return <SearchBarBasicView
+                onSetView={props.onSetView}
+                onSearch={props.onSearch}
+                loadRecentQueries={props.loadRecentQueries}
+                savedQueries={props.savedQueries}
+                deleteSavedQuery={props.deleteSavedQuery}
+                editSavedQuery={props.editSavedQuery}
+                selectedItem={props.selectedItem} />;
+    }
+};