X-Git-Url: https://git.arvados.org/arvados-workbench2.git/blobdiff_plain/353db93c2540a989d3bdd3f695ee07e707bdaf7a..627755be39986d87f292332c37b411147fa28d78:/src/store/run-process-panel/run-process-panel-actions.ts?ds=sidebyside 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 8646164e..adb5ade7 100644 --- a/src/store/run-process-panel/run-process-panel-actions.ts +++ b/src/store/run-process-panel/run-process-panel-actions.ts @@ -3,25 +3,24 @@ // SPDX-License-Identifier: AGPL-3.0 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, WorkflowRunnerResources, getWorkflow, getWorkflowInputs, parseWorkflowDefinition } from '~/models/workflow'; +import { unionize, ofType, UnionOf } from "common/unionize"; +import { ServiceRepository } from "services/services"; +import { RootState } from 'store/store'; +import { getUserUuid } from "common/getuser"; +import { WorkflowResource, WorkflowRunnerResources, getWorkflow, 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 { 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 { navigateTo } from '../navigation/navigation-action'; import { RunProcessAdvancedFormData, RUN_PROCESS_ADVANCED_FORM, VCPUS_FIELD, KEEP_CACHE_RAM_FIELD, RAM_FIELD, RUNTIME_FIELD, OUTPUT_FIELD, RUNNER_IMAGE_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'; +} from 'views/run-process-panel/run-process-advanced-form'; +import { dialogActions } from 'store/dialog/dialog-actions'; +import { setBreadcrumbs } from 'store/breadcrumbs/breadcrumbs-actions'; export const runProcessPanelActions = unionize({ SET_PROCESS_PATHNAME: ofType(), @@ -144,9 +143,8 @@ export const runProcess = async (dispatch: Dispatch, getState: () => RootSt const inputsForm = getFormValues(RUN_PROCESS_INPUTS_FORM)(state) as WorkflowInputsData; const userUuid = getUserUuid(getState()); if (!userUuid) { return; } - const pathname = getState().runProcessPanel.processPathname; const { processOwnerUuid, selectedWorkflow } = state.runProcessPanel; - const ownerUUid = !matchProjectRoute(pathname) ? userUuid : processOwnerUuid; + const ownerUUid = processOwnerUuid ? processOwnerUuid : userUuid; if (selectedWorkflow) { const advancedForm = getFormValues(RUN_PROCESS_ADVANCED_FORM)(state) as RunProcessAdvancedFormData || getWorkflowRunnerSettings(selectedWorkflow); const newProcessData = { @@ -179,7 +177,8 @@ export const runProcess = async (dispatch: Dispatch, getState: () => RootSt properties: { workflowUuid: selectedWorkflow.uuid, workflowName: selectedWorkflow.name - } + }, + useExisting: false }; const newProcess = await services.containerRequestService.create(newProcessData); dispatch(navigateTo(newProcess.uuid));