X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/e036bd4924cf444294483b064aaab28b6df43947..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 df2f4f2df2..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,13 +14,14 @@ 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 { isItemNotInProject, isProjectOrRunProcessRoute } from '~/store/projects/project-create-actions';
 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<string>(),
     SET_PROCESS_OWNER_UUID: ofType<string>(),
     SET_CURRENT_STEP: ofType<number>(),
     SET_STEP_CHANGED: ofType<boolean>(),
@@ -45,7 +47,6 @@ export const loadRunProcessPanel = () =>
     async (dispatch: Dispatch<any>, getState: () => RootState, services: ServiceRepository) => {
         try {
             dispatch(setBreadcrumbs([{ label: 'Run Process' }]));
-            dispatch(runProcessPanelActions.RESET_RUN_PROCESS_PANEL());
             const response = await services.workflowService.list();
             dispatch(runProcessPanelActions.SET_WORKFLOWS(response.items));
         } catch (e) {
@@ -88,7 +89,7 @@ export const setWorkflow = (workflow: WorkflowResource, isWorkflowChanged = true
         }
     };
 
-const loadPresets = (workflowUuid: string) =>
+export const loadPresets = (workflowUuid: string) =>
     async (dispatch: Dispatch<any>, _: () => RootState, { workflowService }: ServiceRepository) => {
         const { items } = await workflowService.presets(workflowUuid);
         dispatch(runProcessPanelActions.SET_WORKFLOW_PRESETS(items));
@@ -118,13 +119,13 @@ export const runProcess = async (dispatch: Dispatch<any>, 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 router = getState();
-    const properties = getState().properties;
+    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,
@@ -136,7 +137,7 @@ export const runProcess = async (dispatch: Dispatch<any>, getState: () => RootSt
                 api: advancedForm[API_FIELD],
             },
             schedulingParameters: {
-                maxRunTime: advancedForm[RUNTIME_FIELD]
+                max_run_time: advancedForm[RUNTIME_FIELD]
             },
             containerImage: 'arvados/jobs',
             cwd: '/var/spool/cwl',
@@ -153,10 +154,10 @@ export const runProcess = async (dispatch: Dispatch<any>, getState: () => RootSt
             properties: {
                 workflowUuid: selectedWorkflow.uuid,
                 workflowName: selectedWorkflow.name
-            }       
+            }
         };
         const newProcess = await services.containerRequestService.create(newProcessData);
-        dispatch(navigateToProcess(newProcess.uuid));
+        dispatch(navigateTo(newProcess.uuid));
     }
 };