X-Git-Url: https://git.arvados.org/arvados-workbench2.git/blobdiff_plain/2d35cbd012daca122052739564120863fefebfce..185beca2556c6a165f494ae941e06fec1c89fc74:/src/views/project-panel/project-panel.tsx?ds=sidebyside

diff --git a/src/views/project-panel/project-panel.tsx b/src/views/project-panel/project-panel.tsx
index 0c9be912..63a57bbd 100644
--- a/src/views/project-panel/project-panel.tsx
+++ b/src/views/project-panel/project-panel.tsx
@@ -4,69 +4,24 @@
 
 import * as React from 'react';
 import { ProjectPanelItem } from './project-panel-item';
-import { Grid, Typography, Button, StyleRulesCallback, WithStyles, withStyles } from '@material-ui/core';
-import { formatDate, formatFileSize } from '../../common/formatters';
-import DataExplorer from "../../views-components/data-explorer/data-explorer";
+import { Button, StyleRulesCallback, WithStyles, withStyles } from '@material-ui/core';
+import { DataExplorer } from "../../views-components/data-explorer/data-explorer";
 import { DispatchProp, connect } from 'react-redux';
 import { DataColumns } from '../../components/data-table/data-table';
 import { RouteComponentProps } from 'react-router';
 import { RootState } from '../../store/store';
-import { ResourceKind } from '../../models/kinds';
 import { DataTableFilterItem } from '../../components/data-table-filters/data-table-filters';
 import { ContainerRequestState } from '../../models/container-request';
 import { SortDirection } from '../../components/data-table/data-column';
-
-export const PROJECT_PANEL_ID = "projectPanel";
-
-export interface ProjectPanelFilter extends DataTableFilterItem {
-    type: ResourceKind | ContainerRequestState;
-}
-
-type ProjectPanelProps = {
-    currentItemId: string,
-    onItemClick: (item: ProjectPanelItem) => void,
-    onContextMenu: (event: React.MouseEvent<HTMLElement>, item: ProjectPanelItem) => void;
-    onDialogOpen: (ownerUuid: string) => void;
-    onItemDoubleClick: (item: ProjectPanelItem) => void,
-    onItemRouteChange: (itemId: string) => void
-}
-    & DispatchProp
-    & WithStyles<CssRules>
-    & RouteComponentProps<{ id: string }>;
-
-class ProjectPanel extends React.Component<ProjectPanelProps> {
-    render() {
-        const { classes, currentItemId, onItemClick, onItemDoubleClick, onContextMenu, onDialogOpen } = this.props;
-        return <div>
-            <div className={classes.toolbar}>
-                <Button color="primary" variant="raised" className={classes.button}>
-                    Create a collection
-                </Button>
-                <Button color="primary" variant="raised" className={classes.button}>
-                    Run a process
-                </Button>
-                <Button color="primary" onClick={() => onDialogOpen(currentItemId)} variant="raised" className={classes.button}>
-                    New project
-                </Button>
-            </div>
-            <DataExplorer
-                id={PROJECT_PANEL_ID}
-                onRowClick={onItemClick}
-                onRowDoubleClick={onItemDoubleClick}
-                onContextMenu={onContextMenu} />
-        </div>;
-    }
-
-    componentWillReceiveProps({ match, currentItemId, onItemRouteChange }: ProjectPanelProps) {
-        if (match.params.id !== currentItemId) {
-            onItemRouteChange(match.params.id);
-        }
-    }
-}
+import { ResourceKind } from '../../models/resource';
+import { resourceLabel } from '../../common/labels';
+import { ArvadosTheme } from '../../common/custom-theme';
+import { renderName, renderStatus, renderType, renderOwner, renderFileSize, renderDate } from '../../views-components/data-explorer/renderers';
+import { restoreBranch } from '../../store/navigation/navigation-action';
 
 type CssRules = "toolbar" | "button";
 
