Merge branch 'master'

[arvados-workbench2.git] / 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 bc5df0d9cc3de20c225554f42a1350abd2815fe7..43efdd0ada3bc97c50284926a3b75758375fb2c8 100644 (file)
--- a/src/components/data-table/data-table.tsx
+++ b/src/components/data-table/data-table.tsx
@@ -3,7 +3,7 @@
 // SPDX-License-Identifier: AGPL-3.0
 
 import * as React from 'react';
-import { Table, TableBody, TableRow, TableCell, TableHead, StyleRulesCallback, Theme, WithStyles, withStyles, Typography } from '@material-ui/core';
+import { Table, TableBody, TableRow, TableCell, TableHead, TableSortLabel, StyleRulesCallback, Theme, WithStyles, withStyles, Typography } from '@material-ui/core';
 import { DataColumn } from './data-column';
 
 export type DataColumns<T> = Array<DataColumn<T>>;
@@ -11,12 +11,13 @@ export type DataColumns<T> = Array<DataColumn<T>>;
 export interface DataTableProps<T> {
     items: T[];
     columns: DataColumns<T>;
-    onItemClick?: (item: T) => void;
+    onRowClick?: (event: React.MouseEvent<HTMLTableRowElement>, item: T) => void;
+    onRowContextMenu?: (event: React.MouseEvent<HTMLTableRowElement>, item: T) => void;
 }
 
 class DataTable<T> extends React.Component<DataTableProps<T> & WithStyles<CssRules>> {
     render() {
-        const { items, columns, classes, onItemClick } = this.props;
+        const { items, columns, classes, onRowClick, onRowContextMenu } = this.props;
         return <div className={classes.tableContainer}>
             {items.length > 0 ?
                 <Table>
@@ -24,9 +25,16 @@ class DataTable<T> extends React.Component<DataTableProps<T> & WithStyles<CssRul
                         <TableRow>
                             {columns
                                 .filter(column => column.selected)
-                                .map(({ name, renderHeader, key }, index) =>
+                                .map(({ name, renderHeader, key, sortDirection, onSortToggle }, index) =>
                                     <TableCell key={key || index}>
-                                        {renderHeader ? renderHeader() : name}
+                                        {renderHeader ?
+                                            renderHeader() :
+                                            <TableSortLabel
+                                                active={!!sortDirection}
+                                                direction={sortDirection}
+                                                onClick={() => onSortToggle && onSortToggle()}>
+                                                {name}
+                                            </TableSortLabel>}
                                     </TableCell>
                                 )}
                         </TableRow>
@@ -37,7 +45,8 @@ class DataTable<T> extends React.Component<DataTableProps<T> & WithStyles<CssRul
                                 <TableRow
                                     hover
                                     key={index}
-                                    onClick={() => onItemClick && onItemClick(item)}>
+                                    onClick={event => onRowClick && onRowClick(event, item)}
+                                    onContextMenu={event => onRowContextMenu && onRowContextMenu(event, item)}>
                                     {columns
                                         .filter(column => column.selected)
                                         .map((column, index) => (