X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/57357cac58b568e2ba1445af6a44eb089026b34e..7ae86efd9905582df4191910528c3803a68ba81b:/src/views/project-panel/project-panel.tsx

diff --git a/src/views/project-panel/project-panel.tsx b/src/views/project-panel/project-panel.tsx
index df9721fda7..81d84990a4 100644
--- a/src/views/project-panel/project-panel.tsx
+++ b/src/views/project-panel/project-panel.tsx
@@ -3,123 +3,229 @@
 // SPDX-License-Identifier: AGPL-3.0
 
 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 { DispatchProp, connect } from 'react-redux';
+import { DataColumns } from '../../components/data-table/data-table';
 import { RouteComponentProps } from 'react-router';
-import { ProjectState } from '../../store/project/project-reducer';
 import { RootState } from '../../store/store';
-import { connect, DispatchProp } from 'react-redux';
-import { CollectionState } from "../../store/collection/collection-reducer";
-import { ItemMode, setProjectItem } from "../../store/navigation/navigation-action";
-import ProjectExplorer from "../../views-components/project-explorer/project-explorer";
-import { projectExplorerItems } from "./project-panel-selectors";
-import { ProjectExplorerItem } from "../../views-components/project-explorer/project-explorer-item";
-import { Button, StyleRulesCallback, WithStyles, withStyles } from '@material-ui/core';
-import { DataColumn, SortDirection } from '../../components/data-table/data-column';
 import { DataTableFilterItem } from '../../components/data-table-filters/data-table-filters';
+import { ContainerRequestState } from '../../models/container-request';
+import { SortDirection } from '../../components/data-table/data-column';
+import { ResourceKind } from '../../models/resource';
+import { resourceLabel } from '../../common/labels';
+import { ProjectIcon, CollectionIcon, ProcessIcon, DefaultIcon, FavoriteIcon } from '../../components/icon/icon';
+import { ArvadosTheme } from '../../common/custom-theme';
+import { FavoriteStar } from '../../views-components/favorite-star/favorite-star';
 
-interface ProjectPanelDataProps {
-    projects: ProjectState;
-    collections: CollectionState;
-}
+type CssRules = "toolbar" | "button";
 
-type ProjectPanelProps = ProjectPanelDataProps & RouteComponentProps<{ name: string }> & DispatchProp;
+const styles: StyleRulesCallback<CssRules> = (theme: ArvadosTheme) => ({
+    toolbar: {
+        paddingBottom: theme.spacing.unit * 3,
+        textAlign: "right"
+    },
+    button: {
+        marginLeft: theme.spacing.unit
+    },
+});
 
-interface ProjectPanelState {
-    sort: {
-        columnName: string;
-        direction: SortDirection;
-    };
-    filters: string[];
-}
+const renderName = (item: ProjectPanelItem) =>
+    <Grid container alignItems="center" wrap="nowrap" spacing={16}>
+        <Grid item>
+            {renderIcon(item)}
+        </Grid>
+        <Grid item>
+            <Typography color="default">
+                {item.name}
+            </Typography>
+        </Grid>
+        <Grid item>
+            <Typography variant="caption">
+                <FavoriteStar resourceUuid={item.uuid} />
+            </Typography>
+        </Grid>
+    </Grid>;
 
