Merge pull request #15 from odeimaiz/feature/prj_model_w_server

Feature/prj model w server
odeimaiz · Sep 13, 2018 · e10ed0c · e10ed0c
2 parents 58bab7a + 87be32b
commit e10ed0c
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 14 deletions.
diff --git a/services/web/client/source/class/qxapp/components/workbench/NodeBase.js b/services/web/client/source/class/qxapp/components/workbench/NodeBase.js
@@ -49,7 +49,8 @@ qx.Class.define("qxapp.components.workbench.NodeBase", {
     "LinkDragOver": "qx.event.type.Data",
     "LinkDrop": "qx.event.type.Data",
     "LinkDragEnd": "qx.event.type.Data",
-    "NodeMoving": "qx.event.type.Event"
+    "NodeMoving": "qx.event.type.Event",
+    "ShowViewer": "qx.event.type.Data"
   },
 
   members: {
@@ -217,7 +218,7 @@ qx.Class.define("qxapp.components.workbench.NodeBase", {
                 viewerButton: button
               });
               button.addListener("execute", function(e) {
-                this.getPropsWidget().fireDataEvent("ShowViewer", {
+                this.fireDataEvent("ShowViewer", {
                   url: srvUrl,
                   name: metaData.name,
                   nodeId: this.getNodeId()

diff --git a/services/web/client/source/class/qxapp/components/workbench/SettingsView.js b/services/web/client/source/class/qxapp/components/workbench/SettingsView.js
@@ -73,16 +73,10 @@ qx.Class.define("qxapp.components.workbench.SettingsView", {
       this.__dynamicViewer.removeAll();
       let viewerButton = node.getViewerButton();
       if (viewerButton) {
-        if (!viewerButton.hasListener("execute")) {
-          viewerButton.addListener("execute", function(e) {
-            const data = {
-              metadata: node.getMetaData(),
-              nodeId: node.getNodeId()
-            };
-            console.log("ShowViewer", data);
-            this.fireDataEvent("ShowViewer", data);
-          }, this);
-        }
+        node.addListener("ShowViewer", function(e) {
+          const data = e.getData();
+          this.fireDataEvent("ShowViewer", data);
+        }, this);
         this.__dynamicViewer.add(viewerButton);
       }
     }

diff --git a/services/web/client/source/class/qxapp/components/workbench/logger/LoggerView.js b/services/web/client/source/class/qxapp/components/workbench/logger/LoggerView.js
@@ -209,7 +209,7 @@ qx.Class.define("qxapp.components.workbench.logger.LoggerView", {
 
     __createInitMsg: function() {
       const who = "System";
-      const what = "Logger intialized";
+      const what = "Logger initialized";
       this.debug(who, what);
     },
 

diff --git a/services/web/client/source/class/qxapp/data/Store.js b/services/web/client/source/class/qxapp/data/Store.js
@@ -47,6 +47,10 @@ qx.Class.define("qxapp.data.Store", {
     },
 
     getNodeMetaDataFromCache: function(nodeImageId) {
+      let metadata = this.getNodeMetaData(nodeImageId);
+      if (metadata) {
+        return metadata;
+      }
       let services = this.__servicesCacheBuiltIn.concat(this.__servicesCacheComputational);
       services = services.concat(this.__servicesCacheInteractive);
       for (let i=0; i<services.length; i++) {

diff --git a/services/web/client/source/class/qxapp/desktop/PrjEditor.js b/services/web/client/source/class/qxapp/desktop/PrjEditor.js
@@ -75,7 +75,7 @@ qx.Class.define("qxapp.desktop.PrjEditor", {
 
       // Workaround for updating inputs
       if (data.name === "3d-viewer") {
-        let urlUpdate = "http://" + window.location.hostname + ":" + data.viewer.port + "/retrieve";
+        let urlUpdate = data.url + "/retrieve";
         let req = new qx.io.request.Xhr();
         req.set({
           url: urlUpdate,