X-Git-Url: https://git.arvados.org/arvados-workbench2.git/blobdiff_plain/e8dae47a3dead0a49cb60c1075b96a95ef8142e5..244bfe2909565499833b7e2ce387adfd81e1cba6:/src/store/run-process-panel/run-process-panel-actions.ts diff --git a/src/store/run-process-panel/run-process-panel-actions.ts b/src/store/run-process-panel/run-process-panel-actions.ts index 07b0b175..7112f715 100644 --- a/src/store/run-process-panel/run-process-panel-actions.ts +++ b/src/store/run-process-panel/run-process-panel-actions.ts @@ -6,7 +6,7 @@ import { Dispatch } from 'redux'; import { unionize, ofType, UnionOf } from "~/common/unionize"; import { ServiceRepository } from "~/services/services"; import { RootState } from '~/store/store'; -import { WorkflowResource, CommandInputParameter } from '~/models/workflow'; +import { WorkflowResource } from '~/models/workflow'; import { getFormValues } from 'redux-form'; import { RUN_PROCESS_BASIC_FORM, RunProcessBasicFormData } from '~/views/run-process-panel/run-process-basic-form'; import { RUN_PROCESS_INPUTS_FORM } from '~/views/run-process-panel/run-process-inputs-form'; @@ -14,12 +14,14 @@ import { WorkflowInputsData } from '~/models/workflow'; import { createWorkflowMounts } from '~/models/process'; import { ContainerRequestState } from '~/models/container-request'; import { navigateToProcess } from '../navigation/navigation-action'; +import { RunProcessAdvancedFormData, RUN_PROCESS_ADVANCED_FORM } from '~/views/run-process-panel/run-process-advanced-form'; export const runProcessPanelActions = unionize({ SET_PROCESS_OWNER_UUID: ofType(), SET_CURRENT_STEP: ofType(), SET_WORKFLOWS: ofType(), SET_SELECTED_WORKFLOW: ofType(), + SEARCH_WORKFLOWS: ofType() }); export interface RunProcessSecondStepDataFormProps { @@ -52,6 +54,7 @@ export const runProcess = async (dispatch: Dispatch, getState: () => RootSt const state = getState(); const basicForm = getFormValues(RUN_PROCESS_BASIC_FORM)(state) as RunProcessBasicFormData; const inputsForm = getFormValues(RUN_PROCESS_INPUTS_FORM)(state) as WorkflowInputsData; + const advancedForm = getFormValues(RUN_PROCESS_ADVANCED_FORM)(state) as RunProcessAdvancedFormData; const { processOwnerUuid, selectedWorkflow } = state.runProcessPanel; if (selectedWorkflow) { const newProcessData = { @@ -77,6 +80,7 @@ export const runProcess = async (dispatch: Dispatch, getState: () => RootSt ], outputPath: '/var/spool/cwl', priority: 1, + outputName: advancedForm && advancedForm.output ? advancedForm.output : undefined, }; const newProcess = await services.containerRequestService.create(newProcessData); dispatch(navigateToProcess(newProcess.uuid)); @@ -87,4 +91,5 @@ const normalizeInputKeys = (inputs: WorkflowInputsData): WorkflowInputsData => Object.keys(inputs).reduce((normalizedInputs, key) => ({ ...normalizedInputs, [key.split('/').slice(1).join('/')]: inputs[key], - }), {}); \ No newline at end of file + }), {}); +export const searchWorkflows = (term: string) => runProcessPanelActions.SEARCH_WORKFLOWS(term);