Skip to content

Commit a29c865

Browse files
authored
🎨 [Frontend] Enh: releaseTag to OEC clipboard data (#7469)
1 parent 5b1d439 commit a29c865

File tree

4 files changed

+23
-19
lines changed

4 files changed

+23
-19
lines changed

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,9 +110,10 @@ qx.Class.define("osparc.FlashMessenger", {
110110
supportId,
111111
timestamp: new Date().toString(),
112112
url: window.location.href,
113+
releaseTag: osparc.utils.Utils.getReleaseTag(),
113114
studyId: osparc.store.Store.getInstance().getCurrentStudy() || "",
114115
}
115-
osparc.utils.Utils.copyTextToClipboard(JSON.stringify(dataToClipboard));
116+
osparc.utils.Utils.copyTextToClipboard(osparc.utils.Utils.prettifyJson(JSON.stringify(dataToClipboard)));
116117
});
117118
return errorLabel;
118119
},

services/static-webserver/client/source/class/osparc/auth/Manager.js

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -149,8 +149,8 @@ qx.Class.define("osparc.auth.Manager", {
149149
const url = osparc.data.Resources.resources["auth"].endpoints["postLogin"].url;
150150
const xhr = new XMLHttpRequest();
151151
xhr.onload = () => {
152+
const resp = JSON.parse(xhr.responseText);
152153
if (xhr.status === 202) {
153-
const resp = JSON.parse(xhr.responseText);
154154
const data = resp.data;
155155
const message = osparc.auth.core.Utils.extractMessage(data);
156156
const retryAfter = osparc.auth.core.Utils.extractRetryAfter(data)
@@ -161,8 +161,7 @@ qx.Class.define("osparc.auth.Manager", {
161161
nextStep: data["name"]
162162
});
163163
} else if (xhr.status === 200) {
164-
const resp = JSON.parse(xhr.responseText);
165-
osparc.data.Resources.getOne("profile", {}, null, false)
164+
osparc.data.Resources.fetch("profile", "getOne")
166165
.then(profile => {
167166
this.__loginUser(profile);
168167
const data = resp.data;
@@ -172,17 +171,14 @@ qx.Class.define("osparc.auth.Manager", {
172171
message
173172
});
174173
})
175-
.catch(err => reject(err.message));
174+
.catch(err => reject(err));
175+
} else if (resp.error == null) {
176+
reject({message: this.tr("Unsuccessful Login")});
176177
} else {
177-
const resp = JSON.parse(xhr.responseText);
178-
if (resp.error == null) {
179-
reject(this.tr("Unsuccessful Login"));
180-
} else {
181-
reject(resp.error.message);
182-
}
178+
reject(resp.error);
183179
}
184180
};
185-
xhr.onerror = () => reject(this.tr("Unsuccessful Login"));
181+
xhr.onerror = err => reject(err);
186182
xhr.open("POST", url, true);
187183
xhr.setRequestHeader("Content-Type", "application/json");
188184
xhr.send(JSON.stringify(params));

services/static-webserver/client/source/class/osparc/auth/ui/LoginView.js

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -215,7 +215,7 @@ qx.Class.define("osparc.auth.ui.LoginView", {
215215
const email = this._form.getItems().email;
216216
const pass = this._form.getItems().password;
217217

218-
const loginFun = msg => {
218+
const loginSuccessful = msg => {
219219
this.__loginBtn.setFetching(false);
220220
this.fireDataEvent("done", msg);
221221
// we don't need the form any more, so remove it and mock-navigate-away
@@ -248,18 +248,18 @@ qx.Class.define("osparc.auth.ui.LoginView", {
248248
window.history.replaceState(null, window.document.title, window.location.pathname);
249249
};
250250

251-
const failFun = msg => {
251+
const loginFailed = err => {
252252
this.__loginBtn.setFetching(false);
253253
// TODO: can get field info from response here
254-
msg = String(msg) || this.tr("email or password don't look correct");
254+
const message = String(err.message) || this.tr("email or password don't look correct");
255255
[email, pass].forEach(item => {
256256
item.set({
257-
invalidMessage: msg,
257+
invalidMessage: message,
258258
valid: false
259259
});
260260
});
261261

262-
osparc.FlashMessenger.logError(msg);
262+
osparc.FlashMessenger.logError(err);
263263
};
264264

265265
const manager = osparc.auth.Manager.getInstance();
@@ -272,10 +272,10 @@ qx.Class.define("osparc.auth.ui.LoginView", {
272272
twoFactorAuthCbk(resp.nextStep, resp.message, resp.retryAfter);
273273
}
274274
} else if (resp.status === 200) {
275-
loginFun(resp.message);
275+
loginSuccessful(resp.message);
276276
}
277277
})
278-
.catch(err => failFun(err));
278+
.catch(err => loginFailed(err));
279279
},
280280

281281
resetValues: function() {

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

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1441,6 +1441,7 @@ qx.Class.define("osparc.data.Resources", {
14411441

14421442
let message = null;
14431443
let status = null;
1444+
let supportId = null;
14441445
if (e.getData().error) {
14451446
const errorData = e.getData().error;
14461447
if (errorData.message) {
@@ -1455,6 +1456,9 @@ qx.Class.define("osparc.data.Resources", {
14551456
message = errors[0].message;
14561457
}
14571458
status = errorData.status;
1459+
if (errorData["support_id"]) {
1460+
supportId = errorData["support_id"];
1461+
}
14581462
} else {
14591463
const req = e.getRequest();
14601464
message = req.getResponse();
@@ -1486,6 +1490,9 @@ qx.Class.define("osparc.data.Resources", {
14861490
if (status) {
14871491
err.status = status;
14881492
}
1493+
if (supportId) {
1494+
err.supportId = supportId;
1495+
}
14891496
reject(err);
14901497
};
14911498

0 commit comments

Comments
 (0)