--- /dev/null
+// Copyright (C) The Arvados Authors. All rights reserved.
+//
+// SPDX-License-Identifier: AGPL-3.0
+
+import { unionize, ofType, UnionOf } from "unionize";
+import { Resource } from "../../common/api/common-resource-service";
+import { ResourceKind } from "../../models/kinds";
+import { Dispatch } from "redux";
+import { groupsService } from "../../services/services";
+
+const actions = unionize({
+ TOGGLE_DETAILS_PANEL: ofType<{}>(),
+ LOAD_DETAILS: ofType<{ uuid: string, kind: ResourceKind }>(),
+ LOAD_DETAILS_SUCCESS: ofType<{ item: Resource }>(),
+}, { tag: 'type', value: 'payload' });
+
+export default actions;
+
+export type DetailsPanelAction = UnionOf<typeof actions>;
+
+export const loadDetails = (uuid: string, kind: ResourceKind) =>
+ (dispatch: Dispatch) => {
+ dispatch(actions.LOAD_DETAILS({ uuid, kind }));
+ if (kind === ResourceKind.Project) {
+ groupsService
+ .get(uuid)
+ .then(project => {
+ dispatch(actions.LOAD_DETAILS_SUCCESS({ item: project }));
+ });
+ }
+
+ };
+
+
+
--- /dev/null
+// Copyright (C) The Arvados Authors. All rights reserved.
+//
+// SPDX-License-Identifier: AGPL-3.0
+
+import { Resource } from "../../common/api/common-resource-service";
+import actions, { DetailsPanelAction } from "./details-panel-action";
+
+export interface DetailsPanelState {
+ item: Resource | null;
+ isOpened: boolean;
+}
+
+const initialState = {
+ item: null,
+ isOpened: false
+};
+
+const reducer = (state: DetailsPanelState = initialState, action: DetailsPanelAction) =>
+ actions.match(action, {
+ default: () => state,
+ LOAD_DETAILS: () => state,
+ LOAD_DETAILS_SUCCESS: ({ item }) => ({ ...state, item }),
+ TOGGLE_DETAILS_PANEL: () => ({ ...state, isOpened: !state.isOpened })
+ });
+
+export default reducer;
import { push } from "react-router-redux";
import { TreeItemStatus } from "../../components/tree/tree";
import { findTreeItem } from "../project/project-reducer";
-import { Resource, ResourceKind } from "../../models/resource";
+import { Resource, ResourceKind as R } from "../../models/resource";
import sidePanelActions from "../side-panel/side-panel-action";
import dataExplorerActions from "../data-explorer/data-explorer-action";
import { PROJECT_PANEL_ID } from "../../views/project-panel/project-panel";
import { RootState } from "../store";
import { sidePanelData } from "../side-panel/side-panel-reducer";
+import { loadDetails } from "../details-panel/details-panel-action";
+import { ResourceKind } from "../../models/kinds";
export const getResourceUrl = (resource: Resource): string => {
switch (resource.kind) {
- case ResourceKind.PROJECT: return `/projects/${resource.uuid}`;
- case ResourceKind.COLLECTION: return `/collections/${resource.uuid}`;
+ case R.PROJECT: return `/projects/${resource.uuid}`;
+ case R.COLLECTION: return `/collections/${resource.uuid}`;
default: return "";
}
};
const treeItem = findTreeItem(projects.items, itemId);
if (treeItem) {
+ // TODO: Get correct resource kind
+ dispatch<any>(loadDetails(treeItem.data.uuid, ResourceKind.Project));
dispatch(sidePanelActions.RESET_SIDE_PANEL_ACTIVITY());
const projectsItem = sidePanelData[0];
import dataExplorerReducer, { DataExplorerState } from './data-explorer/data-explorer-reducer';
import collectionsReducer, { CollectionState } from "./collection/collection-reducer";
import { projectPanelMiddleware } from '../store/project-panel/project-panel-middleware';
+import detailsPanelReducer, { DetailsPanelState } from './details-panel/details-panel-reducer';
const composeEnhancers =
(process.env.NODE_ENV === 'development' &&
router: RouterState;
dataExplorer: DataExplorerState;
sidePanel: SidePanelState;
+ detailsPanel: DetailsPanelState;
}
const rootReducer = combineReducers({
collections: collectionsReducer,
router: routerReducer,
dataExplorer: dataExplorerReducer,
- sidePanel: sidePanelReducer
+ sidePanel: sidePanelReducer,
+ detailsPanel: detailsPanelReducer
});
import Typography from '@material-ui/core/Typography';
import Grid from '@material-ui/core/Grid';
import * as classnames from "classnames";
+import { connect, Dispatch } from 'react-redux';
import EmptyState from '../../components/empty-state/empty-state';
import IconBase from '../../components/icon/icon';
+import { RootState } from '../../store/store';
+import actions from "../../store/details-panel/details-panel-action";
+import { Resource } from '../../common/api/common-resource-service';
+import { ResourceKind } from '../../models/kinds';
+import { ProjectResource } from '../../models/project';
+import { CollectionResource } from '../../models/collection';
export interface DetailsPanelDataProps {
onCloseDrawer: () => void;
isOpened: boolean;
- renderHeader?: React.ComponentType<{}>;
+ header: React.ReactElement<any>;
renderDetails?: React.ComponentType<{}>;
renderActivity?: React.ComponentType<{}>;
}
type DetailsPanelProps = DetailsPanelDataProps & WithStyles<CssRules>;
class DetailsPanel extends React.Component<DetailsPanelProps, {}> {
- state = {
+ state = {
tabsValue: 0
- };
+ };
- handleChange = (event: any, value: boolean) => {
- this.setState({ tabsValue: value });
- }
-
- renderTabContainer = (children: React.ReactElement<any>) =>
+ handleChange = (event: any, value: boolean) => {
+ this.setState({ tabsValue: value });
+ }
+
+ renderTabContainer = (children: React.ReactElement<any>) =>
<Typography className={this.props.classes.tabContainer} component="div">
{children}
</Typography>
-
- render() {
- const { classes, onCloseDrawer, isOpened, renderHeader, renderDetails, renderActivity } = this.props;
+
+ render() {
+ const { classes, onCloseDrawer, isOpened, header, renderDetails, renderActivity } = this.props;
const { tabsValue } = this.state;
return (
<Typography component="div" className={classnames([classes.container, { [classes.opened]: isOpened }])}>
<Drawer variant="permanent" anchor="right" classes={{ paper: classes.drawerPaper }}>
- <Typography component="div" className={classes.headerContainer}>
- <Grid container alignItems='center' justify='space-around'>
- {renderHeader}
- {/* TODO: renderHeader */}
- <IconBase icon='process' />
- <Typography variant="title">
- Tutorial pipeline
- </Typography>
- {/* End */}
+ <Typography component="div" className={classes.headerContainer}>
+ <Grid container alignItems='center' justify='space-around'>
+ {header}
<IconButton color="inherit" onClick={onCloseDrawer}>
<IconBase icon='close' />
- </IconButton>
- </Grid>
- </Typography>
- <Tabs value={tabsValue} onChange={this.handleChange}>
- <Tab disableRipple label="Details" />
- <Tab disableRipple label="Activity" />
- </Tabs>
+ </IconButton>
+ </Grid>
+ </Typography>
+ <Tabs value={tabsValue} onChange={this.handleChange}>
+ <Tab disableRipple label="Details" />
+ <Tab disableRipple label="Activity" />
+ </Tabs>
{tabsValue === 0 && this.renderTabContainer(
<Grid container direction="column">
{renderDetails}
- <EmptyState icon='announcement'
+ <EmptyState icon='announcement'
message='Select a file or folder to view its details.' />
<Attribute label='Type' value='Process' />
<Attribute label='Size' value='---' />
</Attribute>
<Attribute label='Outputs' link='http://www.google.pl' value='New output as link' />
<Attribute label='Owner' value='me' />
- </Grid>
- )}
+ </Grid>
+ )}
{tabsValue === 1 && this.renderTabContainer(
<Grid container direction="column">
{renderActivity}
<EmptyState icon='announcement' message='Select a file or folder to view its details.' />
</Grid>
- )}
+ )}
</Drawer>
</Typography>
);
const drawerWidth = 320;
const styles: StyleRulesCallback<CssRules> = (theme: ArvadosTheme) => ({
- container: {
+ container: {
width: 0,
- position: 'relative',
+ position: 'relative',
height: 'auto',
transition: 'width 0.5s ease',
'&$opened': {
drawerPaper: {
position: 'relative',
width: drawerWidth
- },
- headerContainer: {
+ },
+ headerContainer: {
color: theme.palette.grey["600"],
margin: `${theme.spacing.unit}px 0`,
'& .fa-cogs': {
fontSize: "24px",
color: theme.customs.colors.green700
}
- },
- tabContainer: {
- padding: theme.spacing.unit * 3
- }
+ },
+ tabContainer: {
+ padding: theme.spacing.unit * 3
+ }
});
-export default withStyles(styles)(DetailsPanel);
\ No newline at end of file
+const renderCollectionHeader = (collection: CollectionResource) =>
+ <>
+ <IconBase icon="collection" />
+ <Typography variant="title">
+ {collection.name}
+ </Typography>
+ </>;
+
+const renderProjectHeader = (project: ProjectResource) =>
+ <>
+ <IconBase icon="project" />
+ <Typography variant="title">
+ {project.name}
+ </Typography>
+ </>;
+
+const renderHeader = (resource: Resource) => {
+ switch(resource.kind) {
+ case ResourceKind.Project:
+ return renderProjectHeader(resource as ProjectResource);
+ case ResourceKind.Collection:
+ return renderCollectionHeader(resource as CollectionResource);
+ default:
+ return null;
+ }
+};
+
+const mapStateToProps = ({detailsPanel}: RootState) => ({
+ isOpened: detailsPanel.isOpened,
+ header: detailsPanel.item ? renderHeader(detailsPanel.item) : null
+});
+
+const mapDispatchToProps = (dispatch: Dispatch) => ({
+ onCloseDrawer: () => {
+ dispatch(actions.TOGGLE_DETAILS_PANEL());
+ }
+});
+
+const DetailsPanelContainer = connect(mapStateToProps, mapDispatchToProps)(DetailsPanel);
+
+export default withStyles(styles)(DetailsPanelContainer);
\ No newline at end of file
import { StyleRulesCallback, WithStyles, withStyles } from '@material-ui/core/styles';
import Drawer from '@material-ui/core/Drawer';
import { connect, DispatchProp } from "react-redux";
-import { Route, Switch, RouteComponentProps, withRouter } from "react-router";
+import { Route, Switch, RouteComponentProps } from "react-router";
import authActions from "../../store/auth/auth-action";
-import dataExplorerActions from "../../store/data-explorer/data-explorer-action";
import { User } from "../../models/user";
import { RootState } from "../../store/store";
import MainAppBar, {
import ProjectTree from '../../views-components/project-tree/project-tree';
import { TreeItem } from "../../components/tree/tree";
import { Project } from "../../models/project";
-import { getTreePath, findTreeItem } from '../../store/project/project-reducer';
+import { getTreePath } from '../../store/project/project-reducer';
import sidePanelActions from '../../store/side-panel/side-panel-action';
import SidePanel, { SidePanelItem } from '../../components/side-panel/side-panel';
-import { ResourceKind } from "../../models/resource";
import { ItemMode, setProjectItem } from "../../store/navigation/navigation-action";
import projectActions from "../../store/project/project-action";
import ProjectPanel from "../project-panel/project-panel";
-import { sidePanelData } from '../../store/side-panel/side-panel-reducer';
import DetailsPanel from '../../views-components/details-panel/details-panel';
import { ArvadosTheme } from '../../common/custom-theme';
+import detailsPanelActions from "../../store/details-panel/details-panel-action";
const drawerWidth = 240;
const appBarHeight = 100;
helpMenu: NavMenuItem[],
anonymousMenu: NavMenuItem[]
};
- isDetailsPanelOpened: boolean;
- detailsPanelHeader: React.ComponentType<{}> | undefined;
- detailsPanelDetails: React.ComponentType<{}> | undefined;
- detailsPanelActivity: React.ComponentType<{}> | undefined;
}
action: () => this.props.dispatch(authActions.LOGIN())
}
]
- },
- isDetailsPanelOpened: false,
- detailsPanelHeader: undefined,
- detailsPanelDetails: undefined,
- detailsPanelActivity: undefined,
+ }
};
mainAppBarActions: MainAppBarActionProps = {
},
onMenuItemClick: (menuItem: NavMenuItem) => menuItem.action(),
onDetailsPanelToggle: () => {
- this.setState(prev => ({ isDetailsPanelOpened: !prev.isDetailsPanelOpened }));
+ this.props.dispatch(detailsPanelActions.TOGGLE_DETAILS_PANEL());
}
};
<Route path="/projects/:id" render={this.renderProjectPanel} />
</Switch>
</div>
- <DetailsPanel
- renderHeader={this.state.detailsPanelHeader}
- renderDetails={this.state.detailsPanelDetails}
- renderActivity={this.state.detailsPanelActivity}
- isOpened={this.state.isDetailsPanelOpened}
- onCloseDrawer={this.mainAppBarActions.onDetailsPanelToggle} />
+ <DetailsPanel/>
</main>
</div>
);
projects / arvados-workbench2.git / commitdiff