X-Git-Url: https://git.arvados.org/arvados-workbench2.git/blobdiff_plain/0d6ec80f58aa00e9542f4c69cba872016baa14d6..ada23a4054724d0d6be4ee88efb22daecd86001f:/src/views-components/details-panel/details-panel.tsx diff --git a/src/views-components/details-panel/details-panel.tsx b/src/views-components/details-panel/details-panel.tsx index c0d4797f..5c8ebe74 100644 --- a/src/views-components/details-panel/details-panel.tsx +++ b/src/views-components/details-panel/details-panel.tsx @@ -3,13 +3,13 @@ // SPDX-License-Identifier: AGPL-3.0 import * as React from 'react'; -import { Drawer, IconButton, Tabs, Tab, Typography, Grid } from '@material-ui/core'; +import { IconButton, Tabs, Tab, Typography, Grid, Tooltip } from '@material-ui/core'; import { StyleRulesCallback, WithStyles, withStyles } from '@material-ui/core/styles'; +import { Transition } from 'react-transition-group'; import { ArvadosTheme } from '~/common/custom-theme'; import * as classnames from "classnames"; import { connect } from 'react-redux'; import { RootState } from '~/store/store'; -import { detailsPanelActions } from "~/store/details-panel/details-panel-action"; import { CloseIcon } from '~/components/icon/icon'; import { EmptyResource } from '~/models/empty'; import { Dispatch } from "redux"; @@ -20,72 +20,79 @@ import { ProcessDetails } from "./process-details"; import { EmptyDetails } from "./empty-details"; import { DetailsData } from "./details-data"; import { DetailsResource } from "~/models/details"; -import { getResource } from '../../store/resources/resources'; +import { getResource } from '~/store/resources/resources'; +import { ResourceData } from "~/store/resources-data/resources-data-reducer"; +import { getResourceData } from "~/store/resources-data/resources-data"; +import { toggleDetailsPanel, SLIDE_TIMEOUT } from '~/store/details-panel/details-panel-action'; +import { FileDetails } from '~/views-components/details-panel/file-details'; +import { getNode } from '~/models/tree'; -type CssRules = 'root' | 'container' | 'opened' | 'headerContainer' | 'headerIcon' | 'headerTitle' | 'tabContainer'; +type CssRules = 'root' | 'container' | 'opened' | 'headerContainer' | 'headerIcon' | 'tabContainer'; -const drawerWidth = 320; +const DRAWER_WIDTH = 320; const styles: StyleRulesCallback = (theme: ArvadosTheme) => ({ root: { - width: 0, - overflowX: 'hidden', - transition: 'width 0.5s ease', background: theme.palette.background.paper, borderLeft: `1px solid ${theme.palette.divider}`, height: '100%', + overflow: 'hidden', + transition: `width ${SLIDE_TIMEOUT}ms ease`, + width: 0, }, opened: { - width: drawerWidth, + width: DRAWER_WIDTH, }, container: { - width: drawerWidth, - }, - drawerPaper: { - position: 'relative', - width: drawerWidth + maxWidth: 'none', + width: DRAWER_WIDTH, }, headerContainer: { color: theme.palette.grey["600"], margin: `${theme.spacing.unit}px 0`, - textAlign: 'center' + textAlign: 'center', }, headerIcon: { - fontSize: '2.125rem' - }, - headerTitle: { - overflowWrap: 'break-word', - wordWrap: 'break-word' + fontSize: '2.125rem', }, tabContainer: { - padding: theme.spacing.unit * 3 - } + overflow: 'auto', + padding: theme.spacing.unit * 3, + }, }); -const getItem = (resource: DetailsResource): DetailsData => { - const res = resource || { kind: undefined, name: 'Projects' }; - switch (res.kind) { - case ResourceKind.PROJECT: - return new ProjectDetails(res); - case ResourceKind.COLLECTION: - return new CollectionDetails(res); - case ResourceKind.PROCESS: - return new ProcessDetails(res); - default: - return new EmptyDetails(res as EmptyResource); +const EMPTY_RESOURCE: EmptyResource = { kind: undefined, name: 'Projects' }; + +const getItem = (res: DetailsResource, resourceData?: ResourceData, numberOfCollectionsByPDH?: number): DetailsData => { + if ('kind' in res) { + switch (res.kind) { + case ResourceKind.PROJECT: + return new ProjectDetails(res); + case ResourceKind.COLLECTION: + return new CollectionDetails(res, resourceData, numberOfCollectionsByPDH); + case ResourceKind.PROCESS: + return new ProcessDetails(res); + default: + return new EmptyDetails(res); + } + } else { + return new FileDetails(res); } }; -const mapStateToProps = ({ detailsPanel, resources }: RootState) => { - const resource = getResource(detailsPanel.resourceUuid)(resources) as DetailsResource; +const mapStateToProps = ({ detailsPanel, resources, resourcesData, collectionPanelFiles, collectionPanel }: RootState) => { + const resource = getResource(detailsPanel.resourceUuid)(resources) as DetailsResource | undefined; + const file = getNode(detailsPanel.resourceUuid)(collectionPanelFiles); + const resourceData = getResourceData(detailsPanel.resourceUuid)(resourcesData); + const numberOfCollectionsByPDH = collectionPanel.numberOfCollectionsWithSamePDH; return { isOpened: detailsPanel.isOpened, - item: getItem(resource) + item: getItem(resource || (file && file.value) || EMPTY_RESOURCE, resourceData, numberOfCollectionsByPDH), }; }; const mapDispatchToProps = (dispatch: Dispatch) => ({ onCloseDrawer: () => { - dispatch(detailsPanelActions.TOGGLE_DETAILS_PANEL()); + dispatch(toggleDetailsPanel()); } }); @@ -108,50 +115,68 @@ export const DetailsPanel = withStyles(styles)( this.setState({ tabsValue: value }); } - renderTabContainer = (children: React.ReactElement) => - - {children} - - render() { - const { classes, onCloseDrawer, isOpened, item } = this.props; - const { tabsValue } = this.state; + const { classes, isOpened } = this.props; return ( -
-
-
- - - {item.getIcon(classes.headerIcon)} - - - - {item.getTitle()} - - - - - {} - - - -
- - - - - {tabsValue === 0 && this.renderTabContainer( - - {item.getDetails()} - - )} - {tabsValue === 1 && this.renderTabContainer( - - )} -
-
+ + + {this.renderContent()} + + ); } + + renderContent() { + const { classes, onCloseDrawer, item } = this.props; + const { tabsValue } = this.state; + return + + + {item.getIcon(classes.headerIcon)} + + + + + {item.getTitle()} + + + + + + + + + + + + + + + + + {tabsValue === 0 + ? item.getDetails() + : null} + + ; + } } ) );