Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

🐛 [Frontend] Fix probe #6620

Merged
merged 6 commits into from
Oct 29, 2024
Merged

🐛 [Frontend] Fix probe #6620

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
82fe55b
[skip ci] fix probe
odeimaiz Oct 28, 2024
1e55287
minor
odeimaiz Oct 28, 2024
89a69e2
refactor
odeimaiz Oct 28, 2024
32415a9
git pushMerge remote-tracking branch 'upstream/master' into fix/probl…
odeimaiz Oct 29, 2024
626526f
extra check
odeimaiz Oct 29, 2024
5ddcdf0
Merge branch 'master' into fix/probles-label
odeimaiz Oct 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 10 additions & 7 deletions services/static-webserver/client/source/class/osparc/ui/basic/LinkLabel.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,13 +54,16 @@ qx.Class.define("osparc.ui.basic.LinkLabel", {

members: {
__applyUrl: function(url) {
this.set({
url,
cursor: "pointer",
font: "link-label-12"
});

this.addListener("click", this.__onClick);
if (url) {
this.set({
cursor: "pointer",
font: "link-label-12",
});
this.addListener("click", this.__onClick);
} else {
this.resetCursor();
this.resetFont();
}
},

__onClick: function() {
Expand Down
40 changes: 17 additions & 23 deletions services/static-webserver/client/source/class/osparc/workbench/NodeUI.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -474,15 +474,15 @@ qx.Class.define("osparc.workbench.NodeUI", {
const width = 150;
this.__setNodeUIWidth(width);

const label = new qx.ui.basic.Label().set({
const linkLabel = new osparc.ui.basic.LinkLabel().set({
paddingLeft: 5,
font: "text-18"
font: "text-12"
});
const chipContainer = this.getChildControl("chips");
chipContainer.add(label);
chipContainer.add(linkLabel);

this.getNode().getPropsForm().addListener("linkFieldModified", () => this.__setProbeValue(label), this);
this.__setProbeValue(label);
this.getNode().getPropsForm().addListener("linkFieldModified", () => this.__setProbeValue(linkLabel), this);
this.__setProbeValue(linkLabel);
},

__checkTurnIntoIteratorUI: function() {
Expand All @@ -504,21 +504,19 @@ qx.Class.define("osparc.workbench.NodeUI", {
}
},

__setProbeValue: function(label) {
const replaceByLinkLabel = val => {
__setProbeValue: function(linkLabel) {
const populateLinkLabel = linkInfo => {
const download = true;
const locationId = val.store;
const fileId = val.path;
const locationId = linkInfo.store;
const fileId = linkInfo.path;
osparc.store.Data.getInstance().getPresignedLink(download, locationId, fileId)
.then(presignedLinkData => {
if ("resp" in presignedLinkData && presignedLinkData.resp) {
const filename = val.filename || osparc.file.FilePicker.getFilenameFromPath(val);
const linkLabel = new osparc.ui.basic.LinkLabel(filename, presignedLinkData.resp.link).set({
font: "link-label-12"
const filename = linkInfo.filename || osparc.file.FilePicker.getFilenameFromPath(linkInfo);
linkLabel.set({
value: filename,
url: presignedLinkData.resp.link
});
const chipContainer = this.getChildControl("chips");
chipContainer.remove(label);
chipContainer.add(linkLabel);
}
});
}
Expand All @@ -529,19 +527,15 @@ qx.Class.define("osparc.workbench.NodeUI", {
const portKey = link["output"];
const inputNode = this.getNode().getWorkbench().getNode(inputNodeId);
if (inputNode) {
inputNode.bind("outputs", label, "value", {
inputNode.bind("outputs", linkLabel, "value", {
converter: outputs => {
if (portKey in outputs && "value" in outputs[portKey]) {
if (portKey in outputs && "value" in outputs[portKey] && outputs[portKey]["value"]) {
const val = outputs[portKey]["value"];
if (this.getNode().getMetaData()["key"].includes("probe/array")) {
return "[" + val.join(",") + "]";
} else if (this.getNode().getMetaData()["key"].includes("probe/file")) {
const filename = val.filename || osparc.file.FilePicker.getFilenameFromPath(val);
label.set({
font: "text-12",
rich: true
});
replaceByLinkLabel(val);
populateLinkLabel(val);
return filename;
}
return String(val);
Expand All @@ -551,7 +545,7 @@ qx.Class.define("osparc.workbench.NodeUI", {
});
}
} else {
label.setValue("");
linkLabel.setValue("");
}
},

Expand Down
Loading