Skip to content

🎨 [Frontend] Enh: Expose access rights when Sharing Study #7467

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 25 commits into from
Apr 3, 2025
Merged

🎨 [Frontend] Enh: Expose access rights when Sharing Study #7467

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
f64d366
refactor
odeimaiz Apr 2, 2025
5ddd3b6
refactoring
odeimaiz Apr 2, 2025
523fc06
minHeight
odeimaiz Apr 2, 2025
1ba4892
Access Rights widget
odeimaiz Apr 2, 2025
c745476
Merge branch 'master' into feature/share-with-email
odeimaiz Apr 2, 2025
8923c2c
Refactor ROLES
odeimaiz Apr 2, 2025
15a46e3
more refactoring
odeimaiz Apr 2, 2025
5599d99
WALLET refactoring
odeimaiz Apr 2, 2025
f38a0f0
STUDY
odeimaiz Apr 2, 2025
dd75ef6
last
odeimaiz Apr 2, 2025
4fa268d
WORKSPACE
odeimaiz Apr 2, 2025
ad3fcf4
SERVICES
odeimaiz Apr 2, 2025
be6dd57
minor
odeimaiz Apr 2, 2025
e2afd0a
TAGS
odeimaiz Apr 2, 2025
0b1c272
minor
odeimaiz Apr 2, 2025
86b6eb9
minor
odeimaiz Apr 2, 2025
60c79ea
doc
odeimaiz Apr 2, 2025
3e3a154
wording
odeimaiz Apr 3, 2025
9459040
selectedCollaborators
odeimaiz Apr 3, 2025
53f3065
refactor and pass access rights
odeimaiz Apr 3, 2025
5f384f3
pass access rights
odeimaiz Apr 3, 2025
3a4c480
clean logs
odeimaiz Apr 3, 2025
90d9937
Merge branch 'master' into feature/share-with-email
odeimaiz Apr 3, 2025
8f4e379
minor
odeimaiz Apr 3, 2025
b4af710
Merge branch 'master' into feature/share-with-email
odeimaiz Apr 3, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 9 additions & 2 deletions services/static-webserver/client/source/class/osparc/dashboard/StudyBrowserHeader.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -385,8 +385,15 @@ qx.Class.define("osparc.dashboard.StudyBrowserHeader", {
share.addListener("execute", () => this.__openShareWith(), this);
menu.add(share);
editButton.setMenu(menu);
const val = value["read"] + value["write"] + value["delete"];
roleText.setValue(osparc.data.Roles.WORKSPACE[val].label);
let id = "noRead";
if (value["delete"]) {
id = "delete";
} else if (value["write"]) {
id = "write";
} else if (value["read"]) {
id = "read";
}
roleText.setValue(osparc.data.Roles.WORKSPACE[id].label);
roleText.show();
roleIcon.show();
} else {
Expand Down
133 changes: 80 additions & 53 deletions services/static-webserver/client/source/class/osparc/data/Roles.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,140 +21,167 @@ qx.Class.define("osparc.data.Roles", {

statics: {
ORG: {
0: {
id: "noRead",
"noRead": {
label: qx.locale.Manager.tr("Restricted Member"),
longLabel: qx.locale.Manager.tr("Restricted member: no Read access"),
canDo: [
qx.locale.Manager.tr("- can access content shared within the Organization")
]
],
accessRights: {
"read": false,
"write": false,
"delete": false
},
},
1: {
id: "read",
"read": {
label: qx.locale.Manager.tr("Member"),
longLabel: qx.locale.Manager.tr("Member: Read access"),
canDo: [
qx.locale.Manager.tr("- can see other members"),
qx.locale.Manager.tr("- can share with other members")
]
],
accessRights: {
"read": true,
"write": false,
"delete": false
},
},
2: {
id: "write",
"write": {
label: qx.locale.Manager.tr("Manager"),
longLabel: qx.locale.Manager.tr("Manager: Read/Write access"),
canDo: [
qx.locale.Manager.tr("- can Add/Delete members"),
qx.locale.Manager.tr("- can Promote/Demote members"),
qx.locale.Manager.tr("- can Edit Organization details")
]
],
accessRights: {
"read": true,
"write": true,
"delete": false
},
},
3: {
id: "delete",
"delete": {
label: qx.locale.Manager.tr("Administrator"),
longLabel: qx.locale.Manager.tr("Admin: Read/Write/Delete access"),
canDo: [
qx.locale.Manager.tr("- can Delete the Organization")
]
],
accessRights: {
"read": true,
"write": true,
"delete": true
},
}
},

// study & templates
STUDY: {
1: {
id: "read",
"read": {
label: qx.locale.Manager.tr("User"),
longLabel: qx.locale.Manager.tr("User: Read access"),
canDo: [
qx.locale.Manager.tr("- can open it")
]
qx.locale.Manager.tr("- can open it without making changes")
],
accessRights: {
"read": true,
"write": false,
"delete": false
},
},
2: {
id: "write",
"write": {
label: qx.locale.Manager.tr("Editor"),
longLabel: qx.locale.Manager.tr("Editor: Read/Write access"),
canDo: [
qx.locale.Manager.tr("- can make changes"),
qx.locale.Manager.tr("- can share it")
]
],
accessRights: {
"read": true,
"write": true,
"delete": false
},
},
3: {
id: "delete",
"delete": {
label: qx.locale.Manager.tr("Owner"),
longLabel: qx.locale.Manager.tr("Owner: Read/Write/Delete access"),
canDo: [
qx.locale.Manager.tr("- can delete it")
]
],
accessRights: {
"read": true,
"write": true,
"delete": true
},
}
},
// services
SERVICES: {
1: {
id: "read",
"read": {
label: qx.locale.Manager.tr("User"),
longLabel: qx.locale.Manager.tr("User: Read access"),
canDo: [
qx.locale.Manager.tr("- can use it")
]
],
accessRights: {
"execute": true,
"write": false
},
},
2: {
id: "write",
"write": {
label: qx.locale.Manager.tr("Editor"),
longLabel: qx.locale.Manager.tr("Editor: Read/Write access"),
canDo: [
qx.locale.Manager.tr("- can make changes"),
qx.locale.Manager.tr("- can share it")
]
],
accessRights: {
"execute": true,
"write": true
},
},
3: {
id: "delete",
label: qx.locale.Manager.tr("Owner"),
longLabel: qx.locale.Manager.tr("Owner: Read/Write/Delete access"),
canDo: [
qx.locale.Manager.tr("- can delete it")
]
}
},

WALLET: {
1: {
id: "read",
"read": {
label: qx.locale.Manager.tr("User"),
longLabel: qx.locale.Manager.tr("User: Read access"),
canDo: [
qx.locale.Manager.tr("- can use the credits")
]
],
accessRights: {
"read": true,
"write": false,
"delete": false
},
},
2: {
id: "write",
"write": {
label: qx.locale.Manager.tr("Accountant"),
longLabel: qx.locale.Manager.tr("Accountant: Read/Write access"),
canDo: [
qx.locale.Manager.tr("- can Add/Delete members"),
qx.locale.Manager.tr("- can Edit Credit Account details")
]
],
accessRights: {
"read": true,
"write": true,
"delete": false
},
}
},

WORKSPACE: {
1: {
id: "read",
"read": {
label: qx.locale.Manager.tr("Viewer"),
longLabel: qx.locale.Manager.tr("Viewer: Read access"),
canDo: [
qx.locale.Manager.tr("- can inspect the content and open ") + osparc.product.Utils.getStudyAlias({plural: true})
qx.locale.Manager.tr("- can inspect the content and open ") + osparc.product.Utils.getStudyAlias({plural: true}) + qx.locale.Manager.tr(" without making changes")
]
},
2: {
id: "write",
"write": {
label: qx.locale.Manager.tr("Editor"),
longLabel: qx.locale.Manager.tr("Editor: Read/Write access"),
canDo: [
qx.locale.Manager.tr("- can add ") + osparc.product.Utils.getStudyAlias({plural: true}),
qx.locale.Manager.tr("- can add folders"),
]
},
3: {
id: "delete",
"delete": {
label: qx.locale.Manager.tr("Owner"),
longLabel: qx.locale.Manager.tr("Owner: Read/Write/Delete access"),
canDo: [
Expand Down
Loading
Loading