// SPDX-License-Identifier: AGPL-3.0
import * as React from 'react';
+import { compose } from 'redux';
import {
IconButton,
Paper,
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 ArrowDropDownIcon from '@material-ui/icons/ArrowDropDown';
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";
+import { debounce } from 'debounce';
+import { Vocabulary } from '~/models/vocabulary';
+import { connectVocabulary } from '../resource-properties-form/property-field-common';
-type CssRules = 'container' | 'input' | 'searchBar';
+type CssRules = 'container' | 'containerSearchViewOpened' | 'input' | 'view';
const styles: StyleRulesCallback<CssRules> = (theme: ArvadosTheme) => {
return {
container: {
position: 'relative',
width: '100%',
- borderRadius: '0px'
+ borderRadius: theme.spacing.unit / 2,
+ zIndex: theme.zIndex.modal,
+ },
+ containerSearchViewOpened: {
+ position: 'relative',
+ width: '100%',
+ borderRadius: `${theme.spacing.unit / 2}px ${theme.spacing.unit / 2}px 0 0`,
+ zIndex: theme.zIndex.modal,
},
input: {
border: 'none',
- padding: `0px ${theme.spacing.unit}px`
+ padding: `0`
},
- searchBar: {
- height: '30px'
+ view: {
+ position: 'absolute',
+ width: '100%',
+ zIndex: 1
}
};
};
-type SearchBarDataProps = {
+export type SearchBarDataProps = SearchBarViewDataProps
+ & SearchBarAutocompleteViewDataProps
+ & SearchBarAdvancedViewDataProps
+ & SearchBarBasicViewDataProps;
+
+interface SearchBarViewDataProps {
searchValue: string;
currentView: string;
- open: boolean;
-} & SearchBarAutocompleteViewDataProps;
-
-interface SearchBarActionProps {
- onSearch: (value: string) => any;
+ isPopoverOpen: boolean;
debounce?: number;
- onSetView: (currentView: string) => void;
- openView: () => void;
- closeView: () => void;
+ vocabulary?: Vocabulary;
}
-type SearchBarProps = SearchBarDataProps & SearchBarActionProps & WithStyles<CssRules>;
+export type SearchBarActionProps = SearchBarViewActionProps
+ & SearchBarAutocompleteViewActionProps
+ & SearchBarAdvancedViewActionProps
+ & SearchBarBasicViewActionProps;
-interface SearchBarState {
- value: string;
+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;
+ setAdvancedDataFromSearchValue: (search: string, vocabulary?: Vocabulary) => void;
}
-interface RenderQueriesProps {
- text: string | JSX.Element;
-}
+type SearchBarViewProps = SearchBarDataProps & SearchBarActionProps & WithStyles<CssRules>;
-export const RecentQueriesItem = (props: RenderQueriesProps) => {
- return <ListItem button>
- <ListItemText secondary={props.text} />
- </ListItem>;
+const handleKeyDown = (e: React.KeyboardEvent, props: SearchBarViewProps) => {
+ if (e.keyCode === KEY_CODE_DOWN) {
+ e.preventDefault();
+ if (!props.isPopoverOpen) {
+ props.onSetView(SearchView.AUTOCOMPLETE);
+ 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 RenderSavedQueries = (props: RenderQueriesProps) => {
- return <ListItem button>
- <ListItemText secondary={props.text} />
- <ListItemSecondaryAction>
- <Tooltip title="Remove">
- <IconButton aria-label="Remove">
- <RemoveIcon />
- </IconButton>
- </Tooltip>
- </ListItemSecondaryAction>
- </ListItem>;
+const handleInputClick = (e: React.MouseEvent, props: SearchBarViewProps) => {
+ if (props.searchValue) {
+ props.onSetView(SearchView.AUTOCOMPLETE);
+ props.openSearchView();
+ } else {
+ props.closeView();
+ }
};
-export const DEFAULT_SEARCH_DEBOUNCE = 1000;
-
-export const SearchBarView = withStyles(styles)(
- class extends React.Component<SearchBarProps> {
- state: SearchBarState = {
- value: ""
- };
+const handleDropdownClick = (e: React.MouseEvent, props: SearchBarViewProps) => {
+ e.stopPropagation();
+ if (props.isPopoverOpen && props.currentView === SearchView.ADVANCED) {
+ props.closeView();
+ } else {
+ props.setAdvancedDataFromSearchValue(props.searchValue, props.vocabulary);
+ props.onSetView(SearchView.ADVANCED);
+ }
+};
- timeout: number;
+export const SearchBarView = compose(connectVocabulary, withStyles(styles))(
+ class extends React.Component<SearchBarViewProps> {
- render() {
- const { classes, currentView, openView, closeView, open } = this.props;
- return <ClickAwayListener onClickAway={() => closeView()}>
- <Paper className={classes.container} >
- <form onSubmit={this.handleSubmit} className={classes.searchBar}>
- <Input
- className={classes.input}
- onChange={this.handleChange}
- placeholder="Search"
- value={this.state.value}
- fullWidth={true}
- disableUnderline={true}
- onClick={() => openView()}
- endAdornment={
- <InputAdornment position="end">
- <Tooltip title='Search'>
- <IconButton>
- <SearchIcon />
- </IconButton>
- </Tooltip>
- </InputAdornment>
- } />
- {open && this.getView(currentView)}
- </form>
- </Paper >
- </ClickAwayListener>;
- }
+ debouncedSearch = debounce(() => {
+ this.props.onSearch(this.props.searchValue);
+ }, 1000);
- componentDidMount() {
- this.setState({ value: this.props.searchValue });
+ handleChange = (event: React.ChangeEvent<HTMLInputElement>) => {
+ this.debouncedSearch();
+ this.props.onChange(event);
}
- componentWillReceiveProps(nextProps: SearchBarProps) {
- if (nextProps.searchValue !== this.props.searchValue) {
- this.setState({ value: nextProps.searchValue });
- }
+ handleSubmit = (event: React.FormEvent<HTMLFormElement>) => {
+ this.debouncedSearch.clear();
+ this.props.onSubmit(event);
}
componentWillUnmount() {
- clearTimeout(this.timeout);
+ this.debouncedSearch.clear();
}
- getView = (currentView: string) => {
- switch (currentView) {
- case SearchView.BASIC:
- return <SearchBarBasicView setView={this.props.onSetView} />;
- case SearchView.ADVANCED:
- return <SearchBarAdvancedView setView={this.props.onSetView} />;
- case SearchView.AUTOCOMPLETE:
- return <SearchBarAutocompleteView
- searchResults={this.props.searchResults}
- searchValue={this.props.searchValue} />;
- default:
- return <SearchBarBasicView setView={this.props.onSetView} />;
- }
- }
-
- handleSubmit = (event: React.FormEvent<HTMLFormElement>) => {
- event.preventDefault();
- clearTimeout(this.timeout);
- this.props.onSearch(this.state.value);
- }
-
- 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
+ render() {
+ const { children, ...props } = this.props;
+ const { classes, isPopoverOpen } = this.props;
+ return (
+ <>
+
+ {isPopoverOpen &&
+ <Backdrop onClick={props.closeView} />}
+
+ <Paper className={isPopoverOpen ? classes.containerSearchViewOpened : classes.container} >
+ <form onSubmit={this.handleSubmit}>
+ <Input
+ data-cy='search-input-field'
+ className={classes.input}
+ onChange={this.handleChange}
+ placeholder="Search"
+ value={props.searchValue}
+ fullWidth={true}
+ disableUnderline={true}
+ onClick={e => handleInputClick(e, props)}
+ onKeyDown={e => handleKeyDown(e, props)}
+ startAdornment={
+ <InputAdornment position="start">
+ <Tooltip title='Search'>
+ <IconButton type="submit">
+ <SearchIcon />
+ </IconButton>
+ </Tooltip>
+ </InputAdornment>
+ }
+ endAdornment={
+ <InputAdornment position="end">
+ <Tooltip title='Advanced search'>
+ <IconButton onClick={e => handleDropdownClick(e, props)}>
+ <ArrowDropDownIcon />
+ </IconButton>
+ </Tooltip>
+ </InputAdornment>
+ } />
+ </form>
+ <div className={classes.view}>
+ {isPopoverOpen && getView({ ...props })}
+ </div>
+ </Paper >
+ </>
);
- if (event.target.value.length > 0) {
- this.props.onSetView(SearchView.AUTOCOMPLETE);
- } else {
- this.props.onSetView(SearchView.BASIC);
- }
}
+ });
+
+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}
+ saveQuery={props.saveQuery} />;
+ default:
+ return <SearchBarBasicView
+ onSetView={props.onSetView}
+ onSearch={props.onSearch}
+ loadRecentQueries={props.loadRecentQueries}
+ savedQueries={props.savedQueries}
+ deleteSavedQuery={props.deleteSavedQuery}
+ editSavedQuery={props.editSavedQuery}
+ selectedItem={props.selectedItem} />;
+ }
+};
+
+const Backdrop = withStyles<'backdrop'>(theme => ({
+ backdrop: {
+ position: 'fixed',
+ top: 0,
+ right: 0,
+ bottom: 0,
+ left: 0,
+ zIndex: theme.zIndex.modal
}
-);
+}))(
+ ({ classes, ...props }: WithStyles<'backdrop'> & React.HTMLProps<HTMLDivElement>) =>
+ <div className={classes.backdrop} {...props} />);
projects / arvados-workbench2.git / blobdiff