X-Git-Url: https://git.arvados.org/arvados-workbench2.git/blobdiff_plain/1a9eb2261e6030ba78078e2a206bad27653f2475..0a0db4ca8433ae210df5cf1475dd2b77e4aabec9:/src/views-components/data-explorer/data-explorer.tsx diff --git a/src/views-components/data-explorer/data-explorer.tsx b/src/views-components/data-explorer/data-explorer.tsx index ffb21f93..59555707 100644 --- a/src/views-components/data-explorer/data-explorer.tsx +++ b/src/views-components/data-explorer/data-explorer.tsx @@ -2,236 +2,67 @@ // // SPDX-License-Identifier: AGPL-3.0 -import * as React from 'react'; -import { Typography, Grid, Paper, Toolbar } from '@material-ui/core'; -import IconButton from '@material-ui/core/IconButton'; -import MoreVertIcon from "@material-ui/icons/MoreVert"; -import { formatFileSize, formatDate } from '../../common/formatters'; -import { DataItem } from './data-item'; -import ContextMenu from "../../components/context-menu/context-menu"; -import ColumnSelector from "../../components/column-selector/column-selector"; -import DataTable from "../../components/data-table/data-table"; -import { mockAnchorFromMouseEvent } from "../../components/popover/helpers"; -import { DataColumn, toggleSortDirection, resetSortDirection } from "../../components/data-table/data-column"; - -export interface DataExplorerContextActions { - onAddToFavourite: (dataIitem: DataItem) => void; - onCopy: (dataIitem: DataItem) => void; - onDownload: (dataIitem: DataItem) => void; - onMoveTo: (dataIitem: DataItem) => void; - onRemove: (dataIitem: DataItem) => void; - onRename: (dataIitem: DataItem) => void; - onShare: (dataIitem: DataItem) => void; -} -interface DataExplorerProps { - items: DataItem[]; - onItemClick: (item: DataItem) => void; - contextActions: DataExplorerContextActions; -} - -interface DataExplorerState { - columns: Array>; - contextMenu: { - anchorEl?: HTMLElement; - item?: DataItem; - }; +import { connect } from "react-redux"; +import { RootState } from "~/store/store"; +import { DataExplorer as DataExplorerComponent } from "~/components/data-explorer/data-explorer"; +import { getDataExplorer } from "~/store/data-explorer/data-explorer-reducer"; +import { Dispatch } from "redux"; +import { dataExplorerActions } from "~/store/data-explorer/data-explorer-action"; +import { DataColumn } from "~/components/data-table/data-column"; +import { DataTableFilterItem } from "~/components/data-table-filters/data-table-filters"; +import { DataColumns } from "~/components/data-table/data-table"; + +interface Props { + id: string; + onRowClick: (item: any) => void; + onContextMenu?: (event: React.MouseEvent, item: any) => void; + onRowDoubleClick: (item: any) => void; + extractKey?: (item: any) => React.Key; } -class DataExplorer extends React.Component { - state: DataExplorerState = { - contextMenu: {}, - columns: [{ - name: "Name", - selected: true, - sortDirection: "asc", - onSortToggle: () => this.toggleSort("Name"), - render: item => this.renderName(item) - }, { - name: "Status", - selected: true, - render: item => renderStatus(item.status) - }, { - name: "Type", - selected: true, - render: item => renderType(item.type) - }, { - name: "Owner", - selected: true, - render: item => renderOwner(item.owner) - }, { - name: "File size", - selected: true, - render: item => renderFileSize(item.fileSize) - }, { - name: "Last modified", - selected: true, - onSortToggle: () => this.toggleSort("Last modified"), - render: item => renderDate(item.lastModified) - }, { - name: "Actions", - selected: true, - configurable: false, - renderHeader: () => null, - render: item => this.renderActions(item) - }] - }; - - contextMenuActions = [[{ - icon: "fas fa-users fa-fw", - name: "Share", - onClick: this.handleContextAction("onShare") - }, { - icon: "fas fa-sign-out-alt fa-fw", - name: "Move to", - onClick: this.handleContextAction("onMoveTo") - }, { - icon: "fas fa-star fa-fw", - name: "Add to favourite", - onClick: this.handleContextAction("onAddToFavourite") - }, { - icon: "fas fa-edit fa-fw", - name: "Rename", - onClick: this.handleContextAction("onRename") - }, { - icon: "fas fa-copy fa-fw", - name: "Make a copy", - onClick: this.handleContextAction("onCopy") - }, { - icon: "fas fa-download fa-fw", - name: "Download", - onClick: this.handleContextAction("onDownload") - }], [{ - icon: "fas fa-trash-alt fa-fw", - name: "Remove", - onClick: this.handleContextAction("onRemove") - } - ]]; - - render() { - return - - - - - - - - - ; - } +const mapStateToProps = (state: RootState, { id }: Props) => { + const progress = state.progressIndicator.find(p => p.id === id); + const working = progress && progress.working; + return { ...getDataExplorer(state.dataExplorer, id), working }; +}; - toggleColumn = (column: DataColumn) => { - const index = this.state.columns.indexOf(column); - const columns = this.state.columns.slice(0); - columns.splice(index, 1, { ...column, selected: !column.selected }); - this.setState({ columns }); - } +const mapDispatchToProps = () => { + return (dispatch: Dispatch, { id, onRowClick, onRowDoubleClick, onContextMenu }: Props) => ({ + onSetColumns: (columns: DataColumns) => { + dispatch(dataExplorerActions.SET_COLUMNS({ id, columns })); + }, - renderName = (item: DataItem) => - this.props.onItemClick(item)}> - - {renderIcon(item)} - - - - {item.name} - - - + onSearch: (searchValue: string) => { + dispatch(dataExplorerActions.SET_EXPLORER_SEARCH_VALUE({ id, searchValue })); + }, - renderActions = (item: DataItem) => - - this.openItemMenuOnActionsClick(event, item)}> - - - + onColumnToggle: (column: DataColumn) => { + dispatch(dataExplorerActions.TOGGLE_COLUMN({ id, columnName: column.name })); + }, - openItemMenuOnRowClick = (event: React.MouseEvent, item: DataItem) => { - event.preventDefault(); - this.setState({ - contextMenu: { - anchorEl: mockAnchorFromMouseEvent(event), - item - } - }); - } + onSortToggle: (column: DataColumn) => { + dispatch(dataExplorerActions.TOGGLE_SORT({ id, columnName: column.name })); + }, - openItemMenuOnActionsClick = (event: React.MouseEvent, item: DataItem) => { - this.setState({ - contextMenu: { - anchorEl: event.currentTarget, - item - } - }); - } + onFiltersChange: (filters: DataTableFilterItem[], column: DataColumn) => { + dispatch(dataExplorerActions.SET_FILTERS({ id, columnName: column.name, filters })); + }, - closeContextMenu = () => { - this.setState({ contextMenu: {} }); - } + onChangePage: (page: number) => { + dispatch(dataExplorerActions.SET_PAGE({ id, page })); + }, - handleContextAction(action: keyof DataExplorerContextActions) { - return (item: DataItem) => { - this.closeContextMenu(); - this.props.contextActions[action](item); - }; - } + onChangeRowsPerPage: (rowsPerPage: number) => { + dispatch(dataExplorerActions.SET_ROWS_PER_PAGE({ id, rowsPerPage })); + }, - toggleSort = (columnName: string) => { - this.setState({ - columns: this.state.columns.map((column, index) => - column.name === columnName ? toggleSortDirection(column) : resetSortDirection(column)) - }); - } + onRowClick, -} + onRowDoubleClick, -const renderIcon = (dataItem: DataItem) => { - switch (dataItem.type) { - case "arvados#group": - return ; - case "arvados#groupList": - return ; - default: - return ; - } + onContextMenu, + }); }; -const renderDate = (date: string) => - - {formatDate(date)} - ; - -const renderFileSize = (fileSize?: number) => - - {formatFileSize(fileSize)} - ; - -const renderOwner = (owner: string) => - - {owner} - ; - -const renderType = (type: string) => - - {type} - ; - -const renderStatus = (status?: string) => - - {status || "-"} - ; +export const DataExplorer = connect(mapStateToProps, mapDispatchToProps())(DataExplorerComponent); -export default DataExplorer;