File tree 2 files changed +21
-11
lines changed
services/static-webserver/client/source/class/osparc
2 files changed +21
-11
lines changed Original file line number Diff line number Diff line change @@ -137,12 +137,14 @@ qx.Class.define("osparc.desktop.organizations.MembersList", {
137
137
const usersStore = osparc . store . Users . getInstance ( ) ;
138
138
selectedMembers . forEach ( selectedMemberGId => promises . push ( usersStore . getUser ( selectedMemberGId ) ) ) ;
139
139
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
+ } ) ;
145
146
} )
147
+ . catch ( console . error )
146
148
. finally ( collaboratorsManager . close ( ) ) ;
147
149
} else {
148
150
collaboratorsManager . close ( ) ;
Original file line number Diff line number Diff line change @@ -28,7 +28,7 @@ qx.Class.define("osparc.store.Users", {
28
28
} ,
29
29
30
30
members : {
31
- fetchUser : function ( groupId ) {
31
+ __fetchUser : function ( groupId ) {
32
32
const params = {
33
33
url : {
34
34
gid : groupId
@@ -41,14 +41,22 @@ qx.Class.define("osparc.store.Users", {
41
41
} ) ;
42
42
} ,
43
43
44
- getUser : function ( groupId , fetchIfNotFound = true ) {
44
+ getUser : async function ( groupId , fetchIfNotFound = true ) {
45
45
const userFound = this . getUsers ( ) . find ( user => user . getGroupId ( ) === groupId ) ;
46
46
if ( userFound ) {
47
- return new Promise ( resolve => resolve ( userFound ) ) ;
48
- } else if ( fetchIfNotFound ) {
49
- return this . fetchUser ( groupId ) ;
47
+ return userFound ;
50
48
}
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 ;
52
60
} ,
53
61
54
62
addUser : function ( userData ) {
You can’t perform that action at this time.
0 commit comments