Merge remote-tracking branch 'upstream/master'

Pedro Crespo · Pedro Crespo · commit 6ca6aade81fd · 2018-10-31T14:33:37.000+01:00
diff --git a/services/docker-compose.deploy.devel.yml b/services/docker-compose.deploy.devel.yml
@@ -65,6 +65,8 @@ services:
       - S3_ACCESS_KEY=12345678
       - S3_SECRET_KEY=12345678
       - S3_BUCKET_NAME=simcore
+      - SMTP_HOST=smtp.speag.com
+      - SMTP_PORT=25
   rabbit:
     image: rabbitmq:3-management
     environment:
diff --git a/services/docker-compose.deploy.yml b/services/docker-compose.deploy.yml
@@ -60,6 +60,8 @@ services:
       - S3_ACCESS_KEY=12345678
       - S3_SECRET_KEY=12345678
       - S3_BUCKET_NAME=simcore
+      - SMTP_HOST=smtp.speag.com
+      - SMTP_PORT=25
   rabbit:
     image: rabbitmq:3-management
     environment:
diff --git a/services/web/client/source/class/qxapp/component/widget/FilePicker.js b/services/web/client/source/class/qxapp/component/widget/FilePicker.js
@@ -97,12 +97,18 @@ qx.Class.define("qxapp.component.widget.FilePicker", {
       };
       let emptyModel = qx.data.marshal.Json.createModel(data, true);
       this.__tree.setModel(emptyModel);
+      let that = this;
       this.__tree.setDelegate({
         createItem: () => new qxapp.component.widget.FileTreeItem(),
         bindItem: (c, item, id) => {
           c.bindDefaultProperties(item, id);
           c.bindProperty("fileId", "fileId", null, item, id);
           c.bindProperty("size", "size", null, item, id);
+        },
+        configureItem: item => {
+          item.addListener("dbltap", e => {
+            that.__itemSelected(); // eslint-disable-line no-underscore-dangle
+          }, that);
         }
       });
     },
