X-Git-Url: https://git.arvados.org/arvados-workbench2.git/blobdiff_plain/b3ed96a047c8db5febae40b6f186a656589167d8..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 fbafdbe0..67264511 100644 --- a/src/views/project-panel/project-panel.tsx +++ b/src/views/project-panel/project-panel.tsx @@ -2,224 +2,204 @@ // // 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 { FORMAT_DATE, FORMAT_FILE_SIZE } 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 { 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 { RESOURCE_LABEL } 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, item: ProjectPanelItem) => void; - onDialogOpen: (ownerUuid: string) => void; - onItemDoubleClick: (item: ProjectPanelItem) => void; - onItemRouteChange: (itemId: string) => void; -} - -type ProjectPanelProps = ProjectPanelDataProps & ProjectPanelActionProps & DispatchProp - & WithStyles & RouteComponentProps<{ id: string }>; - -class ProjectPanel 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); - } - } -} - -type CssRules = "toolbar" | "button"; +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) => ({ - toolbar: { - paddingBottom: theme.spacing.unit * 3, - textAlign: "right" + root: { + position: 'relative', + width: '100%', + height: '100%' }, button: { marginLeft: theme.spacing.unit }, }); -const RENDER_NAME = (item: ProjectPanelItem) => - - - {RENDER_ICON(item)} - - - - {item.name} - - - ; - - -const RENDER_ICON = (item: ProjectPanelItem) => { - switch (item.kind) { - case ResourceKind.Project: - return ; - case ResourceKind.Collection: - return ; - case ResourceKind.Process: - return ; - default: - return ; - } -}; - -const RENDER_DATE = (date: string) => { - return {FORMAT_DATE(date)}; -}; - -const RENDER_FILE_SIZE = (fileSize?: number) => - - {FORMAT_FILE_SIZE(fileSize)} - ; - -const RENDER_OWNER = (owner: string) => - - {owner} - ; - -const RENDER_TYPE = (type: string) => - - {RESOURCE_LABEL(type)} - ; - -const RENDER_STATUS = (item: ProjectPanelItem) => - - {item.status || "-"} - ; - -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 = [ +export const projectPanelColumns: DataColumns = [ { - name: ColumnNames.NAME, + name: ProjectPanelColumnNames.NAME, selected: true, - sortDirection: SortDirection.Asc, - render: RENDER_NAME, - width: "450px" + configurable: true, + sortDirection: SortDirection.NONE, + filters: createTree(), + render: uuid => }, { 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: RENDER_STATUS, - width: "75px" + configurable: true, + mutuallyExclusiveFilters: true, + filters: getInitialProcessStatusFilters(), + render: uuid => , }, { - name: ColumnNames.TYPE, + name: ProjectPanelColumnNames.TYPE, selected: true, - filters: [ - { - name: RESOURCE_LABEL(ResourceKind.Collection), - selected: true, - type: ResourceKind.Collection - }, - { - name: RESOURCE_LABEL(ResourceKind.Process), - selected: true, - type: ResourceKind.Process - }, - { - name: RESOURCE_LABEL(ResourceKind.Project), - selected: true, - type: ResourceKind.Project - } - ], - render: item => RENDER_TYPE(item.kind), - width: "125px" + configurable: true, + filters: getInitialResourceTypeFilters(), + render: uuid => }, { - name: ColumnNames.OWNER, - selected: true, - render: item => RENDER_OWNER(item.owner), - width: "200px" + name: ProjectPanelColumnNames.OWNER, + selected: false, + configurable: true, + filters: createTree(), + render: uuid => }, { - name: ColumnNames.FILE_SIZE, + name: ProjectPanelColumnNames.FILE_SIZE, selected: true, - render: item => RENDER_FILE_SIZE(item.fileSize), - width: "50px" + configurable: true, + filters: createTree(), + render: uuid => }, { - name: ColumnNames.LAST_MODIFIED, + name: ProjectPanelColumnNames.LAST_MODIFIED, selected: true, - sortDirection: SortDirection.None, - render: item => RENDER_DATE(item.lastModified), - width: "150px" + configurable: true, + sortDirection: SortDirection.DESC, + filters: createTree(), + render: uuid => } ]; -export default withStyles(styles)( - connect((state: RootState) => ({ currentItemId: state.projects.currentItemId }))(ProjectPanel)); +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)); + } + + } + ) +);