projects
/
arvados-workbench2.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into 14318-new-button-missing-in-several-places
[arvados-workbench2.git]
/
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 affaf5310cc561e0e60d9b5497dd0d47bce60067..48172424ce2685bd12a6183559bb7e458339f7a3 100644
(file)
--- a/
src/views-components/search-bar/search-bar-autocomplete-view.tsx
+++ b/
src/views-components/search-bar/search-bar-autocomplete-view.tsx
@@
-4,7
+4,7
@@
import * as React from 'react';
import { Paper, StyleRulesCallback, withStyles, WithStyles, List } from '@material-ui/core';
import * as React from 'react';
import { Paper, StyleRulesCallback, withStyles, WithStyles, List } from '@material-ui/core';
-import { Re
centQueriesItem
} from '~/views-components/search-bar/search-bar-view';
+import { Re
nderAutocompleteItems
} from '~/views-components/search-bar/search-bar-view';
import { GroupContentsResource } from '~/services/groups-service/groups-service';
import Highlighter from "react-highlight-words";
import { GroupContentsResource } from '~/services/groups-service/groups-service';
import Highlighter from "react-highlight-words";
@@
-16,7
+16,7
@@
const styles: StyleRulesCallback<CssRules> = theme => {
padding: 0
},
searchView: {
padding: 0
},
searchView: {
- borderRadius: `0 0 ${theme.spacing.unit /
4}px ${theme.spacing.unit / 4
}px`
+ borderRadius: `0 0 ${theme.spacing.unit /
2}px ${theme.spacing.unit / 2
}px`
}
};
};
}
};
};
@@
-24,16
+24,17
@@
const styles: StyleRulesCallback<CssRules> = theme => {
export interface SearchBarAutocompleteViewDataProps {
searchResults?: GroupContentsResource[];
searchValue?: string;
export interface SearchBarAutocompleteViewDataProps {
searchResults?: GroupContentsResource[];
searchValue?: string;
+ navigateTo: (uuid: string) => void;
}
type SearchBarAutocompleteViewProps = SearchBarAutocompleteViewDataProps & WithStyles<CssRules>;
export const SearchBarAutocompleteView = withStyles(styles)(
}
type SearchBarAutocompleteViewProps = SearchBarAutocompleteViewDataProps & WithStyles<CssRules>;
export const SearchBarAutocompleteView = withStyles(styles)(
- ({ classes, searchResults, searchValue }: SearchBarAutocompleteViewProps) =>
+ ({ classes, searchResults, searchValue
, navigateTo
}: SearchBarAutocompleteViewProps) =>
<Paper className={classes.searchView}>
{searchResults && <List component="nav" className={classes.list}>
{searchResults.map((item: GroupContentsResource) => {
<Paper className={classes.searchView}>
{searchResults && <List component="nav" className={classes.list}>
{searchResults.map((item: GroupContentsResource) => {
- return <Re
centQueriesItem key={item.uuid} text={getFormattedText(item.name, searchValue)
} />;
+ return <Re
nderAutocompleteItems key={item.uuid} text={getFormattedText(item.name, searchValue)} navigateTo={navigateTo} uuid={item.uuid
} />;
})}
</List>}
</Paper>
})}
</List>}
</Paper>