Skip to content

Commit 934f502

Browse files
committed
cleanup
1 parent 294dc90 commit 934f502

File tree

1 file changed

+23
-21
lines changed

1 file changed

+23
-21
lines changed

services/static-webserver/client/source/class/osparc/po/PreRegistration.js

Lines changed: 23 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -78,30 +78,32 @@ qx.Class.define("osparc.po.PreRegistration", {
7878
submitBtn.setFetching(true);
7979
const findingStatus = this.getChildControl("finding-status");
8080
findingStatus.setValue(this.tr("Searching Pre-Registered users..."));
81+
const preData = requestAccountData.getValue()
8182
try {
82-
const preData = JSON.parse(requestAccountData.getValue())
83+
const params = {
84+
data: JSON.parse(preData)
85+
};
86+
87+
osparc.data.Resources.fetch("users", "preRegister", params)
88+
.then(data => {
89+
if (data.length) {
90+
findingStatus.setValue(this.tr("Pre-Registered as:"));
91+
} else {
92+
findingStatus.setValue(this.tr("No Pre-Registered user found"));
93+
}
94+
this.__populatePreRegistrationLayout(data);
95+
})
96+
.catch(err => {
97+
findingStatus.setValue(this.tr("Error searching Pre-Registered users"));
98+
console.error(err);
99+
osparc.FlashMessenger.logAs(err.message, "ERROR");
100+
})
101+
.finally(() => submitBtn.setFetching(false));
102+
83103
} catch (error) {
84-
console.error(`Cannot parse pre-registration JSON data: ${preData}:`, error)
85-
osparc.FlashMessenger.logAs("Invalid JSON in Pre-Registration input", "ERROR");
104+
console.error(`Cannot parse pre-registration JSON data: ${preData}:`, error)
105+
osparc.FlashMessenger.logAs("Invalid JSON in Pre-Registration input", "ERROR");
86106
}
87-
const params = {
88-
data: preData
89-
};
90-
osparc.data.Resources.fetch("users", "preRegister", params)
91-
.then(data => {
92-
if (data.length) {
93-
findingStatus.setValue(this.tr("Pre-Registered as:"));
94-
} else {
95-
findingStatus.setValue(this.tr("No Pre-Registered user found"));
96-
}
97-
this.__populatePreRegistrationLayout(data);
98-
})
99-
.catch(err => {
100-
findingStatus.setValue(this.tr("Error searching Pre-Registered users"));
101-
console.error(err);
102-
osparc.FlashMessenger.logAs(err.message, "ERROR");
103-
})
104-
.finally(() => submitBtn.setFetching(false));
105107
}
106108
}, this);
107109
form.addButton(submitBtn);

0 commit comments

Comments
 (0)