Clean up data table code

Feature #13601

Arvados-DCO-1.1-Signed-off-by: Michal Klobukowski <michal.klobukowski@contractors.roche.com>

diff --git a/src/components/data-table/data-table.tsx b/src/components/data-table/data-table.tsx
index 382ce1e8a1077e69539e4e5a9f23c8101f31d106..5a372c41d89c8d1d70091ca9b0da9bcb71f1a668 100644 (file)
--- a/src/components/data-table/data-table.tsx
+++ b/src/components/data-table/data-table.tsx
@@ -3,9 +3,8 @@
 // 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 { Table, TableBody, TableRow, TableCell, TableHead, StyleRulesCallback, Theme, WithStyles, withStyles, Typography } from '@material-ui/core';
 import { Column } from './column';
-import ColumnsConfigurator from "./columns-configurator/columns-configurator";
 
 export interface DataTableProps<T> {
     items: T[];
@@ -24,27 +23,32 @@ class DataTable<T> extends React.Component<DataTableProps<T> & WithStyles<CssRul
                             <TableHead>
                                 <TableRow>
                                     {
-                                        columns.filter(column => column.selected).map(({ header, renderHeader, key }, index) => (
-                                            <TableCell key={key || index}>
-                                                {renderHeader ? renderHeader() : header}
-                                            </TableCell>
-                                        ))
+                                        columns
+                                            .filter(column => column.selected)
+                                            .map(({ header, renderHeader, key }, index) => (
+                                                <TableCell key={key || index}>
+                                                    {renderHeader ? renderHeader() : header}
+                                                </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>
-                                    ))
+                                    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>