X-Git-Url: https://git.arvados.org/arvados-workbench2.git/blobdiff_plain/606ab6d3dab1f166c52e471052652460c915f00f..f53d651573ef8c358cbdf38c7a56c6aed8178b61:/src/views/project-panel/project-panel.tsx?ds=inline diff --git a/src/views/project-panel/project-panel.tsx b/src/views/project-panel/project-panel.tsx index 4522f163..06946430 100644 --- a/src/views/project-panel/project-panel.tsx +++ b/src/views/project-panel/project-panel.tsx @@ -3,142 +3,41 @@ // SPDX-License-Identifier: AGPL-3.0 import * as React from 'react'; -import TextField from '@material-ui/core/TextField'; -import Dialog from '@material-ui/core/Dialog'; -import DialogActions from '@material-ui/core/DialogActions'; -import DialogContent from '@material-ui/core/DialogContent'; -import DialogTitle from '@material-ui/core/DialogTitle'; -import { ProjectPanelItem } from './project-panel-item'; -import { Grid, Typography, Button, Toolbar, StyleRulesCallback, WithStyles, withStyles } from '@material-ui/core'; -import { formatDate, formatFileSize } from '../../common/formatters'; -import DataExplorer from "../../views-components/data-explorer/data-explorer"; -import { DataColumn, toggleSortDirection } from '../../components/data-table/data-column'; -import { DataTableFilterItem } from '../../components/data-table-filters/data-table-filters'; -import { ContextMenuAction } from '../../components/context-menu/context-menu'; +import { Button, StyleRulesCallback, WithStyles, withStyles } from '@material-ui/core'; +import { DataExplorer } from "~/views-components/data-explorer/data-explorer"; import { DispatchProp, connect } from 'react-redux'; -import actions from "../../store/data-explorer/data-explorer-action"; -import { DataColumns } from '../../components/data-table/data-table'; -import { ResourceKind } from "../../models/resource"; +import { DataColumns } from '~/components/data-table/data-table'; import { RouteComponentProps } from 'react-router'; -import { RootState } from '../../store/store'; - -export const PROJECT_PANEL_ID = "projectPanel"; - -type ProjectPanelProps = { - currentItemId: string, - onItemClick: (item: ProjectPanelItem) => void, - onItemRouteChange: (itemId: string) => void -} - & DispatchProp - & WithStyles - & RouteComponentProps<{ id: string }>; -class ProjectPanel extends React.Component { - state = { - open: false, - }; - - handleClickOpen = () => { - this.setState({ open: true }); - } - - handleClose = () => { - this.setState({ open: false }); - } - - render() { - return
-
- - - - -
- Create a project - - - - - - - - -
-
-
- ; -
; - } - - componentDidMount() { - this.props.dispatch(actions.SET_COLUMNS({ id: PROJECT_PANEL_ID, columns })); - } - - componentWillReceiveProps({ match, currentItemId }: ProjectPanelProps) { - if (match.params.id !== currentItemId) { - this.props.onItemRouteChange(match.params.id); - } - } - - toggleColumn = (toggledColumn: DataColumn) => { - this.props.dispatch(actions.TOGGLE_COLUMN({ id: PROJECT_PANEL_ID, columnName: toggledColumn.name })); - } - - toggleSort = (column: DataColumn) => { - this.props.dispatch(actions.TOGGLE_SORT({ id: PROJECT_PANEL_ID, columnName: column.name })); - } - - changeFilters = (filters: DataTableFilterItem[], column: DataColumn) => { - this.props.dispatch(actions.SET_FILTERS({ id: PROJECT_PANEL_ID, columnName: column.name, filters })); - } - - executeAction = (action: ContextMenuAction, item: ProjectPanelItem) => { - alert(`Executing ${action.name} on ${item.name}`); - } - - search = (searchValue: string) => { - this.props.dispatch(actions.SET_SEARCH_VALUE({ id: PROJECT_PANEL_ID, searchValue })); - } - - changePage = (page: number) => { - this.props.dispatch(actions.SET_PAGE({ id: PROJECT_PANEL_ID, page })); - } - - changeRowsPerPage = (rowsPerPage: number) => { - this.props.dispatch(actions.SET_ROWS_PER_PAGE({ id: PROJECT_PANEL_ID, rowsPerPage })); - } - -} - -type CssRules = "toolbar" | "button" | "lastButton" | "dialogContent" | "textField" | "dialog"; - -const styles: StyleRulesCallback = theme => ({ +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 { ContextMenuKind } from '~/views-components/context-menu/context-menu'; +import { contextMenuActions, resourceKindToContextMenuKind, openContextMenu } from '~/store/context-menu/context-menu-actions'; +import { CollectionResource } from '~/models/collection'; +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"; + +const styles: StyleRulesCallback = (theme: ArvadosTheme) => ({ + root: { + position: 'relative', + width: '100%', + height: '100%' + }, toolbar: { paddingBottom: theme.spacing.unit * 3, textAlign: "right" @@ -146,140 +45,173 @@ const styles: StyleRulesCallback = theme => ({ button: { marginLeft: theme.spacing.unit }, - lastButton: { - marginLeft: theme.spacing.unit, - marginRight: "20px", - }, - dialogContent: { - marginTop: "20px", - }, - textField: { - marginBottom: "32px", - }, - dialog: { - minWidth: "550px", - minHeight: "320px" - } }); -const renderName = (item: ProjectPanelItem) => - - - {renderIcon(item)} - - - - {item.name} - - - ; +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; +} -const renderIcon = (item: ProjectPanelItem) => { - switch (item.kind) { - case ResourceKind.PROJECT: - return ; - case ResourceKind.COLLECTION: - return ; - default: - return ; +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, + 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 + } + ], + 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" + }, + { + name: ProjectPanelColumnNames.OWNER, + selected: true, + configurable: true, + sortDirection: SortDirection.NONE, + filters: [], + render: uuid => , + width: "200px" + }, + { + name: ProjectPanelColumnNames.FILE_SIZE, + selected: true, + configurable: true, + sortDirection: SortDirection.NONE, + filters: [], + render: uuid => , + width: "50px" + }, + { + name: ProjectPanelColumnNames.LAST_MODIFIED, + selected: true, + configurable: true, + sortDirection: SortDirection.NONE, + filters: [], + render: uuid => , + width: "150px" } -}; - -const renderDate = (date: string) => - - {formatDate(date)} - ; - -const renderFileSize = (fileSize?: number) => - - {formatFileSize(fileSize)} - ; - -const renderOwner = (owner: string) => - - {owner} - ; +]; -const renderType = (type: string) => - - {type} - ; - -const renderStatus = (item: ProjectPanelItem) => - - {item.status || "-"} - ; - -const columns: DataColumns = [{ - name: "Name", - selected: true, - sortDirection: "desc", - render: renderName, - width: "450px" -}, { - name: "Status", - selected: true, - render: renderStatus, - width: "75px" -}, { - name: "Type", - selected: true, - filters: [{ - name: "Collection", - selected: true - }, { - name: "Project", - selected: true - }], - render: item => renderType(item.kind), - width: "125px" -}, { - name: "Owner", - selected: true, - render: item => renderOwner(item.owner), - width: "200px" -}, { - name: "File size", - selected: true, - render: item => renderFileSize(item.fileSize), - width: "50px" -}, { - name: "Last modified", - selected: true, - sortDirection: "none", - render: item => renderDate(item.lastModified), - width: "150px" -}]; +export const PROJECT_PANEL_ID = "projectPanel"; -const contextMenuActions = [[{ - icon: "fas fa-users fa-fw", - name: "Share" -}, { - icon: "fas fa-sign-out-alt fa-fw", - name: "Move to" -}, { - icon: "fas fa-star fa-fw", - name: "Add to favourite" -}, { - icon: "fas fa-edit fa-fw", - name: "Rename" -}, { - icon: "fas fa-copy fa-fw", - name: "Make a copy" -}, { - icon: "fas fa-download fa-fw", - name: "Download" -}], [{ - icon: "fas fa-trash-alt fa-fw", - name: "Remove" +interface ProjectPanelDataProps { + currentItemId: string; + resources: ResourcesState; } -]]; -export default withStyles(styles)( - connect((state: RootState) => ({ currentItemId: state.projects.currentItemId }))( - ProjectPanel)); +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 + }))( + class extends React.Component { + render() { + const { classes } = this.props; + return
+
+ + + +
+ +
; + } + + handleNewProjectClick = () => { + this.props.dispatch(openProjectCreateDialog(this.props.currentItemId)); + } + + handleNewCollectionClick = () => { + this.props.dispatch(openCollectionCreateDialog(this.props.currentItemId)); + } + + handleContextMenu = (event: React.MouseEvent, resourceUuid: string) => { + const kind = resourceKindToContextMenuKind(resourceUuid); + if (kind) { + this.props.dispatch(openContextMenu(event, { name: '', uuid: resourceUuid, kind })); + } + } + + handleRowDoubleClick = (uuid: string) => { + this.props.dispatch(navigateTo(uuid)); + } + + handleRowClick = (uuid: string) => { + this.props.dispatch(loadDetailsPanel(uuid)); + } + + } + ) +);