Skip to content

Commit f385621

Browse files
odeimaizmatusdrobuliak66
authored andcommitted
🐛 [Frontend] Bugfix: handle better groups/${gid}/users error (#7048)
1 parent f818ad2 commit f385621

File tree

2 files changed

+21
-11
lines changed

2 files changed

+21
-11
lines changed

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

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -137,12 +137,14 @@ qx.Class.define("osparc.desktop.organizations.MembersList", {
137137
const usersStore = osparc.store.Users.getInstance();
138138
selectedMembers.forEach(selectedMemberGId => promises.push(usersStore.getUser(selectedMemberGId)));
139139
Promise.all(promises)
140-
.then(users => {
141-
users.forEach(user => this.__addMember(user.getUsername()));
142-
})
143-
.catch(err => {
144-
console.error(err);
140+
.then(values => {
141+
values.forEach(user => {
142+
if (user) {
143+
this.__addMember(user.getUsername());
144+
}
145+
});
145146
})
147+
.catch(console.error)
146148
.finally(collaboratorsManager.close());
147149
} else {
148150
collaboratorsManager.close();

services/static-webserver/client/source/class/osparc/store/Users.js

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ qx.Class.define("osparc.store.Users", {
2828
},
2929

3030
members: {
31-
fetchUser: function(groupId) {
31+
__fetchUser: function(groupId) {
3232
const params = {
3333
url: {
3434
gid: groupId
@@ -41,14 +41,22 @@ qx.Class.define("osparc.store.Users", {
4141
});
4242
},
4343

44-
getUser: function(groupId, fetchIfNotFound = true) {
44+
getUser: async function(groupId, fetchIfNotFound = true) {
4545
const userFound = this.getUsers().find(user => user.getGroupId() === groupId);
4646
if (userFound) {
47-
return new Promise(resolve => resolve(userFound));
48-
} else if (fetchIfNotFound) {
49-
return this.fetchUser(groupId);
47+
return userFound;
5048
}
51-
return new Promise(reject => reject());
49+
if (fetchIfNotFound) {
50+
try {
51+
const user = await this.__fetchUser(groupId);
52+
if (user) {
53+
return user;
54+
}
55+
} catch (error) {
56+
console.error(error);
57+
}
58+
}
59+
return null;
5260
},
5361

5462
addUser: function(userData) {

0 commit comments

Comments
 (0)