Merge branch 'master'
authorMichal Klobukowski <michal.klobukowski@contractors.roche.com>
Thu, 30 Aug 2018 08:47:24 +0000 (10:47 +0200)
committerMichal Klobukowski <michal.klobukowski@contractors.roche.com>
Thu, 30 Aug 2018 08:47:24 +0000 (10:47 +0200)
Feature #14099

Arvados-DCO-1.1-Signed-off-by: Michal Klobukowski <michal.klobukowski@contractors.roche.com>

1  2 
src/components/details-attribute/details-attribute.tsx
src/views/process-panel/process-panel-root.tsx
src/views/workbench/workbench.tsx

index c7ac938a93bdc9c0e6ea7c73ef73bcc327f3cc35,0000000000000000000000000000000000000000..feada3acb3c8231266365de6641a982c498f4b43
mode 100644,000000..100644
--- /dev/null
@@@ -1,37 -1,0 +1,69 @@@
-         ? <Grid container>
 +// Copyright (C) The Arvados Authors. All rights reserved.
 +//
 +// SPDX-License-Identifier: AGPL-3.0
 +
 +import * as React from 'react';
 +import { Grid } from '@material-ui/core';
 +import { ProcessInformationCard } from './process-information-card';
 +import { DefaultView } from '~/components/default-view/default-view';
 +import { ProcessIcon } from '~/components/icon/icon';
 +import { Process } from '~/store/processes/process';
++import { SubprocessesCard } from './subprocesses-card';
 +
 +export interface ProcessPanelRootDataProps {
 +    process?: Process;
 +}
 +
 +export interface ProcessPanelRootActionProps {
 +    onContextMenu: (event: React.MouseEvent<HTMLElement>) => void;
 +}
 +
 +export type ProcessPanelRootProps = ProcessPanelRootDataProps & ProcessPanelRootActionProps;
 +
 +export const ProcessPanelRoot = (props: ProcessPanelRootProps) =>
 +    props.process
++        ? <Grid container spacing={16}>
 +            <Grid item xs={7}>
 +                <ProcessInformationCard
 +                    process={props.process}
 +                    onContextMenu={props.onContextMenu} />
 +            </Grid>
++            <Grid item xs={5}>
++                <SubprocessesCard
++                    subprocesses={4}
++                    filters={[
++                        {
++                            key: 'queued',
++                            value: 1,
++                            label: 'Queued',
++                            checked: true
++                        }, {
++                            key: 'active',
++                            value: 2,
++                            label: 'Active',
++                            checked: true
++                        },
++                        {
++                            key: 'completed',
++                            value: 2,
++                            label: 'Completed',
++                            checked: true
++                        },
++                        {
++                            key: 'failed',
++                            value: 2,
++                            label: 'Failed',
++                            checked: true
++                        }
++                    ]}
++                    onToggle={() => { return; }}
++                />
++            </Grid>
 +        </Grid>
 +        : <Grid container
 +            alignItems='center'
 +            justify='center'>
 +            <DefaultView
 +                icon={ProcessIcon}
 +                messages={['Process not found']} />
 +        </Grid>;
Simple merge