Clean up experiments frontend code

Author: Lucas Rebscher

webapp/Utils.js

@@ -242,38 +242,6 @@ const Utils = {
         ? { ...output, ...Utils.flatten(obj[key], `${path}[${key}].`) }
         : { ...output, ...Utils.flatten(obj[key], `${path + key}.`) }), {});
   },
-
-  /**
-   * Converts a value based on `type` of the netpyne metadata `field`.
-   *
-   * @param {*} field metadata field of netpyne.
-   * @param {*} value value to be converted to proper type.
-   * @returns value converted to `type`.
-   */
-  convertFieldValue (field, value) {
-    if (field == null) {
-      return value;
-    }
-
-    switch (field.type) {
-      case 'int':
-        return Number(value);
-
-      case 'float':
-        return Number(value);
-
-      case 'str':
-        return String(value);
-
-      case 'bool':
-        return Boolean(value);
-
-      default:
-        // .. handling of more types
-        // list(float), dict, list(list(float)), func
-        return value;
-    }
-  },
 };
 
 export default Utils;

webapp/components/experiments/ExperimentHelper.js

@@ -1,6 +1,37 @@
-import Utils from '../../Utils';
 import { REAL_TYPE } from '../../constants';
 
+/**
+ * Converts a value based on `type` of the netpyne metadata `field`.
+ *
+ * @param {*} field metadata field of netpyne.
+ * @param {*} value value to be converted to proper type.
+ * @returns value converted to `type`.
+ */
+export const convertFieldValue = (field, value) => {
+  if (field == null) {
+    return value;
+  }
+
+  switch (field.type) {
+    case REAL_TYPE.INT:
+      return Number(value);
+
+    case REAL_TYPE.FLOAT:
+      return Number(value);
+
+    case REAL_TYPE.STR:
+      return String(value);
+
+    case REAL_TYPE.BOOL:
+      return Boolean(value);
+
+    default:
+      // .. handling of more types
+      // list(float), dict, list(list(float)), func
+      return value;
+  }
+};
+
 export const isValidValue = (value, type) => {
   if (type == null) {
     return false;
@@ -70,7 +101,7 @@ export const validateListParameter = (parameter) => {
 
   const validValue = values.every((element) => isValidValue(element, field?.type));
   if (validValue) {
-    values = values.map((el) => Utils.convertFieldValue(field, el));
+    values = values.map((el) => convertFieldValue(field, el));
   }
 
   return {
@@ -87,7 +118,7 @@ export const validateRangeParameter = (parameter, val, key) => {
   return {
     ...parameter,
     [`${key}Val`]: val,
-    [key]: validValue ? Utils.convertFieldValue(parameter.field, val) : val,
+    [key]: validValue ? convertFieldValue(parameter.field, val) : val,
     [`${key}error`]: !validValue,
     [`${key}helperText`]: validValue ? '' : getErrorText(parameter?.field?.type),
   };

webapp/redux/actions/experiments.js

@@ -1,20 +1,14 @@
 export const GET_EXPERIMENTS = 'GET_EXPERIMENTS';
 export const SET_EXPERIMENTS = 'SET_EXPERIMENTS';
-export const RESET_EXPERIMENT = 'RESET_EXPERIMENT';
 export const CLONE_EXPERIMENT = 'CLONE_EXPERIMENT';
 export const VIEW_EXPERIMENTS_RESULTS = 'VIEW_EXPERIMENT_RESULTS';
 export const TRIAL_LOAD_MODEL_SPEC = 'TRIAL_LOAD_MODEL_SPEC';
 export const OPEN_LAUNCH_DIALOG = 'OPEN_LAUNCH_DIALOG';
 export const CLOSE_LAUNCH_DIALOG = 'CLOSE_LAUNCH_DIALOG';
 
 /**
- * Resets configuration of current Experiment.
- * User can start now with a new Experiment.
+ * Triggers fetching the Experiments from the backend.
  */
-export const resetCurrentExperiment = () => ({
-  type: RESET_EXPERIMENT,
-});
-
 export const getExperiments = () => ({
   type: GET_EXPERIMENTS,
 });
@@ -35,6 +29,9 @@ export const viewExperimentResults = (payload) => ({
   payload,
 });
 
+/**
+ * Load the model specification of the specified trial.
+ */
 export const loadTrialModelSpec = (payload) => ({
   type: TRIAL_LOAD_MODEL_SPEC,
   payload,

webapp/redux/middleware/middleware.js

@@ -23,10 +23,8 @@ import { openBackendErrorDialog } from '../actions/errors';
 import { closeDrawerDialogBox } from '../actions/drawer';
 import Utils from '../../Utils';
 import { downloadJsonResponse, downloadPythonResponse } from './utils';
-
 import { setWidgets, setLayout } from '../actions/layout';
 import * as Constants from '../../constants';
-import { openLaunchDialog } from '../actions/experiments';
 
 let previousLayout = {
   edit: undefined,