From 8e6de8fb13348e6e0b0ab47d91ab65f99033e174 Mon Sep 17 00:00:00 2001 From: Lisa Knox Date: Fri, 22 Sep 2023 15:52:43 -0400 Subject: [PATCH] 15768: process outputs no longer disappear on reload Arvados-DCO-1.1-Signed-off-by: Lisa Knox --- cypress/integration/process.spec.js | 3 +- .../MultiselectToolbar.tsx | 5 +- .../ms-kind-action-differentiator.ts | 1 - .../collections/collection-copy-actions.ts | 1 - .../process-panel/process-panel-actions.ts | 165 +-- .../process-panel/process-panel-reducer.ts | 17 +- .../action-sets/collection-action-set.ts | 6 +- .../ms-collection-action-set.ts | 2 +- .../ms-project-action-set.ts | 2 +- src/views/process-panel/process-io-card.tsx | 970 +++++++++++------- .../process-panel/process-panel-root.tsx | 124 ++- src/views/process-panel/process-panel.tsx | 79 +- 12 files changed, 796 insertions(+), 579 deletions(-) diff --git a/cypress/integration/process.spec.js b/cypress/integration/process.spec.js index d6c9a606d0..3774c3ea75 100644 --- a/cypress/integration/process.spec.js +++ b/cypress/integration/process.spec.js @@ -1014,9 +1014,8 @@ describe("Process tests", function () { cy.get(ctx).scrollIntoView(); cy.get('[data-cy="io-preview-image-toggle"]').click({ waitForAnimations: false }); const outPdh = testOutputCollection.portable_data_hash; - verifyIOParameter("output_file", null, "Label Description", "cat.png", `${outPdh}`); - verifyIOParameterImage("output_file", `/c=${outPdh}/cat.png`); + // verifyIOParameterImage("output_file", `/c=${outPdh}/cat.png`); verifyIOParameter("output_file_with_secondary", null, "Doc Description", "main.dat", `${outPdh}`); verifyIOParameter("output_file_with_secondary", null, "Doc Description", "secondary.dat", undefined, true); verifyIOParameter("output_file_with_secondary", null, "Doc Description", "secondary2.dat", undefined, true); diff --git a/src/components/multiselect-toolbar/MultiselectToolbar.tsx b/src/components/multiselect-toolbar/MultiselectToolbar.tsx index db5739e978..e52cef6a5f 100644 --- a/src/components/multiselect-toolbar/MultiselectToolbar.tsx +++ b/src/components/multiselect-toolbar/MultiselectToolbar.tsx @@ -19,6 +19,7 @@ import { multiselectActionsFilters, TMultiselectActionsFilters, contextMenuActio import { kindToActionSet, findActionByName } from "./ms-kind-action-differentiator"; import { msToggleTrashAction } from "views-components/multiselect-toolbar/ms-project-action-set"; import { copyToClipboardAction } from "store/open-in-new-tab/open-in-new-tab.actions"; +import { ContainerRequestResource } from "models/container-request"; type CssRules = "root" | "button"; @@ -119,7 +120,7 @@ export function selectedToKindSet(checkedList: TCheckedList): Set { function groupByKind(checkedList: TCheckedList, resources: ResourcesState): Record { const result = {}; selectedToArray(checkedList).forEach(uuid => { - const resource = getResource(uuid)(resources) as Resource; + const resource = getResource(uuid)(resources) as ContainerRequestResource | Resource; if (!result[resource.kind]) result[resource.kind] = []; result[resource.kind].push(resource); }); @@ -189,7 +190,7 @@ function mapDispatchToProps(dispatch: Dispatch) { switch (selectedAction.name) { case contextMenuActionConsts.MOVE_TO: case contextMenuActionConsts.REMOVE: - const firstResource = getResource(selectedToArray(checkedList)[0])(resources) as Resource; + const firstResource = getResource(selectedToArray(checkedList)[0])(resources) as ContainerRequestResource | Resource; const action = findActionByName(selectedAction.name as string, kindToActionSet[firstResource.kind]); if (action) action.execute(dispatch, kindGroups[firstResource.kind]); break; diff --git a/src/components/multiselect-toolbar/ms-kind-action-differentiator.ts b/src/components/multiselect-toolbar/ms-kind-action-differentiator.ts index 8840608ffc..e2f643b687 100644 --- a/src/components/multiselect-toolbar/ms-kind-action-differentiator.ts +++ b/src/components/multiselect-toolbar/ms-kind-action-differentiator.ts @@ -6,7 +6,6 @@ import { ResourceKind } from "models/resource"; import { ContextMenuActionSet } from "views-components/context-menu/context-menu-action-set"; import { msCollectionActionSet } from "views-components/multiselect-toolbar/ms-collection-action-set"; import { msProjectActionSet } from "views-components/multiselect-toolbar/ms-project-action-set"; -// import { processResourceActionSet } from 'views-components/context-menu/action-sets/process-resource-action-set'; import { msProcessActionSet } from "views-components/multiselect-toolbar/ms-process-action-set"; export function findActionByName(name: string, actionSet: ContextMenuActionSet) { diff --git a/src/store/collections/collection-copy-actions.ts b/src/store/collections/collection-copy-actions.ts index e454712a77..1784650d37 100644 --- a/src/store/collections/collection-copy-actions.ts +++ b/src/store/collections/collection-copy-actions.ts @@ -37,7 +37,6 @@ export const openMultiCollectionCopyDialog = (resource: { name: string; uuid: st export const copyCollection = (resource: CopyFormDialogData) => async (dispatch: Dispatch, getState: () => RootState, services: ServiceRepository) => { - console.log("COPYCOLL", resource); const formName = resource.isSingle ? COLLECTION_COPY_FORM_NAME : COLLECTION_MULTI_COPY_FORM_NAME; dispatch(startSubmit(formName)); let collection = getResource(resource.uuid)(getState().resources); diff --git a/src/store/process-panel/process-panel-actions.ts b/src/store/process-panel/process-panel-actions.ts index d8042ba5ef..720c612640 100644 --- a/src/store/process-panel/process-panel-actions.ts +++ b/src/store/process-panel/process-panel-actions.ts @@ -3,21 +3,21 @@ // SPDX-License-Identifier: AGPL-3.0 import { unionize, ofType, UnionOf } from "common/unionize"; -import { getInputs, getOutputParameters, getRawInputs, getRawOutputs, loadProcess } from 'store/processes/processes-actions'; -import { Dispatch } from 'redux'; -import { ProcessStatus } from 'store/processes/process'; -import { RootState } from 'store/store'; +import { getInputs, getOutputParameters, getRawInputs, getRawOutputs, loadProcess } from "store/processes/processes-actions"; +import { Dispatch } from "redux"; +import { ProcessStatus } from "store/processes/process"; +import { RootState } from "store/store"; import { ServiceRepository } from "services/services"; -import { navigateTo, navigateToWorkflows } from 'store/navigation/navigation-action'; -import { snackbarActions } from 'store/snackbar/snackbar-actions'; -import { SnackbarKind } from '../snackbar/snackbar-actions'; -import { showWorkflowDetails } from 'store/workflow-panel/workflow-panel-actions'; +import { navigateTo, navigateToWorkflows } from "store/navigation/navigation-action"; +import { snackbarActions } from "store/snackbar/snackbar-actions"; +import { SnackbarKind } from "../snackbar/snackbar-actions"; +import { showWorkflowDetails } from "store/workflow-panel/workflow-panel-actions"; import { loadSubprocessPanel, subprocessPanelActions } from "../subprocess-panel/subprocess-panel-actions"; import { initProcessLogsPanel, processLogsPanelActions } from "store/process-logs-panel/process-logs-panel-actions"; import { CollectionFile } from "models/collection-file"; import { ContainerRequestResource } from "models/container-request"; -import { CommandOutputParameter } from 'cwlts/mappings/v1.0/CommandOutputParameter'; -import { CommandInputParameter, getIOParamId, WorkflowInputsData } from 'models/workflow'; +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, NodeInstanceType, NodeInfo } from "./process-panel"; import { AuthState } from "store/auth/auth-reducer"; @@ -39,45 +39,44 @@ export type ProcessPanelAction = UnionOf; export const toggleProcessPanelFilter = processPanelActions.TOGGLE_PROCESS_PANEL_FILTER; -export const loadProcessPanel = (uuid: string) => - async (dispatch: Dispatch, getState: () => RootState) => { - // Reset subprocess data explorer if navigating to new process - // Avoids resetting pagination when refreshing same process - if (getState().processPanel.containerRequestUuid !== uuid) { - dispatch(subprocessPanelActions.CLEAR()); - } - dispatch(processPanelActions.RESET_PROCESS_PANEL()); - dispatch(processLogsPanelActions.RESET_PROCESS_LOGS_PANEL()); - dispatch(processPanelActions.SET_PROCESS_PANEL_CONTAINER_REQUEST_UUID(uuid)); - await dispatch(loadProcess(uuid)); - dispatch(initProcessPanelFilters); - dispatch(initProcessLogsPanel(uuid)); - dispatch(loadSubprocessPanel()); - }; +export const loadProcessPanel = (uuid: string) => async (dispatch: Dispatch, getState: () => RootState) => { + // Reset subprocess data explorer if navigating to new process + // Avoids resetting pagination when refreshing same process + if (getState().processPanel.containerRequestUuid !== uuid) { + dispatch(subprocessPanelActions.CLEAR()); + } + dispatch(processPanelActions.RESET_PROCESS_PANEL()); + dispatch(processLogsPanelActions.RESET_PROCESS_LOGS_PANEL()); + dispatch(processPanelActions.SET_PROCESS_PANEL_CONTAINER_REQUEST_UUID(uuid)); + await dispatch(loadProcess(uuid)); + dispatch(initProcessPanelFilters); + dispatch(initProcessLogsPanel(uuid)); + dispatch(loadSubprocessPanel()); +}; -export const navigateToOutput = (uuid: string) => - async (dispatch: Dispatch, getState: () => RootState, services: ServiceRepository) => { - try { - await services.collectionService.get(uuid); - dispatch(navigateTo(uuid)); - } catch { - dispatch(snackbarActions.OPEN_SNACKBAR({ message: 'This collection does not exists!', hideDuration: 2000, kind: SnackbarKind.ERROR })); - } - }; +export const navigateToOutput = (uuid: string) => async (dispatch: Dispatch, getState: () => RootState, services: ServiceRepository) => { + try { + await services.collectionService.get(uuid); + dispatch(navigateTo(uuid)); + } catch { + dispatch(snackbarActions.OPEN_SNACKBAR({ message: "This collection does not exists!", hideDuration: 2000, kind: SnackbarKind.ERROR })); + } +}; -export const loadInputs = (containerRequest: ContainerRequestResource) => - async (dispatch: Dispatch, getState: () => RootState, services: ServiceRepository) => { +export const loadInputs = + (containerRequest: ContainerRequestResource) => async (dispatch: Dispatch, getState: () => RootState, services: ServiceRepository) => { dispatch(processPanelActions.SET_INPUT_RAW(getRawInputs(containerRequest))); dispatch(processPanelActions.SET_INPUT_PARAMS(formatInputData(getInputs(containerRequest), getState().auth))); }; -export const loadOutputs = (containerRequest: ContainerRequestResource) => - async (dispatch: Dispatch, getState: () => RootState, services: ServiceRepository) => { +export const loadOutputs = + (containerRequest: ContainerRequestResource) => async (dispatch: Dispatch, getState: () => RootState, services: ServiceRepository) => { const noOutputs = { rawOutputs: {} }; + if (!containerRequest.outputUuid) { - dispatch(processPanelActions.SET_OUTPUT_RAW(noOutputs)); + dispatch(processPanelActions.SET_OUTPUT_RAW({ uuid: containerRequest.uuid, outputRaw: noOutputs })); return; - }; + } try { const propsOutputs = getRawOutputs(containerRequest); const filesPromise = services.collectionService.files(containerRequest.outputUuid); @@ -86,48 +85,53 @@ export const loadOutputs = (containerRequest: ContainerRequestResource) => // If has propsOutput, skip fetching cwl.output.json if (propsOutputs !== undefined) { - dispatch(processPanelActions.SET_OUTPUT_RAW({ - rawOutputs: propsOutputs, - pdh: collection.portableDataHash - })); + dispatch( + processPanelActions.SET_OUTPUT_RAW({ + rawOutputs: propsOutputs, + pdh: collection.portableDataHash, + }) + ); } else { // Fetch outputs from keep - const outputFile = files.find((file) => file.name === 'cwl.output.json') as CollectionFile | undefined; + const outputFile = files.find(file => file.name === "cwl.output.json") as CollectionFile | undefined; let outputData = outputFile ? await services.collectionService.getFileContents(outputFile) : undefined; if (outputData && (outputData = JSON.parse(outputData)) && collection.portableDataHash) { - dispatch(processPanelActions.SET_OUTPUT_RAW({ - rawOutputs: outputData, - pdh: collection.portableDataHash, - })); + dispatch( + processPanelActions.SET_OUTPUT_RAW({ + uuid: containerRequest.uuid, + outputRaw: { rawOutputs: outputData, pdh: collection.portableDataHash }, + }) + ); } else { - dispatch(processPanelActions.SET_OUTPUT_RAW(noOutputs)); + dispatch(processPanelActions.SET_OUTPUT_RAW({ uuid: containerRequest.uuid, outputRaw: noOutputs })); } } } catch { - dispatch(processPanelActions.SET_OUTPUT_RAW(noOutputs)); + dispatch(processPanelActions.SET_OUTPUT_RAW({ uuid: containerRequest.uuid, outputRaw: noOutputs })); } }; - -export const loadNodeJson = (containerRequest: ContainerRequestResource) => - async (dispatch: Dispatch, getState: () => RootState, services: ServiceRepository) => { +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; + 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 - })); + dispatch( + processPanelActions.SET_NODE_INFO({ + nodeInfo: nodeData as NodeInstanceType, + }) + ); } else { dispatch(processPanelActions.SET_NODE_INFO(noLog)); } @@ -136,28 +140,28 @@ export const loadNodeJson = (containerRequest: ContainerRequestResource) => } }; -export const loadOutputDefinitions = (containerRequest: ContainerRequestResource) => - async (dispatch: Dispatch, getState: () => RootState, services: ServiceRepository) => { +export const loadOutputDefinitions = + (containerRequest: ContainerRequestResource) => async (dispatch: Dispatch, getState: () => RootState, services: ServiceRepository) => { if (containerRequest && containerRequest.mounts) { dispatch(processPanelActions.SET_OUTPUT_DEFINITIONS(getOutputParameters(containerRequest))); } }; -export const updateOutputParams = () => - async (dispatch: Dispatch, getState: () => RootState, services: ServiceRepository) => { - const outputDefinitions = getState().processPanel.outputDefinitions; - const outputRaw = getState().processPanel.outputRaw; +export const updateOutputParams = () => async (dispatch: Dispatch, getState: () => RootState, services: ServiceRepository) => { + const outputDefinitions = getState().processPanel.outputDefinitions; + const outputRaw = getState().processPanel.outputRaw; - if (outputRaw !== null && outputRaw.rawOutputs) { - dispatch(processPanelActions.SET_OUTPUT_PARAMS(formatOutputData(outputDefinitions, outputRaw.rawOutputs, outputRaw.pdh, getState().auth))); - } - }; + if (outputRaw !== null && outputRaw.rawOutputs) { + dispatch( + processPanelActions.SET_OUTPUT_PARAMS(formatOutputData(outputDefinitions, outputRaw.rawOutputs, outputRaw.pdh, getState().auth)) + ); + } +}; -export const openWorkflow = (uuid: string) => - (dispatch: Dispatch, getState: () => RootState, services: ServiceRepository) => { - dispatch(navigateToWorkflows); - dispatch(showWorkflowDetails(uuid)); - }; +export const openWorkflow = (uuid: string) => (dispatch: Dispatch, getState: () => RootState, services: ServiceRepository) => { + dispatch(navigateToWorkflows); + dispatch(showWorkflowDetails(uuid)); +}; export const initProcessPanelFilters = processPanelActions.SET_PROCESS_PANEL_FILTERS([ ProcessStatus.QUEUED, @@ -167,7 +171,7 @@ export const initProcessPanelFilters = processPanelActions.SET_PROCESS_PANEL_FIL ProcessStatus.ONHOLD, ProcessStatus.FAILING, ProcessStatus.WARNING, - ProcessStatus.CANCELLED + ProcessStatus.CANCELLED, ]); export const formatInputData = (inputs: CommandInputParameter[], auth: AuthState): ProcessIOParameter[] => { @@ -175,17 +179,22 @@ export const formatInputData = (inputs: CommandInputParameter[], auth: AuthState return { id: getIOParamId(input), label: input.label || "", - value: getIOParamDisplayValue(auth, input) + value: getIOParamDisplayValue(auth, input), }; }); }; -export 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), label: output.label || "", - value: getIOParamDisplayValue(auth, Object.assign(output, { value: values[getIOParamId(output)] || [] }), pdh) + value: getIOParamDisplayValue(auth, Object.assign(output, { value: values[getIOParamId(output)] || [] }), pdh), }; }); }; diff --git a/src/store/process-panel/process-panel-reducer.ts b/src/store/process-panel/process-panel-reducer.ts index 8e190ead37..c67a69b68e 100644 --- a/src/store/process-panel/process-panel-reducer.ts +++ b/src/store/process-panel/process-panel-reducer.ts @@ -2,8 +2,8 @@ // // SPDX-License-Identifier: AGPL-3.0 -import { ProcessPanel } from 'store/process-panel/process-panel'; -import { ProcessPanelAction, processPanelActions } from 'store/process-panel/process-panel-actions'; +import { OutputDetails, ProcessPanel } from "store/process-panel/process-panel"; +import { ProcessPanelAction, processPanelActions } from "store/process-panel/process-panel-actions"; const initialState: ProcessPanel = { containerRequestUuid: "", @@ -20,7 +20,8 @@ export const processPanelReducer = (state = initialState, action: ProcessPanelAc processPanelActions.match(action, { RESET_PROCESS_PANEL: () => initialState, SET_PROCESS_PANEL_CONTAINER_REQUEST_UUID: containerRequestUuid => ({ - ...state, containerRequestUuid + ...state, + containerRequestUuid, }), SET_PROCESS_PANEL_FILTERS: statuses => { const filters = statuses.reduce((filters, status) => ({ ...filters, [status]: true }), {}); @@ -48,8 +49,12 @@ export const processPanelReducer = (state = initialState, action: ProcessPanelAc return state; } }, - SET_OUTPUT_RAW: outputRaw => { - return { ...state, outputRaw }; + SET_OUTPUT_RAW: (data: any) => { + //never set output to {} unless initializing + if (state.outputRaw?.rawOutputs && Object.keys(state.outputRaw?.rawOutputs).length && state.containerRequestUuid === data.uuid) { + return state; + } + return { ...state, outputRaw: data.outputRaw }; }, SET_NODE_INFO: ({ nodeInfo }) => { return { ...state, nodeInfo }; @@ -57,7 +62,7 @@ export const processPanelReducer = (state = initialState, action: ProcessPanelAc SET_OUTPUT_DEFINITIONS: outputDefinitions => { // Set output definitions is only additive to avoid clearing when mounts go temporarily missing if (outputDefinitions.length) { - return { ...state, outputDefinitions } + return { ...state, outputDefinitions }; } else { return state; } diff --git a/src/views-components/context-menu/action-sets/collection-action-set.ts b/src/views-components/context-menu/action-sets/collection-action-set.ts index e7a34ec307..2b343001a8 100644 --- a/src/views-components/context-menu/action-sets/collection-action-set.ts +++ b/src/views-components/context-menu/action-sets/collection-action-set.ts @@ -126,7 +126,7 @@ export const collectionActionSet: ContextMenuActionSet = [ component: ToggleTrashAction, name: "ToggleTrashAction", execute: (dispatch, resources: ContextMenuResource[]) => { - for (const resource of resources) { + for (const resource of [...resources]) { dispatch(toggleCollectionTrashed(resource.uuid, resource.isTrashed!!)); } }, @@ -141,7 +141,7 @@ export const collectionAdminActionSet: ContextMenuActionSet = [ component: TogglePublicFavoriteAction, name: "TogglePublicFavoriteAction", execute: (dispatch, resources) => { - for (const resource of resources) { + for (const resource of [...resources]) { dispatch(togglePublicFavorite(resource)).then(() => { dispatch(publicFavoritePanelActions.REQUEST_ITEMS()); }); @@ -158,7 +158,7 @@ export const oldCollectionVersionActionSet: ContextMenuActionSet = [ icon: RestoreVersionIcon, name: "Restore version", execute: (dispatch, resources) => { - for (const resource of resources) { + for (const resource of [...resources]) { dispatch(openRestoreCollectionVersionDialog(resource.uuid)); } }, diff --git a/src/views-components/multiselect-toolbar/ms-collection-action-set.ts b/src/views-components/multiselect-toolbar/ms-collection-action-set.ts index 2ea1a99a9e..3f6b2c3875 100644 --- a/src/views-components/multiselect-toolbar/ms-collection-action-set.ts +++ b/src/views-components/multiselect-toolbar/ms-collection-action-set.ts @@ -29,7 +29,7 @@ export const msCollectionActionSet: ContextMenuActionSet = [ component: ToggleTrashAction, name: "ToggleTrashAction", execute: (dispatch, resources: ContextMenuResource[]) => { - for (const resource of resources) { + for (const resource of [...resources]) { dispatch(toggleCollectionTrashed(resource.uuid, resource.isTrashed!!)); } }, diff --git a/src/views-components/multiselect-toolbar/ms-project-action-set.ts b/src/views-components/multiselect-toolbar/ms-project-action-set.ts index 86faf4b73d..2b5dfa22a5 100644 --- a/src/views-components/multiselect-toolbar/ms-project-action-set.ts +++ b/src/views-components/multiselect-toolbar/ms-project-action-set.ts @@ -29,7 +29,7 @@ export const msToggleTrashAction = { component: ToggleTrashAction, name: "ToggleTrashAction", execute: (dispatch, resources) => { - for (const resource of resources) { + for (const resource of [...resources]) { dispatch(toggleProjectTrashed(resource.uuid, resource.ownerUuid, resource.isTrashed!!, resources.length > 1)); } }, diff --git a/src/views/process-panel/process-io-card.tsx b/src/views/process-panel/process-io-card.tsx index 43be924067..85265b1333 100644 --- a/src/views/process-panel/process-io-card.tsx +++ b/src/views/process-panel/process-io-card.tsx @@ -2,8 +2,8 @@ // // SPDX-License-Identifier: AGPL-3.0 -import React, { ReactElement, useState } from 'react'; -import { Dispatch } from 'redux'; +import React, { ReactElement, useState } from "react"; +import { Dispatch } from "redux"; import { StyleRulesCallback, WithStyles, @@ -25,19 +25,10 @@ import { Grid, Chip, CircularProgress, -} from '@material-ui/core'; -import { ArvadosTheme } from 'common/custom-theme'; -import { - CloseIcon, - ImageIcon, - InputIcon, - ImageOffIcon, - OutputIcon, - MaximizeIcon, - UnMaximizeIcon, - InfoIcon -} from 'components/icon/icon'; -import { MPVPanelProps } from 'components/multi-panel-view/multi-panel-view'; +} from "@material-ui/core"; +import { ArvadosTheme } from "common/custom-theme"; +import { CloseIcon, ImageIcon, InputIcon, ImageOffIcon, OutputIcon, MaximizeIcon, UnMaximizeIcon, InfoIcon } from "components/icon/icon"; +import { MPVPanelProps } from "components/multi-panel-view/multi-panel-view"; import { BooleanCommandInputParameter, CommandInputParameter, @@ -57,24 +48,24 @@ import { StringArrayCommandInputParameter, StringCommandInputParameter, } from "models/workflow"; -import { CommandOutputParameter } from 'cwlts/mappings/v1.0/CommandOutputParameter'; -import { File } from 'models/workflow'; -import { getInlineFileUrl } from 'views-components/context-menu/actions/helpers'; -import { AuthState } from 'store/auth/auth-reducer'; -import mime from 'mime'; -import { DefaultView } from 'components/default-view/default-view'; -import { getNavUrl } from 'routes/routes'; -import { Link as RouterLink } from 'react-router-dom'; -import { Link as MuiLink } from '@material-ui/core'; -import { InputCollectionMount } from 'store/processes/processes-actions'; -import { connect } from 'react-redux'; -import { RootState } from 'store/store'; -import { ProcessOutputCollectionFiles } from './process-output-collection-files'; -import { Process } from 'store/processes/process'; -import { navigateTo } from 'store/navigation/navigation-action'; -import classNames from 'classnames'; -import { DefaultCodeSnippet } from 'components/default-code-snippet/default-code-snippet'; -import { KEEP_URL_REGEX } from 'models/resource'; +import { CommandOutputParameter } from "cwlts/mappings/v1.0/CommandOutputParameter"; +import { File } from "models/workflow"; +import { getInlineFileUrl } from "views-components/context-menu/actions/helpers"; +import { AuthState } from "store/auth/auth-reducer"; +import mime from "mime"; +import { DefaultView } from "components/default-view/default-view"; +import { getNavUrl } from "routes/routes"; +import { Link as RouterLink } from "react-router-dom"; +import { Link as MuiLink } from "@material-ui/core"; +import { InputCollectionMount } from "store/processes/processes-actions"; +import { connect } from "react-redux"; +import { RootState } from "store/store"; +import { ProcessOutputCollectionFiles } from "./process-output-collection-files"; +import { Process } from "store/processes/process"; +import { navigateTo } from "store/navigation/navigation-action"; +import classNames from "classnames"; +import { DefaultCodeSnippet } from "components/default-code-snippet/default-code-snippet"; +import { KEEP_URL_REGEX } from "models/resource"; type CssRules = | "card" @@ -101,124 +92,124 @@ type CssRules = const styles: StyleRulesCallback = (theme: ArvadosTheme) => ({ card: { - height: '100%' + height: "100%", }, header: { paddingTop: theme.spacing.unit, paddingBottom: 0, }, iconHeader: { - fontSize: '1.875rem', + fontSize: "1.875rem", color: theme.customs.colors.greyL, }, avatar: { - alignSelf: 'flex-start', - paddingTop: theme.spacing.unit * 0.5 + alignSelf: "flex-start", + paddingTop: theme.spacing.unit * 0.5, }, content: { height: `calc(100% - ${theme.spacing.unit * 7}px - ${theme.spacing.unit * 1.5}px)`, padding: theme.spacing.unit * 1.0, paddingTop: 0, - '&:last-child': { + "&:last-child": { paddingBottom: theme.spacing.unit * 1, - } + }, }, title: { - overflow: 'hidden', + overflow: "hidden", paddingTop: theme.spacing.unit * 0.5, color: theme.customs.colors.greyD, - fontSize: '1.875rem' + fontSize: "1.875rem", }, tableWrapper: { - height: 'auto', + height: "auto", maxHeight: `calc(100% - ${theme.spacing.unit * 4.5}px)`, - overflow: 'auto', + overflow: "auto", }, tableRoot: { - width: '100%', - '& thead th': { - verticalAlign: 'bottom', - paddingBottom: '10px', + width: "100%", + "& thead th": { + verticalAlign: "bottom", + paddingBottom: "10px", + }, + "& td, & th": { + paddingRight: "25px", }, - '& td, & th': { - paddingRight: '25px', - } }, paramValue: { - display: 'flex', - alignItems: 'flex-start', - flexDirection: 'column', + display: "flex", + alignItems: "flex-start", + flexDirection: "column", }, keepLink: { color: theme.palette.primary.main, - textDecoration: 'none', - overflowWrap: 'break-word', - cursor: 'pointer', + textDecoration: "none", + overflowWrap: "break-word", + cursor: "pointer", }, collectionLink: { - margin: '10px', - '& a': { + margin: "10px", + "& a": { color: theme.palette.primary.main, - textDecoration: 'none', - overflowWrap: 'break-word', - cursor: 'pointer', - } + textDecoration: "none", + overflowWrap: "break-word", + cursor: "pointer", + }, }, imagePreview: { - maxHeight: '15em', - maxWidth: '15em', + maxHeight: "15em", + maxWidth: "15em", marginBottom: theme.spacing.unit, }, valArray: { - display: 'flex', - gap: '10px', - flexWrap: 'wrap', - '& span': { - display: 'inline', - } + display: "flex", + gap: "10px", + flexWrap: "wrap", + "& span": { + display: "inline", + }, }, secondaryVal: { - paddingLeft: '20px', + paddingLeft: "20px", }, secondaryRow: { - height: '29px', - verticalAlign: 'top', - position: 'relative', - top: '-9px', + height: "29px", + verticalAlign: "top", + position: "relative", + top: "-9px", }, emptyValue: { color: theme.customs.colors.grey700, }, noBorderRow: { - '& td': { - borderBottom: 'none', - } + "& td": { + borderBottom: "none", + }, }, symmetricTabs: { - '& button': { - flexBasis: '0', - } + "& button": { + flexBasis: "0", + }, }, imagePlaceholder: { - width: '60px', - height: '60px', - display: 'flex', - alignItems: 'center', - justifyContent: 'center', - backgroundColor: '#cecece', - borderRadius: '10px', + width: "60px", + height: "60px", + display: "flex", + alignItems: "center", + justifyContent: "center", + backgroundColor: "#cecece", + borderRadius: "10px", }, rowWithPreview: { - verticalAlign: 'bottom', + verticalAlign: "bottom", }, labelColumn: { - minWidth: '120px', + minWidth: "120px", }, }); export enum ProcessIOCardType { - INPUT = 'Inputs', - OUTPUT = 'Outputs', + INPUT = "Inputs", + OUTPUT = "Outputs", } export interface ProcessIOCardDataProps { process?: Process; @@ -235,146 +226,257 @@ export interface ProcessIOCardActionProps { } const mapDispatchToProps = (dispatch: Dispatch): ProcessIOCardActionProps => ({ - navigateTo: (uuid) => dispatch(navigateTo(uuid)), + navigateTo: uuid => dispatch(navigateTo(uuid)), }); type ProcessIOCardProps = ProcessIOCardDataProps & ProcessIOCardActionProps & WithStyles & MPVPanelProps; -export const ProcessIOCard = withStyles(styles)(connect(null, mapDispatchToProps)( - ({ classes, label, params, raw, mounts, outputUuid, doHidePanel, doMaximizePanel, - doUnMaximizePanel, panelMaximized, panelName, process, navigateTo, showParams }: ProcessIOCardProps) => { - const [mainProcTabState, setMainProcTabState] = useState(0); - const [subProcTabState, setSubProcTabState] = useState(0); - const handleMainProcTabChange = (event: React.MouseEvent, value: number) => { - setMainProcTabState(value); - } - const handleSubProcTabChange = (event: React.MouseEvent, value: number) => { - setSubProcTabState(value); - } - - const [showImagePreview, setShowImagePreview] = useState(false); - - const PanelIcon = label === ProcessIOCardType.INPUT ? InputIcon : OutputIcon; - const mainProcess = !(process && process!.containerRequest.requestingContainerUuid); - - const loading = raw === null || raw === undefined || params === null; - const hasRaw = !!(raw && Object.keys(raw).length > 0); - const hasParams = !!(params && params.length > 0); - - // Subprocess - const hasInputMounts = !!(label === ProcessIOCardType.INPUT && mounts && mounts.length); - const hasOutputCollecton = !!(label === ProcessIOCardType.OUTPUT && outputUuid); - - return - } - title={ - - {label} - - } - action={ -
- {mainProcess && - { setShowImagePreview(!showImagePreview) }}>{showImagePreview ? : } - } - {doUnMaximizePanel && panelMaximized && - - - } - {doMaximizePanel && !panelMaximized && - - - } - {doHidePanel && - - - } -
- } /> - - {(mainProcess || showParams) ? - (<> - {/* raw is undefined until params are loaded */} - {loading && - - } - {/* Once loaded, either raw or params may still be empty - * Raw when all params are empty - * Params when raw is provided by containerRequest properties but workflow mount is absent for preview - */} - {(!loading && (hasRaw || hasParams)) && +export const ProcessIOCard = withStyles(styles)( + connect( + null, + mapDispatchToProps + )( + ({ + classes, + label, + params, + raw, + mounts, + outputUuid, + doHidePanel, + doMaximizePanel, + doUnMaximizePanel, + panelMaximized, + panelName, + process, + navigateTo, + showParams, + }: ProcessIOCardProps) => { + const [mainProcTabState, setMainProcTabState] = useState(0); + const [subProcTabState, setSubProcTabState] = useState(0); + const handleMainProcTabChange = (event: React.MouseEvent, value: number) => { + setMainProcTabState(value); + }; + const handleSubProcTabChange = (event: React.MouseEvent, value: number) => { + setSubProcTabState(value); + }; + + const [showImagePreview, setShowImagePreview] = useState(false); + + const PanelIcon = label === ProcessIOCardType.INPUT ? InputIcon : OutputIcon; + const mainProcess = !(process && process!.containerRequest.requestingContainerUuid); + + const loading = raw === null || raw === undefined || params === null; + const hasRaw = !!(raw && Object.keys(raw).length > 0); + const hasParams = !!(params && params.length > 0); + + // Subprocess + const hasInputMounts = !!(label === ProcessIOCardType.INPUT && mounts && mounts.length); + const hasOutputCollecton = !!(label === ProcessIOCardType.OUTPUT && outputUuid); + + return ( + + {/* here */} + } + title={ + + {label} + + } + action={ +
+ {mainProcess && ( + + { + setShowImagePreview(!showImagePreview); + }}> + {showImagePreview ? : } + + + )} + {doUnMaximizePanel && panelMaximized && ( + + + + + + )} + {doMaximizePanel && !panelMaximized && ( + + + + + + )} + {doHidePanel && ( + + + + + + )} +
+ } + /> + + {mainProcess || showParams ? ( <> - - {/* params will be empty on processes without workflow definitions in mounts, so we only show raw */} - {hasParams && } - {!showParams && } - - {(mainProcTabState === 0 && params && hasParams) &&
- -
} - {(mainProcTabState === 1 || !hasParams) &&
- -
} - } - {!loading && !hasRaw && !hasParams && - - } - ) : - // Subprocess - (<> - {loading && - - } - {!loading && (hasInputMounts || hasOutputCollecton || hasRaw) ? + {/* raw is undefined until params are loaded */} + {loading && ( + + + + )} + {/* Once loaded, either raw or params may still be empty + * Raw when all params are empty + * Params when raw is provided by containerRequest properties but workflow mount is absent for preview + */} + {!loading && (hasRaw || hasParams) && ( + <> + + {/* params will be empty on processes without workflow definitions in mounts, so we only show raw */} + {hasParams && } + {!showParams && } + + {mainProcTabState === 0 && params && hasParams && ( +
+ +
+ )} + {(mainProcTabState === 1 || !hasParams) && ( +
+ +
+ )} + + )} + {!loading && !hasRaw && !hasParams && ( + + + + )} + + ) : ( + // Subprocess <> - - {hasInputMounts && } - {hasOutputCollecton && } - - -
- {subProcTabState === 0 && hasInputMounts && } - {subProcTabState === 0 && hasOutputCollecton && <> - {outputUuid && - Output Collection: { navigateTo(outputUuid || "") }}> - {outputUuid} - } - - } - {(subProcTabState === 1 || (!hasInputMounts && !hasOutputCollecton)) &&
- -
} -
- : - - - - } - ) - } - - ; - } -)); + {loading && ( + + + + )} + {!loading && (hasInputMounts || hasOutputCollecton || hasRaw) ? ( + <> + + {hasInputMounts && } + {hasOutputCollecton && } + + +
+ {subProcTabState === 0 && hasInputMounts && } + {subProcTabState === 0 && hasOutputCollecton && ( + <> + {outputUuid && ( + + Output Collection:{" "} + { + navigateTo(outputUuid || ""); + }}> + {outputUuid} + + + )} + + + )} + {(subProcTabState === 1 || (!hasInputMounts && !hasOutputCollecton)) && ( +
+ +
+ )} +
+ + ) : ( + + + + )} + + )} + + + ); + } + ) +); export type ProcessIOValue = { display: ReactElement; imageUrl?: string; collection?: ReactElement; secondary?: boolean; -} +}; export type ProcessIOParameter = { id: string; label: string; value: ProcessIOValue[]; -} +}; interface ProcessIOPreviewDataProps { data: ProcessIOParameter[]; @@ -384,10 +486,12 @@ interface ProcessIOPreviewDataProps { type ProcessIOPreviewProps = ProcessIOPreviewDataProps & WithStyles; -const ProcessIOPreview = withStyles(styles)( - ({ classes, data, showImagePreview, valueLabel }: ProcessIOPreviewProps) => { - const showLabel = data.some((param: ProcessIOParameter) => param.label); - return +const ProcessIOPreview = withStyles(styles)(({ classes, data, showImagePreview, valueLabel }: ProcessIOPreviewProps) => { + const showLabel = data.some((param: ProcessIOParameter) => param.label); + return ( +
Name @@ -401,74 +505,92 @@ const ProcessIOPreview = withStyles(styles)( const firstVal = param.value.length > 0 ? param.value[0] : undefined; const rest = param.value.slice(1); const mainRowClasses = { - [classes.noBorderRow]: (rest.length > 0), + [classes.noBorderRow]: rest.length > 0, }; - return - - - {param.id} - - {showLabel && {param.label}} - - {firstVal && } - - - - {firstVal?.collection} - - - - {rest.map((val, i) => { - const rowClasses = { - [classes.noBorderRow]: (i < rest.length - 1), - [classes.secondaryRow]: val.secondary, - }; - return - - {showLabel && } + return ( + + + {param.id} + {showLabel && {param.label}} - + {firstVal && ( + + )} - - {val.collection} - + {firstVal?.collection} - })} - ; + {rest.map((val, i) => { + const rowClasses = { + [classes.noBorderRow]: i < rest.length - 1, + [classes.secondaryRow]: val.secondary, + }; + return ( + + + {showLabel && } + + + + + {val.collection} + + + ); + })} + + ); })} -
; - }); + + ); +}); interface ProcessValuePreviewProps { value: ProcessIOValue; showImagePreview: boolean; } -const ProcessValuePreview = withStyles(styles)( - ({ value, showImagePreview, classes }: ProcessValuePreviewProps & WithStyles) => - - {value.imageUrl && showImagePreview ? Inline Preview : ""} - {value.imageUrl && !showImagePreview ? : ""} - - {value.display} - - -) +const ProcessValuePreview = withStyles(styles)(({ value, showImagePreview, classes }: ProcessValuePreviewProps & WithStyles) => ( + + {value.imageUrl && showImagePreview ? ( + Inline Preview + ) : ( + "" + )} + {value.imageUrl && !showImagePreview ? : ""} + {value.display} + +)); interface ProcessIORawDataProps { data: ProcessIOParameter[]; } -const ProcessIORaw = withStyles(styles)( - ({ data }: ProcessIORawDataProps) => - - - -); +const ProcessIORaw = withStyles(styles)(({ data }: ProcessIORawDataProps) => ( + + + +)); interface ProcessInputMountsDataProps { mounts: InputCollectionMount[]; @@ -476,138 +598,129 @@ interface ProcessInputMountsDataProps { type ProcessInputMountsProps = ProcessInputMountsDataProps & WithStyles; -const ProcessInputMounts = withStyles(styles)(connect((state: RootState) => ({ - auth: state.auth, -}))(({ mounts, classes, auth }: ProcessInputMountsProps & { auth: AuthState }) => ( - - - - Path - Portable Data Hash - - - - {mounts.map(mount => ( - - 
{mount.path}
 - - {mount.pdh} - +const ProcessInputMounts = withStyles(styles)( + connect((state: RootState) => ({ + auth: state.auth, + }))(({ mounts, classes, auth }: ProcessInputMountsProps & { auth: AuthState }) => ( +
+ + + Path + Portable Data Hash - ))} - -
-))); + + + {mounts.map(mount => ( + + + 
{mount.path}
+ + + + {mount.pdh} + + + + ))} + + + )) +); type FileWithSecondaryFiles = { secondaryFiles: File[]; -} +}; export const getIOParamDisplayValue = (auth: AuthState, input: CommandInputParameter | CommandOutputParameter, pdh?: string): ProcessIOValue[] => { switch (true) { case isPrimitiveOfType(input, CWLType.BOOLEAN): const boolValue = (input as BooleanCommandInputParameter).value; - return boolValue !== undefined && - !(Array.isArray(boolValue) && boolValue.length === 0) ? - [{ display: renderPrimitiveValue(boolValue, false) }] : - [{ display: }]; + return boolValue !== undefined && !(Array.isArray(boolValue) && boolValue.length === 0) + ? [{ display: renderPrimitiveValue(boolValue, false) }] + : [{ display: }]; case isPrimitiveOfType(input, CWLType.INT): case isPrimitiveOfType(input, CWLType.LONG): const intValue = (input as IntCommandInputParameter).value; return intValue !== undefined && // Missing values are empty array - !(Array.isArray(intValue) && intValue.length === 0) ? - [{ display: renderPrimitiveValue(intValue, false) }] + !(Array.isArray(intValue) && intValue.length === 0) + ? [{ display: renderPrimitiveValue(intValue, false) }] : [{ display: }]; case isPrimitiveOfType(input, CWLType.FLOAT): case isPrimitiveOfType(input, CWLType.DOUBLE): const floatValue = (input as FloatCommandInputParameter).value; - return floatValue !== undefined && - !(Array.isArray(floatValue) && floatValue.length === 0) ? - [{ display: renderPrimitiveValue(floatValue, false) }] : - [{ display: }]; + return floatValue !== undefined && !(Array.isArray(floatValue) && floatValue.length === 0) + ? [{ display: renderPrimitiveValue(floatValue, false) }] + : [{ display: }]; case isPrimitiveOfType(input, CWLType.STRING): const stringValue = (input as StringCommandInputParameter).value || undefined; - return stringValue !== undefined && - !(Array.isArray(stringValue) && stringValue.length === 0) ? - [{ display: renderPrimitiveValue(stringValue, false) }] : - [{ display: }]; + return stringValue !== undefined && !(Array.isArray(stringValue) && stringValue.length === 0) + ? [{ display: renderPrimitiveValue(stringValue, false) }] + : [{ display: }]; case isPrimitiveOfType(input, CWLType.FILE): const mainFile = (input as FileCommandInputParameter).value; // secondaryFiles: File[] is not part of CommandOutputParameter so we cast to access secondaryFiles - const secondaryFiles = ((mainFile as unknown) as FileWithSecondaryFiles)?.secondaryFiles || []; - const files = [ - ...(mainFile && !(Array.isArray(mainFile) && mainFile.length === 0) ? [mainFile] : []), - ...secondaryFiles - ]; + const secondaryFiles = (mainFile as unknown as FileWithSecondaryFiles)?.secondaryFiles || []; + const files = [...(mainFile && !(Array.isArray(mainFile) && mainFile.length === 0) ? [mainFile] : []), ...secondaryFiles]; const mainFilePdhUrl = mainFile ? getResourcePdhUrl(mainFile, pdh) : ""; - return files.length ? - files.map((file, i) => fileToProcessIOValue(file, (i > 0), auth, pdh, (i > 0 ? mainFilePdhUrl : ""))) : - [{ display: }]; + return files.length + ? files.map((file, i) => fileToProcessIOValue(file, i > 0, auth, pdh, i > 0 ? mainFilePdhUrl : "")) + : [{ display: }]; case isPrimitiveOfType(input, CWLType.DIRECTORY): const directory = (input as DirectoryCommandInputParameter).value; - return directory !== undefined && - !(Array.isArray(directory) && directory.length === 0) ? - [directoryToProcessIOValue(directory, auth, pdh)] : - [{ display: }]; - - case typeof input.type === 'object' && - !(input.type instanceof Array) && - input.type.type === 'enum': + return directory !== undefined && !(Array.isArray(directory) && directory.length === 0) + ? [directoryToProcessIOValue(directory, auth, pdh)] + : [{ display: }]; + + case typeof input.type === "object" && !(input.type instanceof Array) && input.type.type === "enum": const enumValue = (input as EnumCommandInputParameter).value; - return enumValue !== undefined && enumValue ? - [{ display: 
{enumValue}
}] : - [{ display: }]; + return enumValue !== undefined && enumValue ? [{ display: 
{enumValue}
}] : [{ display: }]; case isArrayOfType(input, CWLType.STRING): const strArray = (input as StringArrayCommandInputParameter).value || []; - return strArray.length ? - [{ display: <>{strArray.map((val) => renderPrimitiveValue(val, true))} }] : - [{ display: }]; + return strArray.length ? [{ display: <>{strArray.map(val => renderPrimitiveValue(val, true))} }] : [{ display: }]; case isArrayOfType(input, CWLType.INT): case isArrayOfType(input, CWLType.LONG): const intArray = (input as IntArrayCommandInputParameter).value || []; - return intArray.length ? - [{ display: <>{intArray.map((val) => renderPrimitiveValue(val, true))} }] : - [{ display: }]; + return intArray.length ? [{ display: <>{intArray.map(val => renderPrimitiveValue(val, true))} }] : [{ display: }]; case isArrayOfType(input, CWLType.FLOAT): case isArrayOfType(input, CWLType.DOUBLE): const floatArray = (input as FloatArrayCommandInputParameter).value || []; - return floatArray.length ? - [{ display: <>{floatArray.map((val) => renderPrimitiveValue(val, true))} }] : - [{ display: }]; + return floatArray.length ? [{ display: <>{floatArray.map(val => renderPrimitiveValue(val, true))} }] : [{ display: }]; case isArrayOfType(input, CWLType.FILE): - const fileArrayMainFiles = ((input as FileArrayCommandInputParameter).value || []); - const firstMainFilePdh = (fileArrayMainFiles.length > 0 && fileArrayMainFiles[0]) ? getResourcePdhUrl(fileArrayMainFiles[0], pdh) : ""; + const fileArrayMainFiles = (input as FileArrayCommandInputParameter).value || []; + const firstMainFilePdh = fileArrayMainFiles.length > 0 && fileArrayMainFiles[0] ? getResourcePdhUrl(fileArrayMainFiles[0], pdh) : ""; // Convert each main file into separate arrays of ProcessIOValue to preserve secondaryFile grouping - const fileArrayValues = fileArrayMainFiles.map((mainFile: File, i): ProcessIOValue[] => { - const secondaryFiles = ((mainFile as unknown) as FileWithSecondaryFiles)?.secondaryFiles || []; - return [ - // Pass firstMainFilePdh to secondary files and every main file besides the first to hide pdh if equal - ...(mainFile ? [fileToProcessIOValue(mainFile, false, auth, pdh, i > 0 ? firstMainFilePdh : "")] : []), - ...(secondaryFiles.map(file => fileToProcessIOValue(file, true, auth, pdh, firstMainFilePdh))) - ]; - // Reduce each mainFile/secondaryFile group into single array preserving ordering - }).reduce((acc: ProcessIOValue[], mainFile: ProcessIOValue[]) => (acc.concat(mainFile)), []); - - return fileArrayValues.length ? - fileArrayValues : - [{ display: }]; + const fileArrayValues = fileArrayMainFiles + .map((mainFile: File, i): ProcessIOValue[] => { + const secondaryFiles = (mainFile as unknown as FileWithSecondaryFiles)?.secondaryFiles || []; + return [ + // Pass firstMainFilePdh to secondary files and every main file besides the first to hide pdh if equal + ...(mainFile ? [fileToProcessIOValue(mainFile, false, auth, pdh, i > 0 ? firstMainFilePdh : "")] : []), + ...secondaryFiles.map(file => fileToProcessIOValue(file, true, auth, pdh, firstMainFilePdh)), + ]; + // Reduce each mainFile/secondaryFile group into single array preserving ordering + }) + .reduce((acc: ProcessIOValue[], mainFile: ProcessIOValue[]) => acc.concat(mainFile), []); + + return fileArrayValues.length ? fileArrayValues : [{ display: }]; case isArrayOfType(input, CWLType.DIRECTORY): const directories = (input as DirectoryArrayCommandInputParameter).value || []; - return directories.length ? - directories.map(directory => directoryToProcessIOValue(directory, auth, pdh)) : - [{ display: }]; + return directories.length ? directories.map(directory => directoryToProcessIOValue(directory, auth, pdh)) : [{ display: }]; default: return [{ display: }]; @@ -615,9 +728,16 @@ export const getIOParamDisplayValue = (auth: AuthState, input: CommandInputParam }; const renderPrimitiveValue = (value: any, asChip: boolean) => { - const isObject = typeof value === 'object'; + const isObject = typeof value === "object"; if (!isObject) { - return asChip ? : 
{String(value)}
; + return asChip ? ( + + ) : ( + 
{String(value)}
+ ); } else { return asChip ? : ; } @@ -627,11 +747,9 @@ const renderPrimitiveValue = (value: any, asChip: boolean) => { * @returns keep url without keep: prefix */ const getKeepUrl = (file: File | Directory, pdh?: string): string => { - const isKeepUrl = file.location?.startsWith('keep:') || false; - const keepUrl = isKeepUrl ? - file.location?.replace('keep:', '') : - pdh ? `${pdh}/${file.location}` : file.location; - return keepUrl || ''; + const isKeepUrl = file.location?.startsWith("keep:") || false; + const keepUrl = isKeepUrl ? file.location?.replace("keep:", "") : pdh ? `${pdh}/${file.location}` : file.location; + return keepUrl || ""; }; interface KeepUrlProps { @@ -642,47 +760,71 @@ interface KeepUrlProps { const getResourcePdhUrl = (res: File | Directory, pdh?: string): string => { const keepUrl = getKeepUrl(res, pdh); - return keepUrl ? keepUrl.split('/').slice(0, 1)[0] : ''; + return keepUrl ? keepUrl.split("/").slice(0, 1)[0] : ""; }; const KeepUrlBase = withStyles(styles)(({ auth, res, pdh, classes }: KeepUrlProps & WithStyles) => { const pdhUrl = getResourcePdhUrl(res, pdh); // Passing a pdh always returns a relative wb2 collection url const pdhWbPath = getNavUrl(pdhUrl, auth); - return pdhUrl && pdhWbPath ? - {pdhUrl} : - <>; + return pdhUrl && pdhWbPath ? ( + + + {pdhUrl} + + + ) : ( + <> + ); }); const KeepUrlPath = withStyles(styles)(({ auth, res, pdh, classes }: KeepUrlProps & WithStyles) => { const keepUrl = getKeepUrl(res, pdh); - const keepUrlParts = keepUrl ? keepUrl.split('/') : []; - const keepUrlPath = keepUrlParts.length > 1 ? keepUrlParts.slice(1).join('/') : ''; + const keepUrlParts = keepUrl ? keepUrl.split("/") : []; + const keepUrlPath = keepUrlParts.length > 1 ? keepUrlParts.slice(1).join("/") : ""; const keepUrlPathNav = getKeepNavUrl(auth, res, pdh); - return keepUrlPathNav ? - {keepUrlPath || '/'} : - ; + return keepUrlPathNav ? ( + + + {keepUrlPath || "/"} + + + ) : ( + + ); }); const getKeepNavUrl = (auth: AuthState, file: File | Directory, pdh?: string): string => { let keepUrl = getKeepUrl(file, pdh); - return (getInlineFileUrl(`${auth.config.keepWebServiceUrl}/c=${keepUrl}?api_token=${auth.apiToken}`, auth.config.keepWebServiceUrl, auth.config.keepWebInlineServiceUrl)); + return getInlineFileUrl( + `${auth.config.keepWebServiceUrl}/c=${keepUrl}?api_token=${auth.apiToken}`, + auth.config.keepWebServiceUrl, + auth.config.keepWebInlineServiceUrl + ); }; const getImageUrl = (auth: AuthState, file: File, pdh?: string): string => { const keepUrl = getKeepUrl(file, pdh); - return getInlineFileUrl(`${auth.config.keepWebServiceUrl}/c=${keepUrl}?api_token=${auth.apiToken}`, auth.config.keepWebServiceUrl, auth.config.keepWebInlineServiceUrl); + return getInlineFileUrl( + `${auth.config.keepWebServiceUrl}/c=${keepUrl}?api_token=${auth.apiToken}`, + auth.config.keepWebServiceUrl, + auth.config.keepWebInlineServiceUrl + ); }; const isFileImage = (basename?: string): boolean => { - return basename ? (mime.getType(basename) || "").startsWith('image/') : false; + return basename ? (mime.getType(basename) || "").startsWith("image/") : false; }; -const isFileUrl = (location?: string): boolean => ( - !!location && !KEEP_URL_REGEX.exec(location) && - (location.startsWith("http://") || location.startsWith("https://")) -); +const isFileUrl = (location?: string): boolean => + !!location && !KEEP_URL_REGEX.exec(location) && (location.startsWith("http://") || location.startsWith("https://")); const normalizeDirectoryLocation = (directory: Directory): Directory => { if (!directory.location) { @@ -690,55 +832,91 @@ const normalizeDirectoryLocation = (directory: Directory): Directory => { } return { ...directory, - location: (directory.location || '').endsWith('/') ? directory.location : directory.location + '/', + location: (directory.location || "").endsWith("/") ? directory.location : directory.location + "/", }; }; const directoryToProcessIOValue = (directory: Directory, auth: AuthState, pdh?: string): ProcessIOValue => { - if (isExternalValue(directory)) { return { display: } } + if (isExternalValue(directory)) { + return { display: }; + } const normalizedDirectory = normalizeDirectoryLocation(directory); return { - display: , - collection: , + display: ( + + ), + collection: ( + + ), }; }; const fileToProcessIOValue = (file: File, secondary: boolean, auth: AuthState, pdh: string | undefined, mainFilePdh: string): ProcessIOValue => { - if (isExternalValue(file)) { return { display: } } + if (isExternalValue(file)) { + return { display: }; + } if (isFileUrl(file.location)) { return { - display: {file.location}, + display: ( + + {file.location} + + ), secondary, }; } const resourcePdh = getResourcePdhUrl(file, pdh); return { - display: , + display: ( + + ), secondary, imageUrl: isFileImage(file.basename) ? getImageUrl(auth, file, pdh) : undefined, - collection: (resourcePdh !== mainFilePdh) ? : <>, - } + collection: + resourcePdh !== mainFilePdh ? ( + + ) : ( + <> + ), + }; }; -const isExternalValue = (val: any) => - Object.keys(val).includes('$import') || - Object.keys(val).includes('$include') +const isExternalValue = (val: any) => Object.keys(val).includes("$import") || Object.keys(val).includes("$include"); -export const EmptyValue = withStyles(styles)( - ({ classes }: WithStyles) => No value -); +export const EmptyValue = withStyles(styles)(({ classes }: WithStyles) => No value); -const UnsupportedValue = withStyles(styles)( - ({ classes }: WithStyles) => Cannot display value -); +const UnsupportedValue = withStyles(styles)(({ classes }: WithStyles) => Cannot display value); -const UnsupportedValueChip = withStyles(styles)( - ({ classes }: WithStyles) => } label={"Cannot display value"} /> -); +const UnsupportedValueChip = withStyles(styles)(({ classes }: WithStyles) => ( + } + label={"Cannot display value"} + /> +)); -const ImagePlaceholder = withStyles(styles)( - ({ classes }: WithStyles) => -); +const ImagePlaceholder = withStyles(styles)(({ classes }: WithStyles) => ( + + + +)); diff --git a/src/views/process-panel/process-panel-root.tsx b/src/views/process-panel/process-panel-root.tsx index d99c62ec74..7889185eb2 100644 --- a/src/views/process-panel/process-panel-root.tsx +++ b/src/views/process-panel/process-panel-root.tsx @@ -2,34 +2,35 @@ // // SPDX-License-Identifier: AGPL-3.0 -import React from 'react'; -import { Grid, StyleRulesCallback, WithStyles, withStyles } from '@material-ui/core'; -import { DefaultView } from 'components/default-view/default-view'; -import { ProcessIcon } from 'components/icon/icon'; -import { Process } from 'store/processes/process'; -import { SubprocessPanel } from 'views/subprocess-panel/subprocess-panel'; -import { SubprocessFilterDataProps } from 'components/subprocess-filter/subprocess-filter'; -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 { ProcessIOCard, ProcessIOCardType, ProcessIOParameter } from './process-io-card'; -import { ProcessResourceCard } from './process-resource-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 { getInputCollectionMounts } from 'store/processes/processes-actions'; -import { WorkflowInputsData } 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'; -import { OutputDetails, NodeInstanceType } from 'store/process-panel/process-panel'; +import React, { useRef } from "react"; +import { Grid, StyleRulesCallback, WithStyles, withStyles } from "@material-ui/core"; +import { DefaultView } from "components/default-view/default-view"; +import { ProcessIcon } from "components/icon/icon"; +import { Process } from "store/processes/process"; +import { SubprocessPanel } from "views/subprocess-panel/subprocess-panel"; +import { SubprocessFilterDataProps } from "components/subprocess-filter/subprocess-filter"; +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 { ProcessIOCard, ProcessIOCardType, ProcessIOParameter } from "./process-io-card"; +import { ProcessResourceCard } from "./process-resource-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 { getInputCollectionMounts } from "store/processes/processes-actions"; +import { WorkflowInputsData } 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"; +import { OutputDetails, NodeInstanceType } from "store/process-panel/process-panel"; +import { ResourcesState } from "store/resources/resources"; -type CssRules = 'root'; +type CssRules = "root"; const styles: StyleRulesCallback = (theme: ArvadosTheme) => ({ root: { - width: '100%', + width: "100%", }, }); @@ -93,7 +94,6 @@ export const ProcessPanelRoot = withStyles(styles)( updateOutputParams, ...props }: ProcessPanelRootProps) => { - const outputUuid = process?.containerRequest.outputUuid; const containerRequest = process?.containerRequest; const inputMounts = getInputCollectionMounts(process?.containerRequest); @@ -117,9 +117,18 @@ export const ProcessPanelRoot = withStyles(styles)( updateOutputParams(); }, [outputRaw, outputDefinitions, updateOutputParams]); - return process - ? - + return process ? ( + + props.onContextMenu(event, process)} @@ -128,28 +137,38 @@ export const ProcessPanelRoot = withStyles(styles)( resumeOnHoldWorkflow={props.resumeOnHoldWorkflow} /> - + + process={process} + /> - + ({ label: filter, value: filter }) - )} + filters={processLogsPanel.filters.map(filter => ({ label: filter, value: filter }))} onLogFilterChange={props.onLogFilterChange} navigateToLog={props.navigateToLog} /> - + - + - + - + - : + ) : ( + - ; + messages={["Process not found"]} + /> + + ); } ); diff --git a/src/views/process-panel/process-panel.tsx b/src/views/process-panel/process-panel.tsx index 9dcb72cf88..afad4832cc 100644 --- a/src/views/process-panel/process-panel.tsx +++ b/src/views/process-panel/process-panel.tsx @@ -2,35 +2,28 @@ // // SPDX-License-Identifier: AGPL-3.0 -import { RootState } from 'store/store'; -import { connect } from 'react-redux'; -import { getProcess, getSubprocesses, Process, getProcessStatus } from 'store/processes/process'; -import { Dispatch } from 'redux'; -import { openProcessContextMenu } from 'store/context-menu/context-menu-actions'; -import { - ProcessPanelRootDataProps, - ProcessPanelRootActionProps, - ProcessPanelRoot -} from './process-panel-root'; -import { - getProcessPanelCurrentUuid, - ProcessPanel as ProcessPanelState -} from 'store/process-panel/process-panel'; -import { groupBy } from 'lodash'; +import { RootState } from "store/store"; +import { connect } from "react-redux"; +import { getProcess, getSubprocesses, Process, getProcessStatus } from "store/processes/process"; +import { Dispatch } from "redux"; +import { openProcessContextMenu } from "store/context-menu/context-menu-actions"; +import { ProcessPanelRootDataProps, ProcessPanelRootActionProps, ProcessPanelRoot } from "./process-panel-root"; +import { getProcessPanelCurrentUuid, ProcessPanel as ProcessPanelState } from "store/process-panel/process-panel"; +import { groupBy } from "lodash"; import { loadInputs, loadOutputDefinitions, loadOutputs, toggleProcessPanelFilter, updateOutputParams, - loadNodeJson -} from 'store/process-panel/process-panel-actions'; -import { cancelRunningWorkflow, resumeOnHoldWorkflow, startWorkflow } 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'; + loadNodeJson, +} from "store/process-panel/process-panel-actions"; +import { cancelRunningWorkflow, resumeOnHoldWorkflow, startWorkflow } 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"; const mapStateToProps = ({ router, auth, resources, processPanel, processLogsPanel }: RootState): ProcessPanelRootDataProps => { - const uuid = getProcessPanelCurrentUuid(router) || ''; + const uuid = getProcessPanelCurrentUuid(router) || ""; const subprocesses = getSubprocesses(uuid)(resources); return { process: getProcess(uuid)(resources), @@ -49,11 +42,13 @@ const mapStateToProps = ({ router, auth, resources, processPanel, processLogsPan const mapDispatchToProps = (dispatch: Dispatch): ProcessPanelRootActionProps => ({ onCopyToClipboard: (message: string) => { - dispatch(snackbarActions.OPEN_SNACKBAR({ - message, - hideDuration: 2000, - kind: SnackbarKind.SUCCESS, - })); + dispatch( + snackbarActions.OPEN_SNACKBAR({ + message, + hideDuration: 2000, + kind: SnackbarKind.SUCCESS, + }) + ); }, onContextMenu: (event, process) => { dispatch(openProcessContextMenu(event, process)); @@ -61,28 +56,26 @@ const mapDispatchToProps = (dispatch: Dispatch): ProcessPanelRootActionProps => onToggle: status => { dispatch(toggleProcessPanelFilter(status)); }, - cancelProcess: (uuid) => dispatch(cancelRunningWorkflow(uuid)), - startProcess: (uuid) => dispatch(startWorkflow(uuid)), - resumeOnHoldWorkflow: (uuid) => dispatch(resumeOnHoldWorkflow(uuid)), - onLogFilterChange: (filter) => dispatch(setProcessLogsPanelFilter(filter.value)), - navigateToLog: (uuid) => dispatch(navigateToLogCollection(uuid)), - loadInputs: (containerRequest) => dispatch(loadInputs(containerRequest)), - loadOutputs: (containerRequest) => dispatch(loadOutputs(containerRequest)), - loadOutputDefinitions: (containerRequest) => dispatch(loadOutputDefinitions(containerRequest)), + cancelProcess: uuid => dispatch(cancelRunningWorkflow(uuid)), + startProcess: uuid => dispatch(startWorkflow(uuid)), + resumeOnHoldWorkflow: uuid => dispatch(resumeOnHoldWorkflow(uuid)), + onLogFilterChange: filter => dispatch(setProcessLogsPanelFilter(filter.value)), + navigateToLog: uuid => dispatch(navigateToLogCollection(uuid)), + loadInputs: containerRequest => dispatch(loadInputs(containerRequest)), + loadOutputs: containerRequest => dispatch(loadOutputs(containerRequest)), + loadOutputDefinitions: containerRequest => dispatch(loadOutputDefinitions(containerRequest)), updateOutputParams: () => dispatch(updateOutputParams()), - loadNodeJson: (containerRequest) => dispatch(loadNodeJson(containerRequest)), + loadNodeJson: containerRequest => dispatch(loadNodeJson(containerRequest)), }); const getFilters = (processPanel: ProcessPanelState, processes: Process[]) => { const grouppedProcesses = groupBy(processes, getProcessStatus); - return Object - .keys(processPanel.filters) - .map(filter => ({ - label: filter, - value: (grouppedProcesses[filter] || []).length, - checked: processPanel.filters[filter], - key: filter, - })); + return Object.keys(processPanel.filters).map(filter => ({ + label: filter, + value: (grouppedProcesses[filter] || []).length, + checked: processPanel.filters[filter], + key: filter, + })); }; export const ProcessPanel = connect(mapStateToProps, mapDispatchToProps)(ProcessPanelRoot); -- 2.30.2