X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/08f35d9b26a06b70da6e54533782276617c5bed1..a54f5270f980d4c2c6143b6654fb96a57b7bf46c:/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 4bd4a2374b..af14db9c9e 100644 --- a/src/components/data-explorer/data-explorer.tsx +++ b/src/components/data-explorer/data-explorer.tsx @@ -7,12 +7,12 @@ import { Grid, Paper, Toolbar, StyleRulesCallback, withStyles, WithStyles, Table 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 { DataColumn, SortDirection } 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"; +import { ArvadosTheme } from "~/common/custom-theme"; import { DefaultView } from '../default-view/default-view'; -import { ProjectIcon } from '../icon/icon'; +import { IconType } from '../icon/icon'; type CssRules = 'searchBox' | "toolbar" | 'defaultRoot' | 'defaultMessage' | 'defaultIcon'; @@ -25,9 +25,10 @@ const styles: StyleRulesCallback = (theme: ArvadosTheme) => ({ }, defaultRoot: { position: 'absolute', - width: '100%', + width: '80%', + left: '50%', top: '50%', - transform: 'translate(0%, -50%)' + transform: 'translate(-50%, -50%)' }, defaultMessage: { fontSize: '1.75rem', @@ -45,9 +46,12 @@ interface DataExplorerDataProps { rowsPerPage: number; rowsPerPageOptions: number[]; page: number; + defaultIcon: IconType; + defaultMessages: string[]; } interface DataExplorerActionProps { + onSetColumns: (columns: DataColumns) => void; onSearch: (value: string) => void; onRowClick: (item: T) => void; onRowDoubleClick: (item: T) => void; @@ -64,11 +68,16 @@ type DataExplorerProps = DataExplorerDataProps & DataExplorerActionProps extends React.Component> { + componentDidMount() { + if (this.props.onSetColumns) { + this.props.onSetColumns(this.props.columns); + } + } render() { - const { - columns, onContextMenu, onFiltersChange, onSortToggle, extractKey, - rowsPerPage, rowsPerPageOptions, onColumnToggle, searchValue, onSearch, - items, itemsAvailable, onRowClick, onRowDoubleClick, classes + const { + columns, onContextMenu, onFiltersChange, onSortToggle, extractKey, + rowsPerPage, rowsPerPageOptions, onColumnToggle, searchValue, onSearch, + items, itemsAvailable, onRowClick, onRowDoubleClick, defaultIcon, defaultMessages, classes } = this.props; return
{ items.length > 0 ? ( @@ -108,11 +117,11 @@ export const DataExplorer = withStyles(styles)( ) : ( - )}
; @@ -137,6 +146,8 @@ export const DataExplorer = withStyles(styles)( name: "Actions", selected: true, configurable: false, + sortDirection: SortDirection.NONE, + filters: [], key: "context-actions", render: this.renderContextMenuTrigger, width: "auto"