// SPDX-License-Identifier: AGPL-3.0
import * as React from 'react';
-import { Grid, Paper, Toolbar, StyleRulesCallback, withStyles, WithStyles, TablePagination, IconButton } from '@material-ui/core';
-import MoreVertIcon from "@material-ui/icons/MoreVert";
+import { Grid, Paper, Toolbar, StyleRulesCallback, withStyles, WithStyles, TablePagination, IconButton, Tooltip } from '@material-ui/core';
import { ColumnSelector } from "../column-selector/column-selector";
import { DataTable, DataColumns } from "../data-table/data-table";
-import { DataColumn } from "../data-table/data-column";
-import { DataTableFilterItem } from '../data-table-filters/data-table-filters';
+import { DataColumn, SortDirection } from "../data-table/data-column";
import { SearchInput } from '../search-input/search-input';
-import { ArvadosTheme } from "../../common/custom-theme";
+import { ArvadosTheme } from "~/common/custom-theme";
+import { createTree } from '~/models/tree';
+import { DataTableFilters } from '../data-table-filters/data-table-filters-tree';
+import { MoreOptionsIcon } from '~/components/icon/icon';
-type CssRules = "searchBox" | "toolbar";
+type CssRules = 'searchBox' | "toolbar" | "footer" | "root" | 'moreOptionsButton';
const styles: StyleRulesCallback<CssRules> = (theme: ArvadosTheme) => ({
searchBox: {
},
toolbar: {
paddingTop: theme.spacing.unit * 2
+ },
+ footer: {
+ overflow: 'auto'
+ },
+ root: {
+ height: '100%'
+ },
+ moreOptionsButton: {
+ padding: 0
}
});
rowsPerPage: number;
rowsPerPageOptions: number[];
page: number;
+ contextMenuColumn: boolean;
+ dataTableDefaultView?: React.ReactNode;
+ working?: boolean;
+}
+
+interface DataExplorerActionProps<T> {
+ onSetColumns: (columns: DataColumns<T>) => void;
onSearch: (value: string) => void;
onRowClick: (item: T) => void;
onRowDoubleClick: (item: T) => void;
onColumnToggle: (column: DataColumn<T>) => void;
onContextMenu: (event: React.MouseEvent<HTMLElement>, item: T) => void;
onSortToggle: (column: DataColumn<T>) => void;
- onFiltersChange: (filters: DataTableFilterItem[], column: DataColumn<T>) => void;
+ onFiltersChange: (filters: DataTableFilters, column: DataColumn<T>) => void;
onChangePage: (page: number) => void;
onChangeRowsPerPage: (rowsPerPage: number) => void;
extractKey?: (item: T) => React.Key;
}
-type DataExplorerProps<T> = DataExplorerDataProps<T> & WithStyles<CssRules>;
+type DataExplorerProps<T> = DataExplorerDataProps<T> & DataExplorerActionProps<T> & WithStyles<CssRules>;
export const DataExplorer = withStyles(styles)(
class DataExplorerGeneric<T> extends React.Component<DataExplorerProps<T>> {
+ componentDidMount() {
+ if (this.props.onSetColumns) {
+ this.props.onSetColumns(this.props.columns);
+ }
+ }
render() {
- return <Paper>
- <Toolbar className={this.props.classes.toolbar}>
+ const {
+ columns, onContextMenu, onFiltersChange, onSortToggle, working, extractKey,
+ rowsPerPage, rowsPerPageOptions, onColumnToggle, searchValue, onSearch,
+ items, itemsAvailable, onRowClick, onRowDoubleClick, classes,
+ dataTableDefaultView
+ } = this.props;
+ return <Paper className={classes.root}>
+ <Toolbar className={classes.toolbar}>
<Grid container justify="space-between" wrap="nowrap" alignItems="center">
- <div className={this.props.classes.searchBox}>
+ <div className={classes.searchBox}>
<SearchInput
- value={this.props.searchValue}
- onSearch={this.props.onSearch}/>
+ value={searchValue}
+ onSearch={onSearch} />
</div>
<ColumnSelector
- columns={this.props.columns}
- onColumnToggle={this.props.onColumnToggle}/>
+ columns={columns}
+ onColumnToggle={onColumnToggle} />
</Grid>
</Toolbar>
<DataTable
- columns={[...this.props.columns, this.contextMenuColumn]}
- items={this.props.items}
- onRowClick={(_, item: T) => this.props.onRowClick(item)}
- onContextMenu={this.props.onContextMenu}
- onRowDoubleClick={(_, item: T) => this.props.onRowDoubleClick(item)}
- onFiltersChange={this.props.onFiltersChange}
- onSortToggle={this.props.onSortToggle}
- extractKey={this.props.extractKey}/>
- <Toolbar>
- {this.props.items.length > 0 &&
+ columns={this.props.contextMenuColumn ? [...columns, this.contextMenuColumn] : columns}
+ items={items}
+ onRowClick={(_, item: T) => onRowClick(item)}
+ onContextMenu={onContextMenu}
+ onRowDoubleClick={(_, item: T) => onRowDoubleClick(item)}
+ onFiltersChange={onFiltersChange}
+ onSortToggle={onSortToggle}
+ extractKey={extractKey}
+ working={working}
+ defaultView={dataTableDefaultView}
+ />
+ <Toolbar className={classes.footer}>
<Grid container justify="flex-end">
<TablePagination
- count={this.props.itemsAvailable}
- rowsPerPage={this.props.rowsPerPage}
- rowsPerPageOptions={this.props.rowsPerPageOptions}
+ count={itemsAvailable}
+ rowsPerPage={rowsPerPage}
+ rowsPerPageOptions={rowsPerPageOptions}
page={this.props.page}
onChangePage={this.changePage}
onChangeRowsPerPage={this.changeRowsPerPage}
- component="div"
- />
- </Grid>}
+ component="div" />
+ </Grid>
</Toolbar>
</Paper>;
}
}
renderContextMenuTrigger = (item: T) =>
- <Grid container justify="flex-end">
- <IconButton onClick={event => this.props.onContextMenu(event, item)}>
- <MoreVertIcon/>
- </IconButton>
+ <Grid container justify="center">
+ <Tooltip title="More options" disableFocusListener>
+ <IconButton className={this.props.classes.moreOptionsButton} onClick={event => this.props.onContextMenu(event, item)}>
+ <MoreOptionsIcon />
+ </IconButton>
+ </Tooltip>
</Grid>
- contextMenuColumn = {
+ contextMenuColumn: DataColumn<any> = {
name: "Actions",
selected: true,
configurable: false,
+ sortDirection: SortDirection.NONE,
+ filters: createTree(),
key: "context-actions",
- render: this.renderContextMenuTrigger,
- width: "auto"
+ render: this.renderContextMenuTrigger
};
}
);
projects / arvados-workbench2.git / blobdiff