[ARVADOS-WORKBENCH2] updated: 1.2.0-193-gd911869
Git user
git at public.curoverse.com
Tue Aug 28 12:30:46 EDT 2018
Summary of changes:
.../details-attribute/details-attribute.tsx | 5 +-
.../file-upload-dialog/file-upload-dialog.tsx | 4 +-
src/components/file-upload/file-upload.tsx | 39 ++++++------
.../collection-panel/collection-panel-action.ts | 1 +
.../collection-panel-files-actions.ts | 56 -----------------
src/store/collections/collection-create-actions.ts | 12 ++--
.../collections/collection-partial-copy-actions.ts | 71 ++++++++++++++++++++++
src/store/collections/collection-upload-actions.ts | 46 ++++++++++++++
src/store/collections/collections-reducer.ts | 14 -----
.../uploader/collection-uploader-actions.ts | 63 -------------------
src/store/file-uploader/file-uploader-actions.ts | 25 ++++++++
.../file-uploader-reducer.ts} | 10 +--
src/store/store.ts | 20 +++---
.../collection-panel-files.ts | 5 +-
.../collection-partial-copy-dialog.tsx | 26 --------
.../action-sets/collection-files-action-set.ts | 2 +-
.../context-menu/action-sets/process-action-set.ts | 18 ++++++
.../dialog-copy/dialog-collection-partial-copy.tsx | 28 +++++++++
.../dialog-create/dialog-collection-create.tsx | 26 +++-----
.../dialog-forms/create-collection-dialog.ts | 2 -
.../dialog-forms/partial-copy-collection-dialog.ts | 19 ++++++
.../dialog-forms/upload-collection-files-dialog.ts | 20 ++++++
.../dialog-collection-files-upload.tsx | 32 ++++++++++
.../file-uploader/file-uploader.tsx | 35 +++++++++++
.../form-fields/collection-form-fields.tsx | 8 ---
.../upload-collection-files-dialog.ts | 29 ---------
src/views/process-panel/information-card.tsx | 69 +++++++++------------
src/views/process-panel/process-panel.tsx | 4 +-
src/views/workbench/workbench.tsx | 7 ++-
29 files changed, 387 insertions(+), 309 deletions(-)
create mode 100644 src/store/collections/collection-partial-copy-actions.ts
create mode 100644 src/store/collections/collection-upload-actions.ts
delete mode 100644 src/store/collections/collections-reducer.ts
delete mode 100644 src/store/collections/uploader/collection-uploader-actions.ts
create mode 100644 src/store/file-uploader/file-uploader-actions.ts
rename src/store/{collections/uploader/collection-uploader-reducer.ts => file-uploader/file-uploader-reducer.ts} (69%)
delete mode 100644 src/views-components/collection-partial-copy-dialog/collection-partial-copy-dialog.tsx
create mode 100644 src/views-components/dialog-copy/dialog-collection-partial-copy.tsx
create mode 100644 src/views-components/dialog-forms/partial-copy-collection-dialog.ts
create mode 100644 src/views-components/dialog-forms/upload-collection-files-dialog.ts
create mode 100644 src/views-components/dialog-upload/dialog-collection-files-upload.tsx
create mode 100644 src/views-components/file-uploader/file-uploader.tsx
delete mode 100644 src/views-components/upload-collection-files-dialog/upload-collection-files-dialog.ts
via d911869b4340a32575e3a2cdce26ebd543522e42 (commit)
via 59b24ea9a90ba60563316a5c2ad4c7ce8a8c423d (commit)
via 931bbc0730608697ddb30f5ad51d9cc19cca3679 (commit)
via e3b0f767bb84fa82188879e391b5feff15a3db0f (commit)
via c175f990704fdef165616125433e2079a00a3437 (commit)
via 9f4bca6531631fc5ed21435f31db36720d58512b (commit)
via d37d39ad8825b03c39915e1258e294abcf0c3b6a (commit)
via 3d8c3da5fdc9488ac37d09211af8312e77ebebcb (commit)
via 6a024c9a0ad6543bf95359b10bcd22aeec3e7dca (commit)
via fb1ecf2421f8aac07d733d3bb56bb39312274f8c (commit)
from 0997bb068a2ecb8f6b0b13d22f3ef57ae1243405 (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 d911869b4340a32575e3a2cdce26ebd543522e42
Author: Pawel Kowalczyk <pawel.kowalczyk at contractors.roche.com>
Date: Tue Aug 28 18:30:31 2018 +0200
refactor
Feature #13858
Arvados-DCO-1.1-Signed-off-by: Pawel Kowalczyk <pawel.kowalczyk at contractors.roche.com>
diff --git a/src/components/details-attribute/details-attribute.tsx b/src/components/details-attribute/details-attribute.tsx
index 8794b15..4a94dc3 100644
--- a/src/components/details-attribute/details-attribute.tsx
+++ b/src/components/details-attribute/details-attribute.tsx
@@ -33,14 +33,15 @@ const styles: StyleRulesCallback<CssRules> = (theme: ArvadosTheme) => ({
width: '60%',
color: theme.palette.primary.main,
textDecoration: 'none',
- overflowWrap: 'break-word'
+ overflowWrap: 'break-word',
+ cursor: 'pointer'
}
});
interface DetailsAttributeDataProps {
label: string;
classLabel?: string;
- value?: any;
+ value?: string | number;
classValue?: string;
lowercaseValue?: boolean;
link?: string;
diff --git a/src/views-components/context-menu/action-sets/process-action-set.ts b/src/views-components/context-menu/action-sets/process-action-set.ts
index 1d94170..5d679f5 100644
--- a/src/views-components/context-menu/action-sets/process-action-set.ts
+++ b/src/views-components/context-menu/action-sets/process-action-set.ts
@@ -56,6 +56,24 @@ export const processActionSet: ContextMenuActionSet = [[
}
},
{
+ name: "Inputs",
+ execute: (dispatch, resource) => {
+ // add code
+ }
+ },
+ {
+ name: "Outputs",
+ execute: (dispatch, resource) => {
+ // add code
+ }
+ },
+ {
+ name: "Command",
+ execute: (dispatch, resource) => {
+ // add code
+ }
+ },
+ {
icon: DetailsIcon,
name: "View details",
execute: (dispatch, resource) => {
diff --git a/src/views/process-panel/information-card.tsx b/src/views/process-panel/information-card.tsx
index 467f727..22e08d2 100644
--- a/src/views/process-panel/information-card.tsx
+++ b/src/views/process-panel/information-card.tsx
@@ -66,13 +66,13 @@ interface ProcessInformationCardDataProps {
item: ProcessResource;
}
-type InformationCardProps = ProcessInformationCardDataProps & DispatchProp & WithStyles<CssRules>;
+type ProcessInformationCardProps = ProcessInformationCardDataProps & DispatchProp & WithStyles<CssRules>;
-export const InformationCard = withStyles(styles)(
+export const ProcessInformationCard = withStyles(styles)(
connect((state: RootState) => ({
item: state.collectionPanel.item
}))(
- class extends React.Component<InformationCardProps> {
+ class extends React.Component<ProcessInformationCardProps> {
render() {
const { classes } = this.props;
@@ -100,10 +100,8 @@ export const InformationCard = withStyles(styles)(
label='Workflow' value='FastQC MultiQC' />
</Grid>
<Grid item xs={6}>
- <DetailsAttribute classLabel={classes.link} classValue={classes.value}
- label='Outputs' />
- <DetailsAttribute classLabel={classes.link} classValue={classes.value}
- label='Inputs' />
+ <DetailsAttribute classLabel={classes.link} label='Outputs' />
+ <DetailsAttribute classLabel={classes.link} label='Inputs' />
</Grid>
</Grid>
</CardContent>
diff --git a/src/views/process-panel/process-panel.tsx b/src/views/process-panel/process-panel.tsx
index a8c92b7..ce98a48 100644
--- a/src/views/process-panel/process-panel.tsx
+++ b/src/views/process-panel/process-panel.tsx
@@ -3,7 +3,7 @@
// SPDX-License-Identifier: AGPL-3.0
import * as React from 'react';
-import { InformationCard } from '~/views/process-panel/information-card';
+import { ProcessInformationCard } from '~/views/process-panel/information-card';
import { Grid } from '@material-ui/core';
export class ProcessPanel extends React.Component {
@@ -11,7 +11,7 @@ export class ProcessPanel extends React.Component {
return <div>
<Grid container>
<Grid item xs={7}>
- <InformationCard />
+ <ProcessInformationCard />
</Grid>
</Grid>
</div>;
commit 59b24ea9a90ba60563316a5c2ad4c7ce8a8c423d
Merge: 931bbc0 e3b0f76
Author: Pawel Kowalczyk <pawel.kowalczyk at contractors.roche.com>
Date: Tue Aug 28 17:33:34 2018 +0200
merge master
Feature #13858
Arvados-DCO-1.1-Signed-off-by: Pawel Kowalczyk <pawel.kowalczyk at contractors.roche.com>
diff --cc src/views/workbench/workbench.tsx
index 27470fa,82a868e..1d53842
--- a/src/views/workbench/workbench.tsx
+++ b/src/views/workbench/workbench.tsx
@@@ -36,7 -34,9 +34,10 @@@ import { UpdateCollectionDialog } from
import { UpdateProjectDialog } from '~/views-components/dialog-forms/update-project-dialog';
import { MoveProjectDialog } from '~/views-components/dialog-forms/move-project-dialog';
import { MoveCollectionDialog } from '~/views-components/dialog-forms/move-collection-dialog';
+import { ProcessPanel } from '~/views/process-panel/process-panel';
+ import { UploadCollectionFilesDialog } from '~/views-components/dialog-forms/upload-collection-files-dialog';
+ import { PartialCopyCollectionDialog } from '~/views-components/dialog-forms/partial-copy-collection-dialog';
+
const APP_BAR_HEIGHT = 100;
commit 931bbc0730608697ddb30f5ad51d9cc19cca3679
Author: Pawel Kowalczyk <pawel.kowalczyk at contractors.roche.com>
Date: Tue Aug 28 17:32:23 2018 +0200
cr changes
Feature #13858
Arvados-DCO-1.1-Signed-off-by: Pawel Kowalczyk <pawel.kowalczyk at contractors.roche.com>
diff --git a/src/views/process-panel/information-card.tsx b/src/views/process-panel/information-card.tsx
index 8350ba9..467f727 100644
--- a/src/views/process-panel/information-card.tsx
+++ b/src/views/process-panel/information-card.tsx
@@ -16,30 +16,27 @@ import { RootState } from '~/store/store';
import { ContextMenuKind } from '~/views-components/context-menu/context-menu';
import { openContextMenu } from '~/store/context-menu/context-menu-actions';
-type CssRules = 'card' | 'iconHeader' | 'label' | 'value' | 'content' | 'chip' | 'headerText' | 'link';
+type CssRules = 'card' | 'iconHeader' | 'label' | 'value' | 'chip' | 'headerText' | 'link';
const styles: StyleRulesCallback<CssRules> = (theme: ArvadosTheme) => ({
card: {
marginBottom: theme.spacing.unit * 2,
+ paddingBottom: theme.spacing.unit * 3,
+ position: 'relative'
},
iconHeader: {
fontSize: '1.875rem',
color: theme.customs.colors.green700
},
label: {
+ display: 'flex',
+ justifyContent: 'flex-end',
fontSize: '0.875rem',
+ marginRight: theme.spacing.unit * 3
},
value: {
textTransform: 'none',
- fontSize: '0.875rem'
- },
- content: {
- display: 'flex',
- paddingBottom: '0px ',
- paddingTop: '0px',
- '&:last-child': {
- paddingBottom: '0px ',
- }
+ fontSize: '0.875rem',
},
link: {
fontSize: '0.875rem',
@@ -49,18 +46,19 @@ const styles: StyleRulesCallback<CssRules> = (theme: ArvadosTheme) => ({
}
},
chip: {
- height: theme.spacing.unit * 2.5,
+ height: theme.spacing.unit * 3,
width: theme.spacing.unit * 12,
backgroundColor: theme.customs.colors.green700,
color: theme.palette.common.white,
fontSize: '0.875rem',
- borderRadius: theme.spacing.unit * 0.625
+ borderRadius: theme.spacing.unit * 0.625,
+ position: 'absolute',
+ top: theme.spacing.unit * 2.5,
+ right: theme.spacing.unit * 8,
},
headerText: {
fontSize: '0.875rem',
- position: 'relative',
- top: -theme.spacing.unit * 4.5,
- left: theme.spacing.unit * 3,
+ marginLeft: theme.spacing.unit * 3,
}
});
@@ -87,38 +85,33 @@ export const InformationCard = withStyles(styles)(
aria-label="More options"
onClick={this.handleContextMenu}>
<MoreOptionsIcon />
- </IconButton>
- }
- title="Pipeline template that generates a config file from a template" />
- <CardContent className={classes.content}>
- <Grid container direction="column">
- <Grid item xs={8}>
- <DetailsAttribute classLabel={classes.label} classValue={classes.value}
- label='Status' value={<Chip label="Complete" className={classes.chip} />} />
+ </IconButton>}
+ title="Pipeline template that generates a config file from a template"
+ subheader="(no description)" />
+ <Chip label="Complete" className={classes.chip} />
+ <CardContent>
+ <Grid container>
+ <Grid item xs={6}>
<DetailsAttribute classLabel={classes.label} classValue={classes.value}
- label='Started at' value="1:25 PM 3/23/2018" />
+ label='From' value="1:25 PM 3/23/2018" />
<DetailsAttribute classLabel={classes.label} classValue={classes.value}
- label='Finished at' value='1:25 PM 3/23/2018' />
+ label='To' value='1:25 PM 3/23/2018' />
+ <DetailsAttribute classLabel={classes.label} classValue={classes.link}
+ label='Workflow' value='FastQC MultiQC' />
</Grid>
- </Grid>
- <Grid container direction="column">
- <Grid item xs={8}>
- <DetailsAttribute classLabel={classes.link} classValue={classes.value}
- label='Container output' />
+ <Grid item xs={6}>
<DetailsAttribute classLabel={classes.link} classValue={classes.value}
- label='Show inputs' />
+ label='Outputs' />
<DetailsAttribute classLabel={classes.link} classValue={classes.value}
- label='Show command' />
+ label='Inputs' />
</Grid>
</Grid>
</CardContent>
- <span className={classes.headerText}>This container request was created from the workflow <span className={classes.link}>FastQC MultiQC</span></span>
</Card>
</div>;
}
handleContextMenu = (event: React.MouseEvent<any>) => {
- // const { uuid, name, description } = this.props.item;
const resource = {
uuid: '',
name: '',
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list