Merge pull request #278 from compute-tooling/fix-mp-handling

Check if meta_parameter value is a ValueObject
compute-tooling · Apr 7, 2020 · 0621531 · 0621531
2 parents 48f4176 + 12d4a10
commit 0621531
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 6 deletions.
diff --git a/src/ParamTools/index.ts b/src/ParamTools/index.ts
@@ -366,9 +366,18 @@ export function convertToFormik(
     let yupObj = yupValidator(data.meta_parameters, mp_data);
     let mpVal = mp_data.value[0].value;
     mpShape[mp_name] = yupObj;
-    initialValues["meta_parameters"][mp_name] = yupObj.cast(
-      meta_parameters && mp_name in meta_parameters ? meta_parameters[mp_name] : mpVal
-    );
+    if (meta_parameters && mp_name in meta_parameters) {
+      if (
+        Array.isArray(meta_parameters[mp_name]) &&
+        (meta_parameters[mp_name] as Array<ValueObject>).length >= 1 &&
+        !!meta_parameters[mp_name][0].value
+      ) {
+        mpVal = meta_parameters[mp_name][0].value;
+      } else {
+        mpVal = meta_parameters[mp_name] as ValueObject["value"];
+      }
+    }
+    initialValues["meta_parameters"][mp_name] = yupObj.cast(mpVal);
   }
   let schema = {
     adjustment: yup.object().shape(adjShape),

diff --git a/src/types.ts b/src/types.ts
@@ -211,7 +211,7 @@ export interface InputsDetail {
   errors_warnings: { [msect: string]: { errors: { [paramName: string]: Array<string> } } };
   gui_url: string;
   job_id: string;
-  meta_parameters: { [paramName: string]: Array<ValueObject> };
+  meta_parameters: { [paramName: string]: Array<ValueObject> | ValueObject["value"] };
   parent_model_pk: number;
   sim: MiniSimulation;
   status: "FAIL" | "WORKER_FAILURE" | "PENDING" | "SUCCESS" | "STARTED";

diff --git a/static/js/sim.js b/static/js/sim.js
diff --git a/static/js/sim.js.map b/static/js/sim.js.map