15672: Merge branch 'master' into 15672-subprocess-list-v2

[arvados-workbench2.git] / src / views / process-panel / process-panel-root.tsx

diff --git a/src/views/process-panel/process-panel-root.tsx b/src/views/process-panel/process-panel-root.tsx
index 4aa51d8e64238fff972a9b51d164d564a4ef57fc..35842c7b12045200291e9a51243518be6b776693 100644 (file)
--- a/src/views/process-panel/process-panel-root.tsx
+++ b/src/views/process-panel/process-panel-root.tsx
@@ -7,42 +7,42 @@ 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, getProcessStatus } from '~/store/processes/process';
-import { SubprocessesCard } from './subprocesses-card';
+import { Process } from '~/store/processes/process';
+import { SubprocessPanel } from '~/views/subprocess-panel/subprocess-panel';
 import { SubprocessFilterDataProps } from '~/components/subprocess-filter/subprocess-filter';
-import { groupBy } from 'lodash';
-import { ProcessSubprocesses } from '~/views/process-panel/process-subprocesses';
 
 export interface ProcessPanelRootDataProps {
     process?: Process;
     subprocesses: Array<Process>;
+    filters: Array<SubprocessFilterDataProps>;
 }
 
 export interface ProcessPanelRootActionProps {
-    onContextMenu: (event: React.MouseEvent<HTMLElement>) => void;
+    onContextMenu: (event: React.MouseEvent<HTMLElement>, process: Process) => void;
+    onToggle: (status: string) => void;
+    openProcessInputDialog: (uuid: string) => void;
+    navigateToOutput: (uuid: string) => void;
+    navigateToWorkflow: (uuid: string) => void;
+    cancelProcess: (uuid: string) => void;
 }
 
 export type ProcessPanelRootProps = ProcessPanelRootDataProps & ProcessPanelRootActionProps;
 
-export const ProcessPanelRoot = (props: ProcessPanelRootProps) =>
-    props.process
-        ? <Grid container spacing={16}>
-            <Grid item xs={7}>
+export const ProcessPanelRoot = ({ process, ...props }: ProcessPanelRootProps) =>
+    process
+        ? <Grid container spacing={16} alignItems="stretch">
+            <Grid item sm={12} md={12}>
                 <ProcessInformationCard
-                    process={props.process}
-                    onContextMenu={props.onContextMenu} />
-                {console.log(props.subprocesses)}
+                    process={process}
+                    onContextMenu={event => props.onContextMenu(event, process)}
+                    openProcessInputDialog={props.openProcessInputDialog}
+                    navigateToOutput={props.navigateToOutput}
+                    openWorkflow={props.navigateToWorkflow}
+                    cancelProcess={props.cancelProcess}
+                />
             </Grid>
-            <Grid item xs={5}>
-                <SubprocessesCard
-                    subprocesses={props.subprocesses}
-                    filters={mapGroupedProcessesToFilters(groupSubprocessesByStatus(props.subprocesses))}
-                    onToggle={() => { return; }} />
-            </Grid>
-            <Grid item xs={12}>
-                <ProcessSubprocesses
-                    subprocesses={props.subprocesses}
-                    onContextMenu={props.onContextMenu} />
+            <Grid item sm={12} md={12}>
+                <SubprocessPanel />
             </Grid>
         </Grid>
         : <Grid container
@@ -54,14 +54,3 @@ export const ProcessPanelRoot = (props: ProcessPanelRootProps) =>
                 messages={['Process not found']} />
         </Grid>;
 
-const groupSubprocessesByStatus = (processes: Process[]) =>
-    groupBy(processes, getProcessStatus);
-
-const mapGroupedProcessesToFilters = (groupedProcesses: { [status: string]: Process[] }): SubprocessFilterDataProps[] =>
-    Object
-        .keys(groupedProcesses)
-        .map(status => ({
-            label: status,
-            key: status,
-            value: groupedProcesses[status].length
-        }));