X-Git-Url: https://git.arvados.org/arvados-workbench2.git/blobdiff_plain/7ff688a46feb12ff62afcc35a287048f3e49fb27..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 57753c05..24cd9140 100644 --- a/src/components/data-table/data-table.tsx +++ b/src/components/data-table/data-table.tsx @@ -2,19 +2,33 @@ // // SPDX-License-Identifier: AGPL-3.0 -import React from 'react'; -import { Table, TableBody, TableRow, TableCell, TableHead, TableSortLabel, StyleRulesCallback, Theme, WithStyles, withStyles, IconButton } 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 { 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 React from "react"; +import { + Table, + TableBody, + TableRow, + TableCell, + TableHead, + TableSortLabel, + StyleRulesCallback, + Theme, + WithStyles, + 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 { DataTableMultiselectOption } from "../data-table-multiselect-popover/data-table-multiselect-popover"; export type DataColumns = Array>; @@ -37,48 +51,74 @@ export interface DataTableDataProps { defaultViewMessages?: string[]; currentItemUuid?: string; currentRoute?: string; + toggleMSToolbar: (isVisible: boolean) => void; + setCheckedListOnStore: (checkedList: TCheckedList) => void; + checkedList: TCheckedList; } -type CssRules = 'tableBody' | 'root' | 'content' | 'noItemsInfo' | 'checkBoxCell' | 'tableCell' | 'arrow' | 'arrowButton' | 'tableCellWorkflows' | 'loader'; +type CssRules = + | "tableBody" + | "root" + | "content" + | "noItemsInfo" + | "checkBoxHead" + | "checkBoxCell" + | "checkBox" + | "firstTableCell" + | "tableCell" + | "arrow" + | "arrowButton" + | "tableCellWorkflows" + | "loader"; const styles: StyleRulesCallback = (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", + }, checkBoxCell: { - padding: '0', - cursor: 'pointer', + padding: "0", + paddingLeft: "10px", + }, + checkBox: { + 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: { @@ -89,92 +129,144 @@ const styles: StyleRulesCallback = (theme: Theme) => ({ }, }); -type DataTableState = Record; +export type TCheckedList = Record; + +type DataTableState = { + isSelected: boolean; +}; type DataTableProps = DataTableDataProps & WithStyles; export const DataTable = withStyles(styles)( class Component extends React.Component> { - state: DataTableState = {}; + state: DataTableState = { + isSelected: false, + }; componentDidMount(): void { this.initializeCheckedList(this.props.items); } - componentDidUpdate(prevProps: Readonly>) { - console.log(prevProps.items, this.props.items, this.state); - console.log(this.props.currentRoute); - if (!arraysAreCongruent(prevProps.items, this.props.items)) { - this.initializeCheckedList(this.props.items); + componentDidUpdate(prevProps: Readonly>, prevState: DataTableState) { + 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); + else setCheckedListOnStore({}); } } componentWillUnmount(): void { - console.log('UNMOUNT'); + this.initializeCheckedList([]) } checkBoxColumn: DataColumn = { - name: 'checkBoxColumn', + name: "checkBoxColumn", selected: true, configurable: false, filters: createTree(), - render: (uuid) => ( - this.handleCheck(uuid)} - onDoubleClick={(ev) => ev.stopPropagation()} - > - ), + render: uuid => { + const { classes, checkedList } = this.props; + return ( + this.handleSelectOne(uuid)} + onDoubleClick={ev => ev.stopPropagation()}> + ); + }, }; + multiselectOptions: DataTableMultiselectOption[] = [ + { 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 checkedList = this.state; - uuids.forEach((uuid) => { - if (!checkedList.hasOwnProperty[uuid]) { - checkedList[uuid] = false; + const newCheckedList = { ...this.props.checkedList }; + + uuids.forEach(uuid => { + if (!newCheckedList.hasOwnProperty(uuid)) { + newCheckedList[uuid] = false; } }); + for (const key in newCheckedList) { + if (!uuids.includes(key)) { + delete newCheckedList[key]; + } + } + this.props.setCheckedListOnStore(newCheckedList); }; - handleCheck = (uuid: string): void => { - const newCheckedList = { ...this.state }; - newCheckedList[uuid] = !this.state[uuid]; - this.setState(newCheckedList); - console.log(newCheckedList); + isAllSelected = (list: TCheckedList): boolean => { + for (const key in list) { + if (list[key] === false) return false; + } + return true; }; - handleSelectAll = (): void => { - const newCheckedList = { ...this.state }; - for (const key in newCheckedList) { - newCheckedList[key] = true; + isAnySelected = (): boolean => { + const { checkedList } = this.props; + if (!Object.keys(checkedList).length) return false; + for (const key in checkedList) { + if (checkedList[key] === true) return true; + } + return false; + }; + + handleSelectOne = (uuid: string): void => { + const { checkedList } = this.props; + const newCheckedList = { ...checkedList }; + newCheckedList[uuid] = !checkedList[uuid]; + this.setState({ isSelected: this.isAllSelected(newCheckedList) }); + this.props.setCheckedListOnStore(newCheckedList); + }; + + handleSelectorSelect = (): void => { + const { checkedList } = this.props; + const { isSelected } = this.state; + isSelected ? this.handleSelectNone(checkedList) : this.handleSelectAll(checkedList); + }; + + handleSelectAll = (list: TCheckedList): void => { + if (Object.keys(list).length) { + const newCheckedList = { ...list }; + for (const key in newCheckedList) { + newCheckedList[key] = true; + } + this.setState({ isSelected: true }); + this.props.setCheckedListOnStore(newCheckedList); } - this.setState(newCheckedList); }; - handleDeselectAll = (): void => { - const newCheckedList = { ...this.state }; + handleSelectNone = (list: TCheckedList): void => { + const newCheckedList = { ...list }; for (const key in newCheckedList) { newCheckedList[key] = false; } - this.setState(newCheckedList); + this.setState({ isSelected: false }); + this.props.setCheckedListOnStore(newCheckedList); }; - handleInvertSelect = (): void => { - const newCheckedList = { ...this.state }; - for (const key in newCheckedList) { - newCheckedList[key] = !this.state[key]; + handleInvertSelect = (list: TCheckedList): void => { + if (Object.keys(list).length) { + const newCheckedList = { ...list }; + for (const key in newCheckedList) { + newCheckedList[key] = !list[key]; + } + this.setState({ isSelected: this.isAllSelected(newCheckedList) }); + this.props.setCheckedListOnStore(newCheckedList); } - this.setState(newCheckedList); }; render() { const { items, classes, working, columns } = this.props; if (columns[0].name === this.checkBoxColumn.name) columns.shift(); columns.unshift(this.checkBoxColumn); - return (
@@ -186,7 +278,10 @@ export const DataTable = withStyles(styles)( {!!working && (
- +
)} {items.length === 0 && !working && this.renderNoItemsPlaceholder(this.props.columns)} @@ -196,30 +291,52 @@ export const DataTable = withStyles(styles)( } renderNoItemsPlaceholder = (columns: DataColumns) => { - const dirty = columns.some((column) => getTreeDirty('')(column.filters)); - return ; + const dirty = columns.some(column => getTreeDirty("")(column.filters)); + return ( + + ); }; renderHeadCell = (column: DataColumn, index: number) => { const { name, key, renderHeader, filters, sort } = column; - const { onSortToggle, onFiltersChange, classes } = this.props; - return index === 0 ? ( - -
select all
-
deselect all
-
invert selection
+ const { onSortToggle, onFiltersChange, classes, checkedList } = this.props; + const { isSelected } = this.state; + return column.name === "checkBoxColumn" ? ( + +
+ + + + +
) : ( - + {renderHeader ? ( renderHeader() ) : countNodes(filters) > 0 ? ( onFiltersChange && onFiltersChange(filters, column)} - filters={filters} - > + onChange={filters => onFiltersChange && onFiltersChange(filters, column)} + filters={filters}> {name} ) : sort ? ( @@ -228,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} ) : ( @@ -240,8 +356,14 @@ export const DataTable = withStyles(styles)( }; ArrowIcon = ({ className, ...props }: SvgIconProps) => ( - - + + ); @@ -251,16 +373,20 @@ export const DataTable = withStyles(styles)( 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) => ( + className={ + currentRoute === "/workflows" + ? classes.tableCellWorkflows + : index === 0 + ? classes.checkBoxCell + : `${classes.tableCell} ${index === 1 ? classes.firstTableCell : ""}` + }> {column.render(item)} ))} @@ -269,7 +395,7 @@ export const DataTable = withStyles(styles)( }; mapVisibleColumns = (fn: (column: DataColumn, index: number) => React.ReactElement) => { - 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) => this.props.onContextMenu(event, item);