X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/c3efa27ba09323568c2b7d2cd27911fe4937ccbc..5c6e7a1fcb3e951c09e4a794f92a80a35f4db2ee:/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 df9721fda7..b75b37aab5 100644 --- a/src/views/project-panel/project-panel.tsx +++ b/src/views/project-panel/project-panel.tsx @@ -3,123 +3,202 @@ // SPDX-License-Identifier: AGPL-3.0 import * as React from 'react'; -import { RouteComponentProps } from 'react-router'; -import { ProjectState } from '../../store/project/project-reducer'; -import { RootState } from '../../store/store'; -import { connect, DispatchProp } from 'react-redux'; -import { CollectionState } from "../../store/collection/collection-reducer"; -import { ItemMode, setProjectItem } from "../../store/navigation/navigation-action"; -import ProjectExplorer from "../../views-components/project-explorer/project-explorer"; -import { projectExplorerItems } from "./project-panel-selectors"; -import { ProjectExplorerItem } from "../../views-components/project-explorer/project-explorer-item"; import { Button, StyleRulesCallback, WithStyles, withStyles } from '@material-ui/core'; -import { DataColumn, SortDirection } from '../../components/data-table/data-column'; -import { DataTableFilterItem } from '../../components/data-table-filters/data-table-filters'; +import { DataExplorer } from "~/views-components/data-explorer/data-explorer"; +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'; -interface ProjectPanelDataProps { - projects: ProjectState; - collections: CollectionState; -} +type CssRules = 'root' | "toolbar" | "button"; -type ProjectPanelProps = ProjectPanelDataProps & RouteComponentProps<{ name: string }> & DispatchProp; +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 + }, +}); -interface ProjectPanelState { - sort: { - columnName: string; - direction: SortDirection; - }; - filters: string[]; +export enum ProjectPanelColumnNames { + NAME = "Name", + STATUS = "Status", + TYPE = "Type", + OWNER = "Owner", + FILE_SIZE = "File size", + LAST_MODIFIED = "Last modified" } -class ProjectPanel extends React.Component, ProjectPanelState> { - state: ProjectPanelState = { - sort: { - columnName: "Name", - direction: "desc" - }, - filters: ['collection', 'project'] - }; - - render() { - const items = projectExplorerItems( - this.props.projects.items, - this.props.projects.currentItemId, - this.props.collections - ); - const [goBackItem, ...otherItems] = items; - const filteredItems = otherItems.filter(i => this.state.filters.some(f => f === i.kind)); - const sortedItems = sortItems(this.state.sort, filteredItems); - return ( -
-
- - - -
- -
- ); - } - - goToItem = (item: ProjectExplorerItem) => { - this.props.dispatch(setProjectItem(this.props.projects.items, item.uuid, item.kind, ItemMode.BOTH)); - } +export interface ProjectPanelFilter extends DataTableFilterItem { + type: ResourceKind | ContainerRequestState; +} - toggleSort = (column: DataColumn) => { - this.setState({ - sort: { - columnName: column.name, - direction: column.sortDirection || "none" +export const projectPanelColumns: DataColumns = [ + { + name: ProjectPanelColumnNames.NAME, + selected: true, + configurable: true, + sortDirection: SortDirection.ASC, + filters: [], + render: uuid => , + width: "450px" + }, + { + name: "Status", + selected: true, + configurable: true, + filters: [], + render: uuid => , + width: "75px" + }, + { + name: ProjectPanelColumnNames.TYPE, + selected: true, + configurable: true, + 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" + }, + { + name: ProjectPanelColumnNames.OWNER, + selected: true, + configurable: true, + filters: [], + render: uuid => , + width: "200px" + }, + { + name: ProjectPanelColumnNames.FILE_SIZE, + selected: true, + configurable: true, + filters: [], + render: uuid => , + width: "50px" + }, + { + name: ProjectPanelColumnNames.LAST_MODIFIED, + selected: true, + configurable: true, + sortDirection: SortDirection.NONE, + filters: [], + render: uuid => , + width: "150px" } +]; - changeFilters = (filters: DataTableFilterItem[]) => { - this.setState({ filters: filters.filter(f => f.selected).map(f => f.name.toLowerCase()) }); - } +export const PROJECT_PANEL_ID = "projectPanel"; + +interface ProjectPanelDataProps { + currentItemId: string; + resources: ResourcesState; } -const sortItems = (sort: { columnName: string, direction: SortDirection }, items: ProjectExplorerItem[]) => { - const sortedItems = items.slice(0); - const direction = sort.direction === "asc" ? -1 : 1; - sortedItems.sort((a, b) => { - if (sort.columnName === "Last modified") { - return ((new Date(a.lastModified)).getTime() - (new Date(b.lastModified)).getTime()) * direction; - } else { - return a.name.localeCompare(b.name) * direction; - } - }); - return sortedItems; -}; +type ProjectPanelProps = ProjectPanelDataProps & DispatchProp + & WithStyles & RouteComponentProps<{ id: string }>; -type CssRules = "toolbar" | "button"; +export const ProjectPanel = withStyles(styles)( + connect((state: RootState) => ({ + currentItemId: getProperty(PROJECT_PANEL_CURRENT_UUID)(state.properties), + resources: state.resources + }))( + class extends React.Component { + render() { + const { classes } = this.props; + return
+
+ + + +
+ +
; + } -const styles: StyleRulesCallback = theme => ({ - toolbar: { - marginBottom: theme.spacing.unit * 3, - display: "flex", - justifyContent: "flex-end" - }, - button: { - marginLeft: theme.spacing.unit - } -}); + handleNewProjectClick = () => { + this.props.dispatch(openProjectCreateDialog(this.props.currentItemId)); + } + + handleNewCollectionClick = () => { + this.props.dispatch(openCollectionCreateDialog(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 + })); + } + } -export default withStyles(styles)( - connect( - (state: RootState) => ({ - projects: state.projects, - collections: state.collections - }) - )(ProjectPanel)); + handleRowDoubleClick = (uuid: string) => { + this.props.dispatch(navigateTo(uuid)); + } + + handleRowClick = (uuid: string) => { + this.props.dispatch(loadDetailsPanel(uuid)); + } + + } + ) +);