Skip to content

Commit 2b7623f

Browse files
committed
wallet members on demand
1 parent 55cd314 commit 2b7623f

File tree

1 file changed

+8
-6
lines changed
  • services/static-webserver/client/source/class/osparc/desktop/wallets

1 file changed

+8
-6
lines changed

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

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -208,13 +208,15 @@ qx.Class.define("osparc.desktop.wallets.MembersList", {
208208

209209
const myGroupId = osparc.auth.Data.getInstance().getGroupId();
210210
const membersList = [];
211-
const potentialCollaborators = osparc.store.Groups.getInstance().getPotentialCollaborators(true);
212211
const canIWrite = wallet.getMyAccessRights()["write"];
213-
wallet.getAccessRights().forEach(accessRights => {
212+
const accessRightss = wallet.getAccessRights();
213+
const usersStore = osparc.store.Users.getInstance();
214+
for (let i=0; i<Object.keys(accessRightss).length; i++) {
215+
const accessRights = accessRightss[i];
214216
const gid = parseInt(accessRights["gid"]);
215-
if (Object.prototype.hasOwnProperty.call(potentialCollaborators, gid)) {
216-
// only users or groupMe
217-
const collab = potentialCollaborators[gid];
217+
// only users or groupMe
218+
const collab = await usersStore.getUser(gid);
219+
if (collab) {
218220
const collaborator = {};
219221
collaborator["userId"] = gid === myGroupId ? osparc.auth.Data.getInstance().getUserId() : collab.getUserId();
220222
collaborator["groupId"] = collab.getGroupId();
@@ -250,7 +252,7 @@ qx.Class.define("osparc.desktop.wallets.MembersList", {
250252
collaborator["showOptions"] = Boolean(options.length);
251253
membersList.push(collaborator);
252254
}
253-
});
255+
}
254256
membersList.sort(this.self().sortWalletMembers);
255257
membersList.forEach(member => membersModel.append(qx.data.marshal.Json.createModel(member)));
256258
},

0 commit comments

Comments
 (0)