Skip to content

Commit 45b07da

Browse files
committed
[skip ci] upload icons working
1 parent 0d0a6ce commit 45b07da

File tree

2 files changed

+37
-16
lines changed

2 files changed

+37
-16
lines changed

services/static-webserver/client/source/class/osparc/desktop/StudyEditor.js

Lines changed: 30 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -466,29 +466,49 @@ qx.Class.define("osparc.desktop.StudyEditor", {
466466
return;
467467
}
468468

469-
if (node.getPropForm()) {
469+
const propsForm = node.getPropsForm();
470+
if (propsForm) {
470471
const portId = socketData["port_key"];
471472
const status = socketData["status"];
472473
switch (status) {
473474
case "DOWNLOAD_STARTED":
474-
node.getPropForm().retrievingPortData(
475+
propsForm.retrievingPortData(
475476
portId,
476477
osparc.form.renderer.PropForm.RETRIEVE_STATUS.downloading);
477478
break;
479+
case "DOWNLOAD_FINISHED_SUCCESSFULLY":
480+
propsForm.retrievedPortData(portId, true);
481+
break;
482+
case "DOWNLOAD_WAS_ABORTED":
483+
case "DOWNLOAD_FINISHED_WITH_ERROR":
484+
propsForm.retrievedPortData(portId, false);
485+
break;
486+
}
487+
}
488+
489+
const outputsForm = node.getOutputsForm();
490+
if (outputsForm) {
491+
const portId = socketData["port_key"];
492+
const status = socketData["status"];
493+
switch (status) {
478494
case "UPLOAD_STARTED":
479-
node.getPropForm().retrievingPortData(
495+
outputsForm.setRetrievingStatus(
480496
portId,
481-
osparc.form.renderer.PropForm.RETRIEVE_STATUS.uploading);
497+
osparc.form.renderer.PropForm.RETRIEVE_STATUS.uploading
498+
);
482499
break;
483-
case "DOWNLOAD_FINISHED_SUCCESSFULLY":
484500
case "UPLOAD_FINISHED_SUCCESSFULLY":
485-
node.getPropForm().retrievedPortData(portId, true);
501+
outputsForm.setRetrievingStatus(
502+
portId,
503+
osparc.form.renderer.PropForm.RETRIEVE_STATUS.succeed
504+
);
486505
break;
487-
case "DOWNLOAD_WAS_ABORTED":
488-
case "DOWNLOAD_FINISHED_WITH_ERRROR":
489506
case "UPLOAD_WAS_ABORTED":
490-
case "UPLOAD_FINISHED_WITH_ERRROR":
491-
node.getPropForm().retrievedPortData(portId, false);
507+
case "UPLOAD_FINISHED_WITH_ERROR":
508+
outputsForm.setRetrievingStatus(
509+
portId,
510+
osparc.form.renderer.PropForm.RETRIEVE_STATUS.failed
511+
);
492512
break;
493513
}
494514
}

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

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -229,26 +229,27 @@ qx.Class.define("osparc.widget.NodeOutputs", {
229229
setRetrievingStatus: function(portId, status) {
230230
const ports = this.getPorts();
231231
const portKeys = Object.keys(ports);
232-
const idx = portKeys.findIndex(portId);
232+
const idx = portKeys.indexOf(portId);
233233
if (idx === -1) {
234234
return;
235235
}
236236

237-
const icon = osparc.form.renderer.PropForm.getIconForStatus(status);
238237
// remove first if any
239-
let children = this._getChildren();
238+
let children = this.__gridLayout.getChildren();
240239
for (let i=0; i<children.length; i++) {
241240
let child = children[i];
242241
const layoutProps = child.getLayoutProperties();
243242
if (
244243
layoutProps.row === idx &&
245244
layoutProps.column === this.self().POS.RETRIEVE_STATUS
246245
) {
247-
this._remove(child);
246+
this.__gridLayout.remove(child);
247+
break;
248248
}
249249
}
250-
this._addAt(icon, idx, {
251-
idx,
250+
const icon = osparc.form.renderer.PropForm.getIconForStatus(status);
251+
this.__gridLayout.add(icon, {
252+
row: idx,
252253
column: this.self().POS.RETRIEVE_STATUS
253254
});
254255
}

0 commit comments

Comments
 (0)