[ARVADOS-WORKBENCH2] created: 2.4.0-11-g4e149522

Git user git at public.arvados.org
Tue Apr 12 19:24:37 UTC 2022


        at  4e1495220aae8fdcca2dc40d3f6d13dfc83e38b6 (commit)


commit 4e1495220aae8fdcca2dc40d3f6d13dfc83e38b6
Author: Stephen Smith <stephen at curii.com>
Date:   Tue Apr 12 15:24:17 2022 -0400

    16068: Fix process panel test
    
    Arvados-DCO-1.1-Signed-off-by: Stephen Smith <stephen at curii.com>

diff --git a/cypress/integration/process.spec.js b/cypress/integration/process.spec.js
index 75c318db..f5dfbcd4 100644
--- a/cypress/integration/process.spec.js
+++ b/cypress/integration/process.spec.js
@@ -95,7 +95,7 @@ describe('Process tests', function() {
         .then(function(containerRequest) {
             cy.loginAs(activeUser);
             cy.goToPath(`/processes/${containerRequest.uuid}`);
-            cy.get('[data-cy=process-info]').should('contain', crName);
+            cy.get('[data-cy=process-details]').should('contain', crName);
             cy.get('[data-cy=process-logs]')
                 .should('contain', 'No logs yet')
                 .and('not.contain', 'hello world');
@@ -191,4 +191,4 @@ describe('Process tests', function() {
             });
         });
     });
-});
\ No newline at end of file
+});

commit 7c6d47d766b7b37463281387d8badbfe18522d09
Author: Stephen Smith <stephen at curii.com>
Date:   Tue Apr 12 14:04:47 2022 -0400

    16068: Merge process info card and process details card.
    
    Arvados-DCO-1.1-Signed-off-by: Stephen Smith <stephen at curii.com>

diff --git a/src/views-components/details-panel/process-details.tsx b/src/views-components/details-panel/process-details.tsx
index d9c991f5..bb0e8a40 100644
--- a/src/views-components/details-panel/process-details.tsx
+++ b/src/views-components/details-panel/process-details.tsx
@@ -15,6 +15,6 @@ export class ProcessDetails extends DetailsData<ProcessResource> {
     }
 
     getDetails() {
-        return <ProcessDetailsAttributes item={this.item} />;
+        return <ProcessDetailsAttributes request={this.item} />;
     }
 }
diff --git a/src/views/process-panel/process-details-attributes.tsx b/src/views/process-panel/process-details-attributes.tsx
index 4f26a71f..6ddeab7a 100644
--- a/src/views/process-panel/process-details-attributes.tsx
+++ b/src/views/process-panel/process-details-attributes.tsx
@@ -3,63 +3,122 @@
 // SPDX-License-Identifier: AGPL-3.0
 
 import React from "react";
-import { Grid } from "@material-ui/core";
+import { Grid, StyleRulesCallback, withStyles } from "@material-ui/core";
+import { Dispatch } from 'redux';
 import { formatDate } from "common/formatters";
 import { resourceLabel } from "common/labels";
 import { DetailsAttribute } from "components/details-attribute/details-attribute";
-import { ProcessResource } from "models/process";
 import { ResourceKind } from "models/resource";
 import { ResourceOwnerWithName } from "views-components/data-explorer/renderers";
+import { getProcess } from "store/processes/process";
+import { RootState } from "store/store";
+import { connect } from "react-redux";
+import { ProcessResource } from "models/process";
+import { ContainerResource } from "models/container";
+import { openProcessInputDialog } from "store/processes/process-input-actions";
+import { navigateToOutput, openWorkflow } from "store/process-panel/process-panel-actions";
+import { ArvadosTheme } from "common/custom-theme";
+
+type CssRules = 'link';
 
-type CssRules = 'label' | 'value';
+const styles: StyleRulesCallback<CssRules> = (theme: ArvadosTheme) => ({
+    link: {
+        fontSize: '0.875rem',
+        color: theme.palette.primary.main,
+        '&:hover': {
+            cursor: 'pointer'
+        }
+    },
+});
 
