X-Git-Url: https://git.arvados.org/arvados-workbench2.git/blobdiff_plain/4beb141298fce3da40f07e1a0a08f29ac28dfd09..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 534f843f..81d84990 100644 --- a/src/views/project-panel/project-panel.tsx +++ b/src/views/project-panel/project-panel.tsx @@ -3,46 +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 { 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"; + +const styles: StyleRulesCallback = (theme: ArvadosTheme) => ({ + toolbar: { + paddingBottom: theme.spacing.unit * 3, + textAlign: "right" + }, + button: { + marginLeft: theme.spacing.unit + }, +}); -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 ( - - ); +const renderName = (item: ProjectPanelItem) => + + + {renderIcon(item)} + + + + {item.name} + + + + + + + + ; + + +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) => { + return {formatDate(date)}; +}; - goToItem = (item: ProjectExplorerItem) => { - this.props.dispatch(setProjectItem(this.props.projects.items, item.uuid, item.kind, ItemMode.BOTH)); +const renderFileSize = (fileSize?: number) => + + {formatFileSize(fileSize)} + ; + +const renderOwner = (owner: string) => + + {owner} + ; + +const renderType = (type: string) => + + {resourceLabel(type)} + ; + +const renderStatus = (item: ProjectPanelItem) => + + {item.status || "-"} + ; + +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 = [ + { + 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" } +]; + +export const PROJECT_PANEL_ID = "projectPanel"; + +interface ProjectPanelDataProps { + currentItemId: string; +} + +interface ProjectPanelActionProps { + onItemClick: (item: ProjectPanelItem) => void; + onContextMenu: (event: React.MouseEvent, item: ProjectPanelItem) => void; + onDialogOpen: (ownerUuid: string) => void; + onItemDoubleClick: (item: ProjectPanelItem) => void; + onItemRouteChange: (itemId: string) => void; } -export default connect( - (state: RootState) => ({ - projects: state.projects, - collections: state.collections - }) -)(ProjectPanel); +type ProjectPanelProps = ProjectPanelDataProps & ProjectPanelActionProps & 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); + } + } + } + ) +); \ No newline at end of file