Apply code formatting and naming according to code review

[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 382ce1e8a1077e69539e4e5a9f23c8101f31d106..0367dfa9c7f65609cfb26180d6d31de8534a8c37 100644 (file)
--- a/src/components/data-table/data-table.tsx
+++ b/src/components/data-table/data-table.tsx
@@ -3,58 +3,51 @@
 // SPDX-License-Identifier: AGPL-3.0
 
 import * as React from 'react';
-import { Table, TableBody, TableRow, TableCell, TableHead, StyleRulesCallback, Theme, WithStyles, withStyles, Typography, Grid } from '@material-ui/core';
-import { Column } from './column';
-import ColumnsConfigurator from "./columns-configurator/columns-configurator";
+import { Table, TableBody, TableRow, TableCell, TableHead, StyleRulesCallback, Theme, WithStyles, withStyles, Typography } from '@material-ui/core';
+import { DataColumn } from './data-column';
 
 export interface DataTableProps<T> {
     items: T[];
-    columns: Array<Column<T>>;
+    columns: Array<DataColumn<T>>;
     onItemClick?: (item: T) => void;
 }
 
 class DataTable<T> extends React.Component<DataTableProps<T> & WithStyles<CssRules>> {
     render() {
         const { items, columns, classes, onItemClick } = this.props;
-        return (
-            <div className={classes.tableContainer}>
-                {
-                    items.length > 0 ? (
-                        <Table>
-                            <TableHead>
-                                <TableRow>
-                                    {
-                                        columns.filter(column => column.selected).map(({ header, renderHeader, key }, index) => (
-                                            <TableCell key={key || index}>
-                                                {renderHeader ? renderHeader() : header}
+        return <div className={classes.tableContainer}>
+            {items.length > 0 ?
+                <Table>
+                    <TableHead>
+                        <TableRow>
+                            {columns
+                                .filter(column => column.selected)
+                                .map(({ name, renderHeader, key }, index) =>
+                                    <TableCell key={key || index}>
+                                        {renderHeader ? renderHeader() : name}
+                                    </TableCell>
+                                )}
+                        </TableRow>
+                    </TableHead>
+                    <TableBody className={classes.tableBody}>
+                        {items
+                            .map((item, index) =>
+                                <TableRow
+                                    hover
+                                    key={index}
+                                    onClick={() => onItemClick && onItemClick(item)}>
+                                    {columns
+                                        .filter(column => column.selected)
+                                        .map((column, index) => (
+                                            <TableCell key={column.key || index}>
+                                                {column.render(item)}
                                             </TableCell>
-                                        ))
-                                    }
+                                        ))}
                                 </TableRow>
-                            </TableHead>
-                            <TableBody className={classes.tableBody}>
-                                {
-                                    items.map((item, index) => (
-                                        <TableRow key={index} hover onClick={() => onItemClick && onItemClick(item)}>
-                                            {
-                                                columns.filter(column => column.selected).map((column, index) => (
-                                                    <TableCell key={column.key || index}>
-                                                        {column.render(item)}
-                                                    </TableCell>
-                                                ))
-                                            }
-                                        </TableRow>
-                                    ))
-                                }
-                            </TableBody>
-                        </Table>
-                    ) : (
-                            <Typography>No items</Typography>
-                        )
-                }
-
-            </div>
-        );
+                            )}
+                    </TableBody>
+                </Table> : <Typography>No items</Typography>}
+        </div>;
     }
 }