From a6ca8c85942e16d50fe32cbba5f5b1e32a480ec5 Mon Sep 17 00:00:00 2001 From: Pawel Kowalczyk Date: Fri, 10 May 2019 12:22:20 +0200 Subject: [PATCH] title-for-data-table Feature #15020 Arvados-DCO-1.1-Signed-off-by: Pawel Kowalczyk --- src/components/data-explorer/data-explorer.tsx | 11 +++++++++-- .../collection-content-address-panel.tsx | 9 ++++++++- 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/src/components/data-explorer/data-explorer.tsx b/src/components/data-explorer/data-explorer.tsx index 7c1f9045..5f019577 100644 --- a/src/components/data-explorer/data-explorer.tsx +++ b/src/components/data-explorer/data-explorer.tsx @@ -14,7 +14,7 @@ import { DataTableFilters } from '~/components/data-table-filters/data-table-fil import { MoreOptionsIcon } from '~/components/icon/icon'; import { PaperProps } from '@material-ui/core/Paper'; -type CssRules = 'searchBox' | "toolbar" | "footer" | "root" | 'moreOptionsButton'; +type CssRules = 'searchBox' | "toolbar" | "footer" | "root" | 'moreOptionsButton' | 'title'; const styles: StyleRulesCallback = (theme: ArvadosTheme) => ({ searchBox: { @@ -31,6 +31,11 @@ const styles: StyleRulesCallback = (theme: ArvadosTheme) => ({ }, moreOptionsButton: { padding: 0 + }, + title: { + paddingLeft: theme.spacing.unit * 3, + paddingTop: theme.spacing.unit * 3, + fontSize: '18px' } }); @@ -52,6 +57,7 @@ interface DataExplorerDataProps { hideSearchInput?: boolean; paperKey?: string; currentItemUuid: string; + title?: string; } interface DataExplorerActionProps { @@ -84,9 +90,10 @@ export const DataExplorer = withStyles(styles)( rowsPerPage, rowsPerPageOptions, onColumnToggle, searchValue, onSearch, items, itemsAvailable, onRowClick, onRowDoubleClick, classes, dataTableDefaultView, hideColumnSelector, actions, paperProps, hideSearchInput, - paperKey, fetchMode, currentItemUuid + paperKey, fetchMode, currentItemUuid, title } = this.props; return + {title ?
Content Address: {title}
: null} {(!hideColumnSelector || !hideSearchInput) &&
diff --git a/src/views/collection-content-address-panel/collection-content-address-panel.tsx b/src/views/collection-content-address-panel/collection-content-address-panel.tsx index f2c6df34..dfe1b5bf 100644 --- a/src/views/collection-content-address-panel/collection-content-address-panel.tsx +++ b/src/views/collection-content-address-panel/collection-content-address-panel.tsx @@ -121,9 +121,15 @@ const mapDispatchToProps = (dispatch: Dispatch): CollectionContentAddressPanelAc } }); +interface CollectionContentAddressDataProps { + match: { + params: { id: string } + }; +} + export const CollectionsContentAddressPanel = withStyles(styles)( connect(null, mapDispatchToProps)( - class extends React.Component> { + class extends React.Component> { render() { return {/* @@ -136,6 +142,7 @@ export const CollectionsContentAddressPanel = withStyles(styles)( onRowDoubleClick={this.props.onItemDoubleClick} onContextMenu={this.props.onContextMenu} contextMenuColumn={true} + title={this.props.match.params.id} dataTableDefaultView={