import * as React from 'react';
import { ProjectPanelItem } from './project-panel-item';
-import { Grid, Typography, Button, Toolbar, StyleRulesCallback, WithStyles, withStyles } from '@material-ui/core';
+import { Grid, Typography, Button, StyleRulesCallback, WithStyles, withStyles } from '@material-ui/core';
import { formatDate, formatFileSize } from '../../common/formatters';
-import DataExplorer from "../../views-components/data-explorer/data-explorer";
-import { ContextMenuAction } from '../../components/context-menu/context-menu';
+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 { 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<CssRules>
- & RouteComponentProps<{ id: string }>;
-class ProjectPanel extends React.Component<ProjectPanelProps> {
- render() {
- return <div>
- <div className={this.props.classes.toolbar}>
- <Button color="primary" variant="raised" className={this.props.classes.button}>
- Create a collection
- </Button>
- <Button color="primary" variant="raised" className={this.props.classes.button}>
- Run a process
- </Button>
- <Button color="primary" variant="raised" className={this.props.classes.button}>
- Create a project
- </Button>
- </div>
- <DataExplorer
- id={PROJECT_PANEL_ID}
- contextActions={contextMenuActions}
- onRowClick={this.props.onItemClick}
- onContextAction={this.executeAction} />;
- </div>;
- }
-
- componentWillReceiveProps({ match, currentItemId }: ProjectPanelProps) {
- if (match.params.id !== currentItemId) {
- this.props.onItemRouteChange(match.params.id);
- }
- }
-
- executeAction = (action: ContextMenuAction, item: ProjectPanelItem) => {
- alert(`Executing ${action.name} on ${item.name}`);
- }
-
-}
+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 { ProjectIcon, CollectionIcon, ProcessIcon, DefaultIcon, FavoriteIcon } from '../../components/icon/icon';
+import { ArvadosTheme } from '../../common/custom-theme';
+import { FavoriteStar } from '../../views-components/favorite-star/favorite-star';
type CssRules = "toolbar" | "button";
-const styles: StyleRulesCallback<CssRules> = theme => ({
+const styles: StyleRulesCallback<CssRules> = (theme: ArvadosTheme) => ({
toolbar: {
paddingBottom: theme.spacing.unit * 3,
textAlign: "right"
},
button: {
marginLeft: theme.spacing.unit
- }
+ },
});
const renderName = (item: ProjectPanelItem) =>
- <Grid
- container
- alignItems="center"
- wrap="nowrap"
- spacing={16}>
+ <Grid container alignItems="center" wrap="nowrap" spacing={16}>
<Grid item>
{renderIcon(item)}
</Grid>
{item.name}
</Typography>
</Grid>
+ <Grid item>
+ <Typography variant="caption">
+ <FavoriteStar resourceUuid={item.uuid} />
+ </Typography>
+ </Grid>
</Grid>;
const renderIcon = (item: ProjectPanelItem) => {
switch (item.kind) {
- case ResourceKind.PROJECT:
- return <i className="fas fa-folder fa-lg" />;
- case ResourceKind.COLLECTION:
- return <i className="fas fa-th fa-lg" />;
+ case ResourceKind.Project:
+ return <ProjectIcon />;
+ case ResourceKind.Collection:
+ return <CollectionIcon />;
+ case ResourceKind.Process:
+ return <ProcessIcon />;
default:
- return <i />;
+ return <DefaultIcon />;
}
};
-const renderDate = (date: string) =>
- <Typography noWrap>
- {formatDate(date)}
- </Typography>;
+const renderDate = (date: string) => {
+ return <Typography noWrap>{formatDate(date)}</Typography>;
+};
const renderFileSize = (fileSize?: number) =>
<Typography noWrap>
</Typography>;
const renderOwner = (owner: string) =>
- <Typography noWrap color="primary">
+ <Typography noWrap color="primary" >
{owner}
</Typography>;
const renderType = (type: string) =>
<Typography noWrap>
- {type}
+ {resourceLabel(type)}
</Typography>;
const renderStatus = (item: ProjectPanelItem) =>
- <Typography noWrap align="center">
+ <Typography noWrap align="center" >
{item.status || "-"}
</Typography>;
-export const columns: DataColumns<ProjectPanelItem> = [{
- 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"
-}];
-
-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"
+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;
+}
+
+export const columns: DataColumns<ProjectPanelItem, ProjectPanelFilter> = [
+ {
+ name: ProjectPanelColumnNames.NAME,
+ selected: true,
+ sortDirection: SortDirection.Asc,
+ render: renderName,
+ width: "450px"
+ },
+ {
+ 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"
+ },
+ {
+ name: ProjectPanelColumnNames.TYPE,
+ selected: 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: item => renderType(item.kind),
+ width: "125px"
+ },
+ {
+ name: ProjectPanelColumnNames.OWNER,
+ selected: true,
+ render: item => renderOwner(item.owner),
+ width: "200px"
+ },
+ {
+ name: ProjectPanelColumnNames.FILE_SIZE,
+ selected: true,
+ render: item => renderFileSize(item.fileSize),
+ width: "50px"
+ },
+ {
+ name: ProjectPanelColumnNames.LAST_MODIFIED,
+ selected: true,
+ sortDirection: SortDirection.None,
+ render: item => renderDate(item.lastModified),
+ width: "150px"
+ }
+];
+
+export const PROJECT_PANEL_ID = "projectPanel";
+
+interface ProjectPanelDataProps {
+ currentItemId: string;
}
-]];
-export default withStyles(styles)(
+interface ProjectPanelActionProps {
+ onItemClick: (item: ProjectPanelItem) => void;
+ onContextMenu: (event: React.MouseEvent<HTMLElement>, item: ProjectPanelItem) => void;
+ onDialogOpen: (ownerUuid: string) => void;
+ onItemDoubleClick: (item: ProjectPanelItem) => void;
+ onItemRouteChange: (itemId: string) => void;
+}
+
+type ProjectPanelProps = ProjectPanelDataProps & ProjectPanelActionProps & DispatchProp
+ & WithStyles<CssRules> & RouteComponentProps<{ id: string }>;
+
+export const ProjectPanel = withStyles(styles)(
connect((state: RootState) => ({ currentItemId: state.projects.currentItemId }))(
- ProjectPanel));
+ class extends React.Component<ProjectPanelProps> {
+ render() {
+ const { classes } = this.props;
+ return <div>
+ <div className={classes.toolbar}>
+ <Button color="primary" variant="raised" className={classes.button}>
+ Create a collection
+ </Button>
+ <Button color="primary" variant="raised" className={classes.button}>
+ Run a process
+ </Button>
+ <Button color="primary" onClick={this.handleNewProjectClick} variant="raised" className={classes.button}>
+ New project
+ </Button>
+ </div>
+ <DataExplorer
+ id={PROJECT_PANEL_ID}
+ onRowClick={this.props.onItemClick}
+ onRowDoubleClick={this.props.onItemDoubleClick}
+ onContextMenu={this.props.onContextMenu}
+ extractKey={(item: ProjectPanelItem) => item.uuid} />
+ </div>;
+ }
+
+ handleNewProjectClick = () => {
+ this.props.onDialogOpen(this.props.currentItemId);
+ }
+ componentWillReceiveProps({ match, currentItemId, onItemRouteChange }: ProjectPanelProps) {
+ if (match.params.id !== currentItemId) {
+ onItemRouteChange(match.params.id);
+ }
+ }
+ }
+ )
+);
\ No newline at end of file
projects / arvados-workbench2.git / blobdiff