// 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 { PaperProps } from "@material-ui/core/Paper";
import { MPVPanelProps } from "components/multi-panel-view/multi-panel-view";
-type CssRules = "titleWrapper" | "searchBox" | "headerMenu" | "toolbar" | "footer" | "root" | "moreOptionsButton" | "title" | 'subProcessTitle' | "dataTable" | "container";
+type CssRules = "titleWrapper" | "searchBox" | "headerMenu" | "toolbar" | "footer" | "loadMoreContainer" | "numResults" | "root" | "moreOptionsButton" | "title" | 'subProcessTitle' | "dataTable" | "container";
const styles: StyleRulesCallback<CssRules> = (theme: ArvadosTheme) => ({
titleWrapper: {
footer: {
overflow: "auto",
},
+ loadMoreContainer: {
+ minWidth: '8rem',
+ },
root: {
height: "100%",
},
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,
defaultViewIcon?: IconType;
defaultViewMessages?: string[];
working?: boolean;
- currentRefresh?: string;
currentRoute?: string;
hideColumnSelector?: boolean;
paperProps?: PaperProps;
elementPath?: string;
isMSToolbarVisible: boolean;
checkedList: TCheckedList;
+ isNotFound: boolean;
}
interface DataExplorerActionProps<T> {
export const DataExplorer = withStyles(styles)(
class DataExplorerGeneric<T> extends React.Component<DataExplorerProps<T>> {
- state = {
- showLoading: false,
- prevRefresh: "",
- prevRoute: "",
- };
multiSelectToolbarInTitle = !this.props.title && !this.props.progressBar;
- componentDidUpdate(prevProps: DataExplorerProps<T>) {
- 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() {
toggleMSToolbar,
setCheckedListOnStore,
checkedList,
+ working,
} = this.props;
return (
<Paper
onFiltersChange={onFiltersChange}
onSortToggle={onSortToggle}
extractKey={extractKey}
- working={this.state.showLoading}
defaultViewIcon={defaultViewIcon}
defaultViewMessages={defaultViewMessages}
currentItemUuid={currentItemUuid}
toggleMSToolbar={toggleMSToolbar}
setCheckedListOnStore={setCheckedListOnStore}
checkedList={checkedList}
+ 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} / {itemsAvailable} 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>