X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/cf895a44aa0b2a175bc70056ce0bf1c66cb8192f..912507a5c39c975554325f528e9b155ff42a03b1:/src/store/process-panel/process-panel-actions.ts?ds=sidebyside diff --git a/src/store/process-panel/process-panel-actions.ts b/src/store/process-panel/process-panel-actions.ts index 6a9ea337b6..9668485c2c 100644 --- a/src/store/process-panel/process-panel-actions.ts +++ b/src/store/process-panel/process-panel-actions.ts @@ -19,7 +19,7 @@ import { ContainerRequestResource } from "models/container-request"; import { CommandOutputParameter } from 'cwlts/mappings/v1.0/CommandOutputParameter'; import { CommandInputParameter, getIOParamId, WorkflowInputsData } from 'models/workflow'; import { getIOParamDisplayValue, ProcessIOParameter } from "views/process-panel/process-io-card"; -import { OutputDetails } from "./process-panel"; +import { OutputDetails, NodeInstanceType, NodeInfo } from "./process-panel"; import { AuthState } from "store/auth/auth-reducer"; export const processPanelActions = unionize({ @@ -32,6 +32,7 @@ export const processPanelActions = unionize({ SET_OUTPUT_RAW: ofType(), SET_OUTPUT_DEFINITIONS: ofType(), SET_OUTPUT_PARAMS: ofType(), + SET_NODE_INFO: ofType(), }); export type ProcessPanelAction = UnionOf; @@ -67,7 +68,7 @@ export const loadInputs = (containerRequest: ContainerRequestResource) => export const loadOutputs = (containerRequest: ContainerRequestResource) => async (dispatch: Dispatch, getState: () => RootState, services: ServiceRepository) => { - const noOutputs = {rawOutputs: {}}; + const noOutputs = { rawOutputs: {} }; if (!containerRequest.outputUuid) { dispatch(processPanelActions.SET_OUTPUT_RAW(noOutputs)); return; @@ -102,6 +103,34 @@ export const loadOutputs = (containerRequest: ContainerRequestResource) => } }; + +export const loadNodeJson = (containerRequest: ContainerRequestResource) => + async (dispatch: Dispatch, getState: () => RootState, services: ServiceRepository) => { + const noLog = { nodeInfo: null }; + if (!containerRequest.logUuid) { + dispatch(processPanelActions.SET_NODE_INFO(noLog)); + return; + }; + try { + const filesPromise = services.collectionService.files(containerRequest.logUuid); + const collectionPromise = services.collectionService.get(containerRequest.logUuid); + const [files] = await Promise.all([filesPromise, collectionPromise]); + + // Fetch node.json from keep + const nodeFile = files.find((file) => file.name === 'node.json') as CollectionFile | undefined; + let nodeData = nodeFile ? await services.collectionService.getFileContents(nodeFile) : undefined; + if (nodeData && (nodeData = JSON.parse(nodeData))) { + dispatch(processPanelActions.SET_NODE_INFO({ + nodeInfo: nodeData as NodeInstanceType + })); + } else { + dispatch(processPanelActions.SET_NODE_INFO(noLog)); + } + } catch { + dispatch(processPanelActions.SET_NODE_INFO(noLog)); + } + }; + export const loadOutputDefinitions = (containerRequest: ContainerRequestResource) => async (dispatch: Dispatch, getState: () => RootState, services: ServiceRepository) => { if (containerRequest && containerRequest.mounts) { @@ -136,7 +165,7 @@ export const initProcessPanelFilters = processPanelActions.SET_PROCESS_PANEL_FIL ProcessStatus.CANCELLED ]); -const formatInputData = (inputs: CommandInputParameter[], auth: AuthState): ProcessIOParameter[] => { +export const formatInputData = (inputs: CommandInputParameter[], auth: AuthState): ProcessIOParameter[] => { return inputs.map(input => { return { id: getIOParamId(input), @@ -146,7 +175,7 @@ const formatInputData = (inputs: CommandInputParameter[], auth: AuthState): Proc }); }; -const formatOutputData = (definitions: CommandOutputParameter[], values: any, pdh: string | undefined, auth: AuthState): ProcessIOParameter[] => { +export const formatOutputData = (definitions: CommandOutputParameter[], values: any, pdh: string | undefined, auth: AuthState): ProcessIOParameter[] => { return definitions.map(output => { return { id: getIOParamId(output),