Merge branch 'precns' of github.com:MetaCell/NetPyNE-UI into precns

Author: rodriguez-facundo

.travis.yml

@@ -1,14 +1,26 @@
 language: python
 os: linux
-dist: trusty
+python:
+  - "3.7"
 node_js:
-  - "7"
+  - "12"
 env:
   global:
-    secure: dn0FPQ5IG4M/3kdwnyI78ElQ308Vc3QnKAvkWfwMFb8QxDqxQdnTo7AV1qTMtbLrDNkeEWIgi4nc7jmXNtvGTwOfhAULVh6606Qs5B+ezTdwzajbbFMI8SKQx/pnTojOMu8dx7V4lMoR/YWcojR0VC1IWVC62TGbSB1k5BDGgH0=
+    - secure: dn0FPQ5IG4M/3kdwnyI78ElQ308Vc3QnKAvkWfwMFb8QxDqxQdnTo7AV1qTMtbLrDNkeEWIgi4nc7jmXNtvGTwOfhAULVh6606Qs5B+ezTdwzajbbFMI8SKQx/pnTojOMu8dx7V4lMoR/YWcojR0VC1IWVC62TGbSB1k5BDGgH0=
+    - DEFAULT_BRANCH: development
+    - LANDING_PAGE: "http://localhost:8888/geppetto"
 notifications:
   slack: metacell:5ALSeoP88DqIhORUJvxE56sq
-services:
-  - docker  
+install:
+  - sudo apt-get install libgnutls28-dev
+  - sudo apt install libcurl4-openssl-dev libssl-dev
+  - sudo apt-get install python3-dev  
 script:
-  - travis_retry docker build -t="netpyne-ui" --build-arg branch=$TRAVIS_BRANCH .
+
+  - python utilities/install.py 
+  - ./NetPyNE-UI &
+  - http_status=$(curl -s -I $1 $LANDING_PAGE | grep HTTP/1.1 | awk {'print $2'})
+  - echo "$http_status"
+  - cd webapp
+  - travis_retry npm run test -- --verbose --colors
+  - exit 0

webapp/components/layout/LayoutManager.tsx

@@ -27,6 +27,8 @@ import {
 } from "./actions";
 
 import { MINIMIZED_PANEL } from '.';
