X-Git-Url: https://git.arvados.org/arvados-workbench2.git/blobdiff_plain/0ee5873d56416cf0c102f9e8930322fa80762f41..5d6640046afef7dc3714b784430e18bf2f2153fe:/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 684fd448..2cc751bf 100644 --- a/src/views/project-panel/project-panel.tsx +++ b/src/views/project-panel/project-panel.tsx @@ -3,12 +3,12 @@ // SPDX-License-Identifier: AGPL-3.0 import React from 'react'; -import withStyles from "@material-ui/core/styles/withStyles"; +import withStyles from '@material-ui/core/styles/withStyles'; import { DispatchProp, connect } from 'react-redux'; import { RouteComponentProps } from 'react-router'; -import { StyleRulesCallback, WithStyles } from "@material-ui/core"; +import { StyleRulesCallback, WithStyles } from '@material-ui/core'; -import { DataExplorer } from "views-components/data-explorer/data-explorer"; +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'; @@ -37,61 +37,53 @@ import { ResourceDeleteDate, } from 'views-components/data-explorer/renderers'; import { ProjectIcon } from 'components/icon/icon'; -import { - ResourcesState, - getResource -} from 'store/resources/resources'; +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 { 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 { ArvadosTheme } from "common/custom-theme"; +import { ArvadosTheme } from 'common/custom-theme'; import { createTree } from 'models/tree'; -import { - getInitialResourceTypeFilters, - getInitialProcessStatusFilters -} from 'store/resource-type-filters/resource-type-filters'; +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'; import { resourceIsFrozen } from 'common/frozen-resources'; import { ProjectResource } from 'models/project'; +import { NotFoundView } from 'views/not-found-panel/not-found-panel'; -type CssRules = 'root' | "button"; +type CssRules = 'root' | 'button'; const styles: StyleRulesCallback = (theme: ArvadosTheme) => ({ root: { width: '100%', }, button: { - marginLeft: theme.spacing.unit + marginLeft: theme.spacing.unit, }, }); export enum ProjectPanelColumnNames { - NAME = "Name", - STATUS = "Status", - TYPE = "Type", - OWNER = "Owner", - PORTABLE_DATA_HASH = "Portable Data Hash", - FILE_SIZE = "File Size", - FILE_COUNT = "File Count", - UUID = "UUID", - CONTAINER_UUID = "Container UUID", - RUNTIME = "Runtime", - OUTPUT_UUID = "Output UUID", - LOG_UUID = "Log UUID", + NAME = 'Name', + STATUS = 'Status', + TYPE = 'Type', + OWNER = 'Owner', + PORTABLE_DATA_HASH = 'Portable Data Hash', + FILE_SIZE = 'File Size', + FILE_COUNT = 'File Count', + UUID = 'UUID', + CONTAINER_UUID = 'Container UUID', + RUNTIME = 'Runtime', + OUTPUT_UUID = 'Output UUID', + LOG_UUID = 'Log UUID', PARENT_PROCESS = 'Parent Process UUID', MODIFIED_BY_USER_UUID = 'Modified by User UUID', - VERSION = "Version", - CREATED_AT = "Date Created", - LAST_MODIFIED = "Last Modified", - TRASH_AT = "Trash at", - DELETE_AT = "Delete at", + VERSION = 'Version', + CREATED_AT = 'Date Created', + LAST_MODIFIED = 'Last Modified', + TRASH_AT = 'Trash at', + DELETE_AT = 'Delete at', } export interface ProjectPanelFilter extends DataTableFilterItem { @@ -103,9 +95,9 @@ export const projectPanelColumns: DataColumns = [ name: ProjectPanelColumnNames.NAME, selected: true, configurable: true, - sort: {direction: SortDirection.NONE, field: "name"}, + sort: { direction: SortDirection.NONE, field: 'name' }, filters: createTree(), - render: uuid => + render: (uuid) => , }, { name: ProjectPanelColumnNames.STATUS, @@ -113,179 +105,187 @@ export const projectPanelColumns: DataColumns = [ configurable: true, mutuallyExclusiveFilters: true, filters: getInitialProcessStatusFilters(), - render: uuid => , + render: (uuid) => , }, { name: ProjectPanelColumnNames.TYPE, selected: true, configurable: true, filters: getInitialResourceTypeFilters(), - render: uuid => + render: (uuid) => , }, { name: ProjectPanelColumnNames.OWNER, selected: false, configurable: true, filters: createTree(), - render: uuid => + render: (uuid) => , }, { name: ProjectPanelColumnNames.PORTABLE_DATA_HASH, selected: false, configurable: true, filters: createTree(), - render: uuid => + render: (uuid) => , }, { name: ProjectPanelColumnNames.FILE_SIZE, selected: true, configurable: true, filters: createTree(), - render: uuid => + render: (uuid) => , }, { name: ProjectPanelColumnNames.FILE_COUNT, selected: false, configurable: true, filters: createTree(), - render: uuid => + render: (uuid) => , }, { name: ProjectPanelColumnNames.UUID, selected: false, configurable: true, filters: createTree(), - render: uuid => + render: (uuid) => , }, { name: ProjectPanelColumnNames.CONTAINER_UUID, selected: false, configurable: true, filters: createTree(), - render: uuid => + render: (uuid) => , }, { name: ProjectPanelColumnNames.RUNTIME, selected: false, configurable: true, filters: createTree(), - render: uuid => + render: (uuid) => , }, { name: ProjectPanelColumnNames.OUTPUT_UUID, selected: false, configurable: true, filters: createTree(), - render: uuid => + render: (uuid) => , }, { name: ProjectPanelColumnNames.LOG_UUID, selected: false, configurable: true, filters: createTree(), - render: uuid => + render: (uuid) => , }, { name: ProjectPanelColumnNames.PARENT_PROCESS, selected: false, configurable: true, filters: createTree(), - render: uuid => + render: (uuid) => , }, { name: ProjectPanelColumnNames.MODIFIED_BY_USER_UUID, selected: false, configurable: true, filters: createTree(), - render: uuid => + render: (uuid) => , }, { name: ProjectPanelColumnNames.VERSION, selected: false, configurable: true, filters: createTree(), - render: uuid => + render: (uuid) => , }, { name: ProjectPanelColumnNames.CREATED_AT, selected: false, configurable: true, - sort: {direction: SortDirection.NONE, field: "createdAt"}, + sort: { direction: SortDirection.NONE, field: 'createdAt' }, filters: createTree(), - render: uuid => + render: (uuid) => , }, { name: ProjectPanelColumnNames.LAST_MODIFIED, selected: true, configurable: true, - sort: {direction: SortDirection.DESC, field: "modifiedAt"}, + sort: { direction: SortDirection.DESC, field: 'modifiedAt' }, filters: createTree(), - render: uuid => + render: (uuid) => , }, { name: ProjectPanelColumnNames.TRASH_AT, selected: false, configurable: true, - sort: {direction: SortDirection.NONE, field: "trashAt"}, + sort: { direction: SortDirection.NONE, field: 'trashAt' }, filters: createTree(), - render: uuid => + render: (uuid) => , }, { name: ProjectPanelColumnNames.DELETE_AT, selected: false, configurable: true, - sort: {direction: SortDirection.NONE, field: "deleteAt"}, + sort: { direction: SortDirection.NONE, field: 'deleteAt' }, filters: createTree(), - render: uuid => + render: (uuid) => , }, - ]; -export const PROJECT_PANEL_ID = "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.', -]; +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; + project: GroupResource; isAdmin: boolean; userUuid: string; dataExplorerItems: any; } -type ProjectPanelProps = ProjectPanelDataProps & DispatchProp - & WithStyles & RouteComponentProps<{ id: string }>; +type ProjectPanelProps = ProjectPanelDataProps & DispatchProp & WithStyles & RouteComponentProps<{ id: string }>; +const mapStateToProps = (state: RootState) => { + const currentItemId = getProperty(PROJECT_PANEL_CURRENT_UUID)(state.properties); + const project = getResource(currentItemId || "")(state.resources); + return { + currentItemId, + project, + resources: state.resources, + userUuid: state.auth.user!.uuid, + }; +} export const ProjectPanel = withStyles(styles)( - connect((state: RootState) => ({ - currentItemId: getProperty(PROJECT_PANEL_CURRENT_UUID)(state.properties), - resources: state.resources, - userUuid: state.auth.user!.uuid - }))( + connect(mapStateToProps)( 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, isAdmin } = this.props; @@ -299,31 +299,32 @@ export const ProjectPanel = withStyles(styles)( 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, - isAdmin, - isFrozen: resourceIsFrozen(resource, resources), - description: resource.description, - storageClassesDesired: (resource as CollectionResource).storageClassesDesired, - properties: ('properties' in resource) ? resource.properties : {}, - })); + 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, + isAdmin, + isFrozen: resourceIsFrozen(resource, resources), + description: resource.description, + storageClassesDesired: (resource as CollectionResource).storageClassesDesired, + properties: 'properties' in resource ? resource.properties : {}, + }) + ); } this.props.dispatch(loadDetailsPanel(resourceUuid)); - } + }; handleRowDoubleClick = (uuid: string) => { this.props.dispatch(navigateTo(uuid)); - } + }; handleRowClick = (uuid: string) => { this.props.dispatch(loadDetailsPanel(uuid)); - } - + }; } ) );