Fixes for alpha tester (#748)

odeimaiz · web-flow · commit 4037c5e7f637 · 2019-05-08T15:26:35.000+02:00
* fake-template-projects.json created. 2 templates moved here
* Kember use case added
* MattWard use case added
* 4x CC 0D added
* Provide a way to refetch data from DataManager
* connect the kember-model to the kember-viewer
* moved null handler to node_ports package
* set node ports log level to same as sidecar
* removed Unused import logging
* New issue: add UX_improvemnts label and asign it to oSPARC Product Backlog project
diff --git a/packages/simcore-sdk/src/simcore_sdk/node_ports/__init__.py b/packages/simcore-sdk/src/simcore_sdk/node_ports/__init__.py
@@ -1,4 +1,12 @@
+import logging
+
 from . import config as node_config
 from . import exceptions
 from ._item import Item as Port
 from .nodeports import ports
+
+# nodeports is a library for accessing data linked to the node
+# in that sense it should not log stuff unless the application code wants it to be so.
+log = logging.getLogger(__name__)
+log.addHandler(logging.NullHandler())
+
diff --git a/packages/simcore-sdk/src/simcore_sdk/node_ports/config.py b/packages/simcore-sdk/src/simcore_sdk/node_ports/config.py
@@ -1,6 +1,5 @@
 """Takes care of the configurations.
 """
-import logging
 import os
 
 
@@ -50,7 +49,3 @@
                             "string":{"type":str, "converter":str}
                             }
 FILE_TYPE_PREFIX = "data:"
-
-# nodeports is a library for accessing data linked to the node
-# in that sense it should not log stuff unless the application code wants it to be so.
-logging.getLogger(__name__).addHandler(logging.NullHandler())
diff --git a/services/sidecar/src/sidecar/core.py b/services/sidecar/src/sidecar/core.py
@@ -14,6 +14,7 @@
 from sqlalchemy import and_, exc
 
 from simcore_sdk import node_ports
+from simcore_sdk.node_ports import log as node_port_log
 from simcore_sdk.models.pipeline_models import (RUNNING, SUCCESS,
                                                 ComputationalPipeline,
                                                 ComputationalTask)
@@ -24,6 +25,7 @@
 
 log = get_task_logger(__name__)
 log.setLevel(logging.DEBUG) # FIXME: set level via config
+node_port_log.setLevel(logging.DEBUG)
 
 @contextmanager
 def session_scope(session_factory):
@@ -138,17 +140,17 @@ def _progress(self, channel, progress):
         prog_data = {"Channel" : "Progress", "Node": self._task.node_id, "Progress" : progress}
         prog_body = json.dumps(prog_data)
         channel.basic_publish(exchange=self._pika.progress_channel, routing_key='', body=prog_body)
-    
+
     def _bg_job(self, log_file):
         connection = pika.BlockingConnection(self._pika.parameters)
 
         channel = connection.channel()
         channel.exchange_declare(exchange=self._pika.log_channel, exchange_type='fanout', auto_delete=True)
         channel.exchange_declare(exchange=self._pika.progress_channel, exchange_type='fanout', auto_delete=True)
-        
+
         def _follow(thefile):
             thefile.seek(0,2)
-            while self._executor.run_pool:                
+            while self._executor.run_pool:
                 line = thefile.readline()
                 if not line:
                     time.sleep(1)
