X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/e8dae47a3dead0a49cb60c1075b96a95ef8142e5..e4b54c3b5d99c99553e319ead28c3aa8dcd6eecc:/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 07b0b175ab..a21f7c04bf 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,18 @@ 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 { dialogActions } from '~/store/dialog/dialog-actions';
 
 export const runProcessPanelActions = unionize({
     SET_PROCESS_OWNER_UUID: ofType<string>(),
     SET_CURRENT_STEP: ofType<number>(),
+    SET_STEP_CHANGED: ofType<boolean>(),
     SET_WORKFLOWS: ofType<WorkflowResource[]>(),
     SET_SELECTED_WORKFLOW: ofType<WorkflowResource>(),
+    SEARCH_WORKFLOWS: ofType<string>(),
+    RESET_RUN_PROCESS_PANEL: ofType<{}>(),
 });
 
 export interface RunProcessSecondStepDataFormProps {
@@ -27,6 +33,7 @@ export interface RunProcessSecondStepDataFormProps {
     description: string;
 }
 
+export const SET_WORKFLOW_DIALOG = 'setWorkflowDialog';
 export const RUN_PROCESS_SECOND_STEP_FORM_NAME = 'runProcessSecondStepFormName';
 
 export type RunProcessPanelAction = UnionOf<typeof runProcessPanelActions>;
@@ -34,6 +41,7 @@ export type RunProcessPanelAction = UnionOf<typeof runProcessPanelActions>;
 export const loadRunProcessPanel = () =>
     async (dispatch: Dispatch<any>, getState: () => RootState, services: ServiceRepository) => {
         try {
+            dispatch(runProcessPanelActions.RESET_RUN_PROCESS_PANEL());
             const response = await services.workflowService.list();
             dispatch(runProcessPanelActions.SET_WORKFLOWS(response.items));
         } catch (e) {
@@ -41,21 +49,57 @@ export const loadRunProcessPanel = () =>
         }
     };
 
-export const setWorkflow = (workflow: WorkflowResource) =>
-    async (dispatch: Dispatch<any>, getState: () => RootState, services: ServiceRepository) => {
-        dispatch(runProcessPanelActions.SET_SELECTED_WORKFLOW(workflow));
+export const openSetWorkflowDialog = (workflow: WorkflowResource) =>
+    (dispatch: Dispatch, getState: () => RootState) => {
+        const selectedWorkflow = getState().runProcessPanel.selectedWorkflow;
+        const isStepChanged = getState().runProcessPanel.isStepChanged;
+        if (isStepChanged && selectedWorkflow && selectedWorkflow.uuid !== workflow.uuid) {
+            dispatch(dialogActions.OPEN_DIALOG({
+                id: SET_WORKFLOW_DIALOG,
+                data: {
+                    title: 'Form will be cleared',
+                    text: 'Changing a workflow will clean all input fields in next step.',
+                    confirmButtonLabel: 'Change Workflow',
+                    workflow
+                }
+            }));
+        } else {
+            dispatch<any>(setWorkflow(workflow, false));
+        }
+    };
+
+export const setWorkflow = (workflow: WorkflowResource, isWorkflowChanged = true) =>
+    (dispatch: Dispatch<any>, getState: () => RootState) => {
+        const isStepChanged = getState().runProcessPanel.isStepChanged;
+        if (isStepChanged && isWorkflowChanged) {
+            dispatch(runProcessPanelActions.SET_STEP_CHANGED(false));
+            dispatch(runProcessPanelActions.SET_SELECTED_WORKFLOW(workflow));
+        }
+        if (!isWorkflowChanged) {
+            dispatch(runProcessPanelActions.SET_SELECTED_WORKFLOW(workflow));
+        }
     };
 
-export const goToStep = (step: number) => runProcessPanelActions.SET_CURRENT_STEP(step);
+export const goToStep = (step: number) =>
+    (dispatch: Dispatch, getState: () => RootState) => {
+        if (step === 1) {
+            dispatch(runProcessPanelActions.SET_STEP_CHANGED(true));
+        }
+        dispatch(runProcessPanelActions.SET_CURRENT_STEP(step));
+    };
 
 export const runProcess = async (dispatch: Dispatch<any>, getState: () => RootState, services: ServiceRepository) => {
     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 { processOwnerUuid, selectedWorkflow } = state.runProcessPanel;
     if (selectedWorkflow) {
         const newProcessData = {
-            ownerUuid: processOwnerUuid,
+            ownerUuid: isItemNotInProject(properties) || !isProjectOrRunProcessRoute(router) ? userUuid : processOwnerUuid,
             name: basicForm.name,
             description: basicForm.description,
             state: ContainerRequestState.COMMITTED,
@@ -65,7 +109,7 @@ export const runProcess = async (dispatch: Dispatch<any>, getState: () => RootSt
                 vcpus: 1,
                 ram: 1073741824,
             },
-            containerImage: 'arvados/jobs:1.1.4.20180618144723',
+            containerImage: 'arvados/jobs',
             cwd: '/var/spool/cwl',
             command: [
                 'arvados-cwl-runner',
@@ -77,6 +121,7 @@ export const runProcess = async (dispatch: Dispatch<any>, 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 +132,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);