-class ProjectPanel extends React.Component<ProjectPanelProps & WithStyles<CssRules>, ProjectPanelState> {
-    state: ProjectPanelState = {
-        sort: {
-            columnName: "Name",
-            direction: "desc"
-        },
-        filters: ['collection', 'project']
-    };
-
-    render() {
-        const items = projectExplorerItems(
-            this.props.projects.items,
-            this.props.projects.currentItemId,
-            this.props.collections
-        );
-        const [goBackItem, ...otherItems] = items;
-        const filteredItems = otherItems.filter(i => this.state.filters.some(f => f === i.kind));
-        const sortedItems = sortItems(this.state.sort, filteredItems);
-        return (
-            <div>
-                <div className={this.props.classes.toolbar}>
-                    <Button color="primary" variant="raised" className={this.props.classes.button}>
-                        Create a collection
-                    </Button>
-                    <Button color="primary" variant="raised" className={this.props.classes.button}>
-                        Run a process
-                    </Button>
-                    <Button color="primary" variant="raised" className={this.props.classes.button}>
-                        Create a project
-                    </Button>
-                </div>
-                <ProjectExplorer
-                    items={goBackItem ? [goBackItem, ...sortedItems] : sortedItems}
-                    onRowClick={this.goToItem}
-                    onToggleSort={this.toggleSort}
-                    onChangeFilters={this.changeFilters}
-                />
-            </div>
-        );
-    }
 
-    goToItem = (item: ProjectExplorerItem) => {
-        this.props.dispatch<any>(setProjectItem(this.props.projects.items, item.uuid, item.kind, ItemMode.BOTH));
+const renderIcon = (item: ProjectPanelItem) => {
+    switch (item.kind) {
+        case ResourceKind.PROJECT:
+            return <ProjectIcon />;
+        case ResourceKind.COLLECTION:
+            return <CollectionIcon />;
+        case ResourceKind.PROCESS:
+            return <ProcessIcon />;
+        default:
+            return <DefaultIcon />;
     }
+};
 
-    toggleSort = (column: DataColumn<ProjectExplorerItem>) => {
-        this.setState({
-            sort: {
-                columnName: column.name,
-                direction: column.sortDirection || "none"
+const renderDate = (date: string) => {
+    return <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 renderType = (type: string) =>
+    <Typography noWrap>
+        {resourceLabel(type)}
+    </Typography>;
+
+const renderStatus = (item: ProjectPanelItem) =>
+    <Typography noWrap align="center" >
+        {item.status || "-"}
+    </Typography>;
+
+export enum ProjectPanelColumnNames {
+    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,
+                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,
+        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,
+        render: item => renderOwner(item.owner),
+        width: "200px"
+    },
+    {
+        name: ProjectPanelColumnNames.FILE_SIZE,
+        selected: true,
+        render: item => renderFileSize(item.fileSize),
+        width: "50px"
+    },
+    {
+        name: ProjectPanelColumnNames.LAST_MODIFIED,
+        selected: true,
+        sortDirection: SortDirection.NONE,
+        render: item => renderDate(item.lastModified),
+        width: "150px"
     }
+];
 
-    changeFilters = (filters: DataTableFilterItem[]) => {
-        this.setState({ filters: filters.filter(f => f.selected).map(f => f.name.toLowerCase()) });
-    }
+export const PROJECT_PANEL_ID = "projectPanel";
+
+interface ProjectPanelDataProps {
+    currentItemId: string;
 }
 
-const sortItems = (sort: { columnName: string, direction: SortDirection }, items: ProjectExplorerItem[]) => {
-    const sortedItems = items.slice(0);
-    const direction = sort.direction === "asc" ? -1 : 1;
-    sortedItems.sort((a, b) => {
-        if (sort.columnName === "Last modified") {
-            return ((new Date(a.lastModified)).getTime() - (new Date(b.lastModified)).getTime()) * direction;
-        } else {
-            return a.name.localeCompare(b.name) * direction;
-        }
-    });
-    return sortedItems;
-};
+interface ProjectPanelActionProps {
+    onItemClick: (item: ProjectPanelItem) => void;
+    onContextMenu: (event: React.MouseEvent<HTMLElement>, item: ProjectPanelItem) => void;
+    onDialogOpen: (ownerUuid: string) => void;
+    onItemDoubleClick: (item: ProjectPanelItem) => void;
+    onItemRouteChange: (itemId: string) => void;
+}
 
-type CssRules = "toolbar" | "button";
+type ProjectPanelProps = ProjectPanelDataProps & ProjectPanelActionProps & DispatchProp
+    & WithStyles<CssRules> & RouteComponentProps<{ id: string }>;
 
-const styles: StyleRulesCallback<CssRules> = theme => ({
-    toolbar: {
-        marginBottom: theme.spacing.unit * 3,
-        display: "flex",
-        justifyContent: "flex-end"
-    },
-    button: {
-        marginLeft: theme.spacing.unit
-    }
-});
+export const ProjectPanel = withStyles(styles)(
+    connect((state: RootState) => ({ currentItemId: state.projects.currentItemId }))(
+        class extends React.Component<ProjectPanelProps> {
+            render() {
+                const { classes } = 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={this.handleNewProjectClick} variant="raised" className={classes.button}>
+                            New project
+                        </Button>
+                    </div>
+                    <DataExplorer
+                        id={PROJECT_PANEL_ID}
+                        onRowClick={this.props.onItemClick}
+                        onRowDoubleClick={this.props.onItemDoubleClick}
+                        onContextMenu={this.props.onContextMenu}
+                        extractKey={(item: ProjectPanelItem) => item.uuid} />
+                </div>;
+            }
 
-export default withStyles(styles)(
-    connect(
-        (state: RootState) => ({
-            projects: state.projects,
-            collections: state.collections
-        })
-    )(ProjectPanel));
+            handleNewProjectClick = () => {
+                this.props.onDialogOpen(this.props.currentItemId);
+            }
+            componentWillReceiveProps({ match, currentItemId, onItemRouteChange }: ProjectPanelProps) {
+                if (match.params.id !== currentItemId) {
+                    onItemRouteChange(match.params.id);
+                }
+            }
+        }
+    )
+);
\ No newline at end of file