X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/1826bc21a34b983778f6e221b6c4004fdea1ad1d..4a18204b2d02945a4f828f8f180bf6a333e6f8d9:/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 c39517fea4..66c784f944 100644 --- a/src/store/run-process-panel/run-process-panel-actions.ts +++ b/src/store/run-process-panel/run-process-panel-actions.ts @@ -6,6 +6,7 @@ import { Dispatch } from 'redux'; import { unionize, ofType, UnionOf } from "~/common/unionize"; import { ServiceRepository } from "~/services/services"; import { RootState } from '~/store/store'; +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'; @@ -13,7 +14,7 @@ import { RUN_PROCESS_INPUTS_FORM } from '~/views/run-process-panel/run-process-i import { WorkflowInputsData } from '~/models/workflow'; import { createWorkflowMounts } from '~/models/process'; import { ContainerRequestState } from '~/models/container-request'; -import { navigateToProcess } from '../navigation/navigation-action'; +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'; @@ -118,7 +119,8 @@ export const runProcess = async (dispatch: Dispatch, getState: () => RootSt 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 || DEFAULT_ADVANCED_FORM_VALUES; - const userUuid = getState().auth.user!.uuid; + const userUuid = getUserUuid(getState()); + if (!userUuid) { return; } const pathname = getState().runProcessPanel.processPathname; const { processOwnerUuid, selectedWorkflow } = state.runProcessPanel; if (selectedWorkflow) { @@ -135,7 +137,7 @@ export const runProcess = async (dispatch: Dispatch, getState: () => RootSt api: advancedForm[API_FIELD], }, schedulingParameters: { - maxRunTime: advancedForm[RUNTIME_FIELD] + max_run_time: advancedForm[RUNTIME_FIELD] }, containerImage: 'arvados/jobs', cwd: '/var/spool/cwl', @@ -152,10 +154,10 @@ export const runProcess = async (dispatch: Dispatch, getState: () => RootSt properties: { workflowUuid: selectedWorkflow.uuid, workflowName: selectedWorkflow.name - } + } }; const newProcess = await services.containerRequestService.create(newProcessData); - dispatch(navigateToProcess(newProcess.uuid)); + dispatch(navigateTo(newProcess.uuid)); } };