X-Git-Url: https://git.arvados.org/arvados-workbench2.git/blobdiff_plain/dd89200ad6fdbfa337fdbab5f54def8712c6746c..8d491bda9abdc1a8d5f0ac8bcea3bf77eb221888:/src/components/data-explorer/data-explorer.tsx diff --git a/src/components/data-explorer/data-explorer.tsx b/src/components/data-explorer/data-explorer.tsx index eaa3464b..4e14b996 100644 --- a/src/components/data-explorer/data-explorer.tsx +++ b/src/components/data-explorer/data-explorer.tsx @@ -2,88 +2,243 @@ // // SPDX-License-Identifier: AGPL-3.0 -import * as React from 'react'; -import { Grid, Paper, Toolbar, StyleRulesCallback, withStyles, WithStyles, TablePagination, IconButton } from '@material-ui/core'; -import MoreVertIcon from "@material-ui/icons/MoreVert"; -import { ColumnSelector } from "../column-selector/column-selector"; -import { DataTable, DataColumns } from "../data-table/data-table"; -import { DataColumn } from "../data-table/data-column"; -import { DataTableFilterItem } from '../data-table-filters/data-table-filters'; -import { SearchInput } from '../search-input/search-input'; -import { ArvadosTheme } from "~/common/custom-theme"; - -type CssRules = "searchBox" | "toolbar"; +import React from 'react'; +import { Grid, Paper, Toolbar, StyleRulesCallback, withStyles, WithStyles, TablePagination, IconButton, Tooltip, Button } from '@material-ui/core'; +import { ColumnSelector } from "components/column-selector/column-selector"; +import { DataTable, DataColumns, DataTableFetchMode } from "components/data-table/data-table"; +import { DataColumn } from "components/data-table/data-column"; +import { SearchInput } from 'components/search-input/search-input'; +import { ArvadosTheme } from "common/custom-theme"; +import { createTree } from 'models/tree'; +import { DataTableFilters } from 'components/data-table-filters/data-table-filters-tree'; +import { + CloseIcon, + IconType, + MaximizeIcon, + UnMaximizeIcon, + MoreOptionsIcon +} from 'components/icon/icon'; +import { PaperProps } from '@material-ui/core/Paper'; +import { MPVPanelProps } from 'components/multi-panel-view/multi-panel-view'; + +type CssRules = 'searchBox' | 'headerMenu' | "toolbar" | "footer" | "root" | 'moreOptionsButton' | 'title' | 'dataTable' | 'container'; const styles: StyleRulesCallback = (theme: ArvadosTheme) => ({ searchBox: { paddingBottom: theme.spacing.unit * 2 }, toolbar: { - paddingTop: theme.spacing.unit * 2 + paddingTop: theme.spacing.unit, + paddingRight: theme.spacing.unit * 2, + }, + footer: { + overflow: 'auto' + }, + root: { + height: '100%', + }, + moreOptionsButton: { + padding: 0 + }, + title: { + display: 'inline-block', + paddingLeft: theme.spacing.unit * 3, + paddingTop: theme.spacing.unit * 3, + fontSize: '18px' + }, + dataTable: { + height: '100%', + overflow: 'auto', + }, + container: { + height: '100%', + }, + headerMenu: { + float: 'right', + display: 'inline-block' } }); interface DataExplorerDataProps { + fetchMode: DataTableFetchMode; items: T[]; itemsAvailable: number; columns: DataColumns; + searchLabel?: string; searchValue: string; rowsPerPage: number; rowsPerPageOptions: number[]; page: number; + contextMenuColumn: boolean; + defaultViewIcon?: IconType; + defaultViewMessages?: string[]; + working?: boolean; + currentRefresh?: string; + currentRoute?: string; + hideColumnSelector?: boolean; + paperProps?: PaperProps; + actions?: React.ReactNode; + hideSearchInput?: boolean; + title?: React.ReactNode; + paperKey?: string; + currentItemUuid: string; + elementPath?: string; +} + +interface DataExplorerActionProps { + onSetColumns: (columns: DataColumns) => void; onSearch: (value: string) => void; onRowClick: (item: T) => void; onRowDoubleClick: (item: T) => void; onColumnToggle: (column: DataColumn) => void; onContextMenu: (event: React.MouseEvent, item: T) => void; onSortToggle: (column: DataColumn) => void; - onFiltersChange: (filters: DataTableFilterItem[], column: DataColumn) => void; + onFiltersChange: (filters: DataTableFilters, column: DataColumn) => void; onChangePage: (page: number) => void; onChangeRowsPerPage: (rowsPerPage: number) => void; + onLoadMore: (page: number) => void; extractKey?: (item: T) => React.Key; } -type DataExplorerProps = DataExplorerDataProps & WithStyles; +type DataExplorerProps = DataExplorerDataProps & + DataExplorerActionProps & WithStyles & MPVPanelProps; export const DataExplorer = withStyles(styles)( class DataExplorerGeneric extends React.Component> { + state = { + showLoading: false, + prevRefresh: '', + prevRoute: '', + }; + + componentDidUpdate(prevProps: DataExplorerProps) { + const currentRefresh = this.props.currentRefresh || ''; + const currentRoute = this.props.currentRoute || ''; + + if (currentRoute !== this.state.prevRoute) { + // Component already mounted, but the user comes from a route change, + // like browsing through a project hierarchy. + this.setState({ + showLoading: this.props.working, + prevRoute: currentRoute, + }); + } + + if (currentRefresh !== this.state.prevRefresh) { + // Component already mounted, but the user just clicked the + // refresh button. + this.setState({ + showLoading: this.props.working, + prevRefresh: currentRefresh, + }); + } + if (this.state.showLoading && !this.props.working) { + this.setState({ + showLoading: false, + }); + } + } + + componentDidMount() { + if (this.props.onSetColumns) { + this.props.onSetColumns(this.props.columns); + } + // Component just mounted, so we need to show the loading indicator. + this.setState({ + showLoading: this.props.working, + prevRefresh: this.props.currentRefresh || '', + prevRoute: this.props.currentRoute || '', + }); + } + render() { - return - - -
- -
- -
-
- this.props.onRowClick(item)} - onContextMenu={this.props.onContextMenu} - onRowDoubleClick={(_, item: T) => this.props.onRowDoubleClick(item)} - onFiltersChange={this.props.onFiltersChange} - onSortToggle={this.props.onSortToggle} - extractKey={this.props.extractKey}/> - - {this.props.items.length > 0 && - - + +
+ {title && {title}} + { + (!hideColumnSelector || !hideSearchInput || !!actions) && + + + + {!hideSearchInput &&
+ {!hideSearchInput && } +
} + {actions} + {!hideColumnSelector && } +
+ { doUnMaximizePanel && panelMaximized && + + + } + { doMaximizePanel && !panelMaximized && + + + } + { doHidePanel && + + + } +
+
+ } +
+ onRowClick(item)} + onContextMenu={onContextMenu} + onRowDoubleClick={(_, item: T) => onRowDoubleClick(item)} + onFiltersChange={onFiltersChange} + onSortToggle={onSortToggle} + extractKey={extractKey} + working={this.state.showLoading} + defaultViewIcon={defaultViewIcon} + defaultViewMessages={defaultViewMessages} + currentItemUuid={currentItemUuid} + currentRoute={paperKey} /> + + { + elementPath && + + + {elementPath} + + + } + + {fetchMode === DataTableFetchMode.PAGINATED ? - } - + // Disable next button on empty lists since that's not default behavior + nextIconButtonProps={(itemsAvailable > 0) ? {} : {disabled: true}} + component="div" /> : } + +
+
; } @@ -95,20 +250,26 @@ export const DataExplorer = withStyles(styles)( this.props.onChangeRowsPerPage(parseInt(event.target.value, 10)); } + loadMore = () => { + this.props.onLoadMore(this.props.page + 1); + } + renderContextMenuTrigger = (item: T) => - - this.props.onContextMenu(event, item)}> - - + + + this.props.onContextMenu(event, item)}> + + + - contextMenuColumn = { + contextMenuColumn: DataColumn = { name: "Actions", selected: true, configurable: false, + filters: createTree(), key: "context-actions", - render: this.renderContextMenuTrigger, - width: "auto" + render: this.renderContextMenuTrigger }; } );