X-Git-Url: https://git.arvados.org/arvados-workbench2.git/blobdiff_plain/06e815a5ab6a9a9a118014b41f023c46237156f1..e7a3f670ea3fa984fb704b204772ba98a5cf4451:/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 7a9d95b0..24cd9140 100644
--- a/src/components/data-table/data-table.tsx
+++ b/src/components/data-table/data-table.tsx
@@ -2,7 +2,7 @@
 //
 // SPDX-License-Identifier: AGPL-3.0
 
-import React from 'react';
+import React from "react";
 import {
     Table,
     TableBody,
@@ -16,20 +16,19 @@ import {
     withStyles,
     IconButton,
     Tooltip,
-} from '@material-ui/core';
-import classnames from 'classnames';
-import { DataColumn, SortDirection } from './data-column';
-import { DataTableDefaultView } from '../data-table-default-view/data-table-default-view';
-import { DataTableFilters } from '../data-table-filters/data-table-filters-tree';
-import { DataTableMultiselectPopover } from '../data-table-multiselect-popover/data-table-multiselect-popover';
-import { DataTableFiltersPopover } from '../data-table-filters/data-table-filters-popover';
-import { countNodes, getTreeDirty } from 'models/tree';
-import { IconType, PendingIcon } from 'components/icon/icon';
-import { SvgIconProps } from '@material-ui/core/SvgIcon';
-import ArrowDownwardIcon from '@material-ui/icons/ArrowDownward';
-import { createTree } from 'models/tree';
-import arraysAreCongruent from 'validators/arrays-are-congruent';
-import { DataTableMultiselectOption } from '../data-table-multiselect-popover/data-table-multiselect-popover';
+} from "@material-ui/core";
+import classnames from "classnames";
+import { DataColumn, SortDirection } from "./data-column";
+import { DataTableDefaultView } from "../data-table-default-view/data-table-default-view";
+import { DataTableFilters } from "../data-table-filters/data-table-filters-tree";
+import { DataTableMultiselectPopover } from "../data-table-multiselect-popover/data-table-multiselect-popover";
+import { DataTableFiltersPopover } from "../data-table-filters/data-table-filters-popover";
+import { countNodes, getTreeDirty } from "models/tree";
+import { IconType, PendingIcon } from "components/icon/icon";
+import { SvgIconProps } from "@material-ui/core/SvgIcon";
+import ArrowDownwardIcon from "@material-ui/icons/ArrowDownward";
+import { createTree } from "models/tree";
+import { DataTableMultiselectOption } from "../data-table-multiselect-popover/data-table-multiselect-popover";
 
 export type DataColumns<I, R> = Array<DataColumn<I, R>>;
 
@@ -54,67 +53,72 @@ export interface DataTableDataProps<I> {
     currentRoute?: string;
     toggleMSToolbar: (isVisible: boolean) => void;
     setCheckedListOnStore: (checkedList: TCheckedList) => void;
+    checkedList: TCheckedList;
 }
 
 type CssRules =
