Merge pull request #692 from MetaCell/feature/netpyne-119

Feature/netpyne 119

Author: ddelpiano

netpyne_ui/netpyne_geppetto.py

@@ -843,6 +843,13 @@ def checkAvailablePlots(self):
     def getPlot(self, plotName, LFPflavour, theme='gui'):
         try:
             with redirect_stdout(sys.__stdout__):
+                availablePlots = self.checkAvailablePlots()
+                checkCondition = availablePlots.get(plotName.replace('iplot', 'plot'), False)
+
+                if checkCondition is False:
+                    logging.info("Plot " + plotName + " not available")
+                    return -1
+
                 args = self.getPlotSettings(plotName)
                 if LFPflavour:
                     args['plots'] = [LFPflavour]

webapp/dev_package.json

@@ -29,15 +29,14 @@
     "jquery": "^3.6.0",
     "js-base64": "^3.6.1",
     "less-vars-to-js": "^1.3.0",
-    "node-sass": "^4.0.0",
     "prop-types": "^15.7.2",
     "react": "^17.0.1",
     "react-color": "^2.19.3",
     "react-dom": "^16.4.0",
     "react-json-view": "^1.21.3",
     "react-redux": "^7.2.0",
     "react-sortable-tree": "^2.8.0",
-    "redux": "^4.1.0",
+    "redux": "4.1.2",
     "sass": "^1.49.0",
     "sass-loader": "^7.2.0",
     "three": "0.111.0"
@@ -63,10 +62,6 @@
     "awesome-typescript-loader": "^5.2.1",
     "babel-eslint": "^10.0.1",
     "babel-loader": "^8.0.6",
-    "babel-plugin-transform-decorators-legacy": "^1.3.5",
-    "babel-plugin-transform-object-assign": "^6.8.0",
-    "babel-plugin-transform-runtime": "^6.15.0",
-    "casperjs": "^1.1.4",
     "copy-webpack-plugin": "^4.6.0",
     "css-loader": "^3.0.0",
     "eslint": "^7.20.0",
@@ -75,28 +70,19 @@
     "eslint-plugin-jsx-a11y": "^6.4.1",
     "eslint-plugin-react": "^7.22.0",
     "eslint-plugin-react-hooks": "^1.7.0",
-    "exports-loader": "^0.6.3",
-    "file-loader": "^5.1.0",
     "file-saver": "^2.0.2",
     "html-to-image": "^1.9.0",
     "html-webpack-plugin": "^3.2.0",
     "ignore-loader": "^0.1.2",
-    "imports-loader": "^0.7.1",
-    "jasmine": "^3.2.0",
-    "json-loader": "^0.5.4",
     "less": "^3.11.1",
     "less-loader": "^5.0.0",
     "mini-css-extract-plugin": "^0.7.0",
     "raw-loader": "^0.5.1",
     "react-resize-detector": "^6.7.4",
-    "slimerjs": "^1.0.0",
-    "source-map-loader": "^0.2.3",
     "style-loader": "^0.13.2",
     "three": ">=0.111.0",
-    "three-render-objects": ">=1.13.3",
     "typedoc": "^0.11.1",
     "typescript": "^2.0.0",
-    "url-join": "^4.0.0",
     "url-loader": "^0.5.8",
     "webpack": "^4.35.0",
     "webpack-cli": "^3.3.5",

webapp/package.bak

@@ -29,7 +29,6 @@
     "jquery": "^3.6.0",
     "js-base64": "^3.6.1",
     "less-vars-to-js": "^1.3.0",
-    "node-sass": "^4.0.0",
     "prop-types": "^15.7.2",
     "react": "^17.0.1",
     "react-color": "^2.19.3",
@@ -63,10 +62,6 @@
     "awesome-typescript-loader": "^5.2.1",
     "babel-eslint": "^10.0.1",
     "babel-loader": "^8.0.6",
