[ARVADOS-WORKBENCH2] updated: 1.3.0-260-g7ee366a5
Git user
git at public.curoverse.com
Thu Dec 27 08:49:57 EST 2018
Summary of changes:
.../run-process-panel/run-process-panel-actions.ts | 23 +++++++++++++--------
.../run-process-advanced-form.tsx | 24 ++++++++++++----------
2 files changed, 28 insertions(+), 19 deletions(-)
via 7ee366a5e6f503d4f1d1cdcdfaa119c08c582679 (commit)
via 5e265ca9e3e4b1554cb267f79f7de86a34c49e97 (commit)
via b4dd02b3300975d84bd6eadb4f9acf6dcf24eab5 (commit)
via ed4406ba8ac546be9838d26c47a5ed5766f6698c (commit)
via 2fe940ec1e978bd9fea2f99e18f1e7aedaf6cf79 (commit)
via 63b006e651f05fa921704bb1accc41391c59d2d7 (commit)
from 9c45d418eedc3c7955db8482aa646af37f2e3c4b (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
commit 7ee366a5e6f503d4f1d1cdcdfaa119c08c582679
Author: Michal Klobukowski <michal.klobukowski at contractors.roche.com>
Date: Thu Dec 27 14:49:34 2018 +0100
Update runProcess action to use new advanced form values
Feature #13708
Arvados-DCO-1.1-Signed-off-by: Michal Klobukowski <michal.klobukowski at contractors.roche.com>
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 8b06a4dd..793d865a 100644
--- a/src/store/run-process-panel/run-process-panel-actions.ts
+++ b/src/store/run-process-panel/run-process-panel-actions.ts
@@ -14,7 +14,7 @@ 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 { RunProcessAdvancedFormData, RUN_PROCESS_ADVANCED_FORM, VCPUS_FIELD, RAM_FIELD, RUNTIME_FIELD, OUTPUT_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';
@@ -117,7 +117,7 @@ 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 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 router = getState();
const properties = getState().properties;
@@ -131,22 +131,22 @@ export const runProcess = async (dispatch: Dispatch<any>, getState: () => RootSt
mounts: createWorkflowMounts(selectedWorkflow, normalizeInputKeys(inputsForm)),
runtimeConstraints: {
API: true,
- vcpus: 1,
- ram: 1073741824,
+ vcpus: advancedForm[VCPUS_FIELD],
+ ram: advancedForm[RAM_FIELD],
+ },
+ schedulingParameters: {
+ maxRunTime: advancedForm[RUNTIME_FIELD]
},
containerImage: 'arvados/jobs',
cwd: '/var/spool/cwl',
command: [
'arvados-cwl-runner',
- '--local',
- '--api=containers',
- `--project-uuid=${processOwnerUuid}`,
'/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,
};
const newProcess = await services.containerRequestService.create(newProcessData);
dispatch(navigateToProcess(newProcess.uuid));
commit 5e265ca9e3e4b1554cb267f79f7de86a34c49e97
Author: Michal Klobukowski <michal.klobukowski at contractors.roche.com>
Date: Thu Dec 27 14:48:56 2018 +0100
Initialize process advanced form from action
Feature #13708
Arvados-DCO-1.1-Signed-off-by: Michal Klobukowski <michal.klobukowski at contractors.roche.com>
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 0cbd9cd6..8b06a4dd 100644
--- a/src/store/run-process-panel/run-process-panel-actions.ts
+++ b/src/store/run-process-panel/run-process-panel-actions.ts
@@ -79,10 +79,12 @@ 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(initialize(RUN_PROCESS_ADVANCED_FORM, DEFAULT_ADVANCED_FORM_VALUES));
}
if (!isWorkflowChanged) {
dispatch(runProcessPanelActions.SET_SELECTED_WORKFLOW(workflow));
dispatch<any>(loadPresets(workflow.uuid));
+ dispatch(initialize(RUN_PROCESS_ADVANCED_FORM, DEFAULT_ADVANCED_FORM_VALUES));
}
};
@@ -151,6 +153,11 @@ export const runProcess = async (dispatch: Dispatch<any>, getState: () => RootSt
}
};
+export const DEFAULT_ADVANCED_FORM_VALUES: Partial<RunProcessAdvancedFormData> = {
+ [VCPUS_FIELD]: 1,
+ [RAM_FIELD]: 1073741824,
+};
+
const normalizeInputKeys = (inputs: WorkflowInputsData): WorkflowInputsData =>
Object.keys(inputs).reduce((normalizedInputs, key) => ({
...normalizedInputs,
commit b4dd02b3300975d84bd6eadb4f9acf6dcf24eab5
Author: Michal Klobukowski <michal.klobukowski at contractors.roche.com>
Date: Thu Dec 27 14:46:51 2018 +0100
Make runtime field a numeric input
Feature #13708
Arvados-DCO-1.1-Signed-off-by: Michal Klobukowski <michal.klobukowski at contractors.roche.com>
diff --git a/src/views/run-process-panel/run-process-advanced-form.tsx b/src/views/run-process-panel/run-process-advanced-form.tsx
index cdebdba5..37e15469 100644
--- a/src/views/run-process-panel/run-process-advanced-form.tsx
+++ b/src/views/run-process-panel/run-process-advanced-form.tsx
@@ -50,7 +50,12 @@ export const RunProcessAdvancedForm =
<Field
name={RUNTIME_FIELD}
component={TextField}
- label="Runtime limit (hh)" />
+ helperText="Maximum running time (in seconds) that this container will be allowed to run before being cancelled."
+ label="Runtime limit"
+ parse={IntInput.parse}
+ format={IntInput.format}
+ type='number'
+ validate={runtimeValidation} />
</Grid>
<Grid item xs={12} md={6}>
<Field
@@ -95,3 +100,4 @@ export const RunProcessAdvancedForm =
const ramValidation = [min(0)];
const vcpusValidation = [min(1)];
const keepCacheRamValdation = [optional(min(0))];
+const runtimeValidation = [optional(min(1))];
commit ed4406ba8ac546be9838d26c47a5ed5766f6698c
Author: Michal Klobukowski <michal.klobukowski at contractors.roche.com>
Date: Thu Dec 27 14:45:46 2018 +0100
Delete initialValues since they are not working
Feature #13708
Arvados-DCO-1.1-Signed-off-by: Michal Klobukowski <michal.klobukowski at contractors.roche.com>
diff --git a/src/views/run-process-panel/run-process-advanced-form.tsx b/src/views/run-process-panel/run-process-advanced-form.tsx
index fc67a8d7..cdebdba5 100644
--- a/src/views/run-process-panel/run-process-advanced-form.tsx
+++ b/src/views/run-process-panel/run-process-advanced-form.tsx
@@ -32,10 +32,6 @@ export interface RunProcessAdvancedFormData {
export const RunProcessAdvancedForm =
reduxForm<RunProcessAdvancedFormData>({
form: RUN_PROCESS_ADVANCED_FORM,
- initialValues: {
- [RAM_FIELD]: 1073741824,
- [VCPUS_FIELD]: 1,
- },
})(() =>
<form>
<ExpansionPanel elevation={0}>
commit 2fe940ec1e978bd9fea2f99e18f1e7aedaf6cf79
Author: Michal Klobukowski <michal.klobukowski at contractors.roche.com>
Date: Thu Dec 27 14:44:55 2018 +0100
Set correct type of runtime field value
Feature #13708
Arvados-DCO-1.1-Signed-off-by: Michal Klobukowski <michal.klobukowski at contractors.roche.com>
diff --git a/src/views/run-process-panel/run-process-advanced-form.tsx b/src/views/run-process-panel/run-process-advanced-form.tsx
index ff3fb114..fc67a8d7 100644
--- a/src/views/run-process-panel/run-process-advanced-form.tsx
+++ b/src/views/run-process-panel/run-process-advanced-form.tsx
@@ -23,7 +23,7 @@ export const KEEP_CACHE_RAM_FIELD = 'keepCacheRam';
export interface RunProcessAdvancedFormData {
[OUTPUT_FIELD]?: string;
- [RUNTIME_FIELD]?: string;
+ [RUNTIME_FIELD]?: number;
[RAM_FIELD]: number;
[VCPUS_FIELD]: number;
[KEEP_CACHE_RAM_FIELD]?: number;
commit 63b006e651f05fa921704bb1accc41391c59d2d7
Author: Michal Klobukowski <michal.klobukowski at contractors.roche.com>
Date: Thu Dec 27 14:44:01 2018 +0100
Export RunProcessAdvancedForm field names
Feature #13708
Arvados-DCO-1.1-Signed-off-by: Michal Klobukowski <michal.klobukowski at contractors.roche.com>
diff --git a/src/views/run-process-panel/run-process-advanced-form.tsx b/src/views/run-process-panel/run-process-advanced-form.tsx
index 5bec245a..ff3fb114 100644
--- a/src/views/run-process-panel/run-process-advanced-form.tsx
+++ b/src/views/run-process-panel/run-process-advanced-form.tsx
@@ -15,11 +15,11 @@ import { optional } from '~/validators/optional';
export const RUN_PROCESS_ADVANCED_FORM = 'runProcessAdvancedForm';
-const OUTPUT_FIELD = 'output';
-const RUNTIME_FIELD = 'runtime';
-const RAM_FIELD = 'ram';
-const VCPUS_FIELD = 'vcpus';
-const KEEP_CACHE_RAM_FIELD = 'keepCacheRam';
+export const OUTPUT_FIELD = 'output';
+export const RUNTIME_FIELD = 'runtime';
+export const RAM_FIELD = 'ram';
+export const VCPUS_FIELD = 'vcpus';
+export const KEEP_CACHE_RAM_FIELD = 'keepCacheRam';
export interface RunProcessAdvancedFormData {
[OUTPUT_FIELD]?: string;
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list