[ARVADOS-WORKBENCH2] updated: 1.2.0-588-g1080aac
Git user
git at public.curoverse.com
Thu Oct 11 03:51:43 EDT 2018
Summary of changes:
package.json | 3 +-
src/services/search-service/search-service.ts | 21 +++++++++++++
src/services/services.ts | 3 ++
src/store/search-bar/search-bar-actions.ts | 18 ++++++++---
.../project-tree-picker/project-tree-picker.tsx | 10 +++---
.../search-bar/search-bar-advanced-view.tsx | 2 +-
.../search-bar/search-bar-autocomplete-view.tsx | 26 +++++++++-------
.../search-bar/search-bar-basic-view.tsx | 9 +++---
.../search-bar/search-bar-view.test.tsx | 36 +++++++++++++---------
.../search-bar/search-bar-view.tsx | 19 +++++++++---
src/views-components/search-bar/search-bar.tsx | 5 ++-
src/views/workbench/workbench.test.tsx | 1 +
12 files changed, 106 insertions(+), 47 deletions(-)
create mode 100644 src/services/search-service/search-service.ts
via 1080aac872d8c1d00b55a7291d88b704fc400813 (commit)
via 63f23fab5d96cbf09751119c9c07d10b4d9c07cf (commit)
via f9a7cbcdce79388e48c0d362027af497252044a4 (commit)
via e458b989c77ed7f76af27337357f575847d5ff86 (commit)
via c819986953a03e0910aca7df20a740835fb86366 (commit)
via d92b067614b451c27a8bd702253e87278defa7a3 (commit)
via 2209cb79b4d5e48187590433246b9026216cfb6a (commit)
via 1f0f9d2dad2f31b8429676f92ac99e8d0a48da30 (commit)
via 1514f6a2ae8103f75f08034299115ad751d8a785 (commit)
via 3b0e0736a359c3c44566ac454d9cddd21ec6a490 (commit)
via 1e2635886e1342a7b29914d3a437313807676466 (commit)
via e7a722835aeda5ebe0eeab2328a7e628927e6416 (commit)
via da3ae51b7b3b63561a9e1c47c965f45a08225d34 (commit)
from 8156d2b941dfcf8773cd733a4e9994740e77f56a (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 1080aac872d8c1d00b55a7291d88b704fc400813
Merge: 8156d2b 63f23fa
Author: Janicki Artur <artur.janicki at contractors.roche.com>
Date: Thu Oct 11 09:49:58 2018 +0200
Merge branch 'master' of git.curoverse.com:arvados-workbench2 into 13827-structured-search-advanced-view
refs #2
13827
Arvados-DCO-1.1-Signed-off-by: Janicki Artur <artur.janicki at contractors.roche.com>
diff --cc src/store/search-bar/search-bar-actions.ts
index 717b982,2b8ca83..dbc77a8
--- a/src/store/search-bar/search-bar-actions.ts
+++ b/src/store/search-bar/search-bar-actions.ts
@@@ -21,20 -21,20 +21,31 @@@ export const searchBarActions = unioniz
export type SearchBarActions = UnionOf<typeof searchBarActions>;
+export interface SearchBarAdvanceFormData {
+ type?: GroupContentsResource;
+ cluster?: string;
+ project?: string;
+ dataFrom: string;
+ dataTo: string;
+ searchQuery: string;
+}
+
+export const SEARCH_BAR_ADVANCE_FORM_NAME = 'searchBarAdvanceFormName';
+
export const goToView = (currentView: string) => searchBarActions.SET_CURRENT_VIEW(currentView);
- export const searchData = (searchValue: string) =>
+ export const saveRecentQuery = (query: string) =>
+ (dispatch: Dispatch<any>, getState: () => RootState, services: ServiceRepository) => {
+ services.searchQueriesService.saveRecentQuery(query);
+ };
+
+ export const loadRecentQueries = () =>
+ (dispatch: Dispatch<any>, getState: () => RootState, services: ServiceRepository) => {
+ const recentSearchQueries = services.searchQueriesService.getRecentQueries();
+ return recentSearchQueries || [];
+ };
+
+ export const searchData = (searchValue: string) =>
async (dispatch: Dispatch, getState: () => RootState, services: ServiceRepository) => {
dispatch(searchBarActions.SET_SEARCH_VALUE(searchValue));
dispatch(searchBarActions.SET_SEARCH_RESULTS([]));
diff --cc src/views-components/search-bar/search-bar-advanced-view.tsx
index 8e20b99,dde2368..583c9a0
--- a/src/views-components/search-bar/search-bar-advanced-view.tsx
+++ b/src/views-components/search-bar/search-bar-advanced-view.tsx
@@@ -63,99 -24,12 +63,99 @@@ interface SearchBarAdvancedViewActionPr
setView: (currentView: string) => void;
}
-export const SearchBarAdvancedView = withStyles(styles)(
- ({ classes, setView }: SearchBarAdvancedViewProps & WithStyles<CssRules>) =>
- <Paper className={classes.searchView}>
- <List component="nav" className={classes.list}>
- <RecentQueriesItem text='ADVANCED VIEW' />
- </List>
- <Button onClick={() => setView(SearchView.BASIC)}>Back</Button>
- </Paper>
-);
+type SearchBarAdvancedViewProps = SearchBarAdvancedViewActionProps & SearchBarAdvancedViewDataProps
+ & InjectedFormProps & WithStyles<CssRules>;
+
+export const SearchBarAdvancedView = compose(
+ reduxForm<SearchBarAdvanceFormData, SearchBarAdvancedViewActionProps>({
+ form: SEARCH_BAR_ADVANCE_FORM_NAME,
+ onSubmit: (data: SearchBarAdvanceFormData, dispatch: Dispatch) => {
+ console.log('data: ', data);
+ dispatch(reset(SEARCH_BAR_ADVANCE_FORM_NAME));
+ }
+ }),
+ withStyles(styles))(
+ ({ classes, setView, handleSubmit, invalid, submitting, pristine }: SearchBarAdvancedViewProps) =>
+ <Paper>
+ <form onSubmit={handleSubmit} className={classes.form}>
+ <Grid container direction="column" justify="flex-start" alignItems="flex-start">
+ <Grid item xs={12} container className={classes.container}>
+ <Grid item container xs={12}>
+ <Grid item xs={2} className={classes.label}>Type</Grid>
+ <Grid item xs={5}>
+ <SearchBarTypeField />
+ </Grid>
+ </Grid>
+ <Grid item container xs={12}>
+ <Grid item xs={2} className={classes.label}>Cluster</Grid>
+ <Grid item xs={5}>
+ <SearchBarClusterField />
+ </Grid>
+ </Grid>
+ <Grid item container xs={12}>
+ <Grid item xs={2} className={classes.label}>Project</Grid>
+ <Grid item xs={5}>
+ <SearchBarProjectField />
+ </Grid>
+ </Grid>
+ <Grid item container xs={12}>
+ <Grid item xs={2} className={classes.label} />
+ <Grid item xs={5}>
+ <SearchBarTrashField />
+ </Grid>
+ </Grid>
+ <IconButton onClick={() => setView(SearchView.BASIC)} className={classes.closeIcon}>
+ <CloseIcon />
+ </IconButton>
+ </Grid>
+ <Grid container item xs={12} className={classes.container}>
+ <Grid item xs={2} className={classes.label}>Data modified</Grid>
+ <Grid item xs={3}>
+ <SearchBarDataFromField />
+ </Grid>
+ <Grid item xs={3}>
+ <SearchBarDataToField />
+ </Grid>
+ </Grid>
+ <Grid container item xs={12} className={classes.container}>
+ <Grid container item xs={12}>
+ <Grid item xs={2} className={classes.label}>Properties</Grid>
+ <Grid item xs={4}>
+ <SearchBarKeyField />
+ </Grid>
+ <Grid item xs={4}>
+ <SearchBarValueField />
+ </Grid>
+ <Grid container item xs={2} justify='flex-end' alignItems="center">
+ <Button className={classes.button}
+ color="primary"
+ size='small'
+ variant="contained">
+ Add
+ </Button>
+ </Grid>
+ </Grid>
+ <Grid container item xs={12} justify="flex-start" alignItems="center">
+ <Grid item xs={2} className={classes.label} />
+ <Grid item xs={4}>
+ <SearchBarSaveSearchField />
+ </Grid>
+ <Grid item xs={4}>
+ <SearchBarQuerySearchField />
+ </Grid>
+ </Grid>
+ <Grid container item xs={12} justify='flex-end'>
+ <div className={classes.buttonWrapper}>
+ <Button type="submit" className={classes.button}
+ color="primary"
+ size='small'
+ variant="contained">
+ Search
+ </Button>
+ {submitting && <CircularProgress size={20} className={classes.circularProgress} />}
+ </div>
+ </Grid>
+ </Grid>
+ </Grid>
+ </form>
- </Paper>);
++ </Paper>);
diff --cc src/views-components/search-bar/search-bar-view.tsx
index 7c87bd3,b2575a8..d6facbd
--- a/src/views-components/search-bar/search-bar-view.tsx
+++ b/src/views-components/search-bar/search-bar-view.tsx
@@@ -22,7 -22,7 +22,7 @@@ import { SearchBarAdvancedView } from '
import { SearchBarAutocompleteView, SearchBarAutocompleteViewDataProps } from '~/views-components/search-bar/search-bar-autocomplete-view';
import { ArvadosTheme } from '~/common/custom-theme';
- type CssRules = 'container' | 'input' | 'searchBar' | 'view';
-type CssRules = 'container' | 'containerSearchViewOpened' | 'input' | 'searchBar';
++type CssRules = 'container' | 'containerSearchViewOpened' | 'input' | 'searchBar' | 'view';
const styles: StyleRulesCallback<CssRules> = (theme: ArvadosTheme) => {
return {
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list