-    "babel-plugin-transform-decorators-legacy": "^1.3.5",
-    "babel-plugin-transform-object-assign": "^6.8.0",
-    "babel-plugin-transform-runtime": "^6.15.0",
-    "casperjs": "^1.1.4",
     "copy-webpack-plugin": "^4.6.0",
     "css-loader": "^3.0.0",
     "eslint": "^7.20.0",
@@ -75,28 +70,19 @@
     "eslint-plugin-jsx-a11y": "^6.4.1",
     "eslint-plugin-react": "^7.22.0",
     "eslint-plugin-react-hooks": "^1.7.0",
-    "exports-loader": "^0.6.3",
-    "file-loader": "^5.1.0",
     "file-saver": "^2.0.2",
     "html-to-image": "^1.9.0",
     "html-webpack-plugin": "^3.2.0",
     "ignore-loader": "^0.1.2",
-    "imports-loader": "^0.7.1",
-    "jasmine": "^3.2.0",
-    "json-loader": "^0.5.4",
     "less": "^3.11.1",
     "less-loader": "^5.0.0",
     "mini-css-extract-plugin": "^0.7.0",
     "raw-loader": "^0.5.1",
     "react-resize-detector": "^6.7.4",
-    "slimerjs": "^1.0.0",
-    "source-map-loader": "^0.2.3",
     "style-loader": "^0.13.2",
     "three": ">=0.111.0",
-    "three-render-objects": ">=1.13.3",
     "typedoc": "^0.11.1",
     "typescript": "^2.0.0",
-    "url-join": "^4.0.0",
     "url-loader": "^0.5.8",
     "webpack": "^4.35.0",
     "webpack-cli": "^3.3.5",

webapp/package.json

@@ -6,7 +6,7 @@
   "license": "MIT",
   "scripts": {
     "lint": "eslint . --color --fix",
-    "build": "webpack --mode production -p --progress --devtool source-map",
+    "build": "webpack --mode development -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",
@@ -29,7 +29,6 @@
     "jquery": "^3.6.0",
     "js-base64": "^3.6.1",
     "less-vars-to-js": "^1.3.0",
-    "node-sass": "^4.0.0",
     "prop-types": "^15.7.2",
     "react": "^17.0.1",
     "react-color": "^2.19.3",
@@ -63,10 +62,6 @@
     "awesome-typescript-loader": "^5.2.1",
     "babel-eslint": "^10.0.1",
     "babel-loader": "^8.0.6",
-    "babel-plugin-transform-decorators-legacy": "^1.3.5",
-    "babel-plugin-transform-object-assign": "^6.8.0",
-    "babel-plugin-transform-runtime": "^6.15.0",
-    "casperjs": "^1.1.4",
     "copy-webpack-plugin": "^4.6.0",
     "css-loader": "^3.0.0",
     "eslint": "^7.20.0",
@@ -75,28 +70,19 @@
     "eslint-plugin-jsx-a11y": "^6.4.1",
     "eslint-plugin-react": "^7.22.0",
     "eslint-plugin-react-hooks": "^1.7.0",
-    "exports-loader": "^0.6.3",
-    "file-loader": "^5.1.0",
     "file-saver": "^2.0.2",
     "html-to-image": "^1.9.0",
     "html-webpack-plugin": "^3.2.0",
     "ignore-loader": "^0.1.2",
-    "imports-loader": "^0.7.1",
-    "jasmine": "^3.2.0",
-    "json-loader": "^0.5.4",
     "less": "^3.11.1",
     "less-loader": "^5.0.0",
     "mini-css-extract-plugin": "^0.7.0",
     "raw-loader": "^0.5.1",
     "react-resize-detector": "^6.7.4",
-    "slimerjs": "^1.0.0",
-    "source-map-loader": "^0.2.3",
     "style-loader": "^0.13.2",
     "three": ">=0.111.0",
-    "three-render-objects": ">=1.13.3",
     "typedoc": "^0.11.1",
     "typescript": "^2.0.0",
-    "url-join": "^4.0.0",
     "url-loader": "^0.5.8",
     "webpack": "^4.35.0",
     "webpack-cli": "^3.3.5",