X-Git-Url: https://git.arvados.org/arvados-workbench2.git/blobdiff_plain/cb89000d480757f8e0f97f3560c5942d08bcd95a..25c3b17ad0dc0e70b48911c5a818bbcf6851352e:/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 dc097c39..f9c62a09 100644 --- a/src/components/data-explorer/data-explorer.tsx +++ b/src/components/data-explorer/data-explorer.tsx @@ -2,26 +2,22 @@ // // SPDX-License-Identifier: AGPL-3.0 -import React from 'react'; -import { Grid, Paper, Toolbar, StyleRulesCallback, withStyles, WithStyles, TablePagination, IconButton, Tooltip, Button } from '@material-ui/core'; +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 { 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, - MoreVerticalIcon -} from 'components/icon/icon'; -import { PaperProps } from '@material-ui/core/Paper'; -import { MPVPanelProps } from 'components/multi-panel-view/multi-panel-view'; +import { MultiselectToolbar } from "components/multiselect-toolbar/MultiselectToolbar"; +import { TCheckedList } from "components/data-table/data-table"; +import { createTree } from "models/tree"; +import { DataTableFilters } from "components/data-table-filters/data-table-filters-tree"; +import { CloseIcon, IconType, MaximizeIcon, UnMaximizeIcon, MoreVerticalIcon } 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'; +type CssRules = "searchBox" | "headerMenu" | "toolbar" | "footer" | "root" | "moreOptionsButton" | "title" | "dataTable" | "container"; const styles: StyleRulesCallback = (theme: ArvadosTheme) => ({ searchBox: { @@ -32,31 +28,34 @@ const styles: StyleRulesCallback = (theme: ArvadosTheme) => ({ paddingRight: theme.spacing.unit, }, footer: { - overflow: 'auto' + overflow: "auto", }, root: { - height: '100%', + height: "100%", }, moreOptionsButton: { - padding: 0 + padding: 0, }, title: { - display: 'inline-block', + display: "inline-block", paddingLeft: theme.spacing.unit * 2, paddingTop: theme.spacing.unit * 2, - fontSize: '18px' + fontSize: "18px", }, dataTable: { - height: '100%', - overflow: 'auto', + height: "100%", + overflow: "auto", }, container: { - height: '100%', + height: "100%", }, headerMenu: { - float: 'right', - display: 'inline-block', - } + width: "100%", + float: "right", + display: "flex", + flexDirection: "row-reverse", + justifyContent: "space-between", + }, }); interface DataExplorerDataProps { @@ -83,6 +82,8 @@ interface DataExplorerDataProps { paperKey?: string; currentItemUuid: string; elementPath?: string; + isMSToolbarVisible: boolean; + checkedList: TCheckedList; } interface DataExplorerActionProps { @@ -98,22 +99,23 @@ interface DataExplorerActionProps { onChangeRowsPerPage: (rowsPerPage: number) => void; onLoadMore: (page: number) => void; extractKey?: (item: T) => React.Key; + toggleMSToolbar: (isVisible: boolean) => void; + setCheckedListOnStore: (checkedList: TCheckedList) => void; } -type DataExplorerProps = DataExplorerDataProps & - DataExplorerActionProps & WithStyles & MPVPanelProps; +type DataExplorerProps = DataExplorerDataProps & DataExplorerActionProps & WithStyles & MPVPanelProps; export const DataExplorer = withStyles(styles)( class DataExplorerGeneric extends React.Component> { state = { showLoading: false, - prevRefresh: '', - prevRoute: '', + prevRefresh: "", + prevRoute: "", }; componentDidUpdate(prevProps: DataExplorerProps) { - const currentRefresh = this.props.currentRefresh || ''; - const currentRoute = this.props.currentRoute || ''; + 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, @@ -146,119 +148,236 @@ export const DataExplorer = withStyles(styles)( // 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 || '', + prevRefresh: this.props.currentRefresh || "", + prevRoute: this.props.currentRoute || "", }); } render() { const { - columns, onContextMenu, onFiltersChange, onSortToggle, extractKey, - rowsPerPage, rowsPerPageOptions, onColumnToggle, searchLabel, searchValue, onSearch, - items, itemsAvailable, onRowClick, onRowDoubleClick, classes, - defaultViewIcon, defaultViewMessages, hideColumnSelector, actions, paperProps, hideSearchInput, - paperKey, fetchMode, currentItemUuid, title, - doHidePanel, doMaximizePanel, doUnMaximizePanel, panelName, panelMaximized, elementPath + columns, + onContextMenu, + onFiltersChange, + onSortToggle, + extractKey, + rowsPerPage, + rowsPerPageOptions, + onColumnToggle, + searchLabel, + searchValue, + onSearch, + items, + itemsAvailable, + onRowClick, + onRowDoubleClick, + classes, + defaultViewIcon, + defaultViewMessages, + hideColumnSelector, + actions, + paperProps, + hideSearchInput, + paperKey, + fetchMode, + currentItemUuid, + title, + doHidePanel, + doMaximizePanel, + doUnMaximizePanel, + panelName, + panelMaximized, + elementPath, + toggleMSToolbar, + setCheckedListOnStore, + checkedList, } = this.props; - return - -
- {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} - + return ( + + +
+ {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} + toggleMSToolbar={toggleMSToolbar} + setCheckedListOnStore={setCheckedListOnStore} + checkedList={checkedList} + /> + + + + {elementPath && ( + + {elementPath} + + )} + + {fetchMode === DataTableFetchMode.PAGINATED ? ( + 0 ? {} : { disabled: true }} + component="div" + /> + ) : ( + + )} + + - } - - {fetchMode === DataTableFetchMode.PAGINATED ? 0) ? {} : {disabled: true}} - component="div" /> : } -
-
-
; + + ); } changePage = (event: React.MouseEvent, page: number) => { this.props.onChangePage(page); - } + }; - changeRowsPerPage: React.ChangeEventHandler = (event) => { + changeRowsPerPage: React.ChangeEventHandler = event => { this.props.onChangeRowsPerPage(parseInt(event.target.value, 10)); - } + }; loadMore = () => { this.props.onLoadMore(this.props.page + 1); - } + }; - renderContextMenuTrigger = (item: T) => - - - this.props.onContextMenu(event, item)}> + renderContextMenuTrigger = (item: T) => ( + + + { + event.stopPropagation() + this.props.onContextMenu(event, item) + }} + > + ); contextMenuColumn: DataColumn = { name: "Actions", @@ -266,7 +385,7 @@ export const DataExplorer = withStyles(styles)( configurable: false, filters: createTree(), key: "context-actions", - render: this.renderContextMenuTrigger + render: this.renderContextMenuTrigger, }; } );