[ARVADOS-WORKBENCH2] updated: 1.1.4-151-g2d06516
Git user
git at public.curoverse.com
Tue Jun 26 08:12:41 EDT 2018
Summary of changes:
src/views/project-panel/project-panel.tsx | 50 ++++++++++++++++++++++++-------
1 file changed, 39 insertions(+), 11 deletions(-)
via 2d06516661e4df961a586e3fd66c8e782332d18f (commit)
from afa829ac853b470517757951c51c6a8b1316f0f1 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
commit 2d06516661e4df961a586e3fd66c8e782332d18f
Author: Michal Klobukowski <michal.klobukowski at contractors.roche.com>
Date: Tue Jun 26 14:12:26 2018 +0200
Add project panel toolbar template
Feature #13683
Arvados-DCO-1.1-Signed-off-by: Michal Klobukowski <michal.klobukowski at contractors.roche.com>
diff --git a/src/views/project-panel/project-panel.tsx b/src/views/project-panel/project-panel.tsx
index 534f843..a9fd378 100644
--- a/src/views/project-panel/project-panel.tsx
+++ b/src/views/project-panel/project-panel.tsx
@@ -12,6 +12,7 @@ import { ItemMode, setProjectItem } from "../../store/navigation/navigation-acti
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';
interface ProjectPanelDataProps {
projects: ProjectState;
@@ -20,7 +21,7 @@ interface ProjectPanelDataProps {
type ProjectPanelProps = ProjectPanelDataProps & RouteComponentProps<{ name: string }> & DispatchProp;
-class ProjectPanel extends React.Component<ProjectPanelProps> {
+class ProjectPanel extends React.Component<ProjectPanelProps & WithStyles<CssRules>> {
render() {
const items = projectExplorerItems(
this.props.projects.items,
@@ -28,10 +29,23 @@ class ProjectPanel extends React.Component<ProjectPanelProps> {
this.props.collections
);
return (
- <ProjectExplorer
- items={items}
- onRowClick={this.goToItem}
- />
+ <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>
+ <ProjectExplorer
+ items={items}
+ onRowClick={this.goToItem}
+ />
+ </div>
);
}
@@ -40,9 +54,23 @@ class ProjectPanel extends React.Component<ProjectPanelProps> {
}
}
-export default connect(
- (state: RootState) => ({
- projects: state.projects,
- collections: state.collections
- })
-)(ProjectPanel);
+type CssRules = "toolbar" | "button";
+
+const styles: StyleRulesCallback<CssRules> = theme => ({
+ toolbar: {
+ marginBottom: theme.spacing.unit * 3,
+ display: "flex",
+ justifyContent: "flex-end"
+ },
+ button: {
+ marginLeft: theme.spacing.unit
+ }
+});
+
+export default withStyles(styles)(
+ connect(
+ (state: RootState) => ({
+ projects: state.projects,
+ collections: state.collections
+ })
+ )(ProjectPanel));
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list