-export const ProcessDetailsAttributes = (props: { item: ProcessResource, twoCol?: boolean, classes?: Record<CssRules, string> }) => {
-    const item = props.item;
-    const classes = props.classes || { label: '', value: '', button: '' };
-    const mdSize = props.twoCol ? 6 : 12;
-    return <Grid container>
-        <Grid item xs={12} md={mdSize}>
-            <DetailsAttribute label='Type' value={resourceLabel(ResourceKind.PROCESS)} />
-        </Grid>
-        <Grid item xs={12} md={mdSize}>
-            <DetailsAttribute classLabel={classes.label} classValue={classes.value}
-                label='Owner' linkToUuid={item.ownerUuid}
-                uuidEnhancer={(uuid: string) => <ResourceOwnerWithName uuid={uuid} />} />
-        </Grid>
-        <Grid item xs={12} md={12}>
-            <DetailsAttribute label='Status' value={item.state} />
-        </Grid>
-        <Grid item xs={12} md={mdSize}>
-            <DetailsAttribute label='Last modified' value={formatDate(item.modifiedAt)} />
-        </Grid>
-        <Grid item xs={12} md={mdSize}>
-            <DetailsAttribute label='Started at' value={formatDate(item.createdAt)} />
-        </Grid>
-        <Grid item xs={12} md={mdSize}>
-            <DetailsAttribute label='Created at' value={formatDate(item.createdAt)} />
-        </Grid>
-        <Grid item xs={12} md={mdSize}>
-            <DetailsAttribute label='Finished at' value={formatDate(item.expiresAt)} />
-        </Grid>
-        <Grid item xs={12} md={mdSize}>
-            <DetailsAttribute label='Outputs' value={item.outputPath} />
-        </Grid>
-        <Grid item xs={12} md={mdSize}>
-            <DetailsAttribute label='UUID' linkToUuid={item.uuid} value={item.uuid} />
-        </Grid>
-        <Grid item xs={12} md={mdSize}>
-            <DetailsAttribute label='Container UUID' value={item.containerUuid} />
-        </Grid>
-        <Grid item xs={12} md={mdSize}>
-            <DetailsAttribute label='Priority' value={item.priority} />
-        </Grid>
-        <Grid item xs={12} md={mdSize}>
-            <DetailsAttribute label='Runtime Constraints'
-            value={JSON.stringify(item.runtimeConstraints)} />
-        </Grid>
-        <Grid item xs={12} md={mdSize}>
-            <DetailsAttribute label='Docker Image locator'
-            linkToUuid={item.containerImage} value={item.containerImage} />
-        </Grid>
-    </Grid>;
+const mapStateToProps = (state: RootState, props: { request: ProcessResource }) => {
+    return {
+        container: getProcess(props.request.uuid)(state.resources)?.container,
+    };
 };
+
+interface ProcessDetailsAttributesActionProps {
+    openProcessInputDialog: (uuid: string) => void;
+    navigateToOutput: (uuid: string) => void;
+    openWorkflow: (uuid: string) => void;
+}
+
+const mapDispatchToProps = (dispatch: Dispatch): ProcessDetailsAttributesActionProps => ({
+    openProcessInputDialog: (uuid) => dispatch<any>(openProcessInputDialog(uuid)),
+    navigateToOutput: (uuid) => dispatch<any>(navigateToOutput(uuid)),
+    openWorkflow: (uuid) => dispatch<any>(openWorkflow(uuid)),
+});
+
+export const ProcessDetailsAttributes = withStyles(styles, { withTheme: true })(
+    connect(mapStateToProps, mapDispatchToProps)(
+        (props: { request: ProcessResource, container?: ContainerResource, twoCol?: boolean, classes?: Record<CssRules, string> } & ProcessDetailsAttributesActionProps) => {
+            const containerRequest = props.request;
+            const container = props.container;
+            const classes = props.classes || { label: '', value: '', button: '', link: '' };
+            const mdSize = props.twoCol ? 6 : 12;
+            return <Grid container>
+                <Grid item xs={12} md={mdSize}>
+                    <DetailsAttribute label='Type' value={resourceLabel(ResourceKind.PROCESS)} />
+                </Grid>
+                <Grid item xs={12} md={mdSize}>
+                    <DetailsAttribute
+                        label='Owner' linkToUuid={containerRequest.ownerUuid}
+                        uuidEnhancer={(uuid: string) => <ResourceOwnerWithName uuid={uuid} />} />
+                </Grid>
+                <Grid item xs={12} md={12}>
+                    <DetailsAttribute label='Status' value={containerRequest.state} />
+                </Grid>
+                <Grid item xs={12} md={mdSize}>
+                    <DetailsAttribute label='Last modified' value={formatDate(containerRequest.modifiedAt)} />
+                </Grid>
+                <Grid item xs={12} md={mdSize}>
+                    <DetailsAttribute label='Created at' value={formatDate(containerRequest.createdAt)} />
+                </Grid>
+                <Grid item xs={12} md={mdSize}>
+                    <DetailsAttribute label='Started at' value={container ? formatDate(container.startedAt) : "N/A"} />
+                </Grid>
+                <Grid item xs={12} md={mdSize}>
+                    <DetailsAttribute label='Finished at' value={container ? formatDate(container.finishedAt) : "N/A"} />
+                </Grid>
+                <Grid item xs={12} md={mdSize}>
+                    <DetailsAttribute label='Expires at' value={formatDate(containerRequest.expiresAt)} />
+                </Grid>
+                <Grid item xs={12} md={mdSize}>
+                    <DetailsAttribute label='Outputs' value={containerRequest.outputPath} />
+                </Grid>
+                <Grid item xs={12} md={mdSize}>
+                    <DetailsAttribute label='UUID' linkToUuid={containerRequest.uuid} value={containerRequest.uuid} />
+                </Grid>
+                <Grid item xs={12} md={mdSize}>
+                    <DetailsAttribute label='Container UUID' value={containerRequest.containerUuid} />
+                </Grid>
+                <Grid item xs={6}>
+                    <span onClick={() => props.navigateToOutput(containerRequest.outputUuid!)}>
+                        <DetailsAttribute classLabel={classes.link} label='Outputs' />
+                    </span>
+                    <span onClick={() => props.openProcessInputDialog(containerRequest.uuid)}>
+                        <DetailsAttribute classLabel={classes.link} label='Inputs' />
+                    </span>
+                </Grid>
+                {containerRequest.properties.workflowUuid &&
+                <Grid item xs={12} md={mdSize}>
+                    <span onClick={() => props.openWorkflow(containerRequest.properties.workflowUuid)}>
+                        <DetailsAttribute classValue={classes.link}
+                            label='Workflow' value={containerRequest.properties.workflowName} />
+                    </span>
+                </Grid>}
+                <Grid item xs={12} md={mdSize}>
+                    <DetailsAttribute label='Priority' value={containerRequest.priority} />
+                </Grid>
+                <Grid item xs={12} md={mdSize}>
+                    <DetailsAttribute label='Runtime Constraints'
+                    value={JSON.stringify(containerRequest.runtimeConstraints)} />
+                </Grid>
+                <Grid item xs={12} md={mdSize}>
+                    <DetailsAttribute label='Docker Image locator'
+                    linkToUuid={containerRequest.containerImage} value={containerRequest.containerImage} />
+                </Grid>
+            </Grid>;
+        }
+    )
+);
diff --git a/src/views/process-panel/process-details-card.tsx b/src/views/process-panel/process-details-card.tsx
index d3349c3a..5cca904a 100644
--- a/src/views/process-panel/process-details-card.tsx
+++ b/src/views/process-panel/process-details-card.tsx
@@ -12,14 +12,17 @@ import {
     IconButton,
     CardContent,
     Tooltip,
+    Typography,
+    Chip,
 } from '@material-ui/core';
 import { ArvadosTheme } from 'common/custom-theme';
-import { CloseIcon } from 'components/icon/icon';
-import { Process } from 'store/processes/process';
+import { CloseIcon, MoreOptionsIcon, ProcessIcon } from 'components/icon/icon';
+import { Process, getProcessStatus, getProcessStatusColor } from 'store/processes/process';
 import { MPVPanelProps } from 'components/multi-panel-view/multi-panel-view';
 import { ProcessDetailsAttributes } from './process-details-attributes';
+import { ContainerState } from 'models/container';
 
-type CssRules = 'card' | 'content' | 'title' | 'header';
+type CssRules = 'card' | 'content' | 'title' | 'header' | 'cancelButton' | 'chip' | 'avatar' | 'iconHeader';
 
 const styles: StyleRulesCallback<CssRules> = (theme: ArvadosTheme) => ({
     card: {
@@ -29,6 +32,14 @@ const styles: StyleRulesCallback<CssRules> = (theme: ArvadosTheme) => ({
         paddingTop: theme.spacing.unit,
         paddingBottom: theme.spacing.unit,
     },
+    iconHeader: {
+        fontSize: '1.875rem',
+        color: theme.customs.colors.green700,
+    },
+    avatar: {
+        alignSelf: 'flex-start',
+        paddingTop: theme.spacing.unit * 0.5
+    },
     content: {
         '&:last-child': {
             paddingBottom: theme.spacing.unit * 2,
@@ -38,31 +49,80 @@ const styles: StyleRulesCallback<CssRules> = (theme: ArvadosTheme) => ({
         overflow: 'hidden',
         paddingTop: theme.spacing.unit * 0.5
     },
+    cancelButton: {
+        paddingRight: theme.spacing.unit * 2,
+        fontSize: '14px',
+        color: theme.customs.colors.red900,
+        "&:hover": {
+            cursor: 'pointer'
+        }
+    },
+    chip: {
+        height: theme.spacing.unit * 3,
+        width: theme.spacing.unit * 12,
+        color: theme.palette.common.white,
+        fontSize: '0.875rem',
+        borderRadius: theme.spacing.unit * 0.625,
+    },
 });
 
 export interface ProcessDetailsCardDataProps {
     process: Process;
+    cancelProcess: (uuid: string) => void;
+    onContextMenu: (event: React.MouseEvent<HTMLElement>) => void;
 }
 
-type ProcessDetailsCardProps = ProcessDetailsCardDataProps & WithStyles<CssRules> & MPVPanelProps;
+type ProcessDetailsCardProps = ProcessDetailsCardDataProps & WithStyles<CssRules, true> & MPVPanelProps;
 
-export const ProcessDetailsCard = withStyles(styles)(
-    ({ classes, process, doHidePanel, panelName }: ProcessDetailsCardProps) => {
+export const ProcessDetailsCard = withStyles(styles, {withTheme: true})(
+    ({ theme, cancelProcess, onContextMenu, classes, process, doHidePanel, panelName }: ProcessDetailsCardProps) => {
         return <Card className={classes.card}>
             <CardHeader
                 className={classes.header}
                 classes={{
                     content: classes.title,
+                    avatar: classes.avatar,
                 }}
-                title='Details'
-                action={ doHidePanel &&
+                avatar={<ProcessIcon className={classes.iconHeader} />}
+                title={
+                    <Tooltip title={process.containerRequest.name} placement="bottom-start">
+                        <Typography noWrap variant='h6' color='inherit'>
+                            {process.containerRequest.name}
+                        </Typography>
+                    </Tooltip>
+                }
+                subheader={
+                    <Tooltip title={getDescription(process)} placement="bottom-start">
+                        <Typography noWrap variant='body1' color='inherit'>
+                            {getDescription(process)}
+                        </Typography>
+                    </Tooltip>}
+                action={
+                    <div>
+                        {process.container && process.container.state === ContainerState.RUNNING &&
+                            <span className={classes.cancelButton} onClick={() => cancelProcess(process.containerRequest.uuid)}>Cancel</span>}
+                        <Chip label={getProcessStatus(process)}
+                            className={classes.chip}
+                            style={{ backgroundColor: getProcessStatusColor(getProcessStatus(process), theme as ArvadosTheme) }} />
+                        <Tooltip title="More options" disableFocusListener>
+                            <IconButton
+                                aria-label="More options"
+                                onClick={event => onContextMenu(event)}>
+                                <MoreOptionsIcon />
+                            </IconButton>
+                        </Tooltip>
+                        { doHidePanel &&
                         <Tooltip title={`Close ${panelName || 'panel'}`} disableFocusListener>
                             <IconButton onClick={doHidePanel}><CloseIcon /></IconButton>
-                        </Tooltip> } />
+                        </Tooltip> }
+                    </div>
+                } />
             <CardContent className={classes.content}>
-                <ProcessDetailsAttributes item={process.containerRequest} twoCol />
+                <ProcessDetailsAttributes request={process.containerRequest} twoCol />
             </CardContent>
         </Card>;
     }
 );
 
+const getDescription = (process: Process) =>
+    process.containerRequest.description || '(no-description)';
diff --git a/src/views/process-panel/process-information-card.tsx b/src/views/process-panel/process-information-card.tsx
deleted file mode 100644
index fc34a31c..00000000
--- a/src/views/process-panel/process-information-card.tsx
+++ /dev/null
@@ -1,169 +0,0 @@
-// Copyright (C) The Arvados Authors. All rights reserved.
-//
-// SPDX-License-Identifier: AGPL-3.0
-
-import React from 'react';
-import {
-    StyleRulesCallback, WithStyles, withStyles, Card,
-    CardHeader, IconButton, CardContent, Grid, Chip, Typography, Tooltip
-} from '@material-ui/core';
-import { ArvadosTheme } from 'common/custom-theme';
-import { CloseIcon, MoreOptionsIcon, ProcessIcon } from 'components/icon/icon';
-import { DetailsAttribute } from 'components/details-attribute/details-attribute';
-import { Process } from 'store/processes/process';
-import { getProcessStatus, getProcessStatusColor } from 'store/processes/process';
-import { formatDate } from 'common/formatters';
-import classNames from 'classnames';
-import { ContainerState } from 'models/container';
-import { MPVPanelProps } from 'components/multi-panel-view/multi-panel-view';
-
-type CssRules = 'card' | 'iconHeader' | 'label' | 'value' | 'chip' | 'link' | 'content' | 'title' | 'avatar' | 'cancelButton' | 'header';
-
-const styles: StyleRulesCallback<CssRules> = (theme: ArvadosTheme) => ({
-    card: {
-        height: '100%'
-    },
-    header: {
-        paddingTop: theme.spacing.unit,
-        paddingBottom: theme.spacing.unit,
-    },
-    iconHeader: {
-        fontSize: '1.875rem',
-        color: theme.customs.colors.green700,
-    },
-    avatar: {
-        alignSelf: 'flex-start',
-        paddingTop: theme.spacing.unit * 0.5
-    },
-    label: {
-        display: 'flex',
-        justifyContent: 'flex-end',
-        fontSize: '0.875rem',
-        marginRight: theme.spacing.unit * 3,
-        paddingRight: theme.spacing.unit
-    },
-    value: {
-        textTransform: 'none',
-        fontSize: '0.875rem',
-    },
-    link: {
-        fontSize: '0.875rem',
-        color: theme.palette.primary.main,
-        '&:hover': {
-            cursor: 'pointer'
-        }
-    },
-    chip: {
-        height: theme.spacing.unit * 3,
-        width: theme.spacing.unit * 12,
-        color: theme.palette.common.white,
-        fontSize: '0.875rem',
-        borderRadius: theme.spacing.unit * 0.625,
-    },
-    content: {
-        '&:last-child': {
-            paddingBottom: theme.spacing.unit * 2,
-        }
-    },
-    title: {
-        overflow: 'hidden',
-        paddingTop: theme.spacing.unit * 0.5
-    },
-    cancelButton: {
-        paddingRight: theme.spacing.unit * 2,
-        fontSize: '14px',
-        color: theme.customs.colors.red900,
-        "&:hover": {
-            cursor: 'pointer'
-        }
-    }
-});
-
-export interface ProcessInformationCardDataProps {
-    process: Process;
-    onContextMenu: (event: React.MouseEvent<HTMLElement>) => void;
-    openProcessInputDialog: (uuid: string) => void;
-    navigateToOutput: (uuid: string) => void;
-    openWorkflow: (uuid: string) => void;
-    cancelProcess: (uuid: string) => void;
-}
-
-type ProcessInformationCardProps = ProcessInformationCardDataProps & WithStyles<CssRules, true> & MPVPanelProps;
-
-export const ProcessInformationCard = withStyles(styles, { withTheme: true })(
-    ({ classes, process, onContextMenu, theme, openProcessInputDialog, navigateToOutput, openWorkflow, cancelProcess, doHidePanel, panelName }: ProcessInformationCardProps) => {
-        const { container } = process;
-        const startedAt = container ? formatDate(container.startedAt) : 'N/A';
-        const finishedAt = container ? formatDate(container.finishedAt) : 'N/A';
-        return <Card className={classes.card}>
-            <CardHeader
-                className={classes.header}
-                classes={{
-                    content: classes.title,
-                    avatar: classes.avatar
-                }}
-                avatar={<ProcessIcon className={classes.iconHeader} />}
-                action={
-                    <div>
-                        {process.container && process.container.state === ContainerState.RUNNING &&
-                            <span className={classes.cancelButton} onClick={() => cancelProcess(process.containerRequest.uuid)}>Cancel</span>}
-                        <Chip label={getProcessStatus(process)}
-                            className={classes.chip}
-                            style={{ backgroundColor: getProcessStatusColor(getProcessStatus(process), theme as ArvadosTheme) }} />
-                        <Tooltip title="More options" disableFocusListener>
-                            <IconButton
-                                aria-label="More options"
-                                onClick={event => onContextMenu(event)}>
-                                <MoreOptionsIcon />
-                            </IconButton>
-                        </Tooltip>
-                        { doHidePanel &&
-                        <Tooltip title={`Close ${panelName || 'panel'}`} disableFocusListener>
-                            <IconButton onClick={doHidePanel}><CloseIcon /></IconButton>
-                        </Tooltip> }
-                    </div>
-                }
-                title={
-                    <Tooltip title={process.containerRequest.name} placement="bottom-start">
-                        <Typography noWrap variant='h6' color='inherit'>
-                            {process.containerRequest.name}
-                        </Typography>
-                    </Tooltip>
-                }
-                subheader={
-                    <Tooltip title={getDescription(process)} placement="bottom-start">
-                        <Typography noWrap variant='body1' color='inherit'>
-                            {getDescription(process)}
-                        </Typography>
-                    </Tooltip>} />
-            <CardContent className={classes.content}>
-                <Grid container>
-                    <Grid item xs={6}>
-                        <DetailsAttribute classLabel={classes.label} classValue={classes.value}
-                            label='From'
-                            value={startedAt} />
-                        <DetailsAttribute classLabel={classes.label} classValue={classes.value}
-                            label='To'
-                            value={finishedAt} />
-                        {process.containerRequest.properties.workflowUuid &&
-                            <span onClick={() => openWorkflow(process.containerRequest.properties.workflowUuid)}>
-                                <DetailsAttribute classLabel={classes.label} classValue={classNames(classes.value, classes.link)}
-                                    label='Workflow' value={process.containerRequest.properties.workflowName} />
-                            </span>}
-                    </Grid>
-                    <Grid item xs={6}>
-                        <span onClick={() => navigateToOutput(process.containerRequest.outputUuid!)}>
-                            <DetailsAttribute classLabel={classes.link} label='Outputs' />
-                        </span>
-                        <span onClick={() => openProcessInputDialog(process.containerRequest.uuid)}>
-                            <DetailsAttribute classLabel={classes.link} label='Inputs' />
-                        </span>
-                    </Grid>
-                </Grid>
-            </CardContent>
-        </Card>;
-    }
-);
-
-const getDescription = (process: Process) =>
-    process.containerRequest.description || '(no-description)';
diff --git a/src/views/process-panel/process-panel-root.tsx b/src/views/process-panel/process-panel-root.tsx
index 156789a2..4f95d0d8 100644
--- a/src/views/process-panel/process-panel-root.tsx
+++ b/src/views/process-panel/process-panel-root.tsx
@@ -4,7 +4,6 @@
 
 import React from 'react';
 import { Grid, StyleRulesCallback, WithStyles, withStyles } 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';
@@ -35,9 +34,6 @@ export interface ProcessPanelRootDataProps {
 export interface ProcessPanelRootActionProps {
     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;
     onLogFilterChange: (filter: FilterOption) => void;
     navigateToLog: (uuid: string) => void;
@@ -47,8 +43,7 @@ export interface ProcessPanelRootActionProps {
 export type ProcessPanelRootProps = ProcessPanelRootDataProps & ProcessPanelRootActionProps & WithStyles<CssRules>;
 
 const panelsData: MPVPanelState[] = [
-    {name: "Info"},
-    {name: "Details", visible: false},
+    {name: "Details"},
     {name: "Logs", visible: true},
     {name: "Subprocesses"},
 ];
@@ -57,19 +52,13 @@ export const ProcessPanelRoot = withStyles(styles)(
     ({ process, processLogsPanel, ...props }: ProcessPanelRootProps) =>
     process
         ? <MPVContainer className={props.classes.root} spacing={8} panelStates={panelsData}  justify-content="flex-start" direction="column" wrap="nowrap">
-            <MPVPanelContent forwardProps xs="auto" data-cy="process-info">
-                <ProcessInformationCard
+            <MPVPanelContent forwardProps xs="auto" data-cy="process-details">
+                <ProcessDetailsCard
                     process={process}
                     onContextMenu={event => props.onContextMenu(event, process)}
-                    openProcessInputDialog={props.openProcessInputDialog}
-                    navigateToOutput={props.navigateToOutput}
-                    openWorkflow={props.navigateToWorkflow}
                     cancelProcess={props.cancelProcess}
                 />
             </MPVPanelContent>
-            <MPVPanelContent forwardProps xs="auto" data-cy="process-details">
-                <ProcessDetailsCard process={process} />
-            </MPVPanelContent>
             <MPVPanelContent forwardProps xs maxHeight='50%' data-cy="process-logs">
                 <ProcessLogsCard
                     onCopy={props.onLogCopyToClipboard}
diff --git a/src/views/process-panel/process-panel.tsx b/src/views/process-panel/process-panel.tsx
index e0460292..de6b13b3 100644
--- a/src/views/process-panel/process-panel.tsx
+++ b/src/views/process-panel/process-panel.tsx
@@ -19,10 +19,7 @@ import {
 import { groupBy } from 'lodash';
 import {
     toggleProcessPanelFilter,
-    navigateToOutput,
-    openWorkflow
 } from 'store/process-panel/process-panel-actions';
-import { openProcessInputDialog } from 'store/processes/process-input-actions';
 import { cancelRunningWorkflow } from 'store/processes/processes-actions';
 import { navigateToLogCollection, setProcessLogsPanelFilter } from 'store/process-logs-panel/process-logs-panel-actions';
 import { snackbarActions, SnackbarKind } from 'store/snackbar/snackbar-actions';
@@ -52,9 +49,6 @@ const mapDispatchToProps = (dispatch: Dispatch): ProcessPanelRootActionProps =>
     onToggle: status => {
         dispatch<any>(toggleProcessPanelFilter(status));
     },
-    openProcessInputDialog: (uuid) => dispatch<any>(openProcessInputDialog(uuid)),
-    navigateToOutput: (uuid) => dispatch<any>(navigateToOutput(uuid)),
-    navigateToWorkflow: (uuid) => dispatch<any>(openWorkflow(uuid)),
     cancelProcess: (uuid) => dispatch<any>(cancelRunningWorkflow(uuid)),
     onLogFilterChange: (filter) => dispatch(setProcessLogsPanelFilter(filter.value)),
     navigateToLog: (uuid) => dispatch<any>(navigateToLogCollection(uuid)),

-----------------------------------------------------------------------


hooks/post-receive
-- 




More information about the arvados-commits mailing list