Merge branch 'master' into 13764-icons-colors-unification-refactoring

[arvados-workbench2.git] / 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 d0bc974d372caf41b686abaad6376290ea14aca0..f2212fc528e430c55e77c3792b6db89cf06ddf59 100644 (file)
--- a/src/views-components/details-panel/details-panel.tsx
+++ b/src/views-components/details-panel/details-panel.tsx
@@ -3,31 +3,25 @@
 // SPDX-License-Identifier: AGPL-3.0
 
 import * as React from 'react';
-import Drawer from '@material-ui/core/Drawer';
-import IconButton from "@material-ui/core/IconButton";
+import { Drawer, IconButton, Tabs, Tab, Typography, Grid } from '@material-ui/core';
 import { StyleRulesCallback, WithStyles, withStyles } from '@material-ui/core/styles';
 import { ArvadosTheme } from '../../common/custom-theme';
-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 { RootState } from '../../store/store';
 import actions from "../../store/details-panel/details-panel-action";
 import { ProjectResource } from '../../models/project';
 import { CollectionResource } from '../../models/collection';
-import IconBase, { IconTypes } from '../../components/icon/icon';
+import { CloseIcon } 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;
-    icon: IconTypes;
-    title: string;
-    details: React.ReactElement<any>;
+    item: AbstractItem;
 }
 
 type DetailsPanelProps = DetailsPanelDataProps & WithStyles<CssRules>;
@@ -47,20 +41,26 @@ class DetailsPanel extends React.Component<DetailsPanelProps, {}> {
         </Typography>
 
     render() {
-        const { classes, onCloseDrawer, isOpened, icon, title, details } = this.props;
+        const { classes, onCloseDrawer, isOpened, item } = this.props;
         const { tabsValue } = this.state;
         return (
             <Typography component="div" className={classnames([classes.container, { [classes.opened]: isOpened }])}>
                 <Drawer variant="permanent" anchor="right" classes={{ paper: classes.drawerPaper }}>
                     <Typography component="div" className={classes.headerContainer}>
                         <Grid container alignItems='center' justify='space-around'>
-                            <IconBase className={classes.headerIcon} icon={icon} />
-                            <Typography variant="title">
-                                {title}
-                            </Typography>
-                            <IconButton color="inherit" onClick={onCloseDrawer}>
-                                <IconBase icon={IconTypes.CLOSE} />
-                            </IconButton>
+                            <Grid item xs={2}>
+                                {item.getIcon(classes.headerIcon)}
+                            </Grid>
+                            <Grid item xs={8}>
+                                <Typography variant="title">
+                                    {item.getTitle()}
+                                </Typography>
+                            </Grid>
+                            <Grid item>
+                                <IconButton color="inherit" onClick={onCloseDrawer}>
+                                    {<CloseIcon />}
+                                </IconButton>
+                            </Grid>
                         </Grid>
                     </Typography>
                     <Tabs value={tabsValue} onChange={this.handleChange}>
@@ -69,7 +69,7 @@ class DetailsPanel extends React.Component<DetailsPanelProps, {}> {
                     </Tabs>
                     {tabsValue === 0 && this.renderTabContainer(
                         <Grid container direction="column">
-                            {details}
+                            {item.buildDetails()}
                         </Grid>
                     )}
                     {tabsValue === 1 && this.renderTabContainer(
@@ -102,7 +102,8 @@ const styles: StyleRulesCallback<CssRules> = (theme: ArvadosTheme) => ({
     },
     headerContainer: {
         color: theme.palette.grey["600"],
-        margin: `${theme.spacing.unit}px 0`
+        margin: `${theme.spacing.unit}px 0`,
+        textAlign: 'center'
     },
     headerIcon: {
         fontSize: "34px"
@@ -112,37 +113,22 @@ const styles: StyleRulesCallback<CssRules> = (theme: ArvadosTheme) => ({
     }
 });
 
-// TODO: move to models
-type DetailsPanelResource = ProjectResource | CollectionResource | ProcessResource;
 
-const getEmptyState = () => {
-    return <EmptyState icon={ IconTypes.ANNOUNCEMENT } 
-        message='Select a file or folder to view its details.' />;
-};
+export type DetailsPanelResource = ProjectResource | CollectionResource | ProcessResource | EmptyResource;
 
 const getItem = (res: DetailsPanelResource) => {
-    const item = DetailsPanelFactory.createItem(res);
-    return {
-        title: item.getTitle(),
-        icon: item.getIcon(),
-        details: item.buildDetails() 
-    };    
+    return DetailsPanelFactory.createItem(res);
 };
 
 const getDefaultItem = () => {
-    return {
-        title: 'Projects',
-        icon: IconTypes.FOLDER,
-        details: getEmptyState()
-    };
+    return DetailsPanelFactory.createItem({ kind: undefined, name: 'Projects' });
 };
 
 const mapStateToProps = ({ detailsPanel }: RootState) => {
     const { isOpened, item } = detailsPanel;
-    const newItem = item ? getItem(item as DetailsPanelResource) : getDefaultItem();
     return {
         isOpened,
-        ...newItem
+        item: item ? getItem(item as DetailsPanelResource) : getDefaultItem()
     };
 };