X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/5fd5db805554d3eddd46cc911a5108fbb74b3cfc..4229645b39e3edfa288be826fb2cdcfa5fd90d38:/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 68cbc8ec73..312a24858c 100644 --- a/src/views/project-panel/project-panel.tsx +++ b/src/views/project-panel/project-panel.tsx @@ -3,46 +3,209 @@ // 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 { setProjectItem } from "../../store/navigation/navigation-action"; -import ProjectExplorer, { ProjectExplorerContextActions } from "../../views-components/project-explorer/project-explorer"; -import { projectExplorerItems } from "./project-panel-selectors"; -import { ProjectExplorerItem } from "../../views-components/project-explorer/project-explorer-item"; - -interface ProjectPanelDataProps { - projects: ProjectState; - collections: CollectionState; -} +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'; + +type CssRules = "toolbar" | "button"; + +const styles: StyleRulesCallback = theme => ({ + toolbar: { + paddingBottom: theme.spacing.unit * 3, + textAlign: "right" + }, + button: { + marginLeft: theme.spacing.unit + }, +}); + +const renderName = (item: ProjectPanelItem) => + + + {renderIcon(item)} + + + + {item.name} + + + ; -type ProjectPanelProps = ProjectPanelDataProps & RouteComponentProps<{ name: string }> & DispatchProp; - -class ProjectPanel extends React.Component { - render() { - const items = projectExplorerItems( - this.props.projects.items, - this.props.projects.currentItemId, - this.props.collections - ); - return ( - - ); - } - goToItem = (item: ProjectExplorerItem) => { - this.props.dispatch(setProjectItem(this.props.projects.items, item.uuid, item.kind)); +const renderIcon = (item: ProjectPanelItem) => { + switch (item.kind) { + case ResourceKind.Project: + return ; + case ResourceKind.Collection: + return ; + case ResourceKind.Process: + return ; + default: + return ; } +}; + +const renderDate = (date: string) => + + {formatDate(date)} + ; + +const renderFileSize = (fileSize?: number) => + + {formatFileSize(fileSize)} + ; + +const renderOwner = (owner: string) => + + {owner} + ; + +const renderType = (type: string) => { + return + {resourceLabel(type)} + ; +}; + +const renderStatus = (item: ProjectPanelItem) => + + {item.status || "-"} + ; + +export enum ProjectPanelColumnNames { + Name = "Name", + Status = "Status", + Type = "Type", + Owner = "Owner", + FileSize = "File size", + LastModified = "Last modified" } -export default connect( - (state: RootState) => ({ - projects: state.projects, - collections: state.collections - }) -)(ProjectPanel); +export interface ProjectPanelFilter extends DataTableFilterItem { + type: ResourceKind | ContainerRequestState; +} + +export const columns: DataColumns = [{ + 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.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" +}]; + +export const PROJECT_PANEL_ID = "projectPanel"; + +type ProjectPanelProps = { + currentItemId: string, + onItemClick: (item: ProjectPanelItem) => void, + onContextMenu: (event: React.MouseEvent, item: ProjectPanelItem) => void; + onDialogOpen: (ownerUuid: string) => void; + onItemDoubleClick: (item: ProjectPanelItem) => void, + onItemRouteChange: (itemId: string) => void +} + & DispatchProp + & WithStyles + & RouteComponentProps<{ id: string }>; + +export const ProjectPanel = withStyles(styles)( + connect((state: RootState) => ({ currentItemId: state.projects.currentItemId }))( + class extends React.Component { + render() { + const { classes } = this.props; + return
+
+ + + +
+ item.uuid} /> +
; + } + + handleNewProjectClick = () => { + this.props.onDialogOpen(this.props.currentItemId); + } + componentWillReceiveProps({ match, currentItemId, onItemRouteChange }: ProjectPanelProps) { + if (match.params.id !== currentItemId) { + onItemRouteChange(match.params.id); + } + } + } + ) +);