+import { TabsetPosition } from './model';
+import { Tab } from '@geppettoengine/geppetto-client/js/components/interface/flexLayout2/src/view/Tab';
 
 const styles = (theme) => createStyles({
   container: {
@@ -80,7 +82,7 @@ class LayoutManager {
     const { model } = this;
     let tabset = model.getNodeById(widgetConfiguration.panelName);
     if (tabset === undefined) {
-      this.createTabSet(widgetConfiguration.panelName);
+      this.createTabSet(widgetConfiguration.panelName, widgetConfiguration.defaultPosition, widgetConfiguration.defaultWeight);
     }
     this.model.doAction(
       Actions.addNode(
@@ -119,32 +121,52 @@ class LayoutManager {
   getComponent = () => withStyles(styles)(this.Component(this));
 
 
-  private createTabSet(tabsetID) {
+  private createTabSet(tabsetID, position = TabsetPosition.BOTTOM, weight = 30) {
     // In case the tabset doesn't exist
     const { model } = this;
     const rootNode = model.getNodeById("root");
 
-    let hrow = new FlexLayout.RowNode(model, {});
-    hrow._setWeight(100);
 
-    const tabset = new FlexLayout.TabSetNode(model, { id: tabsetID });
-    tabset._setWeight(20);
 
+    const tabset = new FlexLayout.TabSetNode(model, { id: tabsetID });
+    tabset._setWeight(weight);
+    let hrow = rootNode.getChildren().find(child => child.getType() === 'row');
+    let hrowRowRow = null;
+    switch (position) {
+      case TabsetPosition.RIGHT:
+        rootNode._addChild(tabset);
+        break;
+      case TabsetPosition.LEFT:
+        rootNode._addChild(tabset, 0);
+        break;
+      case TabsetPosition.BOTTOM:
+      case TabsetPosition.TOP: {
+        if (!hrow) {
+          hrow = new FlexLayout.RowNode(model, {});
+          hrow._setWeight(100);
+
+          hrowRowRow = new FlexLayout.RowNode(model, {});
+          hrowRowRow._setWeight(100 - weight);
+          hrow._addChild(hrowRowRow);
+          rootNode.getChildren().forEach(child => {
+            hrowRowRow._addChild(child);
+          });
+          rootNode._removeAll();
+          rootNode._addChild(hrow);
+        }
 
+        if (position === TabsetPosition.BOTTOM) {
+          hrow._addChild(tabset)
+        } else {
+          hrow._addChild(tabset, 0);
+        }
 
-    rootNode.getChildren().forEach(child => {
-      if (child['getWeight']) {
-        const newWeight = (child as FlexLayout.TabSetNode).getWeight() / 2;
-        child._setWeight(newWeight);
-        hrow._addChild(child);
+        break;
       }
 
-    });
+    }
 
-    hrow._addChild(tabset);
 
-    rootNode._removeAll();
-    rootNode._addChild(hrow);
     setTimeout(() => window.dispatchEvent(new Event("resize")), 1000);
   }
 
@@ -387,7 +409,7 @@ class LayoutManager {
     const panelName = widget.panelName;
     let tabset = model.getNodeById(panelName);
     if (tabset === undefined) {
-      this.createTabSet(panelName);
+      this.createTabSet(panelName, widget.defaultPosition, widget.defaultWeight);
     }
     this.moveWidget(widget);
   }

webapp/components/layout/model.ts

@@ -14,6 +14,13 @@ export enum WidgetStatus {
   MINIMIZED = "MINIMIZED",
 }
 
+export enum TabsetPosition {
+  LEFT = "LEFT",
+  RIGHT = "RIGHT",
+  TOP = "TOP",
+  BOTTOM = "BOTTOM"
+}
+
 export interface ExtendedNode extends Node {
   config: Widget;
 }
@@ -23,6 +30,8 @@ export interface Widget {
   status: WidgetStatus;
   panelName: string;
   defaultPanel?: any;
+  defaultPosition?: TabsetPosition;
+  defaultWeight?: number;
   hideOnClose?: boolean;
   name: string;
   enableClose?: boolean;

webapp/constants.js

@@ -28,6 +28,8 @@ export const PYTHON_CONSOLE_WIDGET = {
   status: WidgetStatus.MINIMIZED, 
   component: 'PythonConsole', 
   panelName: MINIMIZED_PANEL,
+  defaultWeight: 30,
+  defaultPosition: 'BOTTOM',
   defaultPanel: "consolePanel",
   enableClose: true,
   enableDrag: true,
@@ -78,7 +80,6 @@ export const WIDGETS_IDS = {
     MORPHOLOGY: 'D3Canvas',
     CONNECTION_PLOT: 'connectionPlot',
     D2_NET_PLOT: 'd2NetPlot',
-    SHAPE_PLOT: 'shapePlot',
     TRACES_PLOT: 'tracesPlot',
     RASTER_PLOT: 'rasterPlot',
     SPIKE_PLOT: 'spikePlot',

webapp/package.json

@@ -7,13 +7,13 @@
   "scripts": {
     "test": "jest --verbose",
     "prebuild": "eslint . --color",
-    "build": "webpack --mode none -p --progress --devtool source-map",
+    "build": "webpack --mode development -p --progress --devtool source-map",
     "prebuild-dev": "eslint . --color --fix",
-    "build-dev": "webpack --mode none --devtool eval",
+    "build-dev": "webpack --mode development --devtool source-map",
     "prebuild-dev-noTest": "eslint . --color --fix",
-    "build-dev-noTest": "webpack --mode none --devtool source-map --env.noTest=true",
+    "build-dev-noTest": "webpack --mode development --devtool source-map --env.noTest=true",
     "prebuild-dev-noTest:watch": "eslint . --color --fix",
-    "build-dev-noTest:watch": "webpack --mode none --devtool source-map --env.noTest=true --progress --watch",
+    "build-dev-noTest:watch": "webpack --mode development --devtool source-map --env.noTest=true --progress --watch",
     "prestart": "eslint . --color --fix",
     "start": "node --max_old_space_size=2048 node_modules/webpack-dev-server/bin/webpack-dev-server.js --progress  --config webpack.config.dev.js"
   },