projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '#15165-running-a-process-from-workflow-section-doesnt-contain-values...
[arvados.git]
/
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 0cbd9cd6823abd18e284e95c9ecc1177b2febb69..5b082b8c28eaffc19199f8f757fd5fa4f0b4a5eb 100644
(file)
--- a/
src/store/run-process-panel/run-process-panel-actions.ts
+++ b/
src/store/run-process-panel/run-process-panel-actions.ts
@@
-13,13
+13,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 { 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 { dialogActions } from '~/store/dialog/dialog-actions';
import { setBreadcrumbs } from '~/store/breadcrumbs/breadcrumbs-actions';
+import { matchProjectRoute } from '~/routes/routes';
export const runProcessPanelActions = unionize({
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>(),
SET_PROCESS_OWNER_UUID: ofType<string>(),
SET_CURRENT_STEP: ofType<number>(),
SET_STEP_CHANGED: ofType<boolean>(),
@@
-45,7
+46,6
@@
export const loadRunProcessPanel = () =>
async (dispatch: Dispatch<any>, getState: () => RootState, services: ServiceRepository) => {
try {
dispatch(setBreadcrumbs([{ label: 'Run Process' }]));
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) {
const response = await services.workflowService.list();
dispatch(runProcessPanelActions.SET_WORKFLOWS(response.items));
} catch (e) {
@@
-79,14
+79,16
@@
export const setWorkflow = (workflow: WorkflowResource, isWorkflowChanged = true
dispatch(runProcessPanelActions.SET_STEP_CHANGED(false));
dispatch(runProcessPanelActions.SET_SELECTED_WORKFLOW(workflow));
dispatch<any>(loadPresets(workflow.uuid));
dispatch(runProcessPanelActions.SET_STEP_CHANGED(false));
dispatch(runProcessPanelActions.SET_SELECTED_WORKFLOW(workflow));
dispatch<any>(loadPresets(workflow.uuid));
+ dispatch(initialize(RUN_PROCESS_ADVANCED_FORM, DEFAULT_ADVANCED_FORM_VALUES));
}
if (!isWorkflowChanged) {
dispatch(runProcessPanelActions.SET_SELECTED_WORKFLOW(workflow));
dispatch<any>(loadPresets(workflow.uuid));
}
if (!isWorkflowChanged) {
dispatch(runProcessPanelActions.SET_SELECTED_WORKFLOW(workflow));
dispatch<any>(loadPresets(workflow.uuid));
+ dispatch(initialize(RUN_PROCESS_ADVANCED_FORM, DEFAULT_ADVANCED_FORM_VALUES));
}
};
}
};
-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));
async (dispatch: Dispatch<any>, _: () => RootState, { workflowService }: ServiceRepository) => {
const { items } = await workflowService.presets(workflowUuid);
dispatch(runProcessPanelActions.SET_WORKFLOW_PRESETS(items));
@@
-115,42
+117,54
@@
export const runProcess = async (dispatch: Dispatch<any>, 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 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 advancedForm = getFormValues(RUN_PROCESS_ADVANCED_FORM)(state) as RunProcessAdvancedFormData
|| DEFAULT_ADVANCED_FORM_VALUES
;
const userUuid = getState().auth.user!.uuid;
const userUuid = getState().auth.user!.uuid;
- const router = getState();
- const properties = getState().properties;
+ const pathname = getState().runProcessPanel.processPathname;
const { processOwnerUuid, selectedWorkflow } = state.runProcessPanel;
if (selectedWorkflow) {
const newProcessData = {
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,
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: {
+ maxRunTime: advancedForm[RUNTIME_FIELD]
},
containerImage: 'arvados/jobs',
cwd: '/var/spool/cwl',
command: [
'arvados-cwl-runner',
},
containerImage: 'arvados/jobs',
cwd: '/var/spool/cwl',
command: [
'arvados-cwl-runner',
- '--local',
'--api=containers',
'--api=containers',
-
`--project-uuid=${processOwnerUuid}`
,
+
'--local'
,
'/var/lib/cwl/workflow.json#main',
'/var/lib/cwl/cwl.input.json'
],
outputPath: '/var/spool/cwl',
priority: 1,
'/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);
};
const newProcess = await services.containerRequestService.create(newProcessData);
- dispatch(navigateTo
Process
(newProcess.uuid));
+ dispatch(navigateTo(newProcess.uuid));
}
};
}
};
+export const DEFAULT_ADVANCED_FORM_VALUES: Partial<RunProcessAdvancedFormData> = {
+ [VCPUS_FIELD]: 1,
+ [RAM_FIELD]: 1073741824,
+ [API_FIELD]: true,
+};
+
const normalizeInputKeys = (inputs: WorkflowInputsData): WorkflowInputsData =>
Object.keys(inputs).reduce((normalizedInputs, key) => ({
...normalizedInputs,
const normalizeInputKeys = (inputs: WorkflowInputsData): WorkflowInputsData =>
Object.keys(inputs).reduce((normalizedInputs, key) => ({
...normalizedInputs,