projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
13494: Merge branch 'master' into 13494-collection-version-browser
[arvados.git]
/
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 d906a32cbf7b5bab7f41dbed0062de63fa2d252c..28ae86cdfb9d76350092c3e05013c105e46c5841 100644
(file)
--- a/
src/components/data-explorer/data-explorer.tsx
+++ b/
src/components/data-explorer/data-explorer.tsx
@@
-3,17
+3,18
@@
// SPDX-License-Identifier: AGPL-3.0
import * as React from 'react';
// SPDX-License-Identifier: AGPL-3.0
import * as React from 'react';
-import { Grid, Paper, Toolbar, StyleRulesCallback, withStyles, WithStyles, TablePagination, IconButton, Tooltip } from '@material-ui/core';
+import { Grid, Paper, Toolbar, StyleRulesCallback, withStyles, WithStyles, TablePagination, IconButton, Tooltip
, Button
} from '@material-ui/core';
import { ColumnSelector } from "~/components/column-selector/column-selector";
import { ColumnSelector } from "~/components/column-selector/column-selector";
-import { DataTable, DataColumns } from "~/components/data-table/data-table";
-import { DataColumn
, SortDirection
} from "~/components/data-table/data-column";
+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 { MoreOptionsIcon } from '~/components/icon/icon';
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 { MoreOptionsIcon } from '~/components/icon/icon';
+import { PaperProps } from '@material-ui/core/Paper';
-type CssRules = 'searchBox' | "toolbar" | "
footer" | "root" | 'moreOptionsButton' | 'rootUserPanel
';
+type CssRules = 'searchBox' | "toolbar" | "
toolbarUnderTitle" | "footer" | "root" | 'moreOptionsButton' | 'title
';
const styles: StyleRulesCallback<CssRules> = (theme: ArvadosTheme) => ({
searchBox: {
const styles: StyleRulesCallback<CssRules> = (theme: ArvadosTheme) => ({
searchBox: {
@@
-22,25
+23,31
@@
const styles: StyleRulesCallback<CssRules> = (theme: ArvadosTheme) => ({
toolbar: {
paddingTop: theme.spacing.unit * 2
},
toolbar: {
paddingTop: theme.spacing.unit * 2
},
+ toolbarUnderTitle: {
+ paddingTop: 0
+ },
footer: {
overflow: 'auto'
},
root: {
height: '100%'
},
footer: {
overflow: 'auto'
},
root: {
height: '100%'
},
- rootUserPanel: {
- height: '100%',
- boxShadow: 'none'
- },
moreOptionsButton: {
padding: 0
moreOptionsButton: {
padding: 0
+ },
+ title: {
+ paddingLeft: theme.spacing.unit * 3,
+ paddingTop: theme.spacing.unit * 3,
+ fontSize: '18px'
}
});
interface DataExplorerDataProps<T> {
}
});
interface DataExplorerDataProps<T> {
+ fetchMode: DataTableFetchMode;
items: T[];
itemsAvailable: number;
columns: DataColumns<T>;
items: T[];
itemsAvailable: number;
columns: DataColumns<T>;
+ searchLabel?: string;
searchValue: string;
rowsPerPage: number;
rowsPerPageOptions: number[];
searchValue: string;
rowsPerPage: number;
rowsPerPageOptions: number[];
@@
-48,7
+55,13
@@
interface DataExplorerDataProps<T> {
contextMenuColumn: boolean;
dataTableDefaultView?: React.ReactNode;
working?: boolean;
contextMenuColumn: boolean;
dataTableDefaultView?: React.ReactNode;
working?: boolean;
- isUserPanel?: boolean;
+ hideColumnSelector?: boolean;
+ paperProps?: PaperProps;
+ actions?: React.ReactNode;
+ hideSearchInput?: boolean;
+ title?: React.ReactNode;
+ paperKey?: string;
+ currentItemUuid: string;
}
interface DataExplorerActionProps<T> {
}
interface DataExplorerActionProps<T> {
@@
-62,6
+75,7
@@
interface DataExplorerActionProps<T> {
onFiltersChange: (filters: DataTableFilters, column: DataColumn<T>) => void;
onChangePage: (page: number) => void;
onChangeRowsPerPage: (rowsPerPage: number) => void;
onFiltersChange: (filters: DataTableFilters, column: DataColumn<T>) => void;
onChangePage: (page: number) => void;
onChangeRowsPerPage: (rowsPerPage: number) => void;
+ onLoadMore: (page: number) => void;
extractKey?: (item: T) => React.Key;
}
extractKey?: (item: T) => React.Key;
}
@@
-77,23
+91,27
@@
export const DataExplorer = withStyles(styles)(
render() {
const {
columns, onContextMenu, onFiltersChange, onSortToggle, working, extractKey,
render() {
const {
columns, onContextMenu, onFiltersChange, onSortToggle, working, extractKey,
- rowsPerPage, rowsPerPageOptions, onColumnToggle, searchValue, onSearch,
+ rowsPerPage, rowsPerPageOptions, onColumnToggle, search
Label, search
Value, onSearch,
items, itemsAvailable, onRowClick, onRowDoubleClick, classes,
items, itemsAvailable, onRowClick, onRowDoubleClick, classes,
- dataTableDefaultView, isUserPanel
+ dataTableDefaultView, hideColumnSelector, actions, paperProps, hideSearchInput,
+ paperKey, fetchMode, currentItemUuid, title
} = this.props;
} = this.props;
- return <Paper className={!isUserPanel ? classes.root : classes.rootUserPanel}>
- <Toolbar className={!isUserPanel ? classes.toolbar : ''}>
+ return <Paper className={classes.root} {...paperProps} key={paperKey}>
+ {title && <div className={classes.title}>{title}</div>}
+ {(!hideColumnSelector || !hideSearchInput) && <Toolbar className={title ? classes.toolbarUnderTitle : classes.toolbar}>
<Grid container justify="space-between" wrap="nowrap" alignItems="center">
<div className={classes.searchBox}>
<Grid container justify="space-between" wrap="nowrap" alignItems="center">
<div className={classes.searchBox}>
- <SearchInput
+ {!hideSearchInput && <SearchInput
+ label={searchLabel}
value={searchValue}
value={searchValue}
- onSearch={onSearch} />
+ onSearch={onSearch} />
}
</div>
</div>
- {!isUserPanel && <ColumnSelector
+ {actions}
+ {!hideColumnSelector && <ColumnSelector
columns={columns}
onColumnToggle={onColumnToggle} />}
</Grid>
columns={columns}
onColumnToggle={onColumnToggle} />}
</Grid>
- </Toolbar>
+ </Toolbar>
}
<DataTable
columns={this.props.contextMenuColumn ? [...columns, this.contextMenuColumn] : columns}
items={items}
<DataTable
columns={this.props.contextMenuColumn ? [...columns, this.contextMenuColumn] : columns}
items={items}
@@
-105,17
+123,22
@@
export const DataExplorer = withStyles(styles)(
extractKey={extractKey}
working={working}
defaultView={dataTableDefaultView}
extractKey={extractKey}
working={working}
defaultView={dataTableDefaultView}
- />
+ currentItemUuid={currentItemUuid}
+ currentRoute={paperKey} />
<Toolbar className={classes.footer}>
<Grid container justify="flex-end">
<Toolbar className={classes.footer}>
<Grid container justify="flex-end">
- <TablePagination
+
{fetchMode === DataTableFetchMode.PAGINATED ?
<TablePagination
count={itemsAvailable}
rowsPerPage={rowsPerPage}
rowsPerPageOptions={rowsPerPageOptions}
page={this.props.page}
onChangePage={this.changePage}
onChangeRowsPerPage={this.changeRowsPerPage}
count={itemsAvailable}
rowsPerPage={rowsPerPage}
rowsPerPageOptions={rowsPerPageOptions}
page={this.props.page}
onChangePage={this.changePage}
onChangeRowsPerPage={this.changeRowsPerPage}
- component="div" />
+ component="div" /> : <Button
+ variant="text"
+ size="medium"
+ onClick={this.loadMore}
+ >Load more</Button>}
</Grid>
</Toolbar>
</Paper>;
</Grid>
</Toolbar>
</Paper>;
@@
-129,6
+152,10
@@
export const DataExplorer = withStyles(styles)(
this.props.onChangeRowsPerPage(parseInt(event.target.value, 10));
}
this.props.onChangeRowsPerPage(parseInt(event.target.value, 10));
}
+ loadMore = () => {
+ this.props.onLoadMore(this.props.page + 1);
+ }
+
renderContextMenuTrigger = (item: T) =>
<Grid container justify="center">
<Tooltip title="More options" disableFocusListener>
renderContextMenuTrigger = (item: T) =>
<Grid container justify="center">
<Tooltip title="More options" disableFocusListener>
@@
-142,7
+169,6
@@
export const DataExplorer = withStyles(styles)(
name: "Actions",
selected: true,
configurable: false,
name: "Actions",
selected: true,
configurable: false,
- sortDirection: SortDirection.NONE,
filters: createTree(),
key: "context-actions",
render: this.renderContextMenuTrigger
filters: createTree(),
key: "context-actions",
render: this.renderContextMenuTrigger