X-Git-Url: https://git.arvados.org/arvados-workbench2.git/blobdiff_plain/aed25c0fef7e65b307d702e8ee515567d6c2a7c1..4cad4c0d882111b0eb5576005108a62ff30b143d:/src/store/run-process-panel/run-process-panel-actions.ts?ds=inline 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 a21f7c04..66c784f9 100644 --- a/src/store/run-process-panel/run-process-panel-actions.ts +++ b/src/store/run-process-panel/run-process-panel-actions.ts @@ -6,24 +6,29 @@ import { Dispatch } from 'redux'; import { unionize, ofType, UnionOf } from "~/common/unionize"; import { ServiceRepository } from "~/services/services"; import { RootState } from '~/store/store'; -import { WorkflowResource } from '~/models/workflow'; -import { getFormValues } from 'redux-form'; +import { getUserUuid } from "~/common/getuser"; +import { WorkflowResource, getWorkflowInputs, parseWorkflowDefinition } from '~/models/workflow'; +import { getFormValues, initialize } 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'; 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'; -import { isItemNotInProject, isProjectOrRunProcessRoute } from '~/store/projects/project-create-actions'; +import { navigateTo } from '../navigation/navigation-action'; +import { RunProcessAdvancedFormData, RUN_PROCESS_ADVANCED_FORM, VCPUS_FIELD, RAM_FIELD, RUNTIME_FIELD, OUTPUT_FIELD, API_FIELD } from '~/views/run-process-panel/run-process-advanced-form'; import { dialogActions } from '~/store/dialog/dialog-actions'; +import { setBreadcrumbs } from '~/store/breadcrumbs/breadcrumbs-actions'; +import { matchProjectRoute } from '~/routes/routes'; export const runProcessPanelActions = unionize({ + SET_PROCESS_PATHNAME: ofType(), SET_PROCESS_OWNER_UUID: ofType(), SET_CURRENT_STEP: ofType(), SET_STEP_CHANGED: ofType(), SET_WORKFLOWS: ofType(), SET_SELECTED_WORKFLOW: ofType(), + SET_WORKFLOW_PRESETS: ofType(), + SELECT_WORKFLOW_PRESET: ofType(), SEARCH_WORKFLOWS: ofType(), RESET_RUN_PROCESS_PANEL: ofType<{}>(), }); @@ -41,7 +46,7 @@ export type RunProcessPanelAction = UnionOf; export const loadRunProcessPanel = () => async (dispatch: Dispatch, getState: () => RootState, services: ServiceRepository) => { try { - dispatch(runProcessPanelActions.RESET_RUN_PROCESS_PANEL()); + dispatch(setBreadcrumbs([{ label: 'Run Process' }])); const response = await services.workflowService.list(); dispatch(runProcessPanelActions.SET_WORKFLOWS(response.items)); } catch (e) { @@ -74,14 +79,35 @@ export const setWorkflow = (workflow: WorkflowResource, isWorkflowChanged = true if (isStepChanged && isWorkflowChanged) { dispatch(runProcessPanelActions.SET_STEP_CHANGED(false)); dispatch(runProcessPanelActions.SET_SELECTED_WORKFLOW(workflow)); + dispatch(loadPresets(workflow.uuid)); + dispatch(initialize(RUN_PROCESS_ADVANCED_FORM, DEFAULT_ADVANCED_FORM_VALUES)); } if (!isWorkflowChanged) { dispatch(runProcessPanelActions.SET_SELECTED_WORKFLOW(workflow)); + dispatch(loadPresets(workflow.uuid)); + dispatch(initialize(RUN_PROCESS_ADVANCED_FORM, DEFAULT_ADVANCED_FORM_VALUES)); } }; +export const loadPresets = (workflowUuid: string) => + async (dispatch: Dispatch, _: () => RootState, { workflowService }: ServiceRepository) => { + const { items } = await workflowService.presets(workflowUuid); + dispatch(runProcessPanelActions.SET_WORKFLOW_PRESETS(items)); + }; + +export const selectPreset = (preset: WorkflowResource) => + (dispatch: Dispatch) => { + dispatch(runProcessPanelActions.SELECT_WORKFLOW_PRESET(preset)); + const inputs = getWorkflowInputs(parseWorkflowDefinition(preset)) || []; + const values = inputs.reduce((values, input) => ({ + ...values, + [input.id]: input.default, + }), {}); + dispatch(initialize(RUN_PROCESS_INPUTS_FORM, values)); + }; + export const goToStep = (step: number) => - (dispatch: Dispatch, getState: () => RootState) => { + (dispatch: Dispatch) => { if (step === 1) { dispatch(runProcessPanelActions.SET_STEP_CHANGED(true)); } @@ -92,42 +118,55 @@ 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 userUuid = getState().auth.user!.uuid; - const router = getState(); - const properties = getState().properties; + const advancedForm = getFormValues(RUN_PROCESS_ADVANCED_FORM)(state) as RunProcessAdvancedFormData || DEFAULT_ADVANCED_FORM_VALUES; + const userUuid = getUserUuid(getState()); + if (!userUuid) { return; } + const pathname = getState().runProcessPanel.processPathname; const { processOwnerUuid, selectedWorkflow } = state.runProcessPanel; if (selectedWorkflow) { const newProcessData = { - ownerUuid: isItemNotInProject(properties) || !isProjectOrRunProcessRoute(router) ? userUuid : processOwnerUuid, + ownerUuid: !matchProjectRoute(pathname) ? userUuid : processOwnerUuid, name: basicForm.name, description: basicForm.description, state: ContainerRequestState.COMMITTED, mounts: createWorkflowMounts(selectedWorkflow, normalizeInputKeys(inputsForm)), runtimeConstraints: { API: true, - vcpus: 1, - ram: 1073741824, + vcpus: advancedForm[VCPUS_FIELD], + ram: advancedForm[RAM_FIELD], + api: advancedForm[API_FIELD], + }, + schedulingParameters: { + max_run_time: advancedForm[RUNTIME_FIELD] }, containerImage: 'arvados/jobs', cwd: '/var/spool/cwl', command: [ 'arvados-cwl-runner', - '--local', '--api=containers', - `--project-uuid=${processOwnerUuid}`, + '--local', '/var/lib/cwl/workflow.json#main', '/var/lib/cwl/cwl.input.json' ], outputPath: '/var/spool/cwl', priority: 1, - outputName: advancedForm && advancedForm.output ? advancedForm.output : undefined, + outputName: advancedForm[OUTPUT_FIELD] ? advancedForm[OUTPUT_FIELD] : undefined, + properties: { + workflowUuid: selectedWorkflow.uuid, + workflowName: selectedWorkflow.name + } }; const newProcess = await services.containerRequestService.create(newProcessData); - dispatch(navigateToProcess(newProcess.uuid)); + dispatch(navigateTo(newProcess.uuid)); } }; +export const DEFAULT_ADVANCED_FORM_VALUES: Partial = { + [VCPUS_FIELD]: 1, + [RAM_FIELD]: 1073741824, + [API_FIELD]: true, +}; + const normalizeInputKeys = (inputs: WorkflowInputsData): WorkflowInputsData => Object.keys(inputs).reduce((normalizedInputs, key) => ({ ...normalizedInputs,