Merge branch 'development' of https://github.com/MetaCell/netpyne-ui into feature/606

Author: ddelpiano

webapp/components/layout/defaultLayout.js

@@ -4,13 +4,17 @@ export default {
     tabSetHeaderHeight: 26,
     tabSetTabStripHeight: 26,
     enableEdgeDock: false,
-    borderBarSize: 0,
+    borderBarSize: 1,
+    borderEnableDrop: false,
   },
   borders: [
     {
       type: 'border',
       location: 'bottom',
       children: [],
+      size: 1,
+      barSize: 1,
+      enableDrop: false,
     },
   ],
   layout: {

webapp/components/topbar/dialogs/SaveFile.js

@@ -34,11 +34,13 @@ const saveOptions = [
   },
 ];
 
+const getTimeStamp = () => new Date().toGMTString().replace(',', '').replace(/[ ,:]/g, '_');
+
 export default class SaveFile extends React.Component {
   constructor (props) {
     super(props);
     this.state = {
-      fileName: 'output',
+      fileName: 'output_' + getTimeStamp(),
       netParams: true,
       simConfig: true,
       simData: true,

webapp/redux/middleware/middleware.js

@@ -27,7 +27,7 @@ import {
   addInstancesToCanvas,
   openConfirmationDialog
 } from '../actions/general';
-import { OPEN_BACKEND_ERROR_DIALOG, openBackendErrorDialog } from '../actions/errors';
+import { OPEN_BACKEND_ERROR_DIALOG, CLOSE_BACKEND_ERROR_DIALOG, openBackendErrorDialog } from '../actions/errors';
 import { closeDrawerDialogBox } from '../actions/drawer';
 import Utils from '../../Utils';
 import { downloadJsonResponse, downloadPythonResponse } from './utils';
@@ -187,7 +187,6 @@ export default (store) => (next) => (action) => {
     switchLayoutAction(false, reset);
     getExperiments()
     next(action);
-    
   };
 
   const pythonErrorCallback = (error) => {
@@ -341,10 +340,7 @@ export default (store) => (next) => (action) => {
     }
     case CREATE_NETWORK: {
       next(GeppettoActions.waitData('Instantiating the NetPyNE Model', GeppettoActions.layoutActions.SET_WIDGETS));
-
       checkParametersThen(() => instantiateNetwork({}))
-
-
       break;
     }
     case CREATE_SIMULATE_NETWORK: {
@@ -492,6 +488,11 @@ export default (store) => (next) => (action) => {
         }, pythonErrorCallback);
       break;
     }
+    case CLOSE_BACKEND_ERROR_DIALOG: {
+      next(GeppettoActions.setWidgets(store.getState().widgets));
+      next(action);
+      break;
+    }
     default: {
       next(action);
     }

webapp/redux/middleware/utils.js

@@ -1,8 +1,6 @@
 import { Base64 } from 'js-base64';
 
-const getTimeStamp = () => new Date().toGMTString().replace(',', '').replace(/[ ,:]/g, '_');
-
-const createFileName = (name) => name + getTimeStamp();
+const createFileName = (name) => name
 
 const forceBlobDownload = (blob, filename) => {
   const url = window.URL.createObjectURL(blob);
@@ -18,7 +16,7 @@ export const downloadJsonResponse = (jsonData) => {
   let filename = createFileName('NetPyNE_Model_');
 
   if (jsonData.simConfig && jsonData.simConfig.filename) {
-    filename = createFileName(`${jsonData.simConfig.filename}_`);
+    filename = createFileName(`${jsonData.simConfig.filename}`);
   }
 
   filename += '.json';

webapp/redux/store.js

@@ -9,7 +9,7 @@ import middleware from './middleware/middleware';
 import plotMiddleware from './middleware/plotMiddleware';
 import rulesMiddleware from './middleware/rulesOperationsMiddleware';
 
-import defaultLayout from '../components/layout/defaultLayout';
+import baseLayout from '../components/layout/defaultLayout';
 import componentMap from '../components/layout/componentsMap';
 
 const INIT_STATE = {
@@ -22,7 +22,7 @@ const store = createStore(
   all,
   INIT_STATE,
   [middleware, plotMiddleware, rulesMiddleware],
-  { defaultLayout, componentMap },
+  { undefined, baseLayout, componentMap },
 );
 
 export default store;

webapp/scripts/setup_geppetto_ui.sh

@@ -20,16 +20,19 @@ yarn global add yalc
 
 app=$(pwd)
 
+echo "#### geppetto core ####"
 cd $app/../src/geppetto-meta/geppetto.js/geppetto-core
-rm -rf node_modules
+rm -rf node_modules build
 yarn && yarn build:dev && yarn publish:yalc
 
+echo "#### geppetto ui ####"
 cd $app/../src/geppetto-meta/geppetto.js/geppetto-ui
-rm -rf node_modules
+rm -rf node_modules build
 yarn && yarn build:dev && yarn publish:yalc
 
+echo "#### geppetto client ####"
 cd $app/../src/geppetto-meta/geppetto.js/geppetto-client
-rm -rf node_modules
+rm -rf node_modules build
 yarn && yarn build:dev && yarn publish:yalc
 
 cd $app

webapp/yalc.lock

@@ -1,20 +1,17 @@
 {
   "version": "v1",
   "packages": {
-    "@metacell/geppetto-meta-client": {
-      "signature": "918daf407de0a1bb4f9c2b1504fd9f59",
-      "file": true,
-      "replaced": "1.0.0-final"
-    },
     "@metacell/geppetto-meta-core": {
-      "signature": "736f99f823bf49bad526041d1eb37cd3",
-      "file": true,
-      "replaced": "1.0.0-final"
+      "signature": "1ba33c748319dfc31499be76b047ce52",
+      "file": true
     },
     "@metacell/geppetto-meta-ui": {
-      "signature": "aa63de17504247a0c97a54a5ef227199",
-      "file": true,
-      "replaced": "1.0.0-final"
+      "signature": "f6497df9dbe612689d8ed7dca28b3ff1",
+      "file": true
+    },
+    "@metacell/geppetto-meta-client": {
+      "signature": "e466951e2e10fa98016a1fab0c3d8b2c",
+      "file": true
     }
   }
 }