X-Git-Url: https://git.arvados.org/arvados-workbench2.git/blobdiff_plain/c0b0f2e4f2f795e06412db84c77b6b0447815ca2..41f6f1e495c82fcfa79b87cf718fa2e9cd91c726:/src/views-components/search-bar/search-bar-basic-view.tsx diff --git a/src/views-components/search-bar/search-bar-basic-view.tsx b/src/views-components/search-bar/search-bar-basic-view.tsx index 22dfa829..e880c437 100644 --- a/src/views-components/search-bar/search-bar-basic-view.tsx +++ b/src/views-components/search-bar/search-bar-basic-view.tsx @@ -2,18 +2,17 @@ // // SPDX-License-Identifier: AGPL-3.0 -import * as React from 'react'; +import React from 'react'; import { Paper, StyleRulesCallback, withStyles, WithStyles } from '@material-ui/core'; -import { SearchView } from '~/store/search-bar/search-bar-reducer'; import { SearchBarRecentQueries, - SearchBarRecentQueriesActionProps -} from '~/views-components/search-bar/search-bar-recent-queries'; + SearchBarRecentQueriesActionProps +} from 'views-components/search-bar/search-bar-recent-queries'; import { SearchBarSavedQueries, SearchBarSavedQueriesDataProps, SearchBarSavedQueriesActionProps -} from '~/views-components/search-bar/search-bar-save-queries'; +} from 'views-components/search-bar/search-bar-save-queries'; type CssRules = 'advanced' | 'label' | 'root'; @@ -32,10 +31,12 @@ const styles: StyleRulesCallback = theme => { color: theme.palette.primary.main }, label: { - fontSize: '0.875rem', - padding: `${theme.spacing.unit / 2}px ${theme.spacing.unit}px `, + fontSize: '0.775rem', + padding: `${theme.spacing.unit}px ${theme.spacing.unit}px `, color: theme.palette.grey["900"], - background: theme.palette.grey["200"] + background: 'white', + textAlign: 'right', + fontWeight: 'bold' } }; }; @@ -50,18 +51,19 @@ export type SearchBarBasicViewActionProps = { type SearchBarBasicViewProps = SearchBarBasicViewDataProps & SearchBarBasicViewActionProps & WithStyles; export const SearchBarBasicView = withStyles(styles)( - ({ classes, onSetView, loadRecentQueries, deleteSavedQuery, savedQueries, onSearch, editSavedQuery }: SearchBarBasicViewProps) => + ({ classes, onSetView, loadRecentQueries, deleteSavedQuery, savedQueries, onSearch, editSavedQuery, selectedItem }: SearchBarBasicViewProps) => -
Recent search queries
+
{"Recent queries"}
-
Saved search queries
+ loadRecentQueries={loadRecentQueries} + selectedItem={selectedItem} /> +
{"Saved queries"}
-
onSetView(SearchView.ADVANCED)}>Advanced search
+ deleteSavedQuery={deleteSavedQuery} + selectedItem={selectedItem} />
-); \ No newline at end of file +);