Merge pull request #830 from MetaCell/feature/netpyne-217

CNS 24 -

Author: ddelpiano

netpyne_ui/netpyne_geppetto.py

@@ -330,7 +330,9 @@ def simulateNetPyNEModelInGeppetto(self, args):
         use_prev_inst = args.get('usePrevInst', False)
         sim_id = args.get('simId', 0)
         try:
-            self.validate_netParams()
+            # Note this has been commented for CNS 24 since some models were failing
+            # there is a discussion about making this non blocker, to follow up with Salva and Padraig
+            # self.validate_netParams()
 
             experiment = experiments.get_current()
             if experiment:
@@ -805,7 +807,9 @@ def deleteModel(self, modelParams):
         return utils.getJSONReply()
 
     def instantiateNetPyNEModel(self):
-        self.validate_netParams()
+        # Note this has been commented for CNS 24 since some models were failing
+        # there is a discussion about making this non blocker, to follow up with Salva and Padraig
+        # self.validate_netParams()
         with redirect_stdout(sys.__stdout__):
             saveData = sim.allSimData if hasattr(sim, 'allSimData') and 'spkt' in sim.allSimData.keys() and len(
                 sim.allSimData['spkt']) > 0 else False

webapp/components/definition/connectivity/NetPyNEConnectivityRule.js

@@ -32,6 +32,10 @@ export default class NetPyNEConnectivityRule extends React.Component {
     };
   }
 
+  UNSAFE_componentWillReceiveProps (nextProps) {
+    this.setState({ currentName: nextProps.name });
+  }
+
   handleRenameChange = (event) => {
     const storedValue = this.props.name;
     const newValue = Utils.nameValidation(event.target.value);
@@ -60,19 +64,7 @@ export default class NetPyNEConnectivityRule extends React.Component {
     }
   };
 
-  triggerUpdate (updateMethod) {
-    // common strategy when triggering processing of a value change, delay it, every time there is a change we reset
-    // eslint-disable-next-line eqeqeq
-    if (this.updateTimer !== undefined) {
-      clearTimeout(this.updateTimer);
-    }
-    this.updateTimer = setTimeout(updateMethod, 1000);
-  }
-
-  select = (index, sectionId) => this.setState({
-    selectedIndex: index,
-    sectionId,
-  });
+  handleChange = (event, index, values) => this.setState({ values });
 
   getBottomNavigationAction (index, sectionId, label, icon, id) {
     return (
@@ -86,6 +78,20 @@ export default class NetPyNEConnectivityRule extends React.Component {
     );
   }
 
+  select = (index, sectionId) => this.setState({
+    selectedIndex: index,
+    sectionId,
+  });
+
+  triggerUpdate (updateMethod) {
+    // common strategy when triggering processing of a value change, delay it, every time there is a change we reset
+    // eslint-disable-next-line eqeqeq
+    if (this.updateTimer !== undefined) {
+      clearTimeout(this.updateTimer);
+    }
+    this.updateTimer = setTimeout(updateMethod, 1000);
+  }
+
   postProcessMenuItems (pythonData, selected) {
     return pythonData.map((name) => (
       <MenuItem
@@ -99,10 +105,6 @@ export default class NetPyNEConnectivityRule extends React.Component {
     ));
   }
 
-  UNSAFE_componentWillReceiveProps (nextProps) {
-    this.setState({ currentName: nextProps.name });
-  }
-
   render () {
     const dialogPop = this.state.errorMessage !== undefined ? (
       <Dialog open style={{ whiteSpace: 'pre-wrap' }}>
@@ -445,6 +447,4 @@ export default class NetPyNEConnectivityRule extends React.Component {
       </div>
     );
   }
-
-  handleChange = (event, index, values) => this.setState({ values });
 }

webapp/components/definition/connectivity/NetPyNEConnectivityRules.js

@@ -103,8 +103,9 @@ export default class NetPyNEConnectivityRules extends Component {
   }
 
   componentDidUpdate (prevProps, prevState) {
-    if (this.props.commands !== prevProps.commands)
+    if (this.props.commands !== prevProps.commands) {
       this.forceUpdate();
+    }
     // we need to check if any of the three entities have been renamed and if that's the case change the state for the selection variable
     const newConnectivityRuleName = this.hasSelectedConnectivityRuleBeenRenamed(
       prevState,