projects
/
arvados-workbench2.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '20493-optional-array' refs #20493
[arvados-workbench2.git]
/
src
/
views-components
/
search-bar
/
search-bar-recent-queries.tsx
diff --git
a/src/views-components/search-bar/search-bar-recent-queries.tsx
b/src/views-components/search-bar/search-bar-recent-queries.tsx
index 3de3ca7a1f54e9e45b6a2e40d04447711f84d23b..1d5c46c814d4a5cb77dcba68448c23ecdf0dca9c 100644
(file)
--- a/
src/views-components/search-bar/search-bar-recent-queries.tsx
+++ b/
src/views-components/search-bar/search-bar-recent-queries.tsx
@@
-2,9
+2,10
@@
//
// SPDX-License-Identifier: AGPL-3.0
//
// SPDX-License-Identifier: AGPL-3.0
-import
* as
React from 'react';
+import React from 'react';
import { withStyles, WithStyles, StyleRulesCallback, List, ListItem, ListItemText } from '@material-ui/core';
import { withStyles, WithStyles, StyleRulesCallback, List, ListItem, ListItemText } from '@material-ui/core';
-import { ArvadosTheme } from '~/common/custom-theme';
+import { ArvadosTheme } from 'common/custom-theme';
+import { SearchBarSelectedItem } from "store/search-bar/search-bar-reducer";
type CssRules = 'root' | 'listItem' | 'listItemText';
type CssRules = 'root' | 'listItem' | 'listItemText';
@@
-22,22
+23,26
@@
const styles: StyleRulesCallback<CssRules> = (theme: ArvadosTheme) => ({
}
});
}
});
+export interface SearchBarRecentQueriesDataProps {
+ selectedItem: SearchBarSelectedItem;
+}
+
export interface SearchBarRecentQueriesActionProps {
onSearch: (searchValue: string) => void;
loadRecentQueries: () => string[];
}
export interface SearchBarRecentQueriesActionProps {
onSearch: (searchValue: string) => void;
loadRecentQueries: () => string[];
}
-type SearchBarRecentQueriesProps = SearchBarRecentQueriesActionProps & WithStyles<CssRules>;
+type SearchBarRecentQueriesProps = SearchBarRecentQueries
DataProps & SearchBarRecentQueries
ActionProps & WithStyles<CssRules>;
export const SearchBarRecentQueries = withStyles(styles)(
export const SearchBarRecentQueries = withStyles(styles)(
- ({ classes, onSearch, loadRecentQueries }: SearchBarRecentQueriesProps) =>
+ ({ classes, onSearch, loadRecentQueries
, selectedItem
}: SearchBarRecentQueriesProps) =>
<List component="nav" className={classes.root}>
{loadRecentQueries().map((query, index) =>
<List component="nav" className={classes.root}>
{loadRecentQueries().map((query, index) =>
- <ListItem button key={index} className={classes.listItem}>
- <ListItemText disableTypography
- secondary={query}
- onClick={() => onSearch(query)}
+ <ListItem button key={index} className={classes.listItem}
selected={`RQ-${index}-${query}` === selectedItem.id}
>
+ <ListItemText disableTypography
+ secondary={query}
+ onClick={() => onSearch(query)}
className={classes.listItemText} />
</ListItem>
)}
className={classes.listItemText} />
</ListItem>
)}
- </List>);
\ No newline at end of file
+ </List>);