X-Git-Url: https://git.arvados.org/arvados-workbench2.git/blobdiff_plain/9cb78f72cfe7da0fd3e04609f13d5f930a76a2f1..40b55e355fe0a206a4cb3eec676e44d935b7d5ec:/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 ebaba839..e08aea32 100644 --- a/src/views/project-panel/project-panel.tsx +++ b/src/views/project-panel/project-panel.tsx @@ -2,43 +2,56 @@ // // SPDX-License-Identifier: AGPL-3.0 -import * as React from 'react'; -import { Button, StyleRulesCallback, WithStyles, withStyles } from '@material-ui/core'; -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 { resourceLabel } from '~/common/labels'; -import { ArvadosTheme } from '~/common/custom-theme'; -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 { resourceKindToContextMenuKind, openContextMenu } from '~/store/context-menu/context-menu-actions'; -import { ProjectResource } from '~/models/project'; -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 { openCollectionCreateDialog } from '../../store/collections/collection-create-actions'; -import { openProjectCreateDialog } from '~/store/projects/project-create-actions'; - -type CssRules = 'root' | "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) => ({ root: { - position: 'relative', width: '100%', - height: '100%' - }, - toolbar: { - paddingBottom: theme.spacing.unit * 3, - textAlign: "right" }, button: { marginLeft: theme.spacing.unit @@ -58,100 +71,66 @@ export interface ProjectPanelFilter extends DataTableFilterItem { type: ResourceKind | ContainerRequestState; } -export const projectPanelColumns: DataColumns = [ +export const projectPanelColumns: DataColumns = [ { name: ProjectPanelColumnNames.NAME, selected: true, configurable: true, - sortDirection: SortDirection.ASC, - filters: [], - render: uuid => , - width: "450px" + sortDirection: SortDirection.NONE, + filters: createTree(), + render: uuid => }, { name: "Status", selected: true, configurable: true, - sortDirection: SortDirection.NONE, - 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 - } - ], + mutuallyExclusiveFilters: true, + filters: getInitialProcessStatusFilters(), render: uuid => , - width: "75px" }, { name: ProjectPanelColumnNames.TYPE, selected: true, configurable: true, - sortDirection: SortDirection.NONE, - 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: uuid => , - width: "125px" + filters: getInitialResourceTypeFilters(), + render: uuid => }, { name: ProjectPanelColumnNames.OWNER, - selected: true, + selected: false, configurable: true, - sortDirection: SortDirection.NONE, - filters: [], - render: uuid => , - width: "200px" + filters: createTree(), + render: uuid => }, { name: ProjectPanelColumnNames.FILE_SIZE, selected: true, configurable: true, - sortDirection: SortDirection.NONE, - filters: [], - render: uuid => , - width: "50px" + filters: createTree(), + render: uuid => }, { name: ProjectPanelColumnNames.LAST_MODIFIED, selected: true, configurable: true, - sortDirection: SortDirection.NONE, - filters: [], - render: uuid => , - width: "150px" + 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 @@ -160,53 +139,56 @@ type ProjectPanelProps = ProjectPanelDataProps & DispatchProp export const ProjectPanel = withStyles(styles)( connect((state: RootState) => ({ currentItemId: getProperty(PROJECT_PANEL_CURRENT_UUID)(state.properties), - resources: state.resources + resources: state.resources, + userUuid: state.auth.user!.uuid, }))( class extends React.Component { render() { const { classes } = this.props; - return
-
- - - -
+ return
+ contextMenuColumn={true} + dataTableDefaultView={ + + } />
; } - handleNewProjectClick = () => { - this.props.dispatch(openProjectCreateDialog(this.props.currentItemId)); - } - - handleNewCollectionClick = () => { - this.props.dispatch(openCollectionCreateDialog(this.props.currentItemId)); + isCurrentItemChild = (resource: Resource) => { + return resource.ownerUuid === this.props.currentItemId; } handleContextMenu = (event: React.MouseEvent, resourceUuid: string) => { - const kind = resourceKindToContextMenuKind(resourceUuid); - const resource = getResource(resourceUuid)(this.props.resources) as ProjectResource; - if (kind && resource) { + 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: resource.isTrashed, - kind + isTrashed: ('isTrashed' in resource) ? resource.isTrashed: false, + kind: resource.kind, + menuKind, + description: resource.description, + storageClassesDesired: (resource as CollectionResource).storageClassesDesired, + properties: ('properties' in resource) ? resource.properties : {}, })); } + this.props.dispatch(loadDetailsPanel(resourceUuid)); } handleRowDoubleClick = (uuid: string) => { @@ -214,7 +196,7 @@ export const ProjectPanel = withStyles(styles)( } handleRowClick = (uuid: string) => { - this.props.dispatch(loadDetailsPanel(uuid)); + this.props.dispatch(loadDetailsPanel(uuid)); } }