X-Git-Url: https://git.arvados.org/arvados-workbench2.git/blobdiff_plain/342f4ed11da7860e834928aa79974f096a8f6291..627132ee694565c5f3cf347fa0bbee8e514de884:/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 156789a2..248c5215 100644 --- a/src/views/process-panel/process-panel-root.tsx +++ b/src/views/process-panel/process-panel-root.tsx @@ -2,9 +2,8 @@ // // SPDX-License-Identifier: AGPL-3.0 -import React from 'react'; +import React, { useState } 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'; @@ -13,9 +12,17 @@ import { SubprocessFilterDataProps } from 'components/subprocess-filter/subproce import { MPVContainer, MPVPanelContent, MPVPanelState } from 'components/multi-panel-view/multi-panel-view'; import { ArvadosTheme } from 'common/custom-theme'; import { ProcessDetailsCard } from './process-details-card'; +import { getIOParamDisplayValue, ProcessIOCard, ProcessIOCardType, ProcessIOParameter } from './process-io-card'; + import { getProcessPanelLogs, ProcessLogsPanel } from 'store/process-logs-panel/process-logs-panel'; import { ProcessLogsCard } from './process-log-card'; import { FilterOption } from 'views/process-panel/process-log-form'; +import { getInputs, getInputCollectionMounts, getOutputParameters, getRawInputs } from 'store/processes/processes-actions'; +import { CommandInputParameter, getIOParamId } from 'models/workflow'; +import { CommandOutputParameter } from 'cwlts/mappings/v1.0/CommandOutputParameter'; +import { AuthState } from 'store/auth/auth-reducer'; +import { ProcessCmdCard } from './process-cmd-card'; +import { ContainerRequestResource } from 'models/container-request'; type CssRules = 'root'; @@ -30,49 +37,103 @@ export interface ProcessPanelRootDataProps { subprocesses: Array; filters: Array; processLogsPanel: ProcessLogsPanel; + auth: AuthState; } export interface ProcessPanelRootActionProps { onContextMenu: (event: React.MouseEvent, 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; - onLogCopyToClipboard: (uuid: string) => void; + onCopyToClipboard: (uuid: string) => void; + fetchOutputs: (containerRequest: ContainerRequestResource, fetchOutputs) => void; } export type ProcessPanelRootProps = ProcessPanelRootDataProps & ProcessPanelRootActionProps & WithStyles; +type OutputDetails = { + rawOutputs?: any; + pdh?: string; +} + const panelsData: MPVPanelState[] = [ - {name: "Info"}, - {name: "Details", visible: false}, + {name: "Details"}, + {name: "Command"}, {name: "Logs", visible: true}, + {name: "Inputs"}, + {name: "Outputs"}, {name: "Subprocesses"}, ]; export const ProcessPanelRoot = withStyles(styles)( - ({ process, processLogsPanel, ...props }: ProcessPanelRootProps) => - process + ({ process, auth, processLogsPanel, fetchOutputs, ...props }: ProcessPanelRootProps) => { + + const [outputDetails, setOutputs] = useState(undefined); + const [rawInputs, setInputs] = useState(undefined); + + const [processedOutputs, setProcessedOutputs] = useState(undefined); + const [processedInputs, setProcessedInputs] = useState(undefined); + + const outputUuid = process?.containerRequest.outputUuid; + const requestUuid = process?.containerRequest.uuid; + + const containerRequest = process?.containerRequest; + + const inputMounts = getInputCollectionMounts(process?.containerRequest); + + // Resets state when changing processes + React.useEffect(() => { + setOutputs(undefined); + setInputs(undefined); + setProcessedOutputs(undefined); + setProcessedInputs(undefined); + }, [requestUuid]); + + // Fetch raw output (async for fetching from keep) + React.useEffect(() => { + if (containerRequest) { + fetchOutputs(containerRequest, setOutputs); + } + }, [containerRequest, fetchOutputs]); + + // Format raw output into ProcessIOParameter[] when it changes + React.useEffect(() => { + if (outputDetails !== undefined && outputDetails.rawOutputs && containerRequest) { + const outputDefinitions = getOutputParameters(containerRequest); + setProcessedOutputs(formatOutputData(outputDefinitions, outputDetails.rawOutputs, outputDetails.pdh, auth)); + } + }, [outputDetails, auth, containerRequest]); + + // Fetch raw inputs and format into ProcessIOParameter[] + // Can be sync because inputs are either already in containerRequest mounts or props + React.useEffect(() => { + if (containerRequest) { + const rawInputs = getRawInputs(containerRequest); + setInputs(rawInputs); + + const inputs = getInputs(containerRequest); + setProcessedInputs(formatInputData(inputs, auth)); + } + }, [requestUuid, auth, containerRequest]); + + return process ? - - + props.onContextMenu(event, process)} - openProcessInputDialog={props.openProcessInputDialog} - navigateToOutput={props.navigateToOutput} - openWorkflow={props.navigateToWorkflow} cancelProcess={props.cancelProcess} /> - - + + + + + + + + @@ -97,4 +176,26 @@ export const ProcessPanelRoot = withStyles(styles)( - ); + ; + } +); + +const formatInputData = (inputs: CommandInputParameter[], auth: AuthState): ProcessIOParameter[] => { + return inputs.map(input => { + return { + id: getIOParamId(input), + label: input.label || "", + value: getIOParamDisplayValue(auth, input) + }; + }); +}; + +const formatOutputData = (definitions: CommandOutputParameter[], values: any, pdh: string | undefined, auth: AuthState): ProcessIOParameter[] => { + return definitions.map(output => { + return { + id: getIOParamId(output), + label: output.label || "", + value: getIOParamDisplayValue(auth, Object.assign(output, { value: values[getIOParamId(output)] || [] }), pdh) + }; + }); +};