aligning open PRs regarding the change from trial to condition

Author: ddelpiano

netpyne_ui/experiments.py

@@ -154,7 +154,7 @@ def get_model_specification(name: str, trial: str) -> dict:
     """
     path = get_trial_output_path(name, trial, fallback=True)
     if path is None or not os.path.exists(path):
-        raise ExperimentsError(f"Trial file {path} not found")
+        raise ExperimentsError(f"Condition file {path} not found")
 
     with open(path, "r") as f:
         trial_output = json.load(f)
@@ -273,7 +273,7 @@ def onerror(func, path, exc_info):
 
 
 def _create_base_model_trial() -> model.Trial:
-    return model.Trial(name="Trial 1", id=BASE_TRIAL_ID)
+    return model.Trial(name="Condition 1", id=BASE_TRIAL_ID)
 
 
 def _create_trials(experiment: model.Experiment) -> List[model.Trial]:
@@ -315,7 +315,7 @@ def _create_trials(experiment: model.Experiment) -> List[model.Trial]:
 
         filename = combinations["filenames"][combIdx][1:]
         indices = combinations["indices"][combIdx]
-        name = f"Trial {combIdx + 1}"
+        name = f"Condition {combIdx + 1}"
 
         trials.append(
             model.Trial(name=name, params=params, indices=indices, id=filename)

netpyne_ui/netpyne_geppetto.py

@@ -138,7 +138,7 @@ def viewExperimentResult(self, payload: dict):
 
         file = experiments.get_trial_output_path(name, trial)
         if file is None or not os.path.exists(file):
-            return utils.getJSONError(f"Couldn't find output file of trial. Please take a look at the simulation log.", "")
+            return utils.getJSONError(f"Couldn't find output file of condition. Please take a look at the simulation log.", "")
 
         if self.doIhaveInstOrSimData()['haveInstance']:
             sim.clearAll()

webapp/components/experiments/ExperimentView.js

@@ -269,7 +269,7 @@ function EnhancedTableHead (props) {
       id: 'name',
       numeric: false,
       disablePadding: true,
-      label: 'TRIAL NAME',
+      label: 'EXPERIMENTAL CONDITIONS',
     },
     ...paramHeaders,
   ];
@@ -564,7 +564,7 @@ const ExperimentView = (props) => {
                   experimentFinished={experimentFinished}
                 />
                 <TableBody>
-                  {stableSort(filteredRows, getComparator(order, orderBy))
+                  {stableSort(filteredRows, getComparator(order, 'indices'))
                     .slice(page * rowsPerPage, page * rowsPerPage + rowsPerPage)
                     .map((row) => (
                       <TableRow tabIndex={-1} key={row.name}>

webapp/components/general/PlotViewer.js

@@ -1,5 +1,5 @@
 import React from 'react';
-import HTMLViewer from '../index';
+import HTMLViewer from './HTMLViewer';
 
 const PlotViewer = ({ key, id, method }) => {
   const data = window.plotCache[id];

webapp/components/index.js

@@ -357,10 +357,6 @@ export const SelectCellTemplate = connect(
   }),
 )(_SelectCellTemplate);
 
-export const PlotViewer = connect(
-  null,
-  null,
-)(_PlotViewer);
 // ---------------------------------------------------------------------------------------- //
 
 // DEFAULTS

webapp/dev_package.json

@@ -36,9 +36,9 @@
     "react-redux": "^7.2.0",
     "react-sortable-tree": "^2.8.0",
     "redux": "^4.1.0",
-    "three": "0.111.0",
+    "sass": "^1.49.0",
     "sass-loader": "^7.2.0",
-    "node-sass": "^4.0.0"
+    "three": "0.111.0"
   },
   "resolutions": {
     "@material-ui/core": "4.11.4"

webapp/package.json

@@ -36,9 +36,9 @@
     "react-redux": "^7.2.0",
     "react-sortable-tree": "^2.8.0",
     "redux": "^4.1.0",
-    "three": "0.111.0",
+    "sass": "^1.49.0",
     "sass-loader": "^7.2.0",
-    "node-sass": "^5.0.0"
+    "three": "0.111.0"
   },
   "resolutions": {
     "@material-ui/core": "4.11.4"

webapp/update-geppetto-ui.sh

@@ -4,6 +4,10 @@ set -e
 
 app=$(pwd)
 
+cd ../src/geppetto-meta/geppetto.js/geppetto-core
+yarn && yarn build:dev && yarn publish:yalc
+
+cd $app
 cd ../src/geppetto-meta/geppetto.js/geppetto-ui
 yarn && yarn build:dev && yarn publish:yalc