X-Git-Url: https://git.arvados.org/arvados-workbench2.git/blobdiff_plain/b6a5b173cd4e9f325f371d26204dfe156d911c20..00b22552554ddcae9cf3b68ed4017067555ba02e:/src/components/data-table/data-table.tsx diff --git a/src/components/data-table/data-table.tsx b/src/components/data-table/data-table.tsx index 829bc84e..db7b484a 100644 --- a/src/components/data-table/data-table.tsx +++ b/src/components/data-table/data-table.tsx @@ -3,9 +3,10 @@ // SPDX-License-Identifier: AGPL-3.0 import * as React from 'react'; -import { Table, TableBody, TableRow, TableCell, TableHead, TableSortLabel, StyleRulesCallback, Theme, WithStyles, withStyles, Typography } from '@material-ui/core'; +import { Table, TableBody, TableRow, TableCell, TableHead, TableSortLabel, StyleRulesCallback, Theme, WithStyles, withStyles } from '@material-ui/core'; import { DataColumn, SortDirection } from './data-column'; -import { DataTableFilters, DataTableFilterItem } from "../data-table-filters/data-table-filters"; +import { DataTableFilters, DataTableFilterItem } from "../data-table-filters/data-table-filters"; +import { DataTableDefaultView } from '../data-table-default-view/data-table-default-view'; export type DataColumns = Array>; @@ -18,22 +19,26 @@ export interface DataTableDataProps { onSortToggle: (column: DataColumn) => void; onFiltersChange: (filters: DataTableFilterItem[], column: DataColumn) => void; extractKey?: (item: T) => React.Key; + defaultView?: React.ReactNode; } -type CssRules = "tableBody" | "tableContainer" | "noItemsInfo"; +type CssRules = "tableBody" | "root" | "content" | "noItemsInfo"; const styles: StyleRulesCallback = (theme: Theme) => ({ - tableContainer: { + root: { overflowX: 'auto', overflowY: 'hidden' }, + content: { + display: 'inline-block', + }, tableBody: { background: theme.palette.background.paper }, noItemsInfo: { textAlign: "center", padding: theme.spacing.unit - } + }, }); type DataTableProps = DataTableDataProps & WithStyles; @@ -42,28 +47,36 @@ export const DataTable = withStyles(styles)( class Component extends React.Component> { render() { const { items, classes } = this.props; - return
- - - - {this.mapVisibleColumns(this.renderHeadCell)} - - - - {items.map(this.renderBodyRow)} - -
+ return
+
+ + + + {this.mapVisibleColumns(this.renderHeadCell)} + + + + {items.map(this.renderBodyRow)} + +
+ {items.length === 0 && this.renderNoItemsPlaceholder()} +
; } + renderNoItemsPlaceholder = () => { + return this.props.defaultView + ? this.props.defaultView + : ; + } + renderHeadCell = (column: DataColumn, index: number) => { const { name, key, renderHeader, filters, sortDirection } = column; const { onSortToggle, onFiltersChange } = this.props; return {renderHeader ? renderHeader() : - filters + filters.length > 0 ? @@ -74,8 +87,8 @@ export const DataTable = withStyles(styles)( : sortDirection ? onSortToggle && onSortToggle(column)}> @@ -94,7 +107,7 @@ export const DataTable = withStyles(styles)( key={extractKey ? extractKey(item) : index} onClick={event => onRowClick && onRowClick(event, item)} onContextMenu={this.handleRowContextMenu(item)} - onDoubleClick={event => onRowDoubleClick && onRowDoubleClick(event, item) }> + onDoubleClick={event => onRowDoubleClick && onRowDoubleClick(event, item)}> {this.mapVisibleColumns((column, index) => ( {column.render(item)}