🎨 [Frontend] Show Integration version to owners (#6150)

ITISFoundation · Aug 8, 2024 · c4e4dc4 · c4e4dc4
1 parent e25c5e5
commit c4e4dc4
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 6 deletions.
diff --git a/services/static-webserver/client/source/class/osparc/info/MergedLarge.js b/services/static-webserver/client/source/class/osparc/info/MergedLarge.js
@@ -207,7 +207,7 @@ qx.Class.define("osparc.info.MergedLarge", {
         }
       });
 
-      if (osparc.data.Permissions.getInstance().isTester()) {
+      if (osparc.data.Permissions.getInstance().isTester() || this.__canIWrite()) {
         extraInfo.splice(i++, 0, {
           label: this.tr("Service Integration Version"),
           view: this.__createIntegrationVersion(),

diff --git a/services/static-webserver/client/source/class/osparc/info/ServiceLarge.js b/services/static-webserver/client/source/class/osparc/info/ServiceLarge.js
@@ -203,7 +203,7 @@ qx.Class.define("osparc.info.ServiceLarge", {
         }
       });
 
-      if (osparc.data.Permissions.getInstance().isTester()) {
+      if (osparc.data.Permissions.getInstance().isTester() || osparc.service.Utils.canIWrite(this.getService()["accessRights"])) {
         extraInfo.push({
           label: this.tr("INTEGRATION VERSION"),
           view: this.__createIntegrationVersion(),

diff --git a/services/static-webserver/client/source/class/osparc/metadata/ServicesInStudyUpdate.js b/services/static-webserver/client/source/class/osparc/metadata/ServicesInStudyUpdate.js
@@ -203,8 +203,10 @@ qx.Class.define("osparc.metadata.ServicesInStudyUpdate", {
           // updatable
           osparc.service.Store.getService(latestCompatible["key"], latestCompatible["version"])
             .then(latestMetadata => {
-              let label = node["key"] === latestMetadata["key"] ? "" : latestMetadata["name"];
-              label += ":" + osparc.service.Utils.extractVersionDisplay(latestMetadata);
+              let label = osparc.service.Utils.extractVersionDisplay(latestMetadata)
+              if (node["key"] !== latestMetadata["key"]) {
+                label = latestMetadata["name"] + ":" + label;
+              }
               compatibleVersionLabel.setValue(label);
             })
             .catch(err => console.error(err));

diff --git a/services/static-webserver/client/source/class/osparc/share/ShareePermissions.js b/services/static-webserver/client/source/class/osparc/share/ShareePermissions.js
@@ -53,7 +53,7 @@ qx.Class.define("osparc.share.ShareePermissions", {
                 hBox.add(label);
                 osparc.service.Store.getService(inaccessibleService.key, inaccessibleService.version)
                   .then(metadata => {
-                    label.setValue(metadata + " : " + metadata)
+                    label.setValue(metadata["name"] + " : " + metadata["version"])
                     infoButton.addListener("execute", () => {
                       const resourceDetails = new osparc.dashboard.ResourceDetails(metadata);
                       osparc.dashboard.ResourceDetails.popUpInWindow(resourceDetails);

diff --git a/services/static-webserver/client/source/class/osparc/widget/NodeOutputs.js b/services/static-webserver/client/source/class/osparc/widget/NodeOutputs.js
@@ -98,6 +98,7 @@ qx.Class.define("osparc.widget.NodeOutputs", {
     __populateGrid: function() {
       this.__gridLayout.removeAll();
 
+      const outputs = this.getNode().getOutputs();
       const ports = this.getPorts();
       const portKeys = Object.keys(ports);
       for (let i=0; i<portKeys.length; i++) {
@@ -131,7 +132,7 @@ qx.Class.define("osparc.widget.NodeOutputs", {
           column: this.self().POS.ICON
         });
 
-        const value = port.value || null;
+        const value = (portKey in outputs && "value" in outputs[portKey]) ? outputs[portKey]["value"] : null;
         this.__valueToGrid(value, i);
 
         const unit = new qx.ui.basic.Label(port.unitShort || "");