diff --git a/services/web/client/source/class/qxapp/component/widget/NewGHIssue.js b/services/web/client/source/class/qxapp/component/widget/NewGHIssue.js
@@ -34,7 +34,10 @@ qx.Class.define("qxapp.component.widget.NewGHIssue", {
       env += JSON.stringify(qxapp.utils.LibVersions.getEnvLibs(), null, 2);
       env += "\n```";
       const body = encodeURIComponent(temp+env);
-      const url = "https://github.com/ITISFoundation/osparc-simcore/issues/new?labels=tester_review&body=" + body;
+      let url = "https://github.com/ITISFoundation/osparc-simcore/issues/new";
+      url += "?labels=tester_review,UX_improvemnts";
+      url += "&projects=ITISFoundation/3";
+      url += "&body=" + body;
       return url;
     },
 
diff --git a/services/web/client/source/class/qxapp/desktop/DataManager.js b/services/web/client/source/class/qxapp/desktop/DataManager.js
@@ -38,7 +38,7 @@ qx.Class.define("qxapp.desktop.DataManager", {
   construct: function() {
     this.base(arguments);
 
-    let prjBrowserLayout = new qx.ui.layout.VBox(10);
+    const prjBrowserLayout = new qx.ui.layout.VBox(10);
     this._setLayout(prjBrowserLayout);
 
     this.__createDataManagerLayout();
@@ -55,37 +55,50 @@ qx.Class.define("qxapp.desktop.DataManager", {
     },
 
     __createDataManagerLayout: function() {
-      let dataManagerMainLayout = new qx.ui.container.Composite(new qx.ui.layout.VBox(20));
+      const dataManagerMainLayout = new qx.ui.container.Composite(new qx.ui.layout.VBox(20));
 
-      let label = new qx.ui.basic.Label(this.tr("Data Manager")).set({
+      const label = new qx.ui.basic.Label(this.tr("Data Manager")).set({
         font: qx.bom.Font.fromConfig(qxapp.theme.Font.fonts["nav-bar-label"]),
         minWidth: 150
       });
       dataManagerMainLayout.add(label);
 
-      let toDatCore = new qxapp.ui.form.LinkButton(this.tr("To DAT-Core"), "https://app.blackfynn.io");
-      dataManagerMainLayout.add(toDatCore);
+      const dataManagerControl = new qx.ui.container.Composite(new qx.ui.layout.HBox(20));
 
-      let dataManagerLayout = new qx.ui.container.Composite(new qx.ui.layout.HBox(20));
+      // button for refetching data
+      const reloadBtn = new qx.ui.form.Button().set({
+        icon: "@FontAwesome5Solid/sync-alt/16"
+      });
+      reloadBtn.addListener("execute", function() {
+        this.__initResources();
+      }, this);
+      dataManagerControl.add(reloadBtn);
+
+      const toDatCore = new qxapp.ui.form.LinkButton(this.tr("To DAT-Core"), "https://app.blackfynn.io");
+      dataManagerControl.add(toDatCore);
+
+      dataManagerMainLayout.add(dataManagerControl);
+
+      const dataManagerLayout = new qx.ui.container.Composite(new qx.ui.layout.HBox(20));
       dataManagerMainLayout.add(dataManagerLayout, {
         flex: 1
       });
 
-      let treeLayout = this.__createTreeLayout();
+      const treeLayout = this.__createTreeLayout();
       dataManagerLayout.add(treeLayout, {
         flex: 1
       });
 
-      let chartLayout = this.__createChartLayout();
+      const chartLayout = this.__createChartLayout();
       dataManagerLayout.add(chartLayout);
 
       this._add(dataManagerMainLayout);
     },
 
     __createTreeLayout: function() {
-      let treeLayout = new qx.ui.container.Composite(new qx.ui.layout.VBox(10));
+      const treeLayout = new qx.ui.container.Composite(new qx.ui.layout.VBox(10));
 
-      let filesTree = this.__tree = new qxapp.file.FilesTree().set({
+      const filesTree = this.__tree = new qxapp.file.FilesTree().set({
         dragMechnism: true,
         dropMechnism: true,
         minHeight: 600
@@ -103,13 +116,13 @@ qx.Class.define("qxapp.desktop.DataManager", {
         flex: 1
       });
 
-      let addBtn = new qxapp.file.FilesAdd(this.tr("Add file(s)"));
+      const addBtn = new qxapp.file.FilesAdd(this.tr("Add file(s)"));
       addBtn.addListener("fileAdded", e => {
         this.__initResources();
       }, this);
       treeLayout.add(addBtn);
 
-      let selectedFileLayout = this.__selectedFileLayout = new qxapp.file.FileLabelWithActions();
+      const selectedFileLayout = this.__selectedFileLayout = new qxapp.file.FileLabelWithActions();
       selectedFileLayout.addListener("fileDeleted", () => {
         this.__initResources();
       }, this);
@@ -121,18 +134,18 @@ qx.Class.define("qxapp.desktop.DataManager", {
     __createChartLayout: function() {
       let chartLayout = new qx.ui.container.Composite(new qx.ui.layout.VBox(10));
 
-      let label = new qx.ui.basic.Label(this.tr("Data Resources")).set({
+      const label = new qx.ui.basic.Label(this.tr("Data Resources")).set({
         font: qx.bom.Font.fromConfig(qxapp.theme.Font.fonts["nav-bar-label"]),
         minWidth: 500
       });
       chartLayout.add(label);
 
       const plotlyDivId = "DataResources";
-      let plotly = new qxapp.component.widget.PlotlyWidget(plotlyDivId);
+      const plotly = new qxapp.component.widget.PlotlyWidget(plotlyDivId);
       plotly.addListener("plotlyWidgetReady", e => {
         if (e.getData()) {
           this.__pieChart = plotly;
-          let myPlot = document.getElementById(plotlyDivId);
+          const myPlot = document.getElementById(plotlyDivId);
           myPlot.on("plotly_click", data => {
             this.__reloadChartData(data["points"][0]["id"][0]);
           }, this);
@@ -148,7 +161,7 @@ qx.Class.define("qxapp.desktop.DataManager", {
 
     __selectionChanged: function() {
       this.__tree.resetSelection();
-      let selectionData = this.__tree.getSelectedFile();
+      const selectionData = this.__tree.getSelectedFile();
       if (selectionData) {
         this.__selectedFileLayout.itemSelected(selectionData["selectedItem"], selectionData["isFile"]);
       }
diff --git a/services/web/server/src/simcore_service_webserver/data/fake-template-projects.isan.json b/services/web/server/src/simcore_service_webserver/data/fake-template-projects.isan.json
@@ -35,7 +35,7 @@
           "NBeats": 5,
           "Ligand": 0,
           "cAMKII": "WT",
-          "initFile": {
+          "initfile": {
             "nodeUuid": "template-uuid-4674-b758-946151cae351",
             "output": "outFile"
           }
@@ -274,7 +274,12 @@
         "key": "simcore/services/dynamic/kember-viewer",
         "version": "2.9.0",
         "label": "kember-viewer",
-        "inputs": {},
+        "inputs": {
+          "outputController": {
+            "nodeUuid": "template-uuid-43dd-8d87-9969d380df53",
+            "output": "out_1"
+          }
+        },
         "inputNodes": [
           "template-uuid-43dd-8d87-9969d380df53"
         ],
@@ -316,7 +321,7 @@
       }
     }
   }, {
-    "uuid": "b9f00712-0088-40e1-bb95-c68f6358bfe2",
+    "uuid": "template-uuid-40e1-bb95-c68f6358bfe2",
     "name": "ISAN: 4x CC 0D",
     "description": "4 Colleen Clancy solvers with different configuration and the same input file",
     "notes": "",
@@ -600,7 +605,7 @@
       "template-uuid-47c3-a39b-36e4bedadca5": {
         "key": "simcore/services/dynamic/raw-graphs",
         "version": "2.8.0",
-        "label": "GKr 1.00",
+        "label": "MP GKr 1.00",
         "inputs": {
           "input_1": {
             "nodeUuid": "template-uuid-4083-a798-8fe114647ca5",
@@ -638,7 +643,7 @@
       "template-uuid-4e79-9670-46d38e433234": {
         "key": "simcore/services/dynamic/raw-graphs",
         "version": "2.8.0",
-        "label": "GKr 0.75",
+        "label": "MP GKr 0.75",
         "inputs": {
           "input_1": {
             "nodeUuid": "template-uuid-4083-a798-8fe114647ca5",
@@ -676,7 +681,7 @@
       "template-uuid-4979-81e9-35cfdbefcc85": {
         "key": "simcore/services/dynamic/raw-graphs",
         "version": "2.8.0",
-        "label": "GKr 0.50",
+        "label": "MP GKr 0.50",
         "inputs": {
           "input_1": {
             "nodeUuid": "template-uuid-4083-a798-8fe114647ca5",
@@ -714,7 +719,7 @@
       "template-uuid-42da-ae03-1bb50a4c2728": {
         "key": "simcore/services/dynamic/raw-graphs",
         "version": "2.8.0",
-        "label": "GKr 0.25",
+        "label": "MP GKr 0.25",
         "inputs": {
           "input_1": {
             "nodeUuid": "template-uuid-4083-a798-8fe114647ca5",
@@ -752,7 +757,7 @@
       "template-uuid-4c8a-8f8d-7d8baf6a3604": {
         "key": "simcore/services/dynamic/raw-graphs",
         "version": "2.8.0",
-        "label": "GKr 1.00",
+        "label": "LCC GKr 1.00",
         "inputs": {
           "input_1": {
             "nodeUuid": "template-uuid-4083-a798-8fe114647ca5",
@@ -790,7 +795,7 @@
       "template-uuid-456b-b5fc-bc3ee7c257a2": {
         "key": "simcore/services/dynamic/raw-graphs",
         "version": "2.8.0",
-        "label": "GKr 0.75",
+        "label": "LCC GKr 0.75",
         "inputs": {
           "input_1": {
             "nodeUuid": "template-uuid-4083-a798-8fe114647ca5",
@@ -828,7 +833,7 @@
       "template-uuid-4d66-b9af-f8a3153f8d24": {
         "key": "simcore/services/dynamic/raw-graphs",
         "version": "2.8.0",
-        "label": "GKr 0.50",
+        "label": "LCC GKr 0.50",
         "inputs": {
           "input_1": {
             "nodeUuid": "template-uuid-4083-a798-8fe114647ca5",
@@ -866,7 +871,7 @@
       "template-uuid-49f1-9ecf-eff08693074a": {
         "key": "simcore/services/dynamic/raw-graphs",
         "version": "2.8.0",
-        "label": "GKr 0.25",
+        "label": "LCC GKr 0.25",
         "inputs": {
           "input_1": {
             "nodeUuid": "template-uuid-4083-a798-8fe114647ca5",
