// 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 { Grid, Paper, Toolbar, StyleRulesCallback, withStyles, WithStyles, TablePagination, IconButton, Tooltip, Button, Typography } 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 { 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 classNames from "classnames";
-type CssRules = "searchBox" | "headerMenu" | "toolbar" | "footer" | "root" | "moreOptionsButton" | "title" | "dataTable" | "container";
+type CssRules = "titleWrapper" | "msToolbarStyles" | "subpanelToolbarStyles" | "searchBox" | "headerMenu" | "toolbar" | "footer"| "loadMoreContainer" | "numResults" | "root" | "moreOptionsButton" | "title" | 'subProcessTitle' | 'progressWrapper' | 'progressWrapperNoTitle' | "dataTable" | "container";
const styles: StyleRulesCallback<CssRules> = (theme: ArvadosTheme) => ({
+ titleWrapper: {
+ display: "flex",
+ justifyContent: "space-between",
+ },
+ msToolbarStyles: {
+ paddingTop: "0.6rem",
+ },
+ subpanelToolbarStyles: {
+ paddingTop: "1.2rem",
+ },
searchBox: {
paddingBottom: 0,
},
toolbar: {
paddingTop: 0,
paddingRight: theme.spacing.unit,
+ paddingLeft: "10px",
},
footer: {
overflow: "auto",
},
+ loadMoreContainer: {
+ minWidth: '8rem',
+ },
root: {
height: "100%",
+ flex: 1,
+ overflowY: "auto",
},
moreOptionsButton: {
padding: 0,
},
+ numResults: {
+ marginTop: 0,
+ fontSize: "10px",
+ marginLeft: "10px",
+ marginBottom: '-0.5rem',
+ minWidth: '8.5rem',
+ },
title: {
display: "inline-block",
paddingLeft: theme.spacing.unit * 2,
paddingTop: theme.spacing.unit * 2,
fontSize: "18px",
+ paddingRight: "10px",
+ },
+ subProcessTitle: {
+ display: "inline-block",
+ paddingLeft: theme.spacing.unit * 2,
+ paddingTop: theme.spacing.unit * 2,
+ fontSize: "18px",
+ flexGrow: 0,
+ paddingRight: "10px",
+ },
+ progressWrapper: {
+ margin: "28px 0 0",
+ flexGrow: 1,
+ flexBasis: "100px",
+ },
+ progressWrapperNoTitle: {
+ paddingLeft: "10px",
},
dataTable: {
height: "100%",
height: "100%",
},
headerMenu: {
- width: "100%",
- float: "right",
- display: "flex",
- flexDirection: "row-reverse",
- justifyContent: "space-between",
+ marginLeft: "auto",
+ flexBasis: "initial",
+ flexGrow: 0,
},
});
defaultViewIcon?: IconType;
defaultViewMessages?: string[];
working?: boolean;
- currentRefresh?: string;
currentRoute?: string;
hideColumnSelector?: boolean;
paperProps?: PaperProps;
actions?: React.ReactNode;
hideSearchInput?: boolean;
title?: React.ReactNode;
+ progressBar?: React.ReactNode;
paperKey?: string;
- currentItemUuid: string;
+ currentRouteUuid: string;
+ selectedResourceUuid: string;
elementPath?: string;
isMSToolbarVisible: boolean;
checkedList: TCheckedList;
+ isNotFound: boolean;
+ searchBarValue: string;
+ paperClassName?: string;
}
interface DataExplorerActionProps<T> {
extractKey?: (item: T) => React.Key;
toggleMSToolbar: (isVisible: boolean) => void;
setCheckedListOnStore: (checkedList: TCheckedList) => void;
+ setSelectedUuid: (uuid: string) => void;
}
type DataExplorerProps<T> = DataExplorerDataProps<T> & DataExplorerActionProps<T> & WithStyles<CssRules> & MPVPanelProps;
export const DataExplorer = withStyles(styles)(
class DataExplorerGeneric<T> extends React.Component<DataExplorerProps<T>> {
state = {
- showLoading: false,
- prevRefresh: "",
- prevRoute: "",
+ msToolbarInDetailsCard: true,
};
- componentDidUpdate(prevProps: DataExplorerProps<T>) {
- const currentRefresh = this.props.currentRefresh || "";
- const currentRoute = this.props.currentRoute || "";
+ multiSelectToolbarInTitle = !this.props.title && !this.props.progressBar;
+ maxItemsAvailable = 0;
- 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,
- });
+ componentDidMount() {
+ if (this.props.onSetColumns) {
+ this.props.onSetColumns(this.props.columns);
}
+ }
- if (currentRefresh !== this.state.prevRefresh) {
- // Component already mounted, but the user just clicked the
- // refresh button.
+ componentDidUpdate( prevProps: Readonly<DataExplorerProps<T>>, prevState: Readonly<{}>, snapshot?: any ): void {
+ const { selectedResourceUuid, currentRouteUuid } = this.props;
+ if(selectedResourceUuid !== prevProps.selectedResourceUuid || currentRouteUuid !== prevProps.currentRouteUuid) {
this.setState({
- showLoading: this.props.working,
- prevRefresh: currentRefresh,
- });
+ msToolbarInDetailsCard: selectedResourceUuid === this.props.currentRouteUuid,
+ })
}
- if (this.state.showLoading && !this.props.working) {
- this.setState({
- showLoading: false,
- });
+ if (this.props.itemsAvailable !== prevProps.itemsAvailable) {
+ this.maxItemsAvailable = Math.max(this.maxItemsAvailable, this.props.itemsAvailable);
}
- }
-
- componentDidMount() {
- if (this.props.onSetColumns) {
- this.props.onSetColumns(this.props.columns);
+ if (this.props.searchBarValue !== prevProps.searchBarValue) {
+ this.maxItemsAvailable = 0;
}
- // 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() {
hideSearchInput,
paperKey,
fetchMode,
- currentItemUuid,
+ selectedResourceUuid,
+ currentRoute,
title,
+ progressBar,
doHidePanel,
doMaximizePanel,
doUnMaximizePanel,
toggleMSToolbar,
setCheckedListOnStore,
checkedList,
+ working,
+ paperClassName,
} = this.props;
return (
<Paper
- className={classes.root}
+ className={classNames(classes.root, paperClassName)}
{...paperProps}
key={paperKey}
data-cy={this.props["data-cy"]}
wrap="nowrap"
className={classes.container}
>
- <div>
+ <div data-cy="title-wrapper" className={classes.titleWrapper} style={currentRoute?.includes('search-results') || !!progressBar ? {marginBottom: '-20px'} : {}}>
{title && (
<Grid
item
xs
- className={classes.title}
+ className={!!progressBar ? classes.subProcessTitle : classes.title}
>
{title}
</Grid>
)}
+ {!!progressBar &&
+ <div className={classNames({
+ [classes.progressWrapper]: true,
+ [classes.progressWrapperNoTitle]: !title,
+ })}>{progressBar}</div>
+ }
+ {this.multiSelectToolbarInTitle && !this.state.msToolbarInDetailsCard && <MultiselectToolbar injectedStyles={classes.msToolbarStyles} />}
{(!hideColumnSelector || !hideSearchInput || !!actions) && (
<Grid
className={classes.headerMenu}
xs
>
<Toolbar className={classes.toolbar}>
- {!hideSearchInput && (
- <div className={classes.searchBox}>
- {!hideSearchInput && (
- <SearchInput
- label={searchLabel}
- value={searchValue}
- selfClearProp={""}
- onSearch={onSearch}
- />
- )}
- </div>
- )}
- {actions}
- {!hideColumnSelector && (
- <ColumnSelector
- columns={columns}
- onColumnToggle={onColumnToggle}
- />
- )}
+ <Grid container justify="space-between" wrap="nowrap" alignItems="center">
+ {!hideSearchInput && (
+ <div className={classes.searchBox}>
+ {!hideSearchInput && (
+ <SearchInput
+ label={searchLabel}
+ value={searchValue}
+ selfClearProp={""}
+ onSearch={onSearch}
+ />
+ )}
+ </div>
+ )}
+ {actions}
+ {!hideColumnSelector && (
+ <ColumnSelector
+ columns={columns}
+ onColumnToggle={onColumnToggle}
+ />
+ )}
+ </Grid>
{doUnMaximizePanel && panelMaximized && (
<Tooltip
title={`Unmaximize ${panelName || "panel"}`}
</Tooltip>
)}
</Toolbar>
- <MultiselectToolbar />
</Grid>
)}
</div>
+ {!this.multiSelectToolbarInTitle && <MultiselectToolbar isSubPanel={true} injectedStyles={classes.subpanelToolbarStyles}/>}
<Grid
item
xs="auto"
className={classes.dataTable}
+ style={currentRoute?.includes('search-results') || !!progressBar ? {marginTop: '-10px'} : {}}
>
<DataTable
columns={this.props.contextMenuColumn ? [...columns, this.contextMenuColumn] : columns}
onFiltersChange={onFiltersChange}
onSortToggle={onSortToggle}
extractKey={extractKey}
- working={this.state.showLoading}
defaultViewIcon={defaultViewIcon}
defaultViewMessages={defaultViewMessages}
- currentItemUuid={currentItemUuid}
currentRoute={paperKey}
toggleMSToolbar={toggleMSToolbar}
setCheckedListOnStore={setCheckedListOnStore}
checkedList={checkedList}
+ selectedResourceUuid={selectedResourceUuid}
+ setSelectedUuid={this.props.setSelectedUuid}
+ currentRouteUuid={this.props.currentRouteUuid}
+ working={working}
+ isNotFound={this.props.isNotFound}
/>
</Grid>
<Grid
<Toolbar className={classes.footer}>
{elementPath && (
<Grid container>
- <span data-cy="element-path">{elementPath}</span>
+ <span data-cy="element-path">{elementPath.length > 2 ? elementPath : ''}</span>
</Grid>
)}
<Grid
component="div"
/>
) : (
- <Button
- variant="text"
- size="medium"
- onClick={this.loadMore}
- >
- Load more
- </Button>
+ <Grid className={classes.loadMoreContainer}>
+ <Typography className={classes.numResults}>
+ Showing {items.length} / {this.maxItemsAvailable} results
+ </Typography>
+ <Button
+ size="small"
+ onClick={this.loadMore}
+ variant="contained"
+ color="primary"
+ style={{width: '100%', margin: '10px'}}
+ disabled={working || items.length >= itemsAvailable}
+ >
+ Load more
+ </Button>
+ </Grid>
)}
</Grid>
</Toolbar>
>
<IconButton
className={this.props.classes.moreOptionsButton}
- onClick={event => this.props.onContextMenu(event, item)}
+ onClick={event => {
+ event.stopPropagation()
+ this.props.onContextMenu(event, item)
+ }}
>
<MoreVerticalIcon />
</IconButton>
projects / arvados.git / blobdiff