X-Git-Url: https://git.arvados.org/arvados-workbench2.git/blobdiff_plain/a4e2c41eb689b86b04a88ea2971282ce14de2b88..9d465addb74ffb1209dab4b86e45f933bb21c840:/src/views/collection-panel/collection-panel.tsx diff --git a/src/views/collection-panel/collection-panel.tsx b/src/views/collection-panel/collection-panel.tsx index 379a2eb8..42f7787c 100644 --- a/src/views/collection-panel/collection-panel.tsx +++ b/src/views/collection-panel/collection-panel.tsx @@ -22,6 +22,9 @@ import { snackbarActions } from '~/store/snackbar/snackbar-actions'; import { getResource } from '~/store/resources/resources'; import { openContextMenu } from '~/store/context-menu/context-menu-actions'; import { ContextMenuKind } from '~/views-components/context-menu/context-menu'; +import { formatFileSize } from "~/common/formatters"; +import { getResourceData } from "~/store/resources-data/resources-data"; +import { ResourceData } from "~/store/resources-data/resources-data-reducer"; type CssRules = 'card' | 'iconHeader' | 'tag' | 'copyIcon' | 'label' | 'value'; @@ -54,6 +57,7 @@ const styles: StyleRulesCallback = (theme: ArvadosTheme) => ({ interface CollectionPanelDataProps { item: CollectionResource; + data: ResourceData; } type CollectionPanelProps = CollectionPanelDataProps & DispatchProp @@ -62,14 +66,13 @@ type CollectionPanelProps = CollectionPanelDataProps & DispatchProp export const CollectionPanel = withStyles(styles)( connect((state: RootState, props: RouteComponentProps<{ id: string }>) => { - const collection = getResource(props.match.params.id)(state.resources); - return { - item: collection - }; + const item = getResource(props.match.params.id)(state.resources); + const data = getResourceData(props.match.params.id)(state.resourcesData); + return { item, data }; })( class extends React.Component { render() { - const { classes, item } = this.props; + const { classes, item, data } = this.props; return item ? <> @@ -99,9 +102,9 @@ export const CollectionPanel = withStyles(styles)( + label='Number of files' value={data && data.fileCount} /> + label='Content size' value={data && formatFileSize(data.fileSize)} /> @@ -119,7 +122,6 @@ export const CollectionPanel = withStyles(styles)( { Object.keys(item.properties).map(k => { - console.log('k: ', k); return ;