// SPDX-License-Identifier: AGPL-3.0
import { Middleware } from "redux";
- import actions from "../data-explorer/data-explorer-action";
- import { PROJECT_PANEL_ID, ProjectPanelFilter, columns, ProjectPanelColumnNames } from "../../views/project-panel/project-panel";
+ import { dataExplorerActions } from "../data-explorer/data-explorer-action";
+ import { PROJECT_PANEL_ID, columns, ProjectPanelFilter, ProjectPanelColumnNames } from "../../views/project-panel/project-panel";
import { groupsService } from "../../services/services";
import { RootState } from "../store";
import { getDataExplorer } from "../data-explorer/data-explorer-reducer";
import { resourceToDataItem, ProjectPanelItem } from "../../views/project-panel/project-panel-item";
- import FilterBuilder from "../../common/api/filter-builder";
+ import { FilterBuilder } from "../../common/api/filter-builder";
import { DataColumns } from "../../components/data-table/data-table";
import { ProcessResource } from "../../models/process";
- import OrderBuilder from "../../common/api/order-builder";
+ import { OrderBuilder } from "../../common/api/order-builder";
import { GroupContentsResource, GroupContentsResourcePrefix } from "../../services/groups-service/groups-service";
import { SortDirection } from "../../components/data-table/data-column";
export const projectPanelMiddleware: Middleware = store => next => {
- next(actions.SET_COLUMNS({ id: PROJECT_PANEL_ID, columns }));
+ next(dataExplorerActions.SET_COLUMNS({ id: PROJECT_PANEL_ID, columns }));
return action => {
}
};
- actions.match(action, {
+ dataExplorerActions.match(action, {
SET_PAGE: handleProjectPanelAction(() => {
- store.dispatch(actions.REQUEST_ITEMS({ id: PROJECT_PANEL_ID }));
+ store.dispatch(dataExplorerActions.REQUEST_ITEMS({ id: PROJECT_PANEL_ID }));
}),
SET_ROWS_PER_PAGE: handleProjectPanelAction(() => {
- store.dispatch(actions.REQUEST_ITEMS({ id: PROJECT_PANEL_ID }));
+ store.dispatch(dataExplorerActions.REQUEST_ITEMS({ id: PROJECT_PANEL_ID }));
}),
SET_FILTERS: handleProjectPanelAction(() => {
- store.dispatch(actions.RESET_PAGINATION({ id: PROJECT_PANEL_ID }));
- store.dispatch(actions.REQUEST_ITEMS({ id: PROJECT_PANEL_ID }));
+ store.dispatch(dataExplorerActions.RESET_PAGINATION({ id: PROJECT_PANEL_ID }));
+ store.dispatch(dataExplorerActions.REQUEST_ITEMS({ id: PROJECT_PANEL_ID }));
}),
TOGGLE_SORT: handleProjectPanelAction(() => {
- store.dispatch(actions.REQUEST_ITEMS({ id: PROJECT_PANEL_ID }));
+ store.dispatch(dataExplorerActions.REQUEST_ITEMS({ id: PROJECT_PANEL_ID }));
}),
SET_SEARCH_VALUE: handleProjectPanelAction(() => {
- store.dispatch(actions.RESET_PAGINATION({ id: PROJECT_PANEL_ID }));
- store.dispatch(actions.REQUEST_ITEMS({ id: PROJECT_PANEL_ID }));
+ store.dispatch(dataExplorerActions.RESET_PAGINATION({ id: PROJECT_PANEL_ID }));
+ store.dispatch(dataExplorerActions.REQUEST_ITEMS({ id: PROJECT_PANEL_ID }));
}),
REQUEST_ITEMS: handleProjectPanelAction(() => {
const state = store.getState() as RootState;
const dataExplorer = getDataExplorer(state.dataExplorer, PROJECT_PANEL_ID);
const columns = dataExplorer.columns as DataColumns<ProjectPanelItem, ProjectPanelFilter>;
- const typeFilters = getColumnFilters(columns, ProjectPanelColumnNames.Type);
- const statusFilters = getColumnFilters(columns, ProjectPanelColumnNames.Status);
+ const typeFilters = getColumnFilters(columns, ProjectPanelColumnNames.TYPE);
+ const statusFilters = getColumnFilters(columns, ProjectPanelColumnNames.STATUS);
const sortColumn = dataExplorer.columns.find(({ sortDirection }) => Boolean(sortDirection && sortDirection !== "none"));
const sortDirection = sortColumn && sortColumn.sortDirection === SortDirection.Asc ? SortDirection.Asc : SortDirection.Desc;
if (typeFilters.length > 0) {
limit: dataExplorer.rowsPerPage,
offset: dataExplorer.page * dataExplorer.rowsPerPage,
order: sortColumn
- ? sortColumn.name === ProjectPanelColumnNames.Name
+ ? sortColumn.name === ProjectPanelColumnNames.NAME
? getOrder("name", sortDirection)
: getOrder("createdAt", sortDirection)
: OrderBuilder.create(),
.concat(getSearchFilter(dataExplorer.searchValue))
})
.then(response => {
- store.dispatch(actions.SET_ITEMS({
+ store.dispatch(dataExplorerActions.SET_ITEMS({
id: PROJECT_PANEL_ID,
items: response.items.map(resourceToDataItem),
itemsAvailable: response.itemsAvailable,
}));
});
} else {
- store.dispatch(actions.SET_ITEMS({
+ store.dispatch(dataExplorerActions.SET_ITEMS({
id: PROJECT_PANEL_ID,
items: [],
itemsAvailable: 0,
import { ProjectPanelItem } from './project-panel-item';
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 { 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 { SortDirection } from '../../components/data-table/data-column';
import { ResourceKind } from '../../models/resource';
import { resourceLabel } from '../../common/labels';
+import { ProjectIcon, CollectionIcon, ProcessIcon, DefaultIcon } from '../../components/icon/icon';
+import { ArvadosTheme } from '../../common/custom-theme';
- export const PROJECT_PANEL_ID = "projectPanel";
-
- export interface ProjectPanelFilter extends DataTableFilterItem {
- type: ResourceKind | ContainerRequestState;
- }
-
- interface ProjectPanelDataProps {
- currentItemId: string;
- }
-
- 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 }>;
-
- class ProjectPanel 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);
- }
- }
- }
-
type CssRules = "toolbar" | "button";
-const styles: StyleRulesCallback<CssRules> = theme => ({
+const styles: StyleRulesCallback<CssRules> = (theme: ArvadosTheme) => ({
toolbar: {
paddingBottom: theme.spacing.unit * 3,
textAlign: "right"
});
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>
const renderIcon = (item: ProjectPanelItem) => {
switch (item.kind) {
case ResourceKind.Project:
- return <i className="fas fa-folder fa-lg" />;
+ return <ProjectIcon />;
case ResourceKind.Collection:
- return <i className="fas fa-archive fa-lg" />;
+ return <CollectionIcon />;
case ResourceKind.Process:
- return <i className="fas fa-cogs fa-lg" />;
+ 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) => {
- return <Typography noWrap>
+const renderType = (type: string) =>
+ <Typography noWrap>
{resourceLabel(type)}
</Typography>;
-};
const renderStatus = (item: ProjectPanelItem) =>
- <Typography noWrap align="center">
+ <Typography noWrap align="center" >
{item.status || "-"}
</Typography>;
export enum ProjectPanelColumnNames {
- Name = "Name",
- Status = "Status",
- Type = "Type",
- Owner = "Owner",
- FileSize = "File size",
- LastModified = "Last modified"
+ 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,
+export const columns: DataColumns<ProjectPanelItem, ProjectPanelFilter> = [
+ {
+ name: ProjectPanelColumnNames.NAME,
selected: true,
- type: ContainerRequestState.Committed
- }, {
- name: ContainerRequestState.Final,
+ sortDirection: SortDirection.Asc,
+ render: renderName,
+ width: "450px"
+ },
+ {
+ name: "Status",
selected: true,
- type: ContainerRequestState.Final
- }, {
- name: ContainerRequestState.Uncommitted,
+ 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,
- type: ContainerRequestState.Uncommitted
- }],
- render: renderStatus,
- width: "75px"
-}, {
- name: ProjectPanelColumnNames.Type,
- selected: true,
- filters: [{
- name: resourceLabel(ResourceKind.Collection),
+ 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,
- type: ResourceKind.Collection
- }, {
- name: resourceLabel(ResourceKind.Process),
+ render: item => renderOwner(item.owner),
+ width: "200px"
+ },
+ {
+ name: ProjectPanelColumnNames.FILE_SIZE,
selected: true,
- type: ResourceKind.Process
- }, {
- name: resourceLabel(ResourceKind.Project),
+ render: item => renderFileSize(item.fileSize),
+ width: "50px"
+ },
+ {
+ name: ProjectPanelColumnNames.LAST_MODIFIED,
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.FileSize,
- selected: true,
- render: item => renderFileSize(item.fileSize),
- width: "50px"
-}, {
- name: ProjectPanelColumnNames.LastModified,
- selected: true,
- sortDirection: SortDirection.None,
- render: item => renderDate(item.lastModified),
- width: "150px"
-}];
+ sortDirection: SortDirection.None,
+ render: item => renderDate(item.lastModified),
+ width: "150px"
+ }
+];
- export default withStyles(styles)(
- connect((state: RootState) => ({ currentItemId: state.projects.currentItemId }))(ProjectPanel));
+ export const PROJECT_PANEL_ID = "projectPanel";
+
-type ProjectPanelProps = {
- currentItemId: string,
- onItemClick: (item: ProjectPanelItem) => void,
++interface ProjectPanelDataProps {
++ currentItemId: string;
++}
++
++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
++ onItemDoubleClick: (item: ProjectPanelItem) => void;
++ onItemRouteChange: (itemId: string) => void;
+ }
- & DispatchProp
- & WithStyles<CssRules>
- & RouteComponentProps<{ id: string }>;
++
++type ProjectPanelProps = ProjectPanelDataProps & ProjectPanelActionProps & DispatchProp
++ & WithStyles<CssRules> & RouteComponentProps<{ id: string }>;
+
+ export const ProjectPanel = withStyles(styles)(
+ connect((state: RootState) => ({ currentItemId: state.projects.currentItemId }))(
+ 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);
+ }
+ }
+ }
+ )
-);
++);
projects / arvados.git / commitdiff