X-Git-Url: https://git.arvados.org/arvados-workbench2.git/blobdiff_plain/3eba091748f10f981d48f44eed14115b4fcee0ce..78fd0936352c6f50f06bd0c6f9973bccc1ac0d51:/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 c7138c30..2c962ef8 100644 --- a/src/views/project-panel/project-panel.tsx +++ b/src/views/project-panel/project-panel.tsx @@ -3,27 +3,41 @@ // SPDX-License-Identifier: AGPL-3.0 import * as React from 'react'; -import { ProjectPanelItem } from './project-panel-item'; import { Button, StyleRulesCallback, WithStyles, withStyles } from '@material-ui/core'; -import { DataExplorer } from "../../views-components/data-explorer/data-explorer"; +import { DataExplorer } from "~/views-components/data-explorer/data-explorer"; import { DispatchProp, connect } from 'react-redux'; -import { DataColumns } from '../../components/data-table/data-table'; +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 { renderName, renderStatus, renderType, renderOwner, renderFileSize, renderDate } from '../../views-components/data-explorer/renderers'; +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 { 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'; +import { filterResources } from '~/store/resources/resources'; +import { PanelDefaultView } from '~/components/panel-default-view/panel-default-view'; +import { DataTableDefaultView } from '~/components/data-table-default-view/data-table-default-view'; -type CssRules = "toolbar" | "button"; +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 @@ -43,40 +57,26 @@ export interface ProjectPanelFilter extends DataTableFilterItem { type: ResourceKind | ContainerRequestState; } -export const columns: DataColumns = [ +export const projectPanelColumns: DataColumns = [ { name: ProjectPanelColumnNames.NAME, selected: true, + configurable: true, sortDirection: SortDirection.ASC, - render: renderName, - width: "450px" + filters: [], + 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: renderStatus, - width: "75px" + configurable: true, + filters: [], + render: uuid => , }, { name: ProjectPanelColumnNames.TYPE, selected: true, + configurable: true, filters: [ { name: resourceLabel(ResourceKind.COLLECTION), @@ -94,27 +94,29 @@ export const columns: DataColumns = [ type: ResourceKind.PROJECT } ], - render: item => renderType(item.kind), - width: "125px" + render: uuid => }, { name: ProjectPanelColumnNames.OWNER, selected: true, - render: item => renderOwner(item.owner), - width: "200px" + configurable: true, + filters: [], + render: uuid => }, { name: ProjectPanelColumnNames.FILE_SIZE, selected: true, - render: item => renderFileSize(item.fileSize), - width: "50px" + configurable: true, + filters: [], + render: uuid => }, { name: ProjectPanelColumnNames.LAST_MODIFIED, selected: true, + configurable: true, sortDirection: SortDirection.NONE, - render: item => renderDate(item.lastModified), - width: "150px" + filters: [], + render: uuid => } ]; @@ -122,53 +124,69 @@ export const PROJECT_PANEL_ID = "projectPanel"; interface ProjectPanelDataProps { currentItemId: string; + resources: ResourcesState; } -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 +type ProjectPanelProps = ProjectPanelDataProps & DispatchProp & WithStyles & RouteComponentProps<{ id: string }>; export const ProjectPanel = withStyles(styles)( - connect((state: RootState) => ({ currentItemId: state.projects.currentItemId }))( + connect((state: RootState) => ({ + currentItemId: getProperty(PROJECT_PANEL_CURRENT_UUID)(state.properties), + resources: state.resources + }))( class extends React.Component { render() { const { classes } = this.props; - return
-
- - - -
- item.uuid} /> + return
+ {this.hasAnyItems() + ? } /> + : + } +
; } - handleNewProjectClick = () => { - this.props.onDialogOpen(this.props.currentItemId); + hasAnyItems = () => { + const resources = filterResources(this.isCurrentItemChild)(this.props.resources); + return resources.length > 0; } - componentWillReceiveProps({ match, currentItemId, onItemRouteChange }: ProjectPanelProps) { - if (match.params.id !== currentItemId) { - onItemRouteChange(match.params.id); + + isCurrentItemChild = (resource: Resource) => { + return resource.ownerUuid === this.props.currentItemId; + } + + handleContextMenu = (event: React.MouseEvent, resourceUuid: string) => { + const menuKind = resourceKindToContextMenuKind(resourceUuid); + const resource = getResource(resourceUuid)(this.props.resources); + if (menuKind && resource) { + this.props.dispatch(openContextMenu(event, { + name: resource.name, + uuid: resource.uuid, + ownerUuid: resource.ownerUuid, + isTrashed: resource.isTrashed, + kind: resource.kind, + menuKind + })); } } + + handleRowDoubleClick = (uuid: string) => { + this.props.dispatch(navigateTo(uuid)); + } + + handleRowClick = (uuid: string) => { + this.props.dispatch(loadDetailsPanel(uuid)); + } + } ) -); \ No newline at end of file +);