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

ddelpiano · ddelpiano · commit d132d983665d · 2022-11-22T14:41:59.000Z
diff --git a/requirements.txt b/requirements.txt
@@ -23,7 +23,7 @@ jedi==0.17.0
 Jinja2==2.11.2
 jsonpickle==2.1.0
 jsonschema==3.2.0
-jupyter_geppetto==1.1.1
+jupyter_geppetto==1.1.5
 jupyter-client==7.0.6
 jupyter-core==4.9.1
 jupyter-server==1.11.2
diff --git a/setup.py b/setup.py
@@ -15,7 +15,7 @@
 
 setuptools.setup(
     name="netpyne_ui",
-    version="0.8.0",
+    version="0.8.1",
     url="https://github.com/MetaCell/NetPyNE-UI",
     author="MetaCell",
     author_email="info@metacell.us",
diff --git a/tests/frontend/e2e/package-lock.json b/tests/frontend/e2e/package-lock.json
diff --git a/tests/frontend/e2e/yarn.lock b/tests/frontend/e2e/yarn.lock
@@ -4052,9 +4052,9 @@ minimatch@^3.0.4:
     brace-expansion "^1.1.7"
 
 minimist@^1.1.1, minimist@^1.2.0, minimist@^1.2.5:
-  version "1.2.5"
-  resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz#67d66014b66a6a8aaa0c083c5fd58df4e4e97602"
-  integrity sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==
+  version "1.2.6"
+  resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.6.tgz#8637a5b759ea0d6e98702cfb3a9283323c93af44"
+  integrity sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q==
 
 mixin-deep@^1.2.0:
   version "1.3.2"
diff --git a/utilities/install.py b/utilities/install.py
@@ -136,7 +136,8 @@ def main(netpyne_branch, workspace_branch, geppetto_branch=None, skipNpm=False,
         execute(cmd=['npm', 'ci'], cwd=os.path.join(DEPS_DIR, META_DIR, JUPYTER_DIR, 'js'))
         execute(cmd=['npm', 'run', 'build-dev' if development else 'build'],
                 cwd=os.path.join(DEPS_DIR, META_DIR, JUPYTER_DIR, 'js'))
-
+  
+    execute(cmd=['jupyter', 'nbextension', 'uninstall', 'jupyter_geppetto'])                                                                            
     execute(cmd=['jupyter', 'nbextension', 'install', '--py', '--symlink', '--sys-prefix', 'jupyter_geppetto'])
     execute(cmd=['jupyter', 'nbextension', 'enable', '--py', '--sys-prefix', 'jupyter_geppetto'])
     execute(cmd=['jupyter', 'nbextension', 'enable', '--py', '--sys-prefix', 'widgetsnbextension'])
diff --git a/webapp/Main.js b/webapp/Main.js
@@ -13,15 +13,19 @@ import '@metacell/geppetto-meta-ui/flex-layout/style/dark.scss';
 global.GEPPETTO_CONFIGURATION = require('./GeppettoConfiguration.json');
 const { initGeppetto } = require('@metacell/geppetto-meta-client/GEPPETTO');
 
-Sentry.init({
-  dsn: 'https://d8bf7e40eec34cb9891f6dd8207b5e83@sentry.metacell.us/6',
-  integrations: [
-    new CaptureConsole({
-      levels: ['error'],
-    }),
-  ],
-  tracesSampleRate: 1.0,
-});
+if (process.env.NODE_ENV == 'production')
+{
+  Sentry.init({
+    dsn: 'https://d8bf7e40eec34cb9891f6dd8207b5e83@sentry.metacell.us/6',
+    integrations: [
+      new CaptureConsole({
+        levels: ['error'],
+      }),
+    ],
+    tracesSampleRate: 1.0,
+  });
+}
+
 
 initGeppetto();
 require('./css/netpyne.less');
diff --git a/webapp/Utils.js b/webapp/Utils.js
@@ -25,7 +25,8 @@ const Utils = {
   },
 
   captureSentryException (e) {
-    Sentry.captureException(e);
+    if (process.env.NODE_ENV == 'production')
+      Sentry.captureException(e);
     console.error(e);
   },
 
diff --git a/webapp/components/general/Dialog.js b/webapp/components/general/Dialog.js
@@ -26,7 +26,7 @@ const AboutContent = withStyles(styles)(({ classes }) => (
     <img width="250" src={logoNetpyne} />
     <Box m={1}>
       <Link variant="h5" style={{ display: 'block' }} href="https://github.com/MetaCell/NetPyNE-UI" target="_blank">
-        NetPyNE-UI v0.8.0
+        NetPyNE-UI v0.8.1
       </Link>
       <Link variant="h5" style={{ display: 'block' }} href="https://github.com/Neurosim-lab/netpyne" target="_blank">
         NetPyNE v1.0.2.1
diff --git a/webapp/components/layout/defaultLayout.js b/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: {
diff --git a/webapp/components/topbar/dialogs/SaveFile.js b/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,
diff --git a/webapp/dev_package.json b/webapp/dev_package.json
@@ -1,6 +1,6 @@
 {
   "name": "geppetto-netpyne",
-  "version": "0.8.0",
+  "version": "0.8.1",
   "description": "Geppetto NetPyNE-UI frontend.",
   "repository": "https://github.com/MetaCell/NetPyNE-UI",
   "license": "MIT",
@@ -19,9 +19,9 @@
     "@material-ui/core": "4.12.1",
     "@material-ui/icons": "^4.11.2",
     "@material-ui/lab": "^4.0.0-alpha.60",
-    "@metacell/geppetto-meta-client": "1.0.0-final",
-    "@metacell/geppetto-meta-core": "1.0.0-final",
-    "@metacell/geppetto-meta-ui": "1.0.0-final",
+    "@metacell/geppetto-meta-client": "file:.yalc/@metacell/geppetto-meta-client",
+    "@metacell/geppetto-meta-core": "file:.yalc/@metacell/geppetto-meta-core",
+    "@metacell/geppetto-meta-ui": "file:.yalc/@metacell/geppetto-meta-ui",
     "@nosferatu500/react-sortable-tree": "3.0.5",
     "@sentry/integrations": "^6.16.1",
     "@sentry/react": "^6.16.1",
diff --git a/webapp/geppetto_ui.sh b/webapp/geppetto_ui.sh
@@ -11,16 +11,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
diff --git a/webapp/package.bak b/webapp/package.bak
@@ -1,28 +1,27 @@
 {
   "name": "geppetto-netpyne",
-  "version": "0.8.0",
+  "version": "0.8.1",
   "description": "Geppetto NetPyNE-UI frontend.",
   "repository": "https://github.com/MetaCell/NetPyNE-UI",
   "license": "MIT",
   "scripts": {
     "lint": "eslint . --color --fix",
-    "build": "webpack --mode development -p --progress --devtool source-map",
+    "build": "webpack --mode production -p --progress --devtool source-map",
     "build-dev": "webpack --mode development --devtool source-map",
     "build-dev-noTest": "webpack --mode development --devtool source-map --env.noTest=true",
     "build-dev-noTest:watch": "webpack --mode development --devtool source-map --env.noTest=true --progress --watch",
     "start": "node --max_old_space_size=2048 node_modules/webpack-dev-server/bin/webpack-dev-server.js --progress  --config webpack.config.dev.js"
   },
   "dependencies": {
-    "@babel/plugin-proposal-class-properties": "^7.8.3",
     "@fortawesome/fontawesome-svg-core": "^1.2.35",
     "@fortawesome/free-solid-svg-icons": "^5.13.0",
     "@fortawesome/react-fontawesome": "^0.1.9",
     "@material-ui/core": "4.12.1",
     "@material-ui/icons": "^4.11.2",
     "@material-ui/lab": "^4.0.0-alpha.60",
-    "@metacell/geppetto-meta-client": "1.0.0-final",
-    "@metacell/geppetto-meta-core": "1.0.0-final",
-    "@metacell/geppetto-meta-ui": "1.0.0-final",
+    "@metacell/geppetto-meta-client": "file:.yalc/@metacell/geppetto-meta-client",
+    "@metacell/geppetto-meta-core": "file:.yalc/@metacell/geppetto-meta-core",
+    "@metacell/geppetto-meta-ui": "file:.yalc/@metacell/geppetto-meta-ui",
     "@nosferatu500/react-sortable-tree": "3.0.5",
     "@sentry/integrations": "^6.16.1",
     "@sentry/react": "^6.16.1",
diff --git a/webapp/package.json b/webapp/package.json
@@ -1,12 +1,12 @@
 {
   "name": "geppetto-netpyne",
-  "version": "0.8.0",
+  "version": "0.8.1",
   "description": "Geppetto NetPyNE-UI frontend.",
   "repository": "https://github.com/MetaCell/NetPyNE-UI",
   "license": "MIT",
   "scripts": {
     "lint": "eslint . --color --fix",
-    "build": "webpack --mode development -p --progress --devtool source-map",
+    "build": "webpack --mode production -p --progress --devtool source-map",
     "build-dev": "webpack --mode development --devtool source-map",
     "build-dev-noTest": "webpack --mode development --devtool source-map --env.noTest=true",
     "build-dev-noTest:watch": "webpack --mode development --devtool source-map --env.noTest=true --progress --watch",
diff --git a/webapp/redux/middleware/middleware.js b/webapp/redux/middleware/middleware.js
@@ -27,15 +27,15 @@ 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';
 import * as Constants from '../../constants';
 import { ADD_EXPERIMENT, REMOVE_EXPERIMENT } from '../actions/experiments';
 
 
-const TIMEOUT = 10000;
+const TIMEOUT = 30000;
 const EXPERIMENT_POLL_INTERVAL = 5000;
 
 const STABLE_EXPERIMENTS_STATES = new Set([
@@ -187,7 +187,6 @@ export default (store) => (next) => (action) => {
     switchLayoutAction(false, reset);
     getExperiments()
     next(action);
-
   };
 
   const pythonErrorCallback = (error) => {
@@ -488,6 +487,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);
     }
diff --git a/webapp/redux/middleware/utils.js b/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';
diff --git a/webapp/redux/store.js b/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;
diff --git a/webapp/yalc.lock b/webapp/yalc.lock
@@ -1,16 +1,16 @@
 {
   "version": "v1",
   "packages": {
-    "@metacell/geppetto-meta-client": {
-      "signature": "918daf407de0a1bb4f9c2b1504fd9f59",
-      "file": true
-    },
     "@metacell/geppetto-meta-core": {
-      "signature": "736f99f823bf49bad526041d1eb37cd3",
+      "signature": "1ba33c748319dfc31499be76b047ce52",
       "file": true
     },
     "@metacell/geppetto-meta-ui": {
-      "signature": "aa63de17504247a0c97a54a5ef227199",
+      "signature": "f6497df9dbe612689d8ed7dca28b3ff1",
+      "file": true
+    },
+    "@metacell/geppetto-meta-client": {
+      "signature": "e466951e2e10fa98016a1fab0c3d8b2c",
       "file": true
     }
   }
diff --git a/webapp/yarn.lock b/webapp/yarn.lock
