Skip to content

Commit 8923c2c

Browse files
odeimaizodeimaiz
committed
Refactor ROLES
1 parent c745476 commit 8923c2c

File tree

14 files changed

+112
-122
lines changed

14 files changed

+112
-122
lines changed

‎services/static-webserver/client/source/class/osparc/dashboard/StudyBrowserHeader.js‎

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -385,8 +385,15 @@ qx.Class.define("osparc.dashboard.StudyBrowserHeader", {
385385
share.addListener("execute", () => this.__openShareWith(), this);
386386
menu.add(share);
387387
editButton.setMenu(menu);
388-
const val = value["read"] + value["write"] + value["delete"];
389-
roleText.setValue(osparc.data.Roles.WORKSPACE[val].label);
388+
let id = "noRead";
389+
if (value["delete"]) {
390+
id = "delete";
391+
} else if (value["write"]) {
392+
id = "write";
393+
} else if (value["read"]) {
394+
id = "read";
395+
}
396+
roleText.setValue(osparc.data.Roles.WORKSPACE[id].label);
390397
roleText.show();
391398
roleIcon.show();
392399
} else {

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

Lines changed: 15 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -21,25 +21,22 @@ qx.Class.define("osparc.data.Roles", {
2121

2222
statics: {
2323
ORG: {
24-
0: {
25-
id: "noRead",
24+
"noRead": {
2625
label: qx.locale.Manager.tr("Restricted Member"),
2726
longLabel: qx.locale.Manager.tr("Restricted member: no Read access"),
2827
canDo: [
2928
qx.locale.Manager.tr("- can access content shared within the Organization")
3029
]
3130
},
32-
1: {
33-
id: "read",
31+
"read": {
3432
label: qx.locale.Manager.tr("Member"),
3533
longLabel: qx.locale.Manager.tr("Member: Read access"),
3634
canDo: [
3735
qx.locale.Manager.tr("- can see other members"),
3836
qx.locale.Manager.tr("- can share with other members")
3937
]
4038
},
41-
2: {
42-
id: "write",
39+
"write": {
4340
label: qx.locale.Manager.tr("Manager"),
4441
longLabel: qx.locale.Manager.tr("Manager: Read/Write access"),
4542
canDo: [
@@ -48,65 +45,56 @@ qx.Class.define("osparc.data.Roles", {
4845
qx.locale.Manager.tr("- can Edit Organization details")
4946
]
5047
},
51-
3: {
52-
id: "delete",
48+
"delete": {
5349
label: qx.locale.Manager.tr("Administrator"),
5450
longLabel: qx.locale.Manager.tr("Admin: Read/Write/Delete access"),
5551
canDo: [
5652
qx.locale.Manager.tr("- can Delete the Organization")
5753
]
5854
}
5955
},
60-
6156
// study & templates
6257
STUDY: {
63-
1: {
64-
id: "read",
58+
"read": {
6559
label: qx.locale.Manager.tr("User"),
6660
longLabel: qx.locale.Manager.tr("User: Read access"),
6761
canDo: [
6862
qx.locale.Manager.tr("- can open it")
6963
]
7064
},
71-
2: {
72-
id: "write",
65+
"write": {
7366
label: qx.locale.Manager.tr("Editor"),
7467
longLabel: qx.locale.Manager.tr("Editor: Read/Write access"),
7568
canDo: [
7669
qx.locale.Manager.tr("- can make changes"),
7770
qx.locale.Manager.tr("- can share it")
7871
]
7972
},
80-
3: {
81-
id: "delete",
73+
"delete": {
8274
label: qx.locale.Manager.tr("Owner"),
8375
longLabel: qx.locale.Manager.tr("Owner: Read/Write/Delete access"),
8476
canDo: [
8577
qx.locale.Manager.tr("- can delete it")
8678
]
8779
}
8880
},
89-
// services
9081
SERVICES: {
91-
1: {
92-
id: "read",
82+
"read": {
9383
label: qx.locale.Manager.tr("User"),
9484
longLabel: qx.locale.Manager.tr("User: Read access"),
9585
canDo: [
9686
qx.locale.Manager.tr("- can use it")
9787
]
9888
},
99-
2: {
100-
id: "write",
89+
"write": {
10190
label: qx.locale.Manager.tr("Editor"),
10291
longLabel: qx.locale.Manager.tr("Editor: Read/Write access"),
10392
canDo: [
10493
qx.locale.Manager.tr("- can make changes"),
10594
qx.locale.Manager.tr("- can share it")
10695
]
10796
},
108-
3: {
109-
id: "delete",
97+
"delete": {
11098
label: qx.locale.Manager.tr("Owner"),
11199
longLabel: qx.locale.Manager.tr("Owner: Read/Write/Delete access"),
112100
canDo: [
@@ -116,16 +104,14 @@ qx.Class.define("osparc.data.Roles", {
116104
},
117105

118106
WALLET: {
119-
1: {
120-
id: "read",
107+
"read": {
121108
label: qx.locale.Manager.tr("User"),
122109
longLabel: qx.locale.Manager.tr("User: Read access"),
123110
canDo: [
124111
qx.locale.Manager.tr("- can use the credits")
125112
]
126113
},
127-
2: {
128-
id: "write",
114+
"write": {
129115
label: qx.locale.Manager.tr("Accountant"),
130116
longLabel: qx.locale.Manager.tr("Accountant: Read/Write access"),
131117
canDo: [
@@ -136,25 +122,22 @@ qx.Class.define("osparc.data.Roles", {
136122
},
137123

138124
WORKSPACE: {
139-
1: {
140-
id: "read",
125+
"read": {
141126
label: qx.locale.Manager.tr("Viewer"),
142127
longLabel: qx.locale.Manager.tr("Viewer: Read access"),
143128
canDo: [
144129
qx.locale.Manager.tr("- can inspect the content and open ") + osparc.product.Utils.getStudyAlias({plural: true})
145130
]
146131
},
147-
2: {
148-
id: "write",
132+
"write": {
149133
label: qx.locale.Manager.tr("Editor"),
150134
longLabel: qx.locale.Manager.tr("Editor: Read/Write access"),
151135
canDo: [
152136
qx.locale.Manager.tr("- can add ") + osparc.product.Utils.getStudyAlias({plural: true}),
153137
qx.locale.Manager.tr("- can add folders"),
154138
]
155139
},
156-
3: {
157-
id: "delete",
140+
"delete": {
158141
label: qx.locale.Manager.tr("Owner"),
159142
longLabel: qx.locale.Manager.tr("Owner: Read/Write/Delete access"),
160143
canDo: [

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

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -360,11 +360,11 @@ qx.Class.define("osparc.desktop.organizations.MembersList", {
360360
const groupsStore = osparc.store.Groups.getInstance();
361361
groupsStore.patchMember(this.__currentOrg.getGroupId(), listedMember["id"], newAccessRights)
362362
.then(() => {
363-
osparc.FlashMessenger.logAs(this.tr(`Successfully promoted to ${osparc.data.Roles.ORG[1].label}`));
363+
osparc.FlashMessenger.logAs(this.tr(`Successfully promoted to ${osparc.data.Roles.ORG["read"].label}`));
364364
this.__reloadOrgMembers();
365365
})
366366
.catch(err => {
367-
const msg = this.tr("Something went wrong while promoting to ") + osparc.data.Roles.ORG[1].label;
367+
const msg = this.tr("Something went wrong while promoting to ") + osparc.data.Roles.ORG["read"].label;
368368
osparc.FlashMessenger.logError(err, msg);
369369
});
370370
},
@@ -381,13 +381,13 @@ qx.Class.define("osparc.desktop.organizations.MembersList", {
381381
groupsStore.patchAccessRights(orgId, userId, newAccessRights)
382382
.then(() => {
383383
if (msg === undefined) {
384-
msg = this.tr(`Successfully demoted to ${osparc.data.Roles.ORG[0].label}`);
384+
msg = this.tr(`Successfully demoted to ${osparc.data.Roles.ORG["noRead"].label}`);
385385
}
386386
osparc.FlashMessenger.logAs(msg);
387387
this.__reloadOrgMembers();
388388
})
389389
.catch(err => {
390-
const errorMsg = this.tr("Something went wrong while demoting to ") + osparc.data.Roles.ORG[0].label;
390+
const errorMsg = this.tr("Something went wrong while demoting to ") + osparc.data.Roles.ORG["noRead"].label;
391391
osparc.FlashMessenger.logError(err, errorMsg);
392392
});
393393
},
@@ -403,11 +403,11 @@ qx.Class.define("osparc.desktop.organizations.MembersList", {
403403
const groupsStore = osparc.store.Groups.getInstance();
404404
groupsStore.patchAccessRights(orgId, userId, newAccessRights)
405405
.then(() => {
406-
osparc.FlashMessenger.logAs(this.tr(`Successfully promoted to ${osparc.data.Roles.ORG[2].label}`));
406+
osparc.FlashMessenger.logAs(this.tr(`Successfully promoted to ${osparc.data.Roles.ORG["write"].label}`));
407407
this.__reloadOrgMembers();
408408
})
409409
.catch(err => {
410-
const msg = this.tr("Something went wrong while promoting to ") + osparc.data.Roles.ORG[2].label;
410+
const msg = this.tr("Something went wrong while promoting to ") + osparc.data.Roles.ORG["write"].label;
411411
osparc.FlashMessenger.logError(err, msg);
412412
});
413413
},
@@ -423,11 +423,11 @@ qx.Class.define("osparc.desktop.organizations.MembersList", {
423423
const groupsStore = osparc.store.Groups.getInstance();
424424
groupsStore.patchAccessRights(orgId, userId, newAccessRights)
425425
.then(() => {
426-
osparc.FlashMessenger.logAs(this.tr(`Successfully promoted to ${osparc.data.Roles.ORG[3].label}`));
426+
osparc.FlashMessenger.logAs(this.tr(`Successfully promoted to ${osparc.data.Roles.ORG["delete"].label}`));
427427
this.__reloadOrgMembers();
428428
})
429429
.catch(err => {
430-
const msg = this.tr("Something went wrong while promoting to ") + osparc.data.Roles.ORG[3].label;
430+
const msg = this.tr("Something went wrong while promoting to ") + osparc.data.Roles.ORG["delete"].label;
431431
osparc.FlashMessenger.logError(err, msg);
432432
});
433433
},
@@ -443,11 +443,11 @@ qx.Class.define("osparc.desktop.organizations.MembersList", {
443443
const groupsStore = osparc.store.Groups.getInstance();
444444
groupsStore.patchAccessRights(orgId, userId, newAccessRights)
445445
.then(() => {
446-
osparc.FlashMessenger.logAs(this.tr(`Successfully demoted to ${osparc.data.Roles.ORG[1].label}`));
446+
osparc.FlashMessenger.logAs(this.tr(`Successfully demoted to ${osparc.data.Roles.ORG["read"].label}`));
447447
this.__reloadOrgMembers();
448448
})
449449
.catch(err => {
450-
const msg = this.tr("Something went wrong while demoting to ") + osparc.data.Roles.ORG[1].label;
450+
const msg = this.tr("Something went wrong while demoting to ") + osparc.data.Roles.ORG["read"].label;
451451
osparc.FlashMessenger.logError(err, msg);
452452
});
453453
},
@@ -463,11 +463,11 @@ qx.Class.define("osparc.desktop.organizations.MembersList", {
463463
const groupsStore = osparc.store.Groups.getInstance();
464464
groupsStore.patchAccessRights(orgId, userId, newAccessRights)
465465
.then(() => {
466-
osparc.FlashMessenger.logAs(this.tr(`Successfully demoted to ${osparc.data.Roles.ORG[3].label}`));
466+
osparc.FlashMessenger.logAs(this.tr(`Successfully demoted to ${osparc.data.Roles.ORG["write"].label}`));
467467
this.__reloadOrgMembers();
468468
})
469469
.catch(err => {
470-
const msg =this.tr("Something went wrong while demoting to ") + osparc.data.Roles.ORG[3].label;
470+
const msg =this.tr("Something went wrong while demoting to ") + osparc.data.Roles.ORG["write"].label;
471471
osparc.FlashMessenger.logError(err, msg);
472472
});
473473
},
@@ -504,9 +504,9 @@ qx.Class.define("osparc.desktop.organizations.MembersList", {
504504
const isThereAnyManager = members.some(member => member.getAccessRights()["write"]);
505505
let rUSure = this.tr("Are you sure you want to leave?");
506506
if (isThereAnyAdmin) {
507-
rUSure += `<br>There is no ${osparc.data.Roles.ORG[2].label} in this Organization.`;
507+
rUSure += `<br>There is no ${osparc.data.Roles.ORG["delete"].label} in this Organization.`;
508508
} else if (isThereAnyManager) {
509-
rUSure += `<br>There is no ${osparc.data.Roles.ORG[3].label} in this Organization.`;
509+
rUSure += `<br>There is no ${osparc.data.Roles.ORG["write"].label} in this Organization.`;
510510
}
511511
rUSure += "<br><br>" + this.tr("If you leave, the page will reload.");
512512
const confirmationWin = new osparc.ui.window.Confirmation(rUSure).set({

‎services/static-webserver/client/source/class/osparc/desktop/organizations/SharedResourceListItem.js‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -90,23 +90,23 @@ qx.Class.define("osparc.desktop.organizations.SharedResourceListItem", {
9090
return control || this.base(arguments, id);
9191
},
9292

93-
__getRoleInfo: function(i) {
93+
__getRoleInfo: function(id) {
9494
if (this.__resourceType === "service") {
95-
return osparc.data.Roles.SERVICES[i];
95+
return osparc.data.Roles.SERVICES[id];
9696
}
97-
return osparc.data.Roles.STUDY[i];
97+
return osparc.data.Roles.STUDY[id];
9898
},
9999

100100
// overridden
101101
_setRole: function() {
102102
const accessRights = this.getAccessRights();
103103
const role = this.getChildControl("role");
104104
if (this.self().canDelete(accessRights)) {
105-
role.setValue(this.__getRoleInfo(3).label);
105+
role.setValue(this.__getRoleInfo("delete").label);
106106
} else if (this.self().canWrite(accessRights)) {
107-
role.setValue(this.__getRoleInfo(2).label);
107+
role.setValue(this.__getRoleInfo("write").label);
108108
} else {
109-
role.setValue(this.__getRoleInfo(1).label);
109+
role.setValue(this.__getRoleInfo("read").label);
110110
}
111111
},
112112

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -50,9 +50,9 @@ qx.Class.define("osparc.desktop.wallets.MemberListItem", {
5050
const accessRights = this.getAccessRights();
5151
const role = this.getChildControl("role");
5252
if ("getWrite" in accessRights && accessRights.getWrite()) {
53-
role.setValue(osparc.data.Roles.WALLET[2].label);
53+
role.setValue(osparc.data.Roles.WALLET["write"].label);
5454
} else if ("getRead" in accessRights && accessRights.getRead()) {
55-
role.setValue(osparc.data.Roles.WALLET[1].label);
55+
role.setValue(osparc.data.Roles.WALLET["read"].label);
5656
}
5757
},
5858

@@ -68,7 +68,7 @@ qx.Class.define("osparc.desktop.wallets.MemberListItem", {
6868
}
6969

7070
if (options.includes("promoteToAccountant")) {
71-
const promoteButton = new qx.ui.menu.Button(this.tr("Promote to ") + osparc.data.Roles.WALLET[2].label);
71+
const promoteButton = new qx.ui.menu.Button(this.tr("Promote to ") + osparc.data.Roles.WALLET["write"].label);
7272
promoteButton.addListener("execute", () => {
7373
this.fireDataEvent("promoteToAccountant", {
7474
gid: this.getGid(),
@@ -78,7 +78,7 @@ qx.Class.define("osparc.desktop.wallets.MemberListItem", {
7878
menu.add(promoteButton);
7979
}
8080
if (options.includes("demoteToMember")) {
81-
const demoteButton = new qx.ui.menu.Button(this.tr("Demote to ") + osparc.data.Roles.WALLET[1].label);
81+
const demoteButton = new qx.ui.menu.Button(this.tr("Demote to ") + osparc.data.Roles.WALLET["read"].label);
8282
demoteButton.addListener("execute", () => {
8383
this.fireDataEvent("demoteToMember", {
8484
gid: this.getGid(),
@@ -94,9 +94,9 @@ qx.Class.define("osparc.desktop.wallets.MemberListItem", {
9494

9595
if (options.includes("removeMember")) {
9696
const accessRights = this.getAccessRights();
97-
let currentRole = osparc.data.Roles.WALLET[1];
97+
let currentRole = osparc.data.Roles.WALLET["read"];
9898
if (accessRights.getWrite()) {
99-
currentRole = osparc.data.Roles.WALLET[2];
99+
currentRole = osparc.data.Roles.WALLET["write"];
100100
}
101101
const removeButton = new qx.ui.menu.Button(this.tr("Remove ") + currentRole.label).set({
102102
textColor: "danger-red"

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -280,9 +280,9 @@ qx.Class.define("osparc.desktop.wallets.WalletListItem", {
280280
if (found) {
281281
const role = this.getChildControl("role");
282282
if (found["write"]) {
283-
role.setValue(osparc.data.Roles.WALLET[2].label);
283+
role.setValue(osparc.data.Roles.WALLET["write"].label);
284284
} else if (found["read"]) {
285-
role.setValue(osparc.data.Roles.WALLET[1].label);
285+
role.setValue(osparc.data.Roles.WALLET["read"].label);
286286
}
287287
}
288288
},

‎services/static-webserver/client/source/class/osparc/share/CollaboratorsService.js‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -127,8 +127,8 @@ qx.Class.define("osparc.share.CollaboratorsService", {
127127
this.__make(
128128
collaborator["gid"],
129129
this.self().getOwnerAccessRight(),
130-
this.tr(`Successfully promoted to ${osparc.data.Roles.SERVICE[2].label}`),
131-
this.tr(`Something went wrong while promoting to ${osparc.data.Roles.SERVICE[2].label}`),
130+
this.tr(`Successfully promoted to ${osparc.data.Roles.SERVICE["write"].label}`),
131+
this.tr(`Something went wrong while promoting to ${osparc.data.Roles.SERVICE["write"].label}`),
132132
item
133133
);
134134
},
@@ -141,8 +141,8 @@ qx.Class.define("osparc.share.CollaboratorsService", {
141141
this.__make(
142142
collaborator["gid"],
143143
this.self().getCollaboratorAccessRight(),
144-
this.tr(`Successfully demoted to ${osparc.data.Roles.SERVICE[1].label}`),
145-
this.tr(`Something went wrong while demoting ${osparc.data.Roles.SERVICE[1].label}`),
144+
this.tr(`Successfully demoted to ${osparc.data.Roles.SERVICE["read"].label}`),
145+
this.tr(`Something went wrong while demoting ${osparc.data.Roles.SERVICE["read"].label}`),
146146
item
147147
);
148148
},

0 commit comments

Comments
 (0)