Skip to content

🐛 [Frontend] Bugfix: handle better groups/${gid}/users error #7048

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 6 commits into from
Jan 16, 2025
Merged

🐛 [Frontend] Bugfix: handle better groups/${gid}/users error #7048

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
38e44dc
user might be null
odeimaiz Jan 16, 2025
dbd4e2a
handle the gid not found error
odeimaiz Jan 16, 2025
d80fa37
Merge branch 'master' into fix/catch-getUser
odeimaiz Jan 16, 2025
6c9d64b
Update services/static-webserver/client/source/class/osparc/desktop/o…
odeimaiz Jan 16, 2025
0b3eecb
minor
odeimaiz Jan 16, 2025
990de29
Merge branch 'master' into fix/catch-getUser
odeimaiz Jan 16, 2025
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
12 changes: 7 additions & 5 deletions services/static-webserver/client/source/class/osparc/desktop/organizations/MembersList.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,12 +137,14 @@ qx.Class.define("osparc.desktop.organizations.MembersList", {
const usersStore = osparc.store.Users.getInstance();
selectedMembers.forEach(selectedMemberGId => promises.push(usersStore.getUser(selectedMemberGId)));
Promise.all(promises)
.then(users => {
users.forEach(user => this.__addMember(user.getUsername()));
})
.catch(err => {
console.error(err);
.then(values => {
values.forEach(user => {
if (user) {
this.__addMember(user.getUsername());
}
});
})
.catch(console.error)
.finally(collaboratorsManager.close());
} else {
collaboratorsManager.close();
Expand Down
20 changes: 14 additions & 6 deletions services/static-webserver/client/source/class/osparc/store/Users.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ qx.Class.define("osparc.store.Users", {
},

members: {
fetchUser: function(groupId) {
__fetchUser: function(groupId) {
const params = {
url: {
gid: groupId
Expand All @@ -41,14 +41,22 @@ qx.Class.define("osparc.store.Users", {
});
},

getUser: function(groupId, fetchIfNotFound = true) {
getUser: async function(groupId, fetchIfNotFound = true) {
const userFound = this.getUsers().find(user => user.getGroupId() === groupId);
if (userFound) {
return new Promise(resolve => resolve(userFound));
} else if (fetchIfNotFound) {
return this.fetchUser(groupId);
return userFound;
}
return new Promise(reject => reject());
if (fetchIfNotFound) {
try {
const user = await this.__fetchUser(groupId);
if (user) {
return user;
}
} catch (error) {
console.error(error);
}
}
return null;
},

addUser: function(userData) {
Expand Down
Loading