Skip to content

Commit 5599d99

Browse files
committed
WALLET refactoring
1 parent 15a46e3 commit 5599d99

File tree

2 files changed

+18
-37
lines changed

2 files changed

+18
-37
lines changed

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

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -129,15 +129,25 @@ qx.Class.define("osparc.data.Roles", {
129129
longLabel: qx.locale.Manager.tr("User: Read access"),
130130
canDo: [
131131
qx.locale.Manager.tr("- can use the credits")
132-
]
132+
],
133+
accessRights: {
134+
"read": true,
135+
"write": false,
136+
"delete": false
137+
},
133138
},
134139
"write": {
135140
label: qx.locale.Manager.tr("Accountant"),
136141
longLabel: qx.locale.Manager.tr("Accountant: Read/Write access"),
137142
canDo: [
138143
qx.locale.Manager.tr("- can Add/Delete members"),
139144
qx.locale.Manager.tr("- can Edit Credit Account details")
140-
]
145+
],
146+
accessRights: {
147+
"read": true,
148+
"write": true,
149+
"delete": false
150+
},
141151
}
142152
},
143153

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

Lines changed: 6 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -33,38 +33,6 @@ qx.Class.define("osparc.desktop.wallets.MembersList", {
3333
},
3434

3535
statics: {
36-
getNoReadAccess: function() {
37-
return {
38-
"read": false,
39-
"write": false,
40-
"delete": false
41-
};
42-
},
43-
44-
getReadAccess: function() {
45-
return {
46-
"read": true,
47-
"write": false,
48-
"delete": false
49-
};
50-
},
51-
52-
getWriteAccess: function() {
53-
return {
54-
"read": true,
55-
"write": true,
56-
"delete": false
57-
};
58-
},
59-
60-
getDeleteAccess: function() {
61-
return {
62-
"read": true,
63-
"write": true,
64-
"delete": true
65-
};
66-
},
67-
6836
sortWalletMembers: function(a, b) {
6937
const sorted = osparc.share.Collaborators.sortByAccessRights(a["accessRights"], b["accessRights"]);
7038
if (sorted !== 0) {
@@ -266,14 +234,15 @@ qx.Class.define("osparc.desktop.wallets.MembersList", {
266234
return;
267235
}
268236

237+
const readAccessRole = osparc.data.Roles.WALLET["read"];
269238
const promises = [];
270239
gids.forEach(gid => {
271240
const params = {
272241
url: {
273242
"walletId": wallet.getWalletId(),
274243
"groupId": gid
275244
},
276-
data: this.self().getReadAccess()
245+
data: readAccessRole.accessRights
277246
};
278247
promises.push(osparc.data.Resources.fetch("wallets", "postAccessRights", params));
279248
});
@@ -305,12 +274,13 @@ qx.Class.define("osparc.desktop.wallets.MembersList", {
305274
return;
306275
}
307276

277+
const writeAccessRole = osparc.data.Roles.WALLET["write"];
308278
const params = {
309279
url: {
310280
"walletId": wallet.getWalletId(),
311281
"groupId": listedMember["gid"],
312282
},
313-
data: this.self().getWriteAccess()
283+
data: writeAccessRole.accessRights
314284
};
315285
osparc.data.Resources.fetch("wallets", "putAccessRights", params)
316286
.then(() => {
@@ -325,12 +295,13 @@ qx.Class.define("osparc.desktop.wallets.MembersList", {
325295
return;
326296
}
327297

298+
const readAccessRole = osparc.data.Roles.WALLET["read"];
328299
const params = {
329300
url: {
330301
"walletId": wallet.getWalletId(),
331302
"groupId": listedMember["gid"],
332303
},
333-
data: this.self().getReadAccess()
304+
data: readAccessRole.accessRights
334305
};
335306
osparc.data.Resources.fetch("wallets", "putAccessRights", params)
336307
.then(() => {

0 commit comments

Comments
 (0)