-const styles: StyleRulesCallback<CssRules> = theme => ({
+const styles: StyleRulesCallback<CssRules> = (theme: ArvadosTheme) => ({
     toolbar: {
         paddingBottom: theme.spacing.unit * 3,
         textAlign: "right"
@@ -76,148 +31,165 @@ const styles: StyleRulesCallback<CssRules> = theme => ({
     },
 });
 
-const renderName = (item: ProjectPanelItem) =>
-    <Grid
-        container
-        alignItems="center"
-        wrap="nowrap"
-        spacing={16}>
-        <Grid item>
-            {renderIcon(item)}
-        </Grid>
-        <Grid item>
-            <Typography color="primary">
-                {item.name}
-            </Typography>
-        </Grid>
-    </Grid>;
-
-
-const renderIcon = (item: ProjectPanelItem) => {
-    switch (item.kind) {
-        case ResourceKind.Project:
-            return <i className="fas fa-folder fa-lg" />;
-        case ResourceKind.Collection:
-            return <i className="fas fa-archive fa-lg" />;
-        case ResourceKind.Process:
-            return <i className="fas fa-cogs fa-lg" />;
-        default:
-            return <i />;
-    }
-};
-
-const renderDate = (date: string) =>
-    <Typography noWrap>
-        {formatDate(date)}
-    </Typography>;
-
-const renderFileSize = (fileSize?: number) =>
-    <Typography noWrap>
-        {formatFileSize(fileSize)}
-    </Typography>;
-
-const renderOwner = (owner: string) =>
-    <Typography noWrap color="primary">
-        {owner}
-    </Typography>;
-
-
-
-const typeToLabel = (type: string) => {
-    switch (type) {
-        case ResourceKind.Collection:
-            return "Data collection";
-        case ResourceKind.Project:
-            return "Project";
-        case ResourceKind.Process:
-            return "Process";
-        default:
-            return "Unknown";
-    }
-};
-
-const renderType = (type: string) => {
-    return <Typography noWrap>
-        {typeToLabel(type)}
-    </Typography>;
-};
-
-const renderStatus = (item: ProjectPanelItem) =>
-    <Typography noWrap align="center">
-        {item.status || "-"}
-    </Typography>;
-
 export enum ProjectPanelColumnNames {
-    Name = "Name",
-    Status = "Status",
-    Type = "Type",
-    Owner = "Owner",
-    FileSize = "File size",
-    LastModified = "Last modified"
+    NAME = "Name",
+    STATUS = "Status",
+    TYPE = "Type",
+    OWNER = "Owner",
+    FILE_SIZE = "File size",
+    LAST_MODIFIED = "Last modified"
+}
 
+export interface ProjectPanelFilter extends DataTableFilterItem {
+    type: ResourceKind | ContainerRequestState;
 }
 
-export const columns: DataColumns<ProjectPanelItem, ProjectPanelFilter> = [{
-    name: ProjectPanelColumnNames.Name,
-    selected: true,
-    sortDirection: SortDirection.Asc,
-    render: renderName,
-    width: "450px"
-}, {
-    name: "Status",
-    selected: true,
-    filters: [{
-        name: ContainerRequestState.Committed,
+export const columns: DataColumns<ProjectPanelItem, ProjectPanelFilter> = [
+    {
+        name: ProjectPanelColumnNames.NAME,
         selected: true,
-        type: ContainerRequestState.Committed
-    }, {
-        name: ContainerRequestState.Final,
+        configurable: true,
+        sortDirection: SortDirection.ASC,
+        render: renderName,
+        width: "450px"
+    },
+    {
+        name: "Status",
         selected: true,
-        type: ContainerRequestState.Final
-    }, {
-        name: ContainerRequestState.Uncommitted,
+        configurable: true,
+        filters: [
+            {
+                name: ContainerRequestState.COMMITTED,
+                selected: true,
+                type: ContainerRequestState.COMMITTED
+            },
+            {
+                name: ContainerRequestState.FINAL,
+                selected: true,
+                type: ContainerRequestState.FINAL
+            },
+            {
+                name: ContainerRequestState.UNCOMMITTED,
+                selected: true,
+                type: ContainerRequestState.UNCOMMITTED
+            }
+        ],
+        render: renderStatus,
+        width: "75px"
+    },
+    {
+        name: ProjectPanelColumnNames.TYPE,
         selected: true,
-        type: ContainerRequestState.Uncommitted
-    }],
-    render: renderStatus,
-    width: "75px"
-}, {
-    name: ProjectPanelColumnNames.Type,
-    selected: true,
-    filters: [{
-        name: typeToLabel(ResourceKind.Collection),
+        configurable: true,
+        filters: [
+            {
+                name: resourceLabel(ResourceKind.COLLECTION),
+                selected: true,
+                type: ResourceKind.COLLECTION
+            },
+            {
+                name: resourceLabel(ResourceKind.PROCESS),
+                selected: true,
+                type: ResourceKind.PROCESS
+            },
+            {
+                name: resourceLabel(ResourceKind.PROJECT),
+                selected: true,
+                type: ResourceKind.PROJECT
+            }
+        ],
+        render: item => renderType(item.kind),
+        width: "125px"
+    },
+    {
+        name: ProjectPanelColumnNames.OWNER,
         selected: true,
-        type: ResourceKind.Collection
-    }, {
-        name: typeToLabel(ResourceKind.Process),
+        configurable: true,
+        render: item => renderOwner(item.owner),
+        width: "200px"
+    },
+    {
+        name: ProjectPanelColumnNames.FILE_SIZE,
         selected: true,
-        type: ResourceKind.Process
-    }, {
-        name: typeToLabel(ResourceKind.Project),
+        configurable: true,
+        render: item => renderFileSize(item.fileSize),
+        width: "50px"
+    },
+    {
+        name: ProjectPanelColumnNames.LAST_MODIFIED,
         selected: true,
-        type: ResourceKind.Project
-    }],
-    render: item => renderType(item.kind),
-    width: "125px"
-}, {
-    name: ProjectPanelColumnNames.Owner,
-    selected: true,
-    render: item => renderOwner(item.owner),
-    width: "200px"
-}, {
-    name: ProjectPanelColumnNames.FileSize,
-    selected: true,
-    render: item => renderFileSize(item.fileSize),
-    width: "50px"
-}, {
-    name: ProjectPanelColumnNames.LastModified,
-    selected: true,
-    sortDirection: SortDirection.None,
-    render: item => renderDate(item.lastModified),
-    width: "150px"
-}];
+        configurable: true,
+        sortDirection: SortDirection.NONE,
+        render: item => renderDate(item.lastModified),
+        width: "150px"
+    }
+];
 
+export const PROJECT_PANEL_ID = "projectPanel";
 
-export default withStyles(styles)(
-    connect((state: RootState) => ({ currentItemId: state.projects.currentItemId }))(
-        ProjectPanel));
+interface ProjectPanelDataProps {
+    currentItemId: string;
+    isSidePanelOpen: boolean;
+}
+
+interface ProjectPanelActionProps {
+    onItemClick: (item: ProjectPanelItem) => void;
+    onContextMenu: (event: React.MouseEvent<HTMLElement>, item: ProjectPanelItem) => void;
+    onProjectCreationDialogOpen: (ownerUuid: string) => void;
+    onCollectionCreationDialogOpen: (ownerUuid: string) => void;
+    onItemDoubleClick: (item: ProjectPanelItem) => void;
+    onItemRouteChange: (itemId: string) => void;
+}
+
+type ProjectPanelProps = ProjectPanelDataProps & ProjectPanelActionProps & DispatchProp
+    & WithStyles<CssRules> & RouteComponentProps<{ id: string }>;
+
+export const ProjectPanel = withStyles(styles)(
+    connect((state: RootState) => ({ currentItemId: state.projects.currentItemId, isSidePanelOpen: state.sidePanel[0].open }))(
+        class extends React.Component<ProjectPanelProps> {
+            render() {
+                const { classes } = this.props;
+                return <div>
+                    <div className={classes.toolbar}>
+                        <Button color="primary" onClick={this.handleNewCollectionClick} variant="raised" className={classes.button}>
+                            Create a collection
+                        </Button>
+                        <Button color="primary" variant="raised" className={classes.button}>
+                            Run a process
+                        </Button>
+                        <Button color="primary" onClick={this.handleNewProjectClick} variant="raised" className={classes.button}>
+                            New project
+                        </Button>
+                    </div>
+                    <DataExplorer
+                        id={PROJECT_PANEL_ID}
+                        columns={columns}
+                        onRowClick={this.props.onItemClick}
+                        onRowDoubleClick={this.props.onItemDoubleClick}
+                        onContextMenu={this.props.onContextMenu}
+                        extractKey={(item: ProjectPanelItem) => item.uuid} />
+                </div>;
+            }
+
+            handleNewProjectClick = () => {
+                this.props.onProjectCreationDialogOpen(this.props.currentItemId);
+            }
+
+            handleNewCollectionClick = () => {
+                this.props.onCollectionCreationDialogOpen(this.props.currentItemId);
+            }
+
+            componentWillReceiveProps({ match, currentItemId, onItemRouteChange }: ProjectPanelProps) {
+                if (match.params.id !== currentItemId) {
+                    onItemRouteChange(match.params.id);
+                }
+            }
+
+            componentDidMount() {
+                if (this.props.match.params.id && !this.props.isSidePanelOpen) {
+                    this.props.dispatch<any>(restoreBranch(this.props.match.params.id));
+                }
+            }
+        }
+    )
+);
