[ARVADOS-WORKBENCH2] updated: 1.1.4-473-ge84023a
Git user
git at public.curoverse.com
Thu Aug 2 05:10:02 EDT 2018
Summary of changes:
.../collection-panel-files.tsx | 22 ++++++++++++++++++----
src/components/file-tree/file-tree-item.tsx | 2 +-
.../collection-panel-files.ts | 3 ++-
3 files changed, 21 insertions(+), 6 deletions(-)
via e84023ab9caa40e433dbd19ede8f7db6577f78fa (commit)
via 95cac76b24cf817cfc1d825599087833e9ba7742 (commit)
from 540d41f964c7ad3495cead777d6d175ff8f76b53 (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 e84023ab9caa40e433dbd19ede8f7db6577f78fa
Author: Michal Klobukowski <michal.klobukowski at contractors.roche.com>
Date: Thu Aug 2 11:08:32 2018 +0200
Add upload data button
Feature #13855
Arvados-DCO-1.1-Signed-off-by: Michal Klobukowski <michal.klobukowski at contractors.roche.com>
diff --git a/src/components/collection-panel-files/collection-panel-files.tsx b/src/components/collection-panel-files/collection-panel-files.tsx
index cdca7e8..17bbe85 100644
--- a/src/components/collection-panel-files/collection-panel-files.tsx
+++ b/src/components/collection-panel-files/collection-panel-files.tsx
@@ -6,23 +6,28 @@ import * as React from 'react';
import { TreeItem, TreeItemStatus } from '../tree/tree';
import { FileTreeData } from '../file-tree/file-tree-data';
import { FileTree } from '../file-tree/file-tree';
-import { IconButton, Grid, Typography, StyleRulesCallback, withStyles, WithStyles, CardHeader, CardContent, Card } from '@material-ui/core';
+import { IconButton, Grid, Typography, StyleRulesCallback, withStyles, WithStyles, CardHeader, CardContent, Card, Button } from '@material-ui/core';
import { CustomizeTableIcon } from '../icon/icon';
export interface CollectionPanelFilesProps {
items: Array<TreeItem<FileTreeData>>;
+ onUploadDataClick: () => void;
onItemMenuOpen: (event: React.MouseEvent<HTMLElement>, item: TreeItem<FileTreeData>) => void;
onOptionsMenuOpen: (event: React.MouseEvent<HTMLElement>) => void;
onSelectionToggle: (event: React.MouseEvent<HTMLElement>, item: TreeItem<FileTreeData>) => void;
onCollapseToggle: (id: string, status: TreeItemStatus) => void;
}
-type CssRules = 'root' | 'nameHeader' | 'fileSizeHeader';
+type CssRules = 'root' | 'cardSubheader' | 'nameHeader' | 'fileSizeHeader';
const styles: StyleRulesCallback<CssRules> = theme => ({
root: {
paddingBottom: theme.spacing.unit
},
+ cardSubheader: {
+ paddingTop: 0,
+ paddingBottom: 0
+ },
nameHeader: {
marginLeft: '75px'
},
@@ -37,6 +42,16 @@ export const CollectionPanelFiles = withStyles(styles)(
<CardHeader
title="Files"
action={
+ <Button
+ variant='raised'
+ color='primary'
+ size='small'>
+ Upload data
+ </Button>
+ } />
+ <CardHeader
+ className={classes.cardSubheader}
+ action={
<IconButton onClick={onOptionsMenuOpen}>
<CustomizeTableIcon />
</IconButton>
@@ -51,4 +66,3 @@ export const CollectionPanelFiles = withStyles(styles)(
</Grid>
<FileTree onMenuOpen={onItemMenuOpen} {...treeProps} />
</Card>);
-
diff --git a/src/views-components/collection-panel-files/collection-panel-files.ts b/src/views-components/collection-panel-files/collection-panel-files.ts
index bf98834..0009fc0 100644
--- a/src/views-components/collection-panel-files/collection-panel-files.ts
+++ b/src/views-components/collection-panel-files/collection-panel-files.ts
@@ -31,7 +31,8 @@ const memoizedMapStateToProps = () => {
};
};
-const mapDispatchToProps = (dispatch: Dispatch): Pick<CollectionPanelFilesProps, 'onCollapseToggle' | 'onSelectionToggle' | 'onItemMenuOpen' | 'onOptionsMenuOpen'> => ({
+const mapDispatchToProps = (dispatch: Dispatch): Pick<CollectionPanelFilesProps, 'onUploadDataClick' | 'onCollapseToggle' | 'onSelectionToggle' | 'onItemMenuOpen' | 'onOptionsMenuOpen'> => ({
+ onUploadDataClick: () => { return; },
onCollapseToggle: (id) => {
dispatch(collectionPanelFilesAction.TOGGLE_COLLECTION_FILE_COLLAPSE({ id }));
},
commit 95cac76b24cf817cfc1d825599087833e9ba7742
Author: Michal Klobukowski <michal.klobukowski at contractors.roche.com>
Date: Thu Aug 2 10:59:51 2018 +0200
Fix file size info alignment
Feature #13855
Arvados-DCO-1.1-Signed-off-by: Michal Klobukowski <michal.klobukowski at contractors.roche.com>
diff --git a/src/components/collection-panel-files/collection-panel-files.tsx b/src/components/collection-panel-files/collection-panel-files.tsx
index 27354db..cdca7e8 100644
--- a/src/components/collection-panel-files/collection-panel-files.tsx
+++ b/src/components/collection-panel-files/collection-panel-files.tsx
@@ -27,7 +27,7 @@ const styles: StyleRulesCallback<CssRules> = theme => ({
marginLeft: '75px'
},
fileSizeHeader: {
- marginRight: '50px'
+ marginRight: '65px'
}
});
diff --git a/src/components/file-tree/file-tree-item.tsx b/src/components/file-tree/file-tree-item.tsx
index 3a80e0f..5255ded 100644
--- a/src/components/file-tree/file-tree-item.tsx
+++ b/src/components/file-tree/file-tree-item.tsx
@@ -22,7 +22,7 @@ const fileTreeItemStyle: StyleRulesCallback<CssRules> = theme => ({
flex: "1"
},
sizeInfo: {
- marginRight: `${theme.spacing.unit * 3}px`
+ width: `${theme.spacing.unit * 8}px`
},
button: {
width: theme.spacing.unit * 3,
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list