[ARVADOS-WORKBENCH2] updated: 1.2.0-543-g23f1273
Git user
git at public.curoverse.com
Fri Oct 5 04:39:40 EDT 2018
Summary of changes:
src/components/search-bar/search-bar.tsx | 48 ++++++++++++++++++++------------
1 file changed, 30 insertions(+), 18 deletions(-)
via 23f12738ed71ef736cb9c85a530cb4795c760d8f (commit)
from 83e82935bee3fd0047c6e647c1256c4f3a9870aa (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
commit 23f12738ed71ef736cb9c85a530cb4795c760d8f
Author: Pawel Kowalczyk <pawel.kowalczyk at contractors.roche.com>
Date: Fri Oct 5 10:39:28 2018 +0200
fixed basic view
Feature #14275
Arvados-DCO-1.1-Signed-off-by: Pawel Kowalczyk <pawel.kowalczyk at contractors.roche.com>
diff --git a/src/components/search-bar/search-bar.tsx b/src/components/search-bar/search-bar.tsx
index 5021c7c..ebb7f5e 100644
--- a/src/components/search-bar/search-bar.tsx
+++ b/src/components/search-bar/search-bar.tsx
@@ -11,9 +11,10 @@ import {
WithStyles,
Tooltip,
InputAdornment, Input,
- List, ListItem, ListItemText
+ List, ListItem, ListItemText, ListItemSecondaryAction
} from '@material-ui/core';
import SearchIcon from '@material-ui/icons/Search';
+import { RemoveIcon } from '~/components/icon/icon';
type CssRules = 'container' | 'input' | 'advanced' | 'searchQueryList' | 'list' | 'searchView' | 'searchBar';
@@ -44,8 +45,7 @@ const styles: StyleRulesCallback<CssRules> = theme => {
padding: '0px'
},
searchView: {
- color: '#000',
- zIndex: 1000
+ color: theme.palette.common.black
},
searchBar: {
height: '30px'
@@ -85,6 +85,7 @@ export const SearchBar = withStyles(styles)(
return <Paper className={classes.container} onBlur={this.closeSearchView}>
<form onSubmit={this.handleSubmit} className={classes.searchBar}>
<Input
+ autoComplete={''}
className={classes.input}
onChange={this.handleChange}
placeholder="Search"
@@ -101,20 +102,19 @@ export const SearchBar = withStyles(styles)(
</Tooltip>
</InputAdornment>
} />
- {this.state.isSearchViewOpen
- ? <Paper className={classes.searchView}>
- <div className={classes.searchQueryList}>Saved search queries</div>
- <List component="nav" className={classes.list}>
- {this.renderListItem('Trash')}
- {this.renderListItem('Spam')}
- </List>
- <div className={classes.searchQueryList}>Recent search queries</div>
- <List component="nav" className={classes.list}>
- {this.renderListItem('Trash')}
- {this.renderListItem('Spam')}
- </List>
- <div className={classes.advanced}>Advanced</div>
- </Paper> : null}
+ {this.state.isSearchViewOpen && <Paper className={classes.searchView}>
+ <div className={classes.searchQueryList}>Saved search queries</div>
+ <List component="nav" className={classes.list}>
+ {this.renderSavedQueries('Test')}
+ {this.renderSavedQueries('Demo')}
+ </List>
+ <div className={classes.searchQueryList}>Recent search queries</div>
+ <List component="nav" className={classes.list}>
+ {this.renderRecentQueries('cos')}
+ {this.renderRecentQueries('testtest')}
+ </List>
+ <div className={classes.advanced}>Advanced search</div>
+ </Paper>}
</form>
</Paper>;
}
@@ -141,11 +141,23 @@ export const SearchBar = withStyles(styles)(
this.setState({ isSearchViewOpen: true })
- renderListItem = (text: string) =>
+ renderRecentQueries = (text: string) =>
<ListItem button>
<ListItemText secondary={text} />
</ListItem>
+ renderSavedQueries = (text: string) =>
+ <ListItem button>
+ <ListItemText secondary={text} />
+ <ListItemSecondaryAction>
+ <Tooltip title="Remove">
+ <IconButton aria-label="Remove">
+ <RemoveIcon />
+ </IconButton>
+ </Tooltip>
+ </ListItemSecondaryAction>
+ </ListItem>
+
handleSubmit = (event: React.FormEvent<HTMLFormElement>) => {
event.preventDefault();
clearTimeout(this.timeout);
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list