Merge branch 'development' into feature/netpyne-193

Author: aranega

netpyne_ui/netpyne_geppetto.py

@@ -797,7 +797,8 @@ def doIhaveInstOrSimData(self):
         return {'haveInstance': out[0], 'haveSimData': out[1]}
 
     def rename(self, path, oldValue, newValue):
-        command = 'sim.rename(self.' + path + ',"' + oldValue + '","' + newValue + '")'
+        # command = 'sim.rename(self.' + path + ',"' + oldValue + '","' + newValue + '")'
+        command = f'sim.rename(self.{path}, {oldValue!r}, {newValue!r})'
         logging.debug('renaming ' + command)
 
         eval(command)
@@ -935,11 +936,15 @@ def getAvailableCellModels(self):
                     cell_models.add(cm)
         return list(cell_models)
 
-    def getAvailableCellTypes(self):
-        cell_types = set([])
-        for p in self.netParams.cellParams:
-            cell_types.add(p)
-        return list(cell_types)
+    def getAvailableCellModels(self):
+        return ["", "VecStim", "NetStim", "IntFire1"]
+
+    def getAvailableStimulationDistribution(self):
+        return ["normal", "uniform"]
+
+    def getAvailableStimulationPattern(self):
+        # self.netParams.popParams[name]['spikePattern'] = {}
+        return ["", "rhythmic", "evoked", "poisson", "gauss"]
 
     def getAvailableSections(self):
         sections = {}

tests/frontend/e2e/jest-puppeteer.config.js

@@ -1,6 +1,6 @@
 module.exports = {
   launch: {
-    headless: true,
+    headless: 'new',
     defaultViewport: {
       width: 1300,
       height: 1024

tests/frontend/e2e/tests/SaveOpenFile.test.js

@@ -39,7 +39,7 @@ const PASSWORD = 'testpassword'
 
 jest.setTimeout(300000);
 
-describe('Save / Open File testing', () => {
+describe.skip('Save / Open File testing', () => {
 
     beforeAll(async () => {
         await page.goto(baseURL);

webapp/Utils.js

@@ -155,7 +155,13 @@ const Utils = {
     return modelFields;
   },
 
+  asEscapedString (value) {
+    return value.replace(/\\/g, '\\\\').replace(/"/g, '\\"')
+  },
+
   renameKey (path, oldValue, newValue, callback) {
+    oldValue = oldValue.replace(/\\/g, '\\\\').replace(/"/g, '\\"');
+    newValue = newValue.replace(/\\/g, '\\\\').replace(/"/g, '\\"');
     this.execPythonMessage(`netpyne_geppetto.rename("${path}","${oldValue}","${newValue}")`)
       .then((response) => {
         callback(response, newValue);