Skip to content

Commit 7c606ba

Browse files
committed
UserMember
1 parent aa301bf commit 7c606ba

File tree

3 files changed

+45
-9
lines changed

3 files changed

+45
-9
lines changed

services/static-webserver/client/source/class/osparc/data/model/User.js

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@ qx.Class.define("osparc.data.model.User", {
4545
lastName: userData["last_name"],
4646
email: userData["login"],
4747
thumbnail,
48-
accessRights: userData["accessRights"],
4948
});
5049
},
5150

@@ -99,13 +98,6 @@ qx.Class.define("osparc.data.model.User", {
9998
event: "changeEmail",
10099
},
101100

102-
accessRights: {
103-
check: "Object",
104-
nullable: false,
105-
init: null,
106-
event: "changeAccessRights",
107-
},
108-
109101
thumbnail: {
110102
check: "String",
111103
nullable: true,
Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
/* ************************************************************************
2+
3+
osparc - the simcore frontend
4+
5+
https://osparc.io
6+
7+
Copyright:
8+
2024 IT'IS Foundation, https://itis.swiss
9+
10+
License:
11+
MIT: https://opensource.org/licenses/MIT
12+
13+
Authors:
14+
* Odei Maiz (odeimaiz)
15+
16+
************************************************************************ */
17+
18+
/**
19+
* Class that stores User data + access rights to the resource.
20+
*/
21+
22+
qx.Class.define("osparc.data.model.UserMember", {
23+
extend: osparc.data.model.User,
24+
25+
/**
26+
* @param userData {Object} Object containing the serialized User Data
27+
*/
28+
construct: function(userData) {
29+
this.base(arguments, userData);
30+
31+
this.set({
32+
accessRights: userData["accessRights"],
33+
});
34+
},
35+
36+
properties: {
37+
accessRights: {
38+
check: "Object",
39+
nullable: false,
40+
init: null,
41+
event: "changeAccessRights",
42+
},
43+
},
44+
});

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ qx.Class.define("osparc.store.Groups", {
115115
// reset group's group members
116116
group.setGroupMembers({});
117117
orgMembers.forEach(orgMember => {
118-
const user = new osparc.data.model.User(orgMember);
118+
const user = new osparc.data.model.UserMember(orgMember);
119119
this.__addToUsersCache(user, groupId);
120120
});
121121
}

0 commit comments

Comments
 (0)