X-Git-Url: https://git.arvados.org/arvados-workbench2.git/blobdiff_plain/4b4ef8d9e7c3d65e4d65b8aafb68b294c30e2e28..786d7c2b99da82c92d0ab5bc242f75513a46b4b5:/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 2cdb6712..9c3ba1b1 100644 --- a/src/views/project-panel/project-panel.tsx +++ b/src/views/project-panel/project-panel.tsx @@ -4,105 +4,30 @@ import * as React from 'react'; import { ProjectPanelItem } from './project-panel-item'; -import { Grid, Typography, Button, Toolbar, StyleRulesCallback, WithStyles, withStyles } from '@material-ui/core'; -import { formatDate, formatFileSize } from '../../common/formatters'; -import DataExplorer from "../../views-components/data-explorer/data-explorer"; -import { ContextMenuAction } from '../../components/context-menu/context-menu'; +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'; -import DialogProjectCreate from '../../components/dialog-create/dialog-project-create'; -import { mockAnchorFromMouseEvent } from "../../components/popover/helpers"; - -export const PROJECT_PANEL_ID = "projectPanel"; - -export interface ProjectPanelFilter extends DataTableFilterItem { - type: ResourceKind | ContainerRequestState; -} - -interface DataExplorerState { - contextMenu: { - anchorEl?: HTMLElement; - item?: T; - }; - open?: boolean; -} - -type ProjectPanelProps = { - currentItemId: string, - onItemClick: (item: ProjectPanelItem) => void, - onItemRouteChange: (itemId: string) => void, - onContextMenu: (event: React.MouseEvent, item: ProjectPanelItem) => void; - handleCreationDialogOpen: () => void; - handleCreationDialogClose: () => void; - isCreationDialogOpen: boolean; -} - & DispatchProp - & WithStyles - & RouteComponentProps<{ id: string }>; - -class ProjectPanel extends React.Component> { - state: DataExplorerState = { - contextMenu: {}, - open: false, - }; - - render() { - return
-
- - - - -
- ; -
; - } - - componentWillReceiveProps({ match, currentItemId }: ProjectPanelProps) { - if (match.params.id !== currentItemId) { - this.props.onItemRouteChange(match.params.id); - } - } - - executeAction = (action: ContextMenuAction, item: ProjectPanelItem) => { - alert(`Executing ${action.name} on ${item.name}`); - } - - openContextMenu = (event: React.MouseEvent, item: any) => { - event.preventDefault(); - event.stopPropagation(); - this.setState({ - contextMenu: { - anchorEl: mockAnchorFromMouseEvent(event), - item - } - }); - } - - closeContextMenu = () => { - this.setState({ contextMenu: {} }); - } - -} - -type CssRules = "toolbar" | "button"; - -const styles: StyleRulesCallback = theme => ({ +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'; +import { ProjectIcon } from '../../components/icon/icon'; + +type CssRules = 'root' | "toolbar" | "button"; + +const styles: StyleRulesCallback = (theme: ArvadosTheme) => ({ + root: { + position: 'relative', + width: '100%', + height: '100%' + }, toolbar: { paddingBottom: theme.spacing.unit * 3, textAlign: "right" @@ -112,148 +37,166 @@ const styles: StyleRulesCallback = theme => ({ }, }); -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) => - - {formatDate(date)} - ; - -const renderFileSize = (fileSize?: number) => - - {formatFileSize(fileSize)} - ; - -const renderOwner = (owner: string) => - - {owner} - ; - - - -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 - {typeToLabel(type)} - ; -}; - -const renderStatus = (item: ProjectPanelItem) => - - {item.status || "-"} - ; - 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 = [{ - name: ProjectPanelColumnNames.Name, - selected: true, - sortDirection: SortDirection.Asc, - render: renderName, - width: "450px" -}, { - name: "Status", - selected: true, - filters: [{ - name: ContainerRequestState.Committed, +export const columns: DataColumns = [ + { + 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"; + +interface ProjectPanelDataProps { + currentItemId: string; +} -export default withStyles(styles)( +interface ProjectPanelActionProps { + onItemClick: (item: ProjectPanelItem) => void; + onContextMenu: (event: React.MouseEvent, 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 & RouteComponentProps<{ id: string }>; + +export const ProjectPanel = withStyles(styles)( connect((state: RootState) => ({ currentItemId: state.projects.currentItemId }))( - ProjectPanel)); + class extends React.Component { + render() { + const { classes } = this.props; + return
+
+ + + +
+ item.uuid} + defaultIcon={ProjectIcon} + defaultMessages={['Your project is empty. Please create a project', 'or create a collection and upload a data.']} /> +
; + } + + 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.currentItemId === '') { + this.props.dispatch(restoreBranch(this.props.match.params.id)); + } + } + } + ) +);