X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/bca77b4dbbc90bc60de06bd90a20e9a46c02fcfa..994434ce0881e5e4f309982790352e9af66cdb05:/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 4fc9fb9c39..08f52d00d3 100644 --- a/src/components/data-explorer/data-explorer.tsx +++ b/src/components/data-explorer/data-explorer.tsx @@ -3,119 +3,143 @@ // SPDX-License-Identifier: AGPL-3.0 import * as React from 'react'; -import { Grid, Paper, Toolbar } from '@material-ui/core'; -import ContextMenu, { ContextMenuActionGroup } from "../../components/context-menu/context-menu"; -import ColumnSelector from "../../components/column-selector/column-selector"; -import DataTable from "../../components/data-table/data-table"; -import { mockAnchorFromMouseEvent } from "../../components/popover/helpers"; -import { DataColumn, toggleSortDirection } from "../../components/data-table/data-column"; -import { DataTableFilterItem } from '../../components/data-table-filters/data-table-filters'; -import { DataExplorerColumn } from './data-explorer-column'; +import { Grid, Paper, Toolbar, StyleRulesCallback, withStyles, WithStyles, TablePagination, IconButton, Tooltip } from '@material-ui/core'; +import MoreVertIcon from "@material-ui/icons/MoreVert"; +import { ColumnSelector } from "../column-selector/column-selector"; +import { DataTable, DataColumns } from "../data-table/data-table"; +import { DataColumn, SortDirection } from "../data-table/data-column"; +import { DataTableFilterItem } from '../data-table-filters/data-table-filters'; +import { SearchInput } from '../search-input/search-input'; +import { ArvadosTheme } from "~/common/custom-theme"; -interface DataExplorerProps { - items: T[]; - columns: Array>; - contextActions: Array>; - onRowClick: (item: T) => void; - onColumnToggle: (column: DataExplorerColumn) => void; - onSortingToggle: (column: DataExplorerColumn) => void; - onFiltersChange: (columns: DataExplorerColumn) => void; -} - -interface DataExplorerState { - contextMenu: { - anchorEl?: HTMLElement; - item?: T; - }; -} - -class DataExplorer extends React.Component, DataExplorerState> { - state: DataExplorerState = { - contextMenu: {} - }; +type CssRules = 'searchBox' | "toolbar" | "footer" | "root" | 'moreOptionsButton'; - render() { - return - - - - - - - this.props.onRowClick(row)} - onRowContextMenu={this.openItemMenuOnRowClick} /> - - ; +const styles: StyleRulesCallback = (theme: ArvadosTheme) => ({ + searchBox: { + paddingBottom: theme.spacing.unit * 2 + }, + toolbar: { + paddingTop: theme.spacing.unit * 2 + }, + footer: { + overflow: 'auto' + }, + root: { + height: '100%' + }, + moreOptionsButton: { + padding: 0 } +}); - get columns(): Array> { - return this.props.columns.map((column): DataColumn => ({ - configurable: column.configurable, - filters: column.filters, - name: column.name, - onFiltersChange: column.filterable ? this.changeFilters(column) : undefined, - onSortToggle: column.sortable ? this.toggleSort(column) : undefined, - render: column.render, - renderHeader: column.renderHeader, - selected: column.selected, - sortDirection: column.sortDirection - })); - } - - get contextActions() { - return this.props.contextActions.map(actionGroup => - actionGroup.map(action => ({ - ...action, - onClick: (item: T) => { - this.closeContextMenu(); - action.onClick(item); - } - }))); - } - - toggleColumn = (column: DataExplorerColumn) => { - this.props.onColumnToggle(column); - } +interface DataExplorerDataProps { + items: T[]; + itemsAvailable: number; + columns: DataColumns; + searchValue: string; + rowsPerPage: number; + rowsPerPageOptions: number[]; + page: number; + contextMenuColumn: boolean; + dataTableDefaultView?: React.ReactNode; + working?: boolean; +} - toggleSort = (column: DataExplorerColumn) => () => { - this.props.onSortingToggle(toggleSortDirection(column)); - } +interface DataExplorerActionProps { + onSetColumns: (columns: DataColumns) => void; + onSearch: (value: string) => void; + onRowClick: (item: T) => void; + onRowDoubleClick: (item: T) => void; + onColumnToggle: (column: DataColumn) => void; + onContextMenu: (event: React.MouseEvent, item: T) => void; + onSortToggle: (column: DataColumn) => void; + onFiltersChange: (filters: DataTableFilterItem[], column: DataColumn) => void; + onChangePage: (page: number) => void; + onChangeRowsPerPage: (rowsPerPage: number) => void; + extractKey?: (item: T) => React.Key; +} - changeFilters = (column: DataExplorerColumn) => (filters: DataTableFilterItem[]) => { - this.props.onFiltersChange({ ...column, filters }); - } +type DataExplorerProps = DataExplorerDataProps & DataExplorerActionProps & WithStyles; - openItemMenuOnRowClick = (event: React.MouseEvent, item: T) => { - event.preventDefault(); - this.setState({ - contextMenu: { - anchorEl: mockAnchorFromMouseEvent(event), - item +export const DataExplorer = withStyles(styles)( + class DataExplorerGeneric extends React.Component> { + componentDidMount() { + if (this.props.onSetColumns) { + this.props.onSetColumns(this.props.columns); } - }); - } + } + render() { + const { + columns, onContextMenu, onFiltersChange, onSortToggle, working, extractKey, + rowsPerPage, rowsPerPageOptions, onColumnToggle, searchValue, onSearch, + items, itemsAvailable, onRowClick, onRowDoubleClick, classes, + dataTableDefaultView + } = this.props; + return + + +
+ +
+ +
+
+ onRowClick(item)} + onContextMenu={onContextMenu} + onRowDoubleClick={(_, item: T) => onRowDoubleClick(item)} + onFiltersChange={onFiltersChange} + onSortToggle={onSortToggle} + extractKey={extractKey} + working={working} + defaultView={dataTableDefaultView} + /> + + + + + +
; + } - openItemMenuOnActionsClick = (event: React.MouseEvent, item: T) => { - this.setState({ - contextMenu: { - anchorEl: event.currentTarget, - item - } - }); - } + changePage = (event: React.MouseEvent, page: number) => { + this.props.onChangePage(page); + } - closeContextMenu = () => { - this.setState({ contextMenu: {} }); - } + changeRowsPerPage: React.ChangeEventHandler = (event) => { + this.props.onChangeRowsPerPage(parseInt(event.target.value, 10)); + } -} + renderContextMenuTrigger = (item: T) => + + + this.props.onContextMenu(event, item)}> + + + + -export default DataExplorer; + contextMenuColumn: DataColumn = { + name: "Actions", + selected: true, + configurable: false, + sortDirection: SortDirection.NONE, + filters: [], + key: "context-actions", + render: this.renderContextMenuTrigger + }; + } +);