projects
/
arvados-workbench2.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git.curoverse.com:arvados-workbench2 into 14278-unexpected...
[arvados-workbench2.git]
/
src
/
components
/
data-explorer
/
data-explorer.tsx
diff --git
a/src/components/data-explorer/data-explorer.tsx
b/src/components/data-explorer/data-explorer.tsx
index 66b9c35b7d8941d6c59185a918f4e8ec2eb77651..e808351b5257267e340d1498501902c1698b43c9 100644
(file)
--- a/
src/components/data-explorer/data-explorer.tsx
+++ b/
src/components/data-explorer/data-explorer.tsx
@@
-12,7
+12,7
@@
import { DataTableFilterItem } from '../data-table-filters/data-table-filters';
import { SearchInput } from '../search-input/search-input';
import { ArvadosTheme } from "~/common/custom-theme";
import { SearchInput } from '../search-input/search-input';
import { ArvadosTheme } from "~/common/custom-theme";
-type CssRules = 'searchBox' | "toolbar";
+type CssRules = 'searchBox' | "toolbar"
| "footer" | "root"
;
const styles: StyleRulesCallback<CssRules> = (theme: ArvadosTheme) => ({
searchBox: {
const styles: StyleRulesCallback<CssRules> = (theme: ArvadosTheme) => ({
searchBox: {
@@
-21,6
+21,12
@@
const styles: StyleRulesCallback<CssRules> = (theme: ArvadosTheme) => ({
toolbar: {
paddingTop: theme.spacing.unit * 2
},
toolbar: {
paddingTop: theme.spacing.unit * 2
},
+ footer: {
+ overflow: 'auto'
+ },
+ root: {
+ height: '100%'
+ }
});
interface DataExplorerDataProps<T> {
});
interface DataExplorerDataProps<T> {
@@
-66,7
+72,7
@@
export const DataExplorer = withStyles(styles)(
items, itemsAvailable, onRowClick, onRowDoubleClick, classes,
dataTableDefaultView
} = this.props;
items, itemsAvailable, onRowClick, onRowDoubleClick, classes,
dataTableDefaultView
} = this.props;
- return <Paper>
+ return <Paper
className={classes.root}
>
<Toolbar className={classes.toolbar}>
<Grid container justify="space-between" wrap="nowrap" alignItems="center">
<div className={classes.searchBox}>
<Toolbar className={classes.toolbar}>
<Grid container justify="space-between" wrap="nowrap" alignItems="center">
<div className={classes.searchBox}>
@@
-91,7
+97,7
@@
export const DataExplorer = withStyles(styles)(
working={working}
defaultView={dataTableDefaultView}
/>
working={working}
defaultView={dataTableDefaultView}
/>
- <Toolbar>
+ <Toolbar
className={classes.footer}
>
<Grid container justify="flex-end">
<TablePagination
count={itemsAvailable}
<Grid container justify="flex-end">
<TablePagination
count={itemsAvailable}
@@
-116,11
+122,11
@@
export const DataExplorer = withStyles(styles)(
renderContextMenuTrigger = (item: T) =>
<Grid container justify="flex-end">
renderContextMenuTrigger = (item: T) =>
<Grid container justify="flex-end">
- <
IconButton onClick={event => this.props.onContextMenu(event, item)}
>
- <
Tooltip title="More options"
>
+ <
Tooltip title="More options"
>
+ <
IconButton onClick={event => this.props.onContextMenu(event, item)}
>
<MoreVertIcon />
<MoreVertIcon />
- </
Tooltip
>
- </
IconButton
>
+ </
IconButton
>
+ </
Tooltip
>
</Grid>
contextMenuColumn: DataColumn<any> = {
</Grid>
contextMenuColumn: DataColumn<any> = {