-    | 'tableBody'
-    | 'root'
-    | 'content'
-    | 'noItemsInfo'
-    | 'checkBoxHead'
-    | 'checkBoxCell'
-    | 'checkBox'
-    | 'tableCell'
-    | 'arrow'
-    | 'arrowButton'
-    | 'tableCellWorkflows'
-    | 'loader';
+    | "tableBody"
+    | "root"
+    | "content"
+    | "noItemsInfo"
+    | "checkBoxHead"
+    | "checkBoxCell"
+    | "checkBox"
+    | "firstTableCell"
+    | "tableCell"
+    | "arrow"
+    | "arrowButton"
+    | "tableCellWorkflows"
+    | "loader";
 
 const styles: StyleRulesCallback<CssRules> = (theme: Theme) => ({
     root: {
-        width: '100%',
+        width: "100%",
     },
     content: {
-        display: 'inline-block',
-        width: '100%',
+        display: "inline-block",
+        width: "100%",
     },
     tableBody: {
         background: theme.palette.background.paper,
     },
     loader: {
-        left: '50%',
-        marginLeft: '-84px',
-        position: 'absolute',
+        left: "50%",
+        marginLeft: "-84px",
+        position: "absolute",
     },
     noItemsInfo: {
-        textAlign: 'center',
+        textAlign: "center",
         padding: theme.spacing.unit,
     },
     checkBoxHead: {
-        padding: '0',
-        display: 'flex',
+        padding: "0",
+        display: "flex",
     },
     checkBoxCell: {
-        padding: '0',
-        paddingLeft: '10px',
+        padding: "0",
+        paddingLeft: "10px",
     },
     checkBox: {
-        cursor: 'pointer',
+        cursor: "pointer",
     },
     tableCell: {
-        wordWrap: 'break-word',
-        paddingRight: '24px',
-        color: '#737373',
+        wordWrap: "break-word",
+        paddingRight: "24px",
+        color: "#737373",
+    },
+    firstTableCell: {
+        paddingLeft: "5px",
     },
     tableCellWorkflows: {
-        '&:nth-last-child(2)': {
-            padding: '0px',
-            maxWidth: '48px',
+        "&:nth-last-child(2)": {
+            padding: "0px",
+            maxWidth: "48px",
         },
-        '&:last-child': {
-            padding: '0px',
-            paddingRight: '24px',
-            width: '48px',
+        "&:last-child": {
+            padding: "0px",
+            paddingRight: "24px",
+            width: "48px",
         },
     },
     arrow: {
@@ -129,7 +133,6 @@ export type TCheckedList = Record<string, boolean>;
 
 type DataTableState = {
     isSelected: boolean;
-    checkedList: TCheckedList;
 };
 
 type DataTableProps<T> = DataTableDataProps<T> & WithStyles<CssRules>;
@@ -138,7 +141,6 @@ export const DataTable = withStyles(styles)(
     class Component<T> extends React.Component<DataTableProps<T>> {
         state: DataTableState = {
             isSelected: false,
-            checkedList: {},
         };
 
         componentDidMount(): void {
@@ -146,45 +148,48 @@ export const DataTable = withStyles(styles)(
         }
 
         componentDidUpdate(prevProps: Readonly<DataTableProps<T>>, prevState: DataTableState) {
-            const { items, toggleMSToolbar, setCheckedListOnStore } = this.props;
-            const { isSelected, checkedList } = this.state;
-            if (!arraysAreCongruent(prevProps.items, items)) {
+            const { items, setCheckedListOnStore } = this.props;
+            const { isSelected } = this.state;
+            if (prevProps.items !== items) {
                 if (isSelected === true) this.setState({ isSelected: false });
                 if (items.length) this.initializeCheckedList(items);
-            }
-            if (prevState.checkedList !== checkedList) {
-                toggleMSToolbar(this.isAnySelected() ? true : false);
-                setCheckedListOnStore(checkedList);
+                else setCheckedListOnStore({});
             }
         }
 
+        componentWillUnmount(): void {
+            this.initializeCheckedList([])
+        }
+
         checkBoxColumn: DataColumn<any, any> = {
-            name: 'checkBoxColumn',
+            name: "checkBoxColumn",
             selected: true,
             configurable: false,
             filters: createTree(),
-            render: (uuid) => (
-                <input
-                    type='checkbox'
-                    name={uuid}
-                    className={this.props.classes.checkBox}
-                    checked={this.state.checkedList[uuid] ?? false}
-                    onChange={() => this.handleCheck(uuid)}
-                    onDoubleClick={(ev) => ev.stopPropagation()}
-                ></input>
-            ),
+            render: uuid => {
+                const { classes, checkedList } = this.props;
+                return (
+                    <input
+                        type="checkbox"
+                        name={uuid}
+                        className={classes.checkBox}
+                        checked={checkedList && checkedList[uuid] ? checkedList[uuid] : false}
+                        onChange={() => this.handleSelectOne(uuid)}
+                        onDoubleClick={ev => ev.stopPropagation()}></input>
+                );
+            },
         };
 
         multiselectOptions: DataTableMultiselectOption[] = [
-            { name: 'All', fn: (list) => this.handleSelectAll(list) },
-            { name: 'None', fn: (list) => this.handleSelectNone(list) },
-            { name: 'Invert', fn: (list) => this.handleInvertSelect(list) },
+            { name: "All", fn: list => this.handleSelectAll(list) },
+            { name: "None", fn: list => this.handleSelectNone(list) },
+            { name: "Invert", fn: list => this.handleInvertSelect(list) },
         ];
 
         initializeCheckedList = (uuids: any[]): void => {
-            const newCheckedList = { ...this.state.checkedList };
+            const newCheckedList = { ...this.props.checkedList };
 
-            uuids.forEach((uuid) => {
+            uuids.forEach(uuid => {
                 if (!newCheckedList.hasOwnProperty(uuid)) {
                     newCheckedList[uuid] = false;
                 }
@@ -194,7 +199,7 @@ export const DataTable = withStyles(styles)(
                     delete newCheckedList[key];
                 }
             }
-            this.setState({ checkedList: newCheckedList });
+            this.props.setCheckedListOnStore(newCheckedList);
         };
 
         isAllSelected = (list: TCheckedList): boolean => {
@@ -205,7 +210,7 @@ export const DataTable = withStyles(styles)(
         };
 
         isAnySelected = (): boolean => {
-            const { checkedList } = this.state;
+            const { checkedList } = this.props;
             if (!Object.keys(checkedList).length) return false;
             for (const key in checkedList) {
                 if (checkedList[key] === true) return true;
@@ -213,15 +218,16 @@ export const DataTable = withStyles(styles)(
             return false;
         };
 
-        handleCheck = (uuid: string): void => {
-            const { checkedList } = this.state;
+        handleSelectOne = (uuid: string): void => {
+            const { checkedList } = this.props;
             const newCheckedList = { ...checkedList };
             newCheckedList[uuid] = !checkedList[uuid];
-            this.setState({ checkedList: newCheckedList, isSelected: this.isAllSelected(newCheckedList) });
+            this.setState({ isSelected: this.isAllSelected(newCheckedList) });
+            this.props.setCheckedListOnStore(newCheckedList);
         };
 
         handleSelectorSelect = (): void => {
-            const { checkedList } = this.state;
+            const { checkedList } = this.props;
             const { isSelected } = this.state;
             isSelected ? this.handleSelectNone(checkedList) : this.handleSelectAll(checkedList);
         };
@@ -232,7 +238,8 @@ export const DataTable = withStyles(styles)(
                 for (const key in newCheckedList) {
                     newCheckedList[key] = true;
                 }
-                this.setState({ isSelected: true, checkedList: newCheckedList });
+                this.setState({ isSelected: true });
+                this.props.setCheckedListOnStore(newCheckedList);
             }
         };
 
@@ -241,7 +248,8 @@ export const DataTable = withStyles(styles)(
             for (const key in newCheckedList) {
                 newCheckedList[key] = false;
             }
-            this.setState({ isSelected: false, checkedList: newCheckedList });
+            this.setState({ isSelected: false });
+            this.props.setCheckedListOnStore(newCheckedList);
         };
 
         handleInvertSelect = (list: TCheckedList): void => {
@@ -250,7 +258,8 @@ export const DataTable = withStyles(styles)(
                 for (const key in newCheckedList) {
                     newCheckedList[key] = !list[key];
                 }
-                this.setState({ checkedList: newCheckedList, isSelected: this.isAllSelected(newCheckedList) });
+                this.setState({ isSelected: this.isAllSelected(newCheckedList) });
+                this.props.setCheckedListOnStore(newCheckedList);
             }
         };
 
@@ -269,7 +278,10 @@ export const DataTable = withStyles(styles)(
                         </Table>
                         {!!working && (
                             <div className={classes.loader}>
-                                <DataTableDefaultView icon={PendingIcon} messages={['Loading data, please wait.']} />
+                                <DataTableDefaultView
+                                    icon={PendingIcon}
+                                    messages={["Loading data, please wait."]}
+                                />
                             </div>
                         )}
                         {items.length === 0 && !working && this.renderNoItemsPlaceholder(this.props.columns)}
@@ -279,34 +291,52 @@ export const DataTable = withStyles(styles)(
         }
 
         renderNoItemsPlaceholder = (columns: DataColumns<T, any>) => {
-            const dirty = columns.some((column) => getTreeDirty('')(column.filters));
-            return <DataTableDefaultView icon={this.props.defaultViewIcon} messages={this.props.defaultViewMessages} filtersApplied={dirty} />;
+            const dirty = columns.some(column => getTreeDirty("")(column.filters));
+            return (
+                <DataTableDefaultView
+                    icon={this.props.defaultViewIcon}
+                    messages={this.props.defaultViewMessages}
+                    filtersApplied={dirty}
+                />
+            );
         };
 
         renderHeadCell = (column: DataColumn<T, any>, index: number) => {
             const { name, key, renderHeader, filters, sort } = column;
-            const { onSortToggle, onFiltersChange, classes } = this.props;
-            const { isSelected, checkedList } = this.state;
-            return column.name === 'checkBoxColumn' ? (
-                <TableCell key={key || index} className={classes.checkBoxCell}>
+            const { onSortToggle, onFiltersChange, classes, checkedList } = this.props;
+            const { isSelected } = this.state;
+            return column.name === "checkBoxColumn" ? (
+                <TableCell
+                    key={key || index}
+                    className={classes.checkBoxCell}>
                     <div className={classes.checkBoxHead}>
-                        <Tooltip title={this.state.isSelected ? 'Deselect All' : 'Select All'}>
-                            <input type='checkbox' className={classes.checkBox} checked={isSelected} onChange={this.handleSelectorSelect}></input>
+                        <Tooltip title={this.state.isSelected ? "Deselect All" : "Select All"}>
+                            <input
+                                type="checkbox"
+                                className={classes.checkBox}
+                                checked={isSelected}
+                                disabled={!this.props.items.length}
+                                onChange={this.handleSelectorSelect}></input>
                         </Tooltip>
-                        <DataTableMultiselectPopover name={`Options`} options={this.multiselectOptions} checkedList={checkedList}></DataTableMultiselectPopover>
+                        <DataTableMultiselectPopover
+                            name={`Options`}
+                            disabled={!this.props.items.length}
+                            options={this.multiselectOptions}
+                            checkedList={checkedList}></DataTableMultiselectPopover>
                     </div>
                 </TableCell>
             ) : (
-                <TableCell className={classes.tableCell} key={key || index}>
+                <TableCell
+                    className={index === 1 ? classes.firstTableCell : classes.tableCell}
+                    key={key || index}>
                     {renderHeader ? (
                         renderHeader()
                     ) : countNodes(filters) > 0 ? (
                         <DataTableFiltersPopover
                             name={`${name} filters`}
                             mutuallyExclusive={column.mutuallyExclusiveFilters}
-                            onChange={(filters) => onFiltersChange && onFiltersChange(filters, column)}
-                            filters={filters}
-                        >
+                            onChange={filters => onFiltersChange && onFiltersChange(filters, column)}
+                            filters={filters}>
                             {name}
                         </DataTableFiltersPopover>
                     ) : sort ? (
@@ -315,8 +345,7 @@ export const DataTable = withStyles(styles)(
                             direction={sort.direction !== SortDirection.NONE ? sort.direction : undefined}
                             IconComponent={this.ArrowIcon}
                             hideSortIcon
-                            onClick={() => onSortToggle && onSortToggle(column)}
-                        >
+                            onClick={() => onSortToggle && onSortToggle(column)}>
                             {name}
                         </TableSortLabel>
                     ) : (
@@ -327,8 +356,14 @@ export const DataTable = withStyles(styles)(
         };
 
         ArrowIcon = ({ className, ...props }: SvgIconProps) => (
-            <IconButton component='span' className={this.props.classes.arrowButton} tabIndex={-1}>
-                <ArrowDownwardIcon {...props} className={classnames(className, this.props.classes.arrow)} />
+            <IconButton
+                component="span"
+                className={this.props.classes.arrowButton}
+                tabIndex={-1}>
+                <ArrowDownwardIcon
+                    {...props}
+                    className={classnames(className, this.props.classes.arrow)}
+                />
             </IconButton>
         );
 
@@ -338,16 +373,20 @@ export const DataTable = withStyles(styles)(
                 <TableRow
                     hover
                     key={extractKey ? extractKey(item) : index}
-                    onClick={(event) => onRowClick && onRowClick(event, item)}
+                    onClick={event => onRowClick && onRowClick(event, item)}
                     onContextMenu={this.handleRowContextMenu(item)}
-                    onDoubleClick={(event) => onRowDoubleClick && onRowDoubleClick(event, item)}
-                    selected={item === currentItemUuid}
-                >
+                    onDoubleClick={event => onRowDoubleClick && onRowDoubleClick(event, item)}
+                    selected={item === currentItemUuid}>
                     {this.mapVisibleColumns((column, index) => (
                         <TableCell
                             key={column.key || index}
-                            className={currentRoute === '/workflows' ? classes.tableCellWorkflows : index === 0 ? classes.checkBoxCell : classes.tableCell}
-                        >
+                            className={
+                                currentRoute === "/workflows"
+                                    ? classes.tableCellWorkflows
+                                    : index === 0
+                                    ? classes.checkBoxCell
+                                    : `${classes.tableCell} ${index === 1 ? classes.firstTableCell : ""}`
+                            }>
                             {column.render(item)}
                         </TableCell>
                     ))}
@@ -356,7 +395,7 @@ export const DataTable = withStyles(styles)(
         };
 
         mapVisibleColumns = (fn: (column: DataColumn<T, any>, index: number) => React.ReactElement<any>) => {
-            return this.props.columns.filter((column) => column.selected).map(fn);
+            return this.props.columns.filter(column => column.selected).map(fn);
         };
 
         handleRowContextMenu = (item: T) => (event: React.MouseEvent<HTMLElement>) => this.props.onContextMenu(event, item);