Skip to content

Commit c4e4dc4

Browse files
authored
🎨 [Frontend] Show Integration version to owners (#6150)
1 parent e25c5e5 commit c4e4dc4

File tree

5 files changed

+9
-6
lines changed

5 files changed

+9
-6
lines changed

services/static-webserver/client/source/class/osparc/info/MergedLarge.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,7 @@ qx.Class.define("osparc.info.MergedLarge", {
207207
}
208208
});
209209

210-
if (osparc.data.Permissions.getInstance().isTester()) {
210+
if (osparc.data.Permissions.getInstance().isTester() || this.__canIWrite()) {
211211
extraInfo.splice(i++, 0, {
212212
label: this.tr("Service Integration Version"),
213213
view: this.__createIntegrationVersion(),

services/static-webserver/client/source/class/osparc/info/ServiceLarge.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,7 @@ qx.Class.define("osparc.info.ServiceLarge", {
203203
}
204204
});
205205

206-
if (osparc.data.Permissions.getInstance().isTester()) {
206+
if (osparc.data.Permissions.getInstance().isTester() || osparc.service.Utils.canIWrite(this.getService()["accessRights"])) {
207207
extraInfo.push({
208208
label: this.tr("INTEGRATION VERSION"),
209209
view: this.__createIntegrationVersion(),

services/static-webserver/client/source/class/osparc/metadata/ServicesInStudyUpdate.js

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -203,8 +203,10 @@ qx.Class.define("osparc.metadata.ServicesInStudyUpdate", {
203203
// updatable
204204
osparc.service.Store.getService(latestCompatible["key"], latestCompatible["version"])
205205
.then(latestMetadata => {
206-
let label = node["key"] === latestMetadata["key"] ? "" : latestMetadata["name"];
207-
label += ":" + osparc.service.Utils.extractVersionDisplay(latestMetadata);
206+
let label = osparc.service.Utils.extractVersionDisplay(latestMetadata)
207+
if (node["key"] !== latestMetadata["key"]) {
208+
label = latestMetadata["name"] + ":" + label;
209+
}
208210
compatibleVersionLabel.setValue(label);
209211
})
210212
.catch(err => console.error(err));

services/static-webserver/client/source/class/osparc/share/ShareePermissions.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ qx.Class.define("osparc.share.ShareePermissions", {
5353
hBox.add(label);
5454
osparc.service.Store.getService(inaccessibleService.key, inaccessibleService.version)
5555
.then(metadata => {
56-
label.setValue(metadata + " : " + metadata)
56+
label.setValue(metadata["name"] + " : " + metadata["version"])
5757
infoButton.addListener("execute", () => {
5858
const resourceDetails = new osparc.dashboard.ResourceDetails(metadata);
5959
osparc.dashboard.ResourceDetails.popUpInWindow(resourceDetails);

services/static-webserver/client/source/class/osparc/widget/NodeOutputs.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,7 @@ qx.Class.define("osparc.widget.NodeOutputs", {
9898
__populateGrid: function() {
9999
this.__gridLayout.removeAll();
100100

101+
const outputs = this.getNode().getOutputs();
101102
const ports = this.getPorts();
102103
const portKeys = Object.keys(ports);
103104
for (let i=0; i<portKeys.length; i++) {
@@ -131,7 +132,7 @@ qx.Class.define("osparc.widget.NodeOutputs", {
131132
column: this.self().POS.ICON
132133
});
133134

134-
const value = port.value || null;
135+
const value = (portKey in outputs && "value" in outputs[portKey]) ? outputs[portKey]["value"] : null;
135136
this.__valueToGrid(value, i);
136137

137138
const unit = new qx.ui.basic.Label(port.unitShort || "");

0 commit comments

Comments
 (0)