diff --git a/services/web/client/source/class/qxapp/component/widget/NewProjectDlg.js b/services/web/client/source/class/qxapp/component/widget/NewProjectDlg.js
@@ -38,10 +38,12 @@ qx.Class.define("qxapp.component.widget.NewProjectDlg", {
       let templatesList = new qx.ui.form.List().set({
         minHeight: 200
       });
-      templatesList.add(new qx.ui.form.ListItem(this.tr("Blank Project")));
+      let blankItem = new qx.ui.form.ListItem(this.tr("Blank Project"));
+      templatesList.add(blankItem);
       templatesList.add(new qx.ui.form.ListItem(this.tr("EM General")));
       templatesList.add(new qx.ui.form.ListItem(this.tr("EM-Neuro")));
       templatesList.add(new qx.ui.form.ListItem(this.tr("EM-Thermal")));
+      templatesList.setSelection([blankItem]);
       prjFormLayout.add(new qx.ui.basic.Label(this.tr("Categories / Templates")));
       prjFormLayout.add(templatesList, {
         flex: 1
@@ -92,8 +94,24 @@ qx.Class.define("qxapp.component.widget.NewProjectDlg", {
 
       prjFormLayout.add(new qx.ui.core.Spacer(5));
 
-      let createBtn = new qx.ui.form.Button(this.tr("Create"));
-      createBtn.addListener("execute", function() {
+      // create the form manager
+      let manager = new qx.ui.form.validation.Manager();
+      // create a async validator function
+      let projectTitleValidator = new qx.ui.form.validation.AsyncValidator(
+        function(validator, value) {
+          if (value === null || value.length === 0) {
+            validator.setValid(false, "Project title is required");
+          } else {
+            validator.setValid(true);
+          }
+        }
+      );
+      manager.add(projectTitle, projectTitleValidator);
+
+      manager.addListener("complete", function() {
+        if (!manager.getValid()) {
+          return;
+        }
         const title = projectTitle.getValue();
         const desc = description.getValue();
         const sele = templatesList.getSelection();
@@ -108,6 +126,11 @@ qx.Class.define("qxapp.component.widget.NewProjectDlg", {
         };
         this.fireDataEvent("CreatePrj", data);
       }, this);
+
+      let createBtn = new qx.ui.form.Button(this.tr("Create"));
+      createBtn.addListener("execute", function() {
+        manager.validate();
+      }, this);
       prjFormLayout.add(createBtn);
 
       this._add(prjFormLayout, {
diff --git a/services/web/client/source/class/qxapp/component/widget/NodeView.js b/services/web/client/source/class/qxapp/component/widget/NodeView.js
@@ -1,6 +1,6 @@
 const PORT_INPUTS_WIDTH = 300;
 
-qx.Class.define("qxapp.component.widget.SettingsView", {
+qx.Class.define("qxapp.component.widget.NodeView", {
   extend: qx.ui.container.Composite,
 
   construct: function() {
@@ -30,7 +30,10 @@ qx.Class.define("qxapp.component.widget.SettingsView", {
     let mainLayout = this.__mainLayout = new qx.ui.container.Composite(new qx.ui.layout.VBox(10));
     mainLayout.set({
       alignX: "center",
-      padding: 70
+      paddingTop: 20,
+      paddingRight: 30,
+      paddingBottom: 20,
+      paddingLeft: 30
     });
     this.add(mainLayout, {
       flex: 1
diff --git a/services/web/client/source/class/qxapp/component/widget/TreeTool.js b/services/web/client/source/class/qxapp/component/widget/TreeTool.js
@@ -16,10 +16,17 @@ qx.Class.define("qxapp.component.widget.TreeTool", {
 
     this.__buildLayout();
     this.buildTree();
+
+    this.addListener("keypress", function(keyEvent) {
+      if (keyEvent.getKeyIdentifier() === "F2") {
+        this.__changeLabel();
+      }
+    }, this);
   },
 
   events: {
-    "NodeDoubleClicked": "qx.event.type.Data"
+    "NodeDoubleClicked": "qx.event.type.Data",
+    "NodeLabelChanged": "qx.event.type.Data"
   },
 
   properties: {
@@ -35,7 +42,6 @@ qx.Class.define("qxapp.component.widget.TreeTool", {
 
   members: {
     __tree: null,
-    __selectedNodeId: null,
 
     __buildLayout: function() {
       let tree = this.__tree = new qx.ui.tree.VirtualTree(null, "label", "children").set({
@@ -73,6 +79,7 @@ qx.Class.define("qxapp.component.widget.TreeTool", {
           createItem: () => new qxapp.component.widget.NodeTreeItem(),
           bindItem: (c, item, id) => {
             c.bindDefaultProperties(item, id);
+            c.bindProperty("label", "label", null, item, id);
             c.bindProperty("nodeId", "nodeId", null, item, id);
           }
         });
@@ -118,6 +125,86 @@ qx.Class.define("qxapp.component.widget.TreeTool", {
         this.__tree.openNodeAndParents(nodeInTree);
         this.__tree.setSelection(new qx.data.Array([nodeInTree]));
       }
+    },
+
+    __changeLabel: function() {
+      let treeSelection = this.__tree.getSelection();
+      if (treeSelection.length < 1) {
+        return;
+      }
+      let selectedItem = treeSelection.toArray()[0];
+      const selectedNodeId = selectedItem.getNodeId();
+      if (selectedNodeId === "root") {
+        return;
+      }
+
+      let nodeLabelEditor = this.__createNodeLabelEditor(selectedItem);
+      const bounds = this.getLayoutParent().getBounds();
+      nodeLabelEditor.moveTo(bounds.left+100, bounds.top+150);
+      nodeLabelEditor.open();
+    },
+
+    __createNodeLabelEditor : function(selectedItem) {
+      const oldLabel = selectedItem.getLabel();
+      const maxWidth = 350;
+      const minWidth = 100;
+      const labelWidth = Math.min(Math.max(parseInt(oldLabel.length*4), minWidth), maxWidth);
+      let labelEditorWin = new qx.ui.window.Window("Rename").set({
+        appearance: "window-small-cap",
+        layout: new qx.ui.layout.HBox(4),
+        padding: 2,
+        modal: true,
+        showMaximize: false,
+        showMinimize: false,
+        width: labelWidth
+      });
+
+      // Create a text field in which to edit the data
+      let labelEditor = new qx.ui.form.TextField(oldLabel).set({
+        allowGrowX: true,
+        minWidth: labelWidth
+      });
+      labelEditorWin.add(labelEditor, {
+        flex: 1
+      });
+
+      labelEditorWin.addListener("appear", e => {
+        labelEditor.focus();
+        labelEditor.setTextSelection(0, labelEditor.getValue().length);
+      }, this);
+
+      // Create the "Save" button to close the cell editor
+      let save = new qx.ui.form.Button("Save");
+      save.addListener("execute", function(e) {
+        const newLabel = labelEditor.getValue();
+        selectedItem.setLabel(newLabel);
+        const data = {
+          nodeId: selectedItem.getNodeId(),
+          newLabel: newLabel
+        };
+        this.fireDataEvent("NodeLabelChanged", data);
+
+        labelEditorWin.close();
+      }, this);
+      labelEditorWin.add(save);
+
+      // Let user press Enter from the cell editor text field to finish.
+      let command = new qx.ui.command.Command("Enter");
+      command.addListener("execute", e => {
+        save.execute();
+        command.dispose();
+        command = null;
+      });
+
+      // Let user press Enter from the cell editor text field to finish.
+      let commandEsc = new qx.ui.command.Command("Esc");
+      commandEsc.addListener("execute", e => {
+        labelEditorWin.close();
+        commandEsc.dispose();
+        commandEsc = null;
+      });
+
+      return labelEditorWin;
     }
   }
 });
diff --git a/services/web/client/source/class/qxapp/component/workbench/NodeBase.js b/services/web/client/source/class/qxapp/component/workbench/NodeBase.js
@@ -103,8 +103,10 @@ qx.Class.define("qxapp.component.workbench.NodeBase", {
       }
       this.__inputPort = {};
       this.__outputPort = {};
-      this.__createUIPorts(true, metaData.inputs);
-      this.__createUIPorts(false, metaData.outputs);
+      if (metaData) {
+        this.__createUIPorts(true, metaData.inputs);
+        this.__createUIPorts(false, metaData.outputs);
+      }
     },
 
     getInputPort: function() {
diff --git a/services/web/client/source/class/qxapp/desktop/PrjBrowser.js b/services/web/client/source/class/qxapp/desktop/PrjBrowser.js
@@ -47,21 +47,6 @@ qx.Class.define("qxapp.desktop.PrjBrowser", {
     __controller2: null,
     __list2: null,
 
-    __createControls: function() {
-      let controlsLayout = new qx.ui.container.Composite(new qx.ui.layout.HBox(10));
-
-      let newPrjBtn = new qx.ui.form.Button(this.tr("New Project")).set({
-        width: 150,
-        height: 50
-      });
-      newPrjBtn.addListener("execute", function() {
-        this.__newPrjBtnClkd();
-      }, this);
-      controlsLayout.add(newPrjBtn);
-
-      return controlsLayout;
-    },
-
     newPrjBtnClkd: function() {
       let win = new qx.ui.window.Window(this.tr("Create New Project")).set({
         layout: new qx.ui.layout.Grow(),
diff --git a/services/web/client/source/class/qxapp/desktop/PrjEditor.js b/services/web/client/source/class/qxapp/desktop/PrjEditor.js
@@ -72,9 +72,8 @@ qx.Class.define("qxapp.desktop.PrjEditor", {
       let workbenchView = this.__workbenchView = new qxapp.component.workbench.WorkbenchView(project.getWorkbenchModel());
       this.showInMainView(workbenchView, "root");
 
-      let settingsView = this.__settingsView = new qxapp.component.widget.SettingsView().set({
-        minHeight: 200,
-        maxHeight: 500
+      let settingsView = this.__settingsView = new qxapp.component.widget.NodeView().set({
+        minHeight: 200
       });
       settingsView.setWorkbenchModel(project.getWorkbenchModel());
     },
@@ -117,6 +116,15 @@ qx.Class.define("qxapp.desktop.PrjEditor", {
         }, this);
       });
 
+      this.__treeView.addListener("NodeLabelChanged", function(e) {
+        const data = e.getData();
+        const nodeId = data.nodeId;
+        const newLabel = data.newLabel;
+
+        let nodeModel = this.getProjectModel().getWorkbenchModel().getNodeModel(nodeId);
+        nodeModel.setLabel(newLabel);
+      }, this);
+
       this.__settingsView.addListener("ShowViewer", e => {
         const data = e.getData();
         const url = data.url;
@@ -273,8 +281,8 @@ qx.Class.define("qxapp.desktop.PrjEditor", {
       console.log(currentPipeline);
       let req = new qxapp.io.request.ApiRequest("/start_pipeline", "POST");
       let data = {};
-      data = currentPipeline;
-      data["pipeline_mockup_id"] = qxapp.utils.Utils.uuidv4();
+      data["workbench"] = currentPipeline;
+      data["project_id"] = this.getProjectModel().getUuid();
       req.set({
         requestData: qx.util.Serializer.toJson(data)
       });
diff --git a/services/web/client/source/class/qxapp/desktop/mainPanel/MainPanel.js b/services/web/client/source/class/qxapp/desktop/mainPanel/MainPanel.js
@@ -8,24 +8,14 @@ qx.Class.define("qxapp.desktop.mainPanel.MainPanel", {
 
     this._setLayout(new qx.ui.layout.VBox(5));
 
-    // let optionsBar = this.__optionsBar = new qxapp.desktop.mainPanel.OptionsBar();
-    let mainView = new qx.ui.core.Widget();
     let controlsBar = this.__controlsBar = new qxapp.desktop.mainPanel.ControlsBar();
-    /*
-    optionsBar.set({
-      width: 60,
-      allowGrowX: false
-    });
-    */
     controlsBar.set({
       height: 60,
       allowGrowY: false
     });
 
-    let hBox = this.__hBox = new qx.ui.container.Composite(new qx.ui.layout.HBox(5));
-    // hBox.add(optionsBar);
-    hBox.add(mainView, {
-      flex: 1
+    let hBox = this.__mainView = new qx.ui.container.Composite(new qx.ui.layout.HBox(5)).set({
+      allowGrowY: true
     });
 
     this._add(hBox, {
@@ -42,28 +32,17 @@ qx.Class.define("qxapp.desktop.mainPanel.MainPanel", {
     }
   },
 
-  events: {},
-
   members: {
-    __hBox: null,
-    // __optionsBar: null,
+    __mainView: null,
     __controlsBar: null,
 
     __applyMainView: function(newWidget) {
-      // const mainViewIndex = 1;
-      const mainViewIndex = 0;
-      if (this.__hBox._indexOf(newWidget) != mainViewIndex) {
-        this.__hBox._removeAt(mainViewIndex);
-        this.__hBox._addAt(newWidget, mainViewIndex, {
-          flex: 1
-        });
-      }
+      this.__mainView.removeAll();
+      this.__mainView.add(newWidget, {
+        flex: 1
+      });
     },
-    /*
-    getOptions: function() {
-      return this.__optionsBar;
-    },
-    */
+
     getControls: function() {
       return this.__controlsBar;
     }
diff --git a/services/web/client/source/class/qxapp/dev/fake/Data.js b/services/web/client/source/class/qxapp/dev/fake/Data.js
