X-Git-Url: https://git.arvados.org/arvados-workbench2.git/blobdiff_plain/e8d0331277033fea37a9fd73ffc781ffca8759f0..refs/heads/18257-chips-error-fix:/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 f1b82357..67264511 100644 --- a/src/views/project-panel/project-panel.tsx +++ b/src/views/project-panel/project-panel.tsx @@ -2,219 +2,204 @@ // // SPDX-License-Identifier: AGPL-3.0 -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 React from 'react'; +import withStyles from "@material-ui/core/styles/withStyles"; 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'; - -export const PROJECT_PANEL_ID = "projectPanel"; - -export interface ProjectPanelFilter extends DataTableFilterItem { - type: ResourceKind | ContainerRequestState; -} - -type ProjectPanelProps = { - currentItemId: string, - onItemClick: (item: ProjectPanelItem) => void, - onItemRouteChange: (itemId: string) => void, - onContextMenu: (event: React.MouseEvent, item: ProjectPanelItem) => void; - onDialogOpen: () => void; -} - & DispatchProp - & WithStyles - & RouteComponentProps<{ id: string }>; - -class ProjectPanel extends React.Component { - render() { - return
-
- - - -
- ; -
; - } - - componentWillReceiveProps({ match, currentItemId }: ProjectPanelProps) { - if (match.params.id !== currentItemId) { - this.props.onItemRouteChange(match.params.id); - } - } -} - -type CssRules = "toolbar" | "button"; - -const styles: StyleRulesCallback = theme => ({ - toolbar: { - paddingBottom: theme.spacing.unit * 3, - textAlign: "right" +import { StyleRulesCallback, WithStyles } from "@material-ui/core"; + +import { DataExplorer } from "views-components/data-explorer/data-explorer"; +import { DataColumns } from 'components/data-table/data-table'; +import { RootState } from 'store/store'; +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, Resource } from 'models/resource'; +import { + ResourceFileSize, + ResourceLastModifiedDate, + ProcessStatus, + ResourceType, + ResourceOwner +} from 'views-components/data-explorer/renderers'; +import { ProjectIcon } from 'components/icon/icon'; +import { ResourceName } from 'views-components/data-explorer/renderers'; +import { + ResourcesState, + getResource +} from 'store/resources/resources'; +import { loadDetailsPanel } from 'store/details-panel/details-panel-action'; +import { + openContextMenu, + resourceUuidToContextMenuKind +} from 'store/context-menu/context-menu-actions'; +import { navigateTo } from 'store/navigation/navigation-action'; +import { getProperty } from 'store/properties/properties'; +import { PROJECT_PANEL_CURRENT_UUID } from 'store/project-panel/project-panel-action'; +import { DataTableDefaultView } from 'components/data-table-default-view/data-table-default-view'; +import { ArvadosTheme } from "common/custom-theme"; +import { createTree } from 'models/tree'; +import { + getInitialResourceTypeFilters, + getInitialProcessStatusFilters +} from 'store/resource-type-filters/resource-type-filters'; +import { GroupContentsResource } from 'services/groups-service/groups-service'; +import { GroupClass, GroupResource } from 'models/group'; +import { CollectionResource } from 'models/collection'; + +type CssRules = 'root' | "button"; + +const styles: StyleRulesCallback = (theme: ArvadosTheme) => ({ + root: { + position: 'relative', + width: '100%', + height: '100%' }, button: { marginLeft: theme.spacing.unit }, }); -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, - selected: true, - type: ContainerRequestState.Committed - }, { - name: ContainerRequestState.Final, +export const projectPanelColumns: DataColumns = [ + { + name: ProjectPanelColumnNames.NAME, selected: true, - type: ContainerRequestState.Final - }, { - name: ContainerRequestState.Uncommitted, + configurable: true, + sortDirection: SortDirection.NONE, + filters: createTree(), + render: uuid => + }, + { + name: "Status", selected: true, - type: ContainerRequestState.Uncommitted - }], - render: renderStatus, - width: "75px" -}, { - name: ProjectPanelColumnNames.Type, - selected: true, - filters: [{ - name: typeToLabel(ResourceKind.Collection), + configurable: true, + mutuallyExclusiveFilters: true, + filters: getInitialProcessStatusFilters(), + render: uuid => , + }, + { + name: ProjectPanelColumnNames.TYPE, selected: true, - type: ResourceKind.Collection - }, { - name: typeToLabel(ResourceKind.Process), + configurable: true, + filters: getInitialResourceTypeFilters(), + render: uuid => + }, + { + name: ProjectPanelColumnNames.OWNER, + selected: false, + configurable: true, + filters: createTree(), + render: uuid => + }, + { + name: ProjectPanelColumnNames.FILE_SIZE, selected: true, - type: ResourceKind.Process - }, { - name: typeToLabel(ResourceKind.Project), + configurable: true, + filters: createTree(), + render: uuid => + }, + { + 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" -}]; - - -export default withStyles(styles)( - connect((state: RootState) => ({ currentItemId: state.projects.currentItemId }))( - ProjectPanel)); + configurable: true, + sortDirection: SortDirection.DESC, + filters: createTree(), + render: uuid => + } +]; + +export const PROJECT_PANEL_ID = "projectPanel"; + +const DEFAULT_VIEW_MESSAGES = [ + 'Your project is empty.', + 'Please create a project or create a collection and upload a data.', +]; + +interface ProjectPanelDataProps { + currentItemId: string; + resources: ResourcesState; + isAdmin: boolean; + userUuid: string; +} + +type ProjectPanelProps = ProjectPanelDataProps & DispatchProp + & WithStyles & RouteComponentProps<{ id: string }>; + +export const ProjectPanel = withStyles(styles)( + connect((state: RootState) => ({ + currentItemId: getProperty(PROJECT_PANEL_CURRENT_UUID)(state.properties), + resources: state.resources, + userUuid: state.auth.user!.uuid, + }))( + class extends React.Component { + render() { + const { classes } = this.props; + return
+ + } /> +
; + } + + isCurrentItemChild = (resource: Resource) => { + return resource.ownerUuid === this.props.currentItemId; + } + + handleContextMenu = (event: React.MouseEvent, resourceUuid: string) => { + const { resources } = this.props; + const resource = getResource(resourceUuid)(resources); + // When viewing the contents of a filter group, all contents should be treated as read only. + let readonly = false; + const project = getResource(this.props.currentItemId)(resources); + if (project && project.groupClass === GroupClass.FILTER) { + readonly = true; + } + + const menuKind = this.props.dispatch(resourceUuidToContextMenuKind(resourceUuid, readonly)); + if (menuKind && resource) { + this.props.dispatch(openContextMenu(event, { + name: resource.name, + uuid: resource.uuid, + ownerUuid: resource.ownerUuid, + isTrashed: ('isTrashed' in resource) ? resource.isTrashed: false, + kind: resource.kind, + menuKind, + description: resource.description, + storageClassesDesired: (resource as CollectionResource).storageClassesDesired, + })); + } + this.props.dispatch(loadDetailsPanel(resourceUuid)); + } + + handleRowDoubleClick = (uuid: string) => { + this.props.dispatch(navigateTo(uuid)); + } + + handleRowClick = (uuid: string) => { + this.props.dispatch(loadDetailsPanel(uuid)); + } + + } + ) +);