X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/b3ed96a047c8db5febae40b6f186a656589167d8..7df4149100f41cc8d4a5438630ba95a1d72409a1:/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 fbafdbe0cc..daf22b11fa 100644
--- a/src/views/project-panel/project-panel.tsx
+++ b/src/views/project-panel/project-panel.tsx
@@ -5,8 +5,8 @@
 import * as React from 'react';
 import { ProjectPanelItem } from './project-panel-item';
 import { Grid, Typography, Button, StyleRulesCallback, WithStyles, withStyles } from '@material-ui/core';
-import { FORMAT_DATE, FORMAT_FILE_SIZE } from '../../common/formatters';
-import DataExplorer from "../../views-components/data-explorer/data-explorer";
+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';
@@ -15,65 +15,10 @@ import { DataTableFilterItem } from '../../components/data-table-filters/data-ta
 import { ContainerRequestState } from '../../models/container-request';
 import { SortDirection } from '../../components/data-table/data-column';
 import { ResourceKind } from '../../models/resource';
-import { RESOURCE_LABEL } from '../../common/labels';
+import { resourceLabel } from '../../common/labels';
 import { ProjectIcon, CollectionIcon, ProcessIcon, DefaultIcon } from '../../components/icon/icon';
 import { ArvadosTheme } from '../../common/custom-theme';
 
-export const PROJECT_PANEL_ID = "projectPanel";
-
-export interface ProjectPanelFilter extends DataTableFilterItem {
-    type: ResourceKind | ContainerRequestState;
-}
-
-interface ProjectPanelDataProps {
-    currentItemId: string;
-}
-
-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 ProjectPanelProps = ProjectPanelDataProps & ProjectPanelActionProps & DispatchProp
-                        & WithStyles<CssRules> & RouteComponentProps<{ id: string }>;
-
-class ProjectPanel 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>;
-    }
-    
-    handleNewProjectClick = () => {
-        this.props.onDialogOpen(this.props.currentItemId);
-    }
-    componentWillReceiveProps({ match, currentItemId, onItemRouteChange }: ProjectPanelProps) {
-        if (match.params.id !== currentItemId) {
-            onItemRouteChange(match.params.id);
-        }
-    }
-}
-
 type CssRules = "toolbar" | "button";
 
 const styles: StyleRulesCallback<CssRules> = (theme: ArvadosTheme) => ({
@@ -86,10 +31,10 @@ const styles: StyleRulesCallback<CssRules> = (theme: ArvadosTheme) => ({
     },
 });
 
-const RENDER_NAME = (item: ProjectPanelItem) =>
+const renderName = (item: ProjectPanelItem) =>
     <Grid container alignItems="center" wrap="nowrap" spacing={16}>
         <Grid item>
-            {RENDER_ICON(item)}
+            {renderIcon(item)}
         </Grid>
         <Grid item>
             <Typography color="primary">
@@ -99,7 +44,7 @@ const RENDER_NAME = (item: ProjectPanelItem) =>
     </Grid>;
 
 
-const RENDER_ICON = (item: ProjectPanelItem) => {
+const renderIcon = (item: ProjectPanelItem) => {
     switch (item.kind) {
         case ResourceKind.Project:
             return <ProjectIcon />;
@@ -112,46 +57,49 @@ const RENDER_ICON = (item: ProjectPanelItem) => {
     }
 };
 
-const RENDER_DATE = (date: string) => {
-    return <Typography noWrap>{FORMAT_DATE(date)}</Typography>;
+const renderDate = (date: string) => {
+    return <Typography noWrap>{formatDate(date)}</Typography>;
 };
 
-const RENDER_FILE_SIZE = (fileSize?: number) =>
+const renderFileSize = (fileSize?: number) =>
     <Typography noWrap>
-        {FORMAT_FILE_SIZE(fileSize)}
+        {formatFileSize(fileSize)}
     </Typography>;
 
-const RENDER_OWNER = (owner: string) =>
+const renderOwner = (owner: string) =>
     <Typography noWrap color="primary" >
         {owner}
     </Typography>;
 
-const RENDER_TYPE = (type: string) =>
+const renderType = (type: string) =>
     <Typography noWrap>
-        {RESOURCE_LABEL(type)}
+        {resourceLabel(type)}
     </Typography>;
 
-const RENDER_STATUS = (item: ProjectPanelItem) =>
+const renderStatus = (item: ProjectPanelItem) =>
     <Typography noWrap align="center" >
         {item.status || "-"}
     </Typography>;
 
-export enum ColumnNames {
+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> = [
+export const columns: DataColumns<ProjectPanelItem, ProjectPanelFilter> = [
     {
-        name: ColumnNames.NAME,
+        name: ProjectPanelColumnNames.NAME,
         selected: true,
         sortDirection: SortDirection.Asc,
-        render: RENDER_NAME,
+        render: renderName,
         width: "450px"
     },
     {
@@ -174,52 +122,104 @@ export const COLUMNS: DataColumns<ProjectPanelItem, ProjectPanelFilter> = [
                 type: ContainerRequestState.Uncommitted
             }
         ],
-        render: RENDER_STATUS,
+        render: renderStatus,
         width: "75px"
     },
     {
-        name: ColumnNames.TYPE,
+        name: ProjectPanelColumnNames.TYPE,
         selected: true,
         filters: [
             {
-                name: RESOURCE_LABEL(ResourceKind.Collection),
+                name: resourceLabel(ResourceKind.Collection),
                 selected: true,
                 type: ResourceKind.Collection
             },
             {
-                name: RESOURCE_LABEL(ResourceKind.Process),
+                name: resourceLabel(ResourceKind.Process),
                 selected: true,
                 type: ResourceKind.Process
             },
             {
-                name: RESOURCE_LABEL(ResourceKind.Project),
+                name: resourceLabel(ResourceKind.Project),
                 selected: true,
                 type: ResourceKind.Project
             }
         ],
-        render: item => RENDER_TYPE(item.kind),
+        render: item => renderType(item.kind),
         width: "125px"
     },
     {
-        name: ColumnNames.OWNER,
+        name: ProjectPanelColumnNames.OWNER,
         selected: true,
-        render: item => RENDER_OWNER(item.owner),
+        render: item => renderOwner(item.owner),
         width: "200px"
     },
     {
-        name: ColumnNames.FILE_SIZE,
+        name: ProjectPanelColumnNames.FILE_SIZE,
         selected: true,
-        render: item => RENDER_FILE_SIZE(item.fileSize),
+        render: item => renderFileSize(item.fileSize),
         width: "50px"
     },
     {
-        name: ColumnNames.LAST_MODIFIED,
+        name: ProjectPanelColumnNames.LAST_MODIFIED,
         selected: true,
         sortDirection: SortDirection.None,
-        render: item => RENDER_DATE(item.lastModified),
+        render: item => renderDate(item.lastModified),
         width: "150px"
     }
 ];
 
-export default withStyles(styles)(
-    connect((state: RootState) => ({ currentItemId: state.projects.currentItemId }))(ProjectPanel));
+export const PROJECT_PANEL_ID = "projectPanel";
+
+interface ProjectPanelDataProps {
+    currentItemId: string;
+}
+
+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 ProjectPanelProps = ProjectPanelDataProps & ProjectPanelActionProps & DispatchProp
+                        & WithStyles<CssRules> & RouteComponentProps<{ id: string }>;
+
+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>;
+            }
+
+            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