Skip to content

🐛[FrontEnd] Better error handling of invalid pre-registration data #6438

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

Merged
merged 11 commits into from
Sep 25, 2024
Merged

🐛[FrontEnd] Better error handling of invalid pre-registration data #6438

Changes from 10 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
84b667d
handles error with json parsing
pcrespov Sep 24, 2024
69dbdfe
cleanup
pcrespov Sep 24, 2024
6725932
refactor
pcrespov Sep 24, 2024
92a3c83
cleanup msg
pcrespov Sep 24, 2024
5de7458
formatting
pcrespov Sep 24, 2024
2273d93
Merge branch 'master' into fix/ui-pre-registration
pcrespov Sep 25, 2024
dfdf213
Merge branch 'master' into fix/ui-pre-registration
pcrespov Sep 25, 2024
00ec5e1
linter
pcrespov Sep 25, 2024
0d96f4f
@odeimaiz review: rich control
pcrespov Sep 25, 2024
2626a57
Merge branch 'master' into fix/ui-pre-registration
pcrespov Sep 25, 2024
3147440
Merge branch 'master' into fix/ui-pre-registration
pcrespov Sep 25, 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
31 changes: 25 additions & 6 deletions services/static-webserver/client/source/class/osparc/po/PreRegistration.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,9 @@ qx.Class.define("osparc.po.PreRegistration", {
break;
case "finding-status":
control = new qx.ui.basic.Label();
this._add(control);
this._add(control, {
rich: true
});
break;
case "pre-registration-container":
control = new qx.ui.container.Scroll();
Expand Down Expand Up @@ -76,11 +78,27 @@ qx.Class.define("osparc.po.PreRegistration", {
}
if (form.validate()) {
submitBtn.setFetching(true);

const flashErrorMsg = this.tr("Pre-Registration Failed. See details below");
const findingStatus = this.getChildControl("finding-status");
findingStatus.setValue(this.tr("Searching Pre-Registered users..."));
const params = {
data: JSON.parse(requestAccountData.getValue())
};

let params;
try {
params = {
data: JSON.parse(requestAccountData.getValue())
};
} catch (err) {
console.error(err);

const detailErrorMsg = `Error parsing Request Form JSON. ${err}`;
findingStatus.setValue(detailErrorMsg);

osparc.FlashMessenger.logAs(flashErrorMsg, "ERROR");
submitBtn.setFetching(false);
return
}

osparc.data.Resources.fetch("users", "preRegister", params)
.then(data => {
if (data.length) {
Expand All @@ -91,9 +109,10 @@ qx.Class.define("osparc.po.PreRegistration", {
this.__populatePreRegistrationLayout(data);
})
.catch(err => {
findingStatus.setValue(this.tr("Error searching Pre-Registered users"));
const detailErrorMsg = this.tr(`Error during Pre-Registeristration: ${err.message}`)
findingStatus.setValue(detailErrorMsg);
console.error(err);
osparc.FlashMessenger.logAs(err.message, "ERROR");
osparc.FlashMessenger.logAs(flashErrorMsg, "ERROR");
})
.finally(() => submitBtn.setFetching(false));
}
Expand Down
Loading