Skip to content

Commit 0f1ef1d

Browse files
odeimaizmrnicegyu11
authored andcommitted
🎨 [Frontend] Handle LongRunningTask errors better (ITISFoundation#6485)
1 parent 6588f3b commit 0f1ef1d

File tree

7 files changed

+21
-14
lines changed

7 files changed

+21
-14
lines changed

‎services/static-webserver/client/source/class/osparc/FlashMessenger.js‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,10 @@ qx.Class.define("osparc.FlashMessenger", {
100100
* @param {osparc.ui.message.FlashMessage} flashMessage FlashMessage element to show.
101101
*/
102102
__showMessage: function(flashMessage) {
103+
if (!flashMessage.getMessage()) {
104+
flashMessage.setMessage(qx.locale.Manager.tr("No message"));
105+
}
106+
103107
this.__messages.remove(flashMessage);
104108
this.__messageContainer.resetDecorator();
105109
this.__messageContainer.add(flashMessage);
@@ -113,7 +117,8 @@ qx.Class.define("osparc.FlashMessenger", {
113117

114118
let duration = flashMessage.getDuration();
115119
if (duration === null) {
116-
const wordCount = flashMessage.getMessage() ? flashMessage.getMessage().split(" ").length : 20;
120+
const message = flashMessage.getMessage();
121+
const wordCount = message.split(" ").length;
117122
duration = Math.max(5500, wordCount*500); // An average reader takes 300ms to read a word
118123
}
119124
if (duration !== 0) {

‎services/static-webserver/client/source/class/osparc/dashboard/StudyBrowser.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1781,8 +1781,8 @@ qx.Class.define("osparc.dashboard.StudyBrowser", {
17811781
this._updateStudyData(duplicatedStudyData);
17821782
});
17831783
task.addListener("pollingError", e => {
1784-
const errMsg = e.getData();
1785-
const msg = this.tr("Something went wrong Duplicating the study<br>") + errMsg;
1784+
const err = e.getData();
1785+
const msg = this.tr("Something went wrong Duplicating the study<br>") + err.message;
17861786
finished(msg, "ERROR");
17871787
});
17881788
}

‎services/static-webserver/client/source/class/osparc/dashboard/TemplateBrowser.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -422,8 +422,8 @@ qx.Class.define("osparc.dashboard.TemplateBrowser", {
422422
this.reloadResources();
423423
});
424424
task.addListener("pollingError", e => {
425-
const errMsg = e.getData();
426-
const msg = this.tr("Something went wrong Publishing the study<br>") + errMsg;
425+
const err = e.getData();
426+
const msg = this.tr("Something went wrong Publishing the study<br>") + err.message;
427427
finished(msg, "ERROR");
428428
});
429429
},

‎services/static-webserver/client/source/class/osparc/data/PollTask.js‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -113,8 +113,9 @@ qx.Class.define("osparc.data.PollTask", {
113113
return resp.json();
114114
}
115115
const errMsg = qx.locale.Manager.tr("Failed polling status");
116-
this.fireDataEvent("pollingError", errMsg);
117-
throw new Error(errMsg);
116+
const err = new Error(errMsg);
117+
this.fireDataEvent("pollingError", err);
118+
throw err;
118119
})
119120
.then(data => {
120121
if (data === null) {

‎services/static-webserver/client/source/class/osparc/data/PollTasks.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ qx.Class.define("osparc.data.PollTasks", {
5555
throw Error("Status missing");
5656
}
5757
})
58-
.catch(errMsg => reject(errMsg));
58+
.catch(err => reject(err));
5959
});
6060
},
6161

‎services/static-webserver/client/source/class/osparc/study/Utils.js‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,8 @@ qx.Class.define("osparc.study.Utils", {
175175
resolve(resultData);
176176
});
177177
task.addListener("pollingError", e => {
178-
reject("Polling Error");
178+
const err = e.getData();
179+
reject(err);
179180
});
180181
})
181182
.catch(err => reject(err));
@@ -250,8 +251,8 @@ qx.Class.define("osparc.study.Utils", {
250251
resolve(studyData["uuid"]);
251252
}, this);
252253
task.addListener("pollingError", e => {
253-
const errMsg = e.getData();
254-
reject(errMsg);
254+
const err = e.getData();
255+
reject(err);
255256
}, this);
256257
})
257258
.catch(err => reject(err));

‎services/static-webserver/client/source/class/osparc/ui/message/FlashMessage.js‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -119,23 +119,23 @@ qx.Class.define("osparc.ui.message.FlashMessage", {
119119
control = new qx.ui.basic.Image().set({
120120
alignY: "middle"
121121
});
122-
this.getChildControl("message-layout").add(control);
122+
this.getChildControl("message-layout").addAt(control, 0);
123123
break;
124124
case "message":
125125
control = new qx.ui.basic.Label().set({
126126
font: "text-16",
127127
selectable: true,
128128
rich: true
129129
});
130-
this.getChildControl("message-layout").add(control, {
130+
this.getChildControl("message-layout").addAt(control, 1, {
131131
flex: 1
132132
});
133133
break;
134134
case "closebutton":
135135
control = new osparc.ui.basic.IconButton("@MaterialIcons/close/16", () => this.fireEvent("closeMessage")).set({
136136
alignY: "middle"
137137
});
138-
this.getChildControl("message-layout").add(control);
138+
this.getChildControl("message-layout").addAt(control, 2);
139139
break;
140140
}
141141
return control || this.base(arguments, id);

0 commit comments

Comments
 (0)