output

Author: odeimaiz

services/static-webserver/client/source/class/osparc/service/StatusUI.js

@@ -199,12 +199,12 @@ qx.Class.define("osparc.service.StatusUI", {
         // output
         case "busy":
           return "busy-orange";
+        case "not-available":
+          return "workbench-edge";
         case "out-of-date":
           return "failed-red";
-          /*
         case "up-to-date":
           return "ready-green";
-          */
 
         default:
           return "text";

services/static-webserver/client/source/class/osparc/workbench/EdgeUI.js

@@ -48,7 +48,7 @@ qx.Class.define("osparc.workbench.EdgeUI", {
     representation.hint = hint;
 
     if (edge.getInputNode()) {
-      edge.getInputNode().getStatus().addListener("changeModified", () => this.__updateEdgeState());
+      edge.getInputNode().getStatus().addListener("changeOutput", () => this.__updateEdgeState());
     }
     edge.addListener("changePortConnected", () => this.__updateEdgeState());
 
@@ -69,13 +69,8 @@ qx.Class.define("osparc.workbench.EdgeUI", {
   },
 
   statics: {
-    getEdgeColor: function(modified) {
-      let newColor = null;
-      if (modified === null) {
-        newColor = qx.theme.manager.Color.getInstance().resolve("workbench-edge-comp-active");
-      } else {
-        newColor = osparc.service.StatusUI.getColor(modified ? "modified" : "ready");
-      }
+    getEdgeColor: function(outputState) {
+      const newColor = osparc.service.StatusUI.getColor(outputState);
       const colorHex = qx.theme.manager.Color.getInstance().resolve(newColor);
       return colorHex;
     },
@@ -89,10 +84,10 @@ qx.Class.define("osparc.workbench.EdgeUI", {
     __updateEdgeState: function() {
       const inputNode = this.getEdge().getInputNode();
       const portConnected = this.getEdge().isPortConnected();
-      const modified = inputNode ? inputNode.getStatus().getModified() : false;
+      const output = inputNode ? inputNode.getStatus().getOutput() : null;
 
       // color
-      const colorHex = this.self().getEdgeColor(modified);
+      const colorHex = this.self().getEdgeColor(output);
       osparc.wrapper.Svg.updateCurveColor(this.getRepresentation(), colorHex);
 
       // shape
@@ -102,7 +97,7 @@ qx.Class.define("osparc.workbench.EdgeUI", {
       const hint = this.getHint();
       if (this.getEdge().isPortConnected() === false) {
         hint.setText(this.self().noPortsConnectedText(this.getEdge()));
-      } else if (modified) {
+      } else if (output === "out-of-date") {
         hint.setText("Out-of-date");
       } else {
         hint.setText(null);

services/static-webserver/client/source/class/osparc/workbench/WorkbenchUI.js

@@ -1054,8 +1054,8 @@ qx.Class.define("osparc.workbench.WorkbenchUI", {
       portLabel.setSource(osparc.workbench.NodeUI.PORT_CONNECTED);
 
       if (!this.__tempEdgeIsInput) {
-        const modified = nodeUI.getNode().getStatus().getModified();
-        const colorHex = osparc.workbench.EdgeUI.getEdgeColor(modified);
+        const output = nodeUI.getNode().getStatus().getOutput();
+        const colorHex = osparc.workbench.EdgeUI.getEdgeColor(output);
         osparc.wrapper.Svg.updateCurveColor(this.__tempEdgeRepr, colorHex);
       }
     },

services/static-webserver/client/source/class/osparc/wrapper/Svg.js

@@ -67,7 +67,7 @@ qx.Class.define("osparc.wrapper.Svg", {
     drawCurve: function(draw, controls, dashed) {
       const edgeWidth = 3;
       const arrowSize = 4;
-      const edgeColor = qx.theme.manager.Color.getInstance().getTheme().colors["workbench-edge-comp-active"];
+      const edgeColor = qx.theme.manager.Color.getInstance().getTheme().colors["workbench-edge"];
 
       osparc.wrapper.Svg.curateCurveControls(controls);
 
@@ -391,7 +391,7 @@ qx.Class.define("osparc.wrapper.Svg", {
     /* / ANNOTATIONS */
 
     drawDashedRect: function(draw, width, height, x, y) {
-      const edgeColor = qx.theme.manager.Color.getInstance().getTheme().colors["workbench-edge-comp-active"];
+      const edgeColor = qx.theme.manager.Color.getInstance().getTheme().colors["workbench-edge"];
       const rect = draw.rect(width, height)
         .fill("none")
         .stroke({