[ARVADOS-WORKBENCH2] updated: 1.2.0-183-g0997bb0
Git user
git at public.curoverse.com
Tue Aug 28 09:21:28 EDT 2018
Summary of changes:
.../{process-panel.tsx => information-card.tsx} | 17 +--
src/views/process-panel/process-panel.tsx | 146 ++-------------------
2 files changed, 18 insertions(+), 145 deletions(-)
copy src/views/process-panel/{process-panel.tsx => information-card.tsx} (89%)
via 0997bb068a2ecb8f6b0b13d22f3ef57ae1243405 (commit)
from 00acbabe840ee98597ef94751e22f48f44ee5777 (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 0997bb068a2ecb8f6b0b13d22f3ef57ae1243405
Author: Pawel Kowalczyk <pawel.kowalczyk at contractors.roche.com>
Date: Tue Aug 28 15:21:14 2018 +0200
information card in separate file
Feature #13858
Arvados-DCO-1.1-Signed-off-by: Pawel Kowalczyk <pawel.kowalczyk at contractors.roche.com>
diff --git a/src/views/process-panel/process-panel.tsx b/src/views/process-panel/information-card.tsx
similarity index 89%
copy from src/views/process-panel/process-panel.tsx
copy to src/views/process-panel/information-card.tsx
index 3910099..8350ba9 100644
--- a/src/views/process-panel/process-panel.tsx
+++ b/src/views/process-panel/information-card.tsx
@@ -10,7 +10,6 @@ import {
import { ArvadosTheme } from '~/common/custom-theme';
import { ProcessResource } from '~/models/process';
import { DispatchProp, connect } from 'react-redux';
-import { RouteComponentProps } from 'react-router';
import { MoreOptionsIcon, ProcessIcon } from '~/components/icon/icon';
import { DetailsAttribute } from '~/components/details-attribute/details-attribute';
import { RootState } from '~/store/store';
@@ -22,7 +21,6 @@ type CssRules = 'card' | 'iconHeader' | 'label' | 'value' | 'content' | 'chip' |
const styles: StyleRulesCallback<CssRules> = (theme: ArvadosTheme) => ({
card: {
marginBottom: theme.spacing.unit * 2,
- width: '60%'
},
iconHeader: {
fontSize: '1.875rem',
@@ -66,22 +64,17 @@ const styles: StyleRulesCallback<CssRules> = (theme: ArvadosTheme) => ({
}
});
-interface ProcessPanelDataProps {
+interface ProcessInformationCardDataProps {
item: ProcessResource;
}
-interface ProcessPanelActionProps {
- onContextMenu: (event: React.MouseEvent<HTMLElement>, item: ProcessResource) => void;
-}
-
-type ProcessPanelProps = ProcessPanelDataProps & ProcessPanelActionProps & DispatchProp & WithStyles<CssRules> & RouteComponentProps<{ id: string }>;
+type InformationCardProps = ProcessInformationCardDataProps & DispatchProp & WithStyles<CssRules>;
-export const ProcessPanel = withStyles(styles)(
+export const InformationCard = withStyles(styles)(
connect((state: RootState) => ({
- item: state.collectionPanel.item,
- tags: state.collectionPanel.tags
+ item: state.collectionPanel.item
}))(
- class extends React.Component<ProcessPanelProps> {
+ class extends React.Component<InformationCardProps> {
render() {
const { classes } = this.props;
diff --git a/src/views/process-panel/process-panel.tsx b/src/views/process-panel/process-panel.tsx
index 3910099..a8c92b7 100644
--- a/src/views/process-panel/process-panel.tsx
+++ b/src/views/process-panel/process-panel.tsx
@@ -3,137 +3,17 @@
// SPDX-License-Identifier: AGPL-3.0
import * as React from 'react';
-import {
- StyleRulesCallback, WithStyles, withStyles, Card,
- CardHeader, IconButton, CardContent, Grid, Chip
-} from '@material-ui/core';
-import { ArvadosTheme } from '~/common/custom-theme';
-import { ProcessResource } from '~/models/process';
-import { DispatchProp, connect } from 'react-redux';
-import { RouteComponentProps } from 'react-router';
-import { MoreOptionsIcon, ProcessIcon } from '~/components/icon/icon';
-import { DetailsAttribute } from '~/components/details-attribute/details-attribute';
-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';
-
-const styles: StyleRulesCallback<CssRules> = (theme: ArvadosTheme) => ({
- card: {
- marginBottom: theme.spacing.unit * 2,
- width: '60%'
- },
- iconHeader: {
- fontSize: '1.875rem',
- color: theme.customs.colors.green700
- },
- label: {
- fontSize: '0.875rem',
- },
- value: {
- textTransform: 'none',
- fontSize: '0.875rem'
- },
- content: {
- display: 'flex',
- paddingBottom: '0px ',
- paddingTop: '0px',
- '&:last-child': {
- paddingBottom: '0px ',
- }
- },
- link: {
- fontSize: '0.875rem',
- color: theme.palette.primary.main,
- '&:hover': {
- cursor: 'pointer'
- }
- },
- chip: {
- height: theme.spacing.unit * 2.5,
- width: theme.spacing.unit * 12,
- backgroundColor: theme.customs.colors.green700,
- color: theme.palette.common.white,
- fontSize: '0.875rem',
- borderRadius: theme.spacing.unit * 0.625
- },
- headerText: {
- fontSize: '0.875rem',
- position: 'relative',
- top: -theme.spacing.unit * 4.5,
- left: theme.spacing.unit * 3,
+import { InformationCard } from '~/views/process-panel/information-card';
+import { Grid } from '@material-ui/core';
+
+export class ProcessPanel extends React.Component {
+ render() {
+ return <div>
+ <Grid container>
+ <Grid item xs={7}>
+ <InformationCard />
+ </Grid>
+ </Grid>
+ </div>;
}
-});
-
-interface ProcessPanelDataProps {
- item: ProcessResource;
-}
-
-interface ProcessPanelActionProps {
- onContextMenu: (event: React.MouseEvent<HTMLElement>, item: ProcessResource) => void;
-}
-
-type ProcessPanelProps = ProcessPanelDataProps & ProcessPanelActionProps & DispatchProp & WithStyles<CssRules> & RouteComponentProps<{ id: string }>;
-
-export const ProcessPanel = withStyles(styles)(
- connect((state: RootState) => ({
- item: state.collectionPanel.item,
- tags: state.collectionPanel.tags
- }))(
- class extends React.Component<ProcessPanelProps> {
- render() {
- const { classes } = this.props;
-
- return <div>
- <Card className={classes.card}>
- <CardHeader
- avatar={<ProcessIcon className={classes.iconHeader} />}
- action={
- <IconButton
- 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} />} />
- <DetailsAttribute classLabel={classes.label} classValue={classes.value}
- label='Started at' value="1:25 PM 3/23/2018" />
- <DetailsAttribute classLabel={classes.label} classValue={classes.value}
- label='Finished at' value='1:25 PM 3/23/2018' />
- </Grid>
- </Grid>
- <Grid container direction="column">
- <Grid item xs={8}>
- <DetailsAttribute classLabel={classes.link} classValue={classes.value}
- label='Container output' />
- <DetailsAttribute classLabel={classes.link} classValue={classes.value}
- label='Show inputs' />
- <DetailsAttribute classLabel={classes.link} classValue={classes.value}
- label='Show command' />
- </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: '',
- description: '',
- kind: ContextMenuKind.PROCESS
- };
- this.props.dispatch<any>(openContextMenu(event, resource));
- }
- }
- )
-);
\ No newline at end of file
+}
\ No newline at end of file
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list