X-Git-Url: https://git.arvados.org/arvados-workbench2.git/blobdiff_plain/7622261116e685cad4af9cf6a4d1dd9c58cd1605..87dad7df1d3e32afccf7357df1b1d39af5a98154:/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 13498f33..34195784 100644 --- a/src/views-components/details-panel/details-panel.tsx +++ b/src/views-components/details-panel/details-panel.tsx @@ -7,28 +7,26 @@ import Drawer from '@material-ui/core/Drawer'; import IconButton from "@material-ui/core/IconButton"; import { StyleRulesCallback, WithStyles, withStyles } from '@material-ui/core/styles'; import { ArvadosTheme } from '../../common/custom-theme'; -import Attribute from '../../components/attribute/attribute'; import Tabs from '@material-ui/core/Tabs'; import Tab from '@material-ui/core/Tab'; import Typography from '@material-ui/core/Typography'; import Grid from '@material-ui/core/Grid'; import * as classnames from "classnames"; import { connect, Dispatch } from 'react-redux'; -import EmptyState from '../../components/empty-state/empty-state'; -import IconBase from '../../components/icon/icon'; import { RootState } from '../../store/store'; import actions from "../../store/details-panel/details-panel-action"; -import { Resource } from '../../common/api/common-resource-service'; -import { ResourceKind } from '../../models/kinds'; import { ProjectResource } from '../../models/project'; import { CollectionResource } from '../../models/collection'; +import IconBase, { IconTypes } from '../../components/icon/icon'; +import { ProcessResource } from '../../models/process'; +import DetailsPanelFactory from '../../components/details-panel-factory/details-panel-factory'; +import AbstractItem from '../../components/details-panel-factory/items/abstract-item'; +import { EmptyResource } from '../../models/empty'; export interface DetailsPanelDataProps { onCloseDrawer: () => void; isOpened: boolean; - header: React.ReactElement; - renderDetails?: React.ComponentType<{}>; - renderActivity?: React.ComponentType<{}>; + item: AbstractItem; } type DetailsPanelProps = DetailsPanelDataProps & WithStyles; @@ -48,43 +46,39 @@ class DetailsPanel extends React.Component { render() { - const { classes, onCloseDrawer, isOpened, header, renderDetails, renderActivity } = this.props; + const { classes, onCloseDrawer, isOpened, item } = this.props; const { tabsValue } = this.state; return ( - {header} - - - + + + + + + {item.getTitle()} + + + + + + + - + {tabsValue === 0 && this.renderTabContainer( - {renderDetails} - - - - - - Projects - - - + {item.buildDetails()} )} {tabsValue === 1 && this.renderTabContainer( - - {renderActivity} - - + )} @@ -93,7 +87,7 @@ class DetailsPanel extends React.Component { } -type CssRules = 'drawerPaper' | 'container' | 'opened' | 'headerContainer' | 'tabContainer'; +type CssRules = 'drawerPaper' | 'container' | 'opened' | 'headerContainer' | 'headerIcon' | 'tabContainer'; const drawerWidth = 320; const styles: StyleRulesCallback = (theme: ArvadosTheme) => ({ @@ -114,47 +108,34 @@ const styles: StyleRulesCallback = (theme: ArvadosTheme) => ({ headerContainer: { color: theme.palette.grey["600"], margin: `${theme.spacing.unit}px 0`, - '& .fa-cogs': { - fontSize: "24px", - color: theme.customs.colors.green700 - } + textAlign: 'center' + }, + headerIcon: { + fontSize: "34px" }, tabContainer: { padding: theme.spacing.unit * 3 } }); -const renderCollectionHeader = (collection: CollectionResource) => - <> - - - {collection.name} - - ; -const renderProjectHeader = (project: ProjectResource) => - <> - - - {project.name} - - ; - -const renderHeader = (resource: Resource) => { - switch(resource.kind) { - case ResourceKind.Project: - return renderProjectHeader(resource as ProjectResource); - case ResourceKind.Collection: - return renderCollectionHeader(resource as CollectionResource); - default: - return null; - } +export type DetailsPanelResource = ProjectResource | CollectionResource | ProcessResource | EmptyResource; + +const getItem = (res: DetailsPanelResource) => { + return DetailsPanelFactory.createItem(res); }; -const mapStateToProps = ({detailsPanel}: RootState) => ({ - isOpened: detailsPanel.isOpened, - header: detailsPanel.item ? renderHeader(detailsPanel.item) : null -}); +const getDefaultItem = () => { + return DetailsPanelFactory.createItem({ kind: undefined, name: 'Projects' }); +}; + +const mapStateToProps = ({ detailsPanel }: RootState) => { + const { isOpened, item } = detailsPanel; + return { + isOpened, + item: item ? getItem(item as DetailsPanelResource) : getDefaultItem() + }; +}; const mapDispatchToProps = (dispatch: Dispatch) => ({ onCloseDrawer: () => {