X-Git-Url: https://git.arvados.org/arvados-workbench2.git/blobdiff_plain/97599484adf25a991f6733854334676dd55f7260..c952afae1af2fb31b68be04f70bd7ae6f9d52aba:/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 65c2761b..399f4ef4 100644 --- a/src/views-components/details-panel/details-panel.tsx +++ b/src/views-components/details-panel/details-panel.tsx @@ -2,100 +2,112 @@ // // SPDX-License-Identifier: AGPL-3.0 -import * as React from 'react'; +import React from 'react'; 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 { ArvadosTheme } from 'common/custom-theme'; +import 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 { RootState } from 'store/store'; +import { CloseIcon } from 'components/icon/icon'; +import { EmptyResource } from 'models/empty'; import { Dispatch } from "redux"; -import { ResourceKind } from "~/models/resource"; +import { ResourceKind } from "models/resource"; import { ProjectDetails } from "./project-details"; import { CollectionDetails } from "./collection-details"; 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 { DetailsResource } from "models/details"; +import { Config } from 'common/config'; +import { isInlineFileUrlSafe } from "../context-menu/actions/helpers"; +import { getResource } from 'store/resources/resources'; +import { toggleDetailsPanel, SLIDE_TIMEOUT, openDetailsPanel } 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 DRAWER_WIDTH = 320; -const SLIDE_TIMEOUT = 500; const styles: StyleRulesCallback = (theme: ArvadosTheme) => ({ root: { - width: 0, - overflow: 'hidden', - transition: `width ${SLIDE_TIMEOUT}ms 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: DRAWER_WIDTH, }, container: { + maxWidth: 'none', width: DRAWER_WIDTH, }, - drawerPaper: { - position: 'relative', - 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 * 1, + }, }); -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): DetailsData => { + if ('kind' in res) { + 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); + } + } else { + return new FileDetails(res); } }; -const mapStateToProps = ({ detailsPanel, resources }: RootState) => { - const resource = getResource(detailsPanel.resourceUuid)(resources) as DetailsResource; +const mapStateToProps = ({ auth, detailsPanel, resources, collectionPanelFiles }: RootState) => { + const resource = getResource(detailsPanel.resourceUuid)(resources) as DetailsResource | undefined; + const file = resource + ? undefined + : getNode(detailsPanel.resourceUuid)(collectionPanelFiles); return { + authConfig: auth.config, isOpened: detailsPanel.isOpened, - item: getItem(resource) + tabNr: detailsPanel.tabNr, + res: resource || (file && file.value) || EMPTY_RESOURCE, }; }; const mapDispatchToProps = (dispatch: Dispatch) => ({ onCloseDrawer: () => { - dispatch(detailsPanelActions.TOGGLE_DETAILS_PANEL()); - } + dispatch(toggleDetailsPanel()); + }, + setActiveTab: (tabNr: number) => { + dispatch(openDetailsPanel(undefined, tabNr)); + }, }); export interface DetailsPanelDataProps { onCloseDrawer: () => void; + setActiveTab: (tabNr: number) => void; + authConfig: Config; isOpened: boolean; - item: DetailsData; + tabNr: number; + res: DetailsResource; } type DetailsPanelProps = DetailsPanelDataProps & WithStyles; @@ -103,12 +115,18 @@ type DetailsPanelProps = DetailsPanelDataProps & WithStyles; export const DetailsPanel = withStyles(styles)( connect(mapStateToProps, mapDispatchToProps)( class extends React.Component { - state = { - tabsValue: 0 - }; + shouldComponentUpdate(nextProps: DetailsPanelProps) { + if ('etag' in nextProps.res && 'etag' in this.props.res && + nextProps.res.etag === this.props.res.etag && + nextProps.isOpened === this.props.isOpened && + nextProps.tabNr === this.props.tabNr) { + return false; + } + return true; + } - handleChange = (event: any, value: boolean) => { - this.setState({ tabsValue: value }); + handleChange = (event: any, value: number) => { + this.props.setActiveTab(value); } render() { @@ -122,47 +140,65 @@ export const DetailsPanel = withStyles(styles)( in={isOpened} timeout={SLIDE_TIMEOUT} unmountOnExit> - {this.renderContent()} + {isOpened ? this.renderContent() :
} ); } renderContent() { - const { classes, onCloseDrawer, item } = this.props; - const { tabsValue } = this.state; - return - - - - {item.getIcon(classes.headerIcon)} - - - - - {item.getTitle()} - - - - - - {} - - + const { classes, onCloseDrawer, res, tabNr, authConfig } = this.props; + + let shouldShowInlinePreview = false; + if (!('kind' in res)) { + shouldShowInlinePreview = isInlineFileUrlSafe( + res ? res.url : "", + authConfig.keepWebServiceUrl, + authConfig.keepWebInlineServiceUrl + ) || authConfig.clusterConfig.Collections.TrustAllContent; + } + + const item = getItem(res); + return + + + {item.getIcon(classes.headerIcon)} + + + + + {item.getTitle()} + + + + + + + - - - + = tabNr+1) ? tabNr : 0}> + { item.getTabLabels().map((tabLabel, idx) => + ) + } - - {tabsValue === 0 - ? item.getDetails() - : null} - + {item.getDetails({tabNr, showPreview: shouldShowInlinePreview})} ; }