Merge pull request #595 from MetaCell/feature/557

feature/557

Author: enicolasgomez

webapp/redux/middleware/middleware.js

@@ -212,7 +212,7 @@ export default (store) => (next) => (action) => {
       );
   }
 
-  const checkParametersThen = (callback, goToNetworkView = false) => {
+  const checkParametersThen = (callback, goToNetworkView = false, waitingMessage = '') => {
     let allParams = true;
     const inDesignExp = store.getState().experiments?.inDesign;
 
@@ -221,7 +221,7 @@ export default (store) => (next) => (action) => {
       .then((params) => {
         const flattened = Utils.flatten(params);
         const paramKeys = new Set(Object.keys(flattened));
- 
+
         inDesignExp.params?.forEach((param) => {
           if (!paramKeys.has(param.mapsTo)) {
             pythonErrorCallback(
@@ -235,17 +235,17 @@ export default (store) => (next) => (action) => {
         });
         if (allParams) {
           callback().then((response => {
-            next(openConfirmationDialog({title: "Experiment started", ...response})); 
+            next(openConfirmationDialog({title: "Experiment started", ...response}));
             getExperiments();
           })
             ,pythonErrorCallback);
         }
       }, pythonErrorCallback);
     } else {
-      next(GeppettoActions.waitData('Simulating the NetPyNE Model', GeppettoActions.layoutActions.SET_WIDGETS));
+      next(GeppettoActions.waitData(waitingMessage, GeppettoActions.layoutActions.SET_WIDGETS));
       callback().then(toNetworkCallback(goToNetworkView), pythonErrorCallback)
     }
-    
+
   }
 
   switch (action.type) {
@@ -339,13 +339,12 @@ export default (store) => (next) => (action) => {
       break;
     }
     case CREATE_NETWORK: {
-      next(GeppettoActions.waitData('Instantiating the NetPyNE Model', GeppettoActions.layoutActions.SET_WIDGETS));
-      checkParametersThen(() => instantiateNetwork({}))
+      checkParametersThen(() => instantiateNetwork({}), false, "Instantiating the NetPyNE Model")
+
       break;
     }
     case CREATE_SIMULATE_NETWORK: {
-
-      checkParametersThen(() => simulateNetwork({ allTrials: false }))
+      checkParametersThen(() => simulateNetwork({ allTrials: false }), false, "Instantiating and simulating the NetPyNE Model")
 
       break;
     }
@@ -354,7 +353,7 @@ export default (store) => (next) => (action) => {
         next(GeppettoActions.activateWidget(EDIT_WIDGETS.experimentManager.id));
       }
 
-      checkParametersThen(() => simulateNetwork({ allTrials: action.payload, usePrevInst: (store.getState().general.modelState !== Constants.MODEL_STATE.NOT_INSTANTIATED) }))
+      checkParametersThen(() => simulateNetwork({ allTrials: action.payload, usePrevInst: (store.getState().general.modelState !== Constants.MODEL_STATE.NOT_INSTANTIATED) }), false, "Simulating the NetPyNE Model")
       break;
     }
     case PYTHON_CALL: {