Merge branch 'master' into is309/webserver-uses-apihub

Author: Pedro Crespo

services/director/src/simcore_service_director/registry_proxy.py

@@ -95,7 +95,7 @@ def __registry_request(path, method="GET"):
         # r = s.get(api_url, verify=False) #getattr(s, method.lower())(api_url)
         request_result = getattr(_SESSION, method.lower())(api_url)
         _logger.info("Request status: %s",request_result.status_code)
-        if request_result.status_code > 399:            
+        if request_result.status_code > 399:
             request_result.raise_for_status()
 
         return request_result

services/web/client/source/class/qxapp/auth/ui/LoginPage.js

@@ -38,9 +38,14 @@ qx.Class.define("qxapp.auth.ui.LoginPage", {
       this.__form = new qx.ui.form.Form();
 
       let atm = new qx.ui.basic.Atom().set({
-        icon: "qxapp/osparc-white-small.png",
+        icon: "qxapp/osparc-white.svg",
         iconPosition: "top"
       });
+      atm.getChildControl("icon").set({
+        width: 250,
+        height: 150,
+        scale: true
+      });
       this.add(atm);
 
       let email = new qx.ui.form.TextField();

services/web/client/source/class/qxapp/component/widget/PersistentIframe.js

@@ -45,6 +45,7 @@ qx.Class.define("qxapp.component.widget.PersistentIframe", {
   },
   members: {
     __iframe: null,
+    __syncScheduled: null,
     __actionButton: null,
     // override
     _createContentElement : function() {
@@ -96,11 +97,11 @@ qx.Class.define("qxapp.component.widget.PersistentIframe", {
       });
       this.addListener("move", e => {
         // got to let the new layout render first or we don't see it
-        qx.event.Timer.once(this.__syncIframePos, this, 0);
+        this.__syncIframePos();
       });
       this.addListener("resize", e => {
         // got to let the new layout render first or we don't see it
-        qx.event.Timer.once(this.__syncIframePos, this, 0);
+        this.__syncIframePos();
       });
       this.addListener("changeVisibility", e => {
         var visibility = e.getData()[0];
@@ -115,21 +116,28 @@ qx.Class.define("qxapp.component.widget.PersistentIframe", {
       return standin;
     },
     __syncIframePos: function() {
-      let iframeParentPos = qx.bom.element.Location.get(qx.bom.element.Location.getOffsetParent(this.__iframe.getContentElement().getDomElement()), "scroll");
-      let divPos = qx.bom.element.Location.get(this.getContentElement().getDomElement(), "scroll");
-      let divSize = qx.bom.element.Dimension.getSize(this.getContentElement().getDomElement());
-      this.__iframe.setLayoutProperties({
-        top: divPos.top - iframeParentPos.top,
-        left: (divPos.left - iframeParentPos.left)
-      });
-      this.__iframe.set({
-        width: (divSize.width),
-        height: (divSize.height)
-      });
-      this.__actionButton.setLayoutProperties({
-        top: (divPos.top - iframeParentPos.top),
-        right: (iframeParentPos.right - iframeParentPos.left - divPos.right)
-      });
+      if (this.__syncScheduled) {
+        return;
+      }
+      this.__syncScheduled = true;
+      window.setTimeout(() => {
+        this.__syncScheduled = false;
+        let iframeParentPos = qx.bom.element.Location.get(qx.bom.element.Location.getOffsetParent(this.__iframe.getContentElement().getDomElement()), "scroll");
+        let divPos = qx.bom.element.Location.get(this.getContentElement().getDomElement(), "scroll");
+        let divSize = qx.bom.element.Dimension.getSize(this.getContentElement().getDomElement());
+        this.__iframe.setLayoutProperties({
+          top: divPos.top - iframeParentPos.top,
+          left: (divPos.left - iframeParentPos.left)
+        });
+        this.__iframe.set({
+          width: (divSize.width),
+          height: (divSize.height)
+        });
+        this.__actionButton.setLayoutProperties({
+          top: (divPos.top - iframeParentPos.top),
+          right: (iframeParentPos.right - iframeParentPos.left - divPos.right)
+        });
+      }, 0);
     },
     _applyShowMaximize: function(newValue, oldValue) {
       this._maximizeBtn.show();

services/web/client/source/class/qxapp/component/widget/TreeTool.js

@@ -1,45 +1,22 @@
-/* eslint no-warning-comments: "off" */
-
 qx.Class.define("qxapp.component.widget.TreeTool", {
   extend: qx.ui.core.Widget,
 
   construct: function(projectName, workbenchModel) {
     this.base(arguments);
 
-    let treeLayout = new qx.ui.layout.VBox(10);
-    this._setLayout(treeLayout);
-
     this.set({
       projectName: projectName,
       workbenchModel: workbenchModel
     });
 
-    this.__buildLayout();
-    this.buildTree();
+    this._setLayout(new qx.ui.layout.VBox());
+
+    this.__tree = this._createChildControlImpl("tree");
+    this.populateTree();
 
     this.addListener("keypress", function(keyEvent) {
       if (keyEvent.getKeyIdentifier() === "F2") {
-        let treeSelection = this.__tree.getSelection();
-        if (treeSelection.length < 1) {
-          return;
-        }
-        let selectedItem = treeSelection.toArray()[0];
-        const selectedNodeId = selectedItem.getNodeId();
-        if (selectedNodeId === "root") {
-          return;
-        }
-
-        let treeItemRenamer = new qxapp.component.widget.TreeItemRenamer(selectedItem);
-        treeItemRenamer.addListener("LabelChanged", e => {
-          const data = e.getData();
-          const newLabel = data.newLabel;
-          const nodeId = selectedItem.getNodeId();
-          let nodeModel = this.getWorkbenchModel().getNodeModel(nodeId);
-          nodeModel.setLabel(newLabel);
-        }, this);
-        const bounds = this.getLayoutParent().getBounds();
-        treeItemRenamer.moveTo(bounds.left+100, bounds.top+150);
-        treeItemRenamer.open();
+        this.__renameItem();
       }
     }, this);
   },
@@ -62,27 +39,36 @@ qx.Class.define("qxapp.component.widget.TreeTool", {
   members: {
     __tree: null,
 
-    __buildLayout: function() {
-      let tree = this.__tree = new qx.ui.tree.VirtualTree(null, "label", "children").set({
-        openMode: "none"
-      });
+    _createChildControlImpl: function(id) {
+      let control;
+      switch (id) {
+        case "tree":
+          control = this.__buildTree();
+          this._add(control, {
+            flex: 1
+          });
+          break;
+      }
 
-      this._removeAll();
-      this._add(tree, {
-        flex: 1
-      });
+      return control || this.base(arguments, id);
+    },
 
-      this.__tree.addListener("dblclick", e => {
+    __buildTree: function() {
+      let tree = new qx.ui.tree.VirtualTree(null, "label", "children").set({
+        openMode: "none"
+      });
+      tree.addListener("dblclick", e => {
         let selection = this.__tree.getSelection();
         let currentSelection = selection.toArray();
         if (currentSelection.length > 0) {
           let selectedRow = currentSelection[0];
           this.fireDataEvent("NodeDoubleClicked", selectedRow.getNodeId());
         }
       }, this);
+      return tree;
     },
 
-    buildTree: function() {
+    populateTree: function() {
       const topLevelNodes = this.getWorkbenchModel().getNodeModels();
       let data = {
         label: this.getProjectName(),
@@ -137,6 +123,40 @@ qx.Class.define("qxapp.component.widget.TreeTool", {
       return null;
     },
 
+    __getSelection: function() {
+      let treeSelection = this.__tree.getSelection();
+      if (treeSelection.length < 1) {
+        return null;
+      }
+
+      let selectedItem = treeSelection.toArray()[0];
+      const selectedNodeId = selectedItem.getNodeId();
+      if (selectedNodeId === "root") {
+        return null;
+      }
+
+      return selectedItem;
+    },
+
+    __renameItem: function() {
+      let selectedItem = this.__getSelection();
+      if (selectedItem === null) {
+        return;
+      }
+
+      let treeItemRenamer = new qxapp.component.widget.TreeItemRenamer(selectedItem);
+      treeItemRenamer.addListener("LabelChanged", e => {
+        const data = e.getData();
+        const newLabel = data.newLabel;
+        const nodeId = selectedItem.getNodeId();
+        let nodeModel = this.getWorkbenchModel().getNodeModel(nodeId);
+        nodeModel.setLabel(newLabel);
+      }, this);
+      const bounds = this.getLayoutParent().getBounds();
+      treeItemRenamer.moveTo(bounds.left+100, bounds.top+150);
+      treeItemRenamer.open();
+    },
+
     nodeSelected: function(nodeId) {
       const dataModel = this.__tree.getModel();
       let nodeInTree = this.__getNodeInTree(dataModel, nodeId);

services/web/client/source/class/qxapp/component/workbench/LinkBase.js

@@ -1,33 +1,31 @@
 qx.Class.define("qxapp.component.workbench.LinkBase", {
   extend: qx.core.Object,
 
-  construct: function(representation) {
+  construct: function(linkModel, representation) {
     this.base();
 
+    this.setLinkModel(linkModel);
     this.setRepresentation(representation);
-
-    this.setLinkId(qxapp.utils.Utils.uuidv4());
   },
 
   events: {
     "linkSelected": "qx.event.type.Data"
   },
 
   properties: {
-    representation: {
-      init: null
-    },
-    linkId: {
-      check: "String",
+    linkModel: {
+      check: "qxapp.data.model.LinkModel",
       nullable: false
     },
-    inputNodeId: {
-      init: null,
-      check: "String"
-    },
-    outputNodeId: {
-      init: null,
-      check: "String"
+
+    representation: {
+      init: null
+    }
+  },
+
+  members: {
+    getLinkId: function() {
+      return this.getLinkModel().getLinkId();
     }
   }
 });