Skip to content

Add concept of user groups #1062

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

Draft
wants to merge 18 commits into
base: main
Choose a base branch
from
Draft

Add concept of user groups #1062

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
d668817
Move `/search-users` to users blueprint
ml-evs Mar 11, 2025
2578bb9
Add endpoints for group management
ml-evs Mar 11, 2025
3237856
Add tests for group creation
ml-evs Mar 11, 2025
0c4d0f9
Add admin endpoints for group listing and tweak user listing
ml-evs Mar 11, 2025
be62ebe
Restructure group routes and add test for search-groups
ml-evs Mar 11, 2025
367b138
Add group display to admin panel
ml-evs Mar 11, 2025
37b15a0
Fix user table issue caused by API change
ml-evs Mar 13, 2025
a369ddf
update type annotations to modern Python syntax
BenjaminCharmes Jun 18, 2025
9a7d9b6
implement user groups management system in UI
BenjaminCharmes Jun 20, 2025
24ffaac
implement group-based permissions system
BenjaminCharmes Jun 20, 2025
8b2a055
implement explicit group sharing for items
BenjaminCharmes Jun 20, 2025
ff2405e
Allow users to assign samples as visible to groups on creation
BenjaminCharmes Jun 24, 2025
0edafaa
Add same thing in BatchCreateItemModal
BenjaminCharmes Jun 24, 2025
0ad0178
Fix python tests
BenjaminCharmes Jun 24, 2025
f69dffd
Fix cypress batchSampleFeature by using data-testid rather than index
BenjaminCharmes Jun 25, 2025
5cd6596
Update getBatchTemplateCell for date
BenjaminCharmes Jun 25, 2025
426c7d1
Update getBatchTemplateCell for date
BenjaminCharmes Jun 25, 2025
87c61b6
Removes the possibility of adding yourself twice as a creator
BenjaminCharmes Jun 25, 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
110 changes: 110 additions & 0 deletions pydatalab/schemas/cell.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,13 +41,28 @@
"type": "string"
}
},
"group_ids": {
"title": "Group Ids",
"default": [],
"type": "array",
"items": {
"type": "string"
}
},
"creators": {
"title": "Creators",
"type": "array",
"items": {
"$ref": "#/definitions/Person"
}
},
"groups": {
"title": "Groups",
"type": "array",
"items": {
"$ref": "#/definitions/Group"
}
},
"type": {
"title": "Type",
"default": "cells",
Expand Down Expand Up @@ -275,6 +290,64 @@
"name"
]
},
"Group": {
"title": "Group",
"description": "A model that describes a group of users, for the sake\nof applying group permissions.\n\nEach `Person` model can point to a given group.",
"type": "object",
"properties": {
"type": {
"title": "Type",
"default": "groups",
"const": "groups",
"type": "string"
},
"immutable_id": {
"title": "Immutable ID",
"format": "uuid",
"type": "string"
},
"last_modified": {
"title": "Last Modified",
"type": "string",
"format": "date-time"
},
"relationships": {
"title": "Relationships",
"type": "array",
"items": {
"$ref": "#/definitions/TypedRelationship"
}
},
"group_id": {
"title": "Group Id",
"minLength": 1,
"maxLength": 40,
"pattern": "^(?:[a-zA-Z0-9]+|[a-zA-Z0-9][a-zA-Z0-9._-]+[a-zA-Z0-9])$",
"type": "string"
},
"display_name": {
"title": "Display Name",
"minLength": 1,
"maxLength": 150,
"type": "string"
},
"description": {
"title": "Description",
"type": "string"
},
"group_admins": {
"title": "Group Admins",
"type": "array",
"items": {
"type": "string"
}
}
},
"required": [
"group_id",
"display_name"
]
},
"AccountStatus": {
"title": "AccountStatus",
"description": "A string enum representing the account status.",
Expand Down Expand Up @@ -331,6 +404,13 @@
"type": "string",
"format": "email"
},
"groups": {
"title": "Groups",
"type": "array",
"items": {
"$ref": "#/definitions/Group"
}
},
"managers": {
"title": "Managers",
"type": "array",
Expand Down Expand Up @@ -374,13 +454,28 @@
"type": "string"
}
},
"group_ids": {
"title": "Group Ids",
"default": [],
"type": "array",
"items": {
"type": "string"
}
},
"creators": {
"title": "Creators",
"type": "array",
"items": {
"$ref": "#/definitions/Person"
}
},
"groups": {
"title": "Groups",
"type": "array",
"items": {
"$ref": "#/definitions/Group"
}
},
"type": {
"title": "Type",
"default": "collections",
Expand Down Expand Up @@ -448,13 +543,28 @@
"type": "string"
}
},
"group_ids": {
"title": "Group Ids",
"default": [],
"type": "array",
"items": {
"type": "string"
}
},
"creators": {
"title": "Creators",
"type": "array",
"items": {
"$ref": "#/definitions/Person"
}
},
"groups": {
"title": "Groups",
"type": "array",
"items": {
"$ref": "#/definitions/Group"
}
},
"type": {
"title": "Type",
"default": "files",
Expand Down
110 changes: 110 additions & 0 deletions pydatalab/schemas/equipment.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,13 +41,28 @@
"type": "string"
}
},
"group_ids": {
"title": "Group Ids",
"default": [],
"type": "array",
"items": {
"type": "string"
}
},
"creators": {
"title": "Creators",
"type": "array",
"items": {
"$ref": "#/definitions/Person"
}
},
"groups": {
"title": "Groups",
"type": "array",
"items": {
"$ref": "#/definitions/Group"
}
},
"type": {
"title": "Type",
"default": "equipment",
Expand Down Expand Up @@ -239,6 +254,64 @@
"name"
]
},
"Group": {
"title": "Group",
"description": "A model that describes a group of users, for the sake\nof applying group permissions.\n\nEach `Person` model can point to a given group.",
"type": "object",
"properties": {
"type": {
"title": "Type",
"default": "groups",
"const": "groups",
"type": "string"
},
"immutable_id": {
"title": "Immutable ID",
"format": "uuid",
"type": "string"
},
"last_modified": {
"title": "Last Modified",
"type": "string",
"format": "date-time"
},
"relationships": {
"title": "Relationships",
"type": "array",
"items": {
"$ref": "#/definitions/TypedRelationship"
}
},
"group_id": {
"title": "Group Id",
"minLength": 1,
"maxLength": 40,
"pattern": "^(?:[a-zA-Z0-9]+|[a-zA-Z0-9][a-zA-Z0-9._-]+[a-zA-Z0-9])$",
"type": "string"
},
"display_name": {
"title": "Display Name",
"minLength": 1,
"maxLength": 150,
"type": "string"
},
"description": {
"title": "Description",
"type": "string"
},
"group_admins": {
"title": "Group Admins",
"type": "array",
"items": {
"type": "string"
}
}
},
"required": [
"group_id",
"display_name"
]
},
"AccountStatus": {
"title": "AccountStatus",
"description": "A string enum representing the account status.",
Expand Down Expand Up @@ -295,6 +368,13 @@
"type": "string",
"format": "email"
},
"groups": {
"title": "Groups",
"type": "array",
"items": {
"$ref": "#/definitions/Group"
}
},
"managers": {
"title": "Managers",
"type": "array",
Expand Down Expand Up @@ -338,13 +418,28 @@
"type": "string"
}
},
"group_ids": {
"title": "Group Ids",
"default": [],
"type": "array",
"items": {
"type": "string"
}
},
"creators": {
"title": "Creators",
"type": "array",
"items": {
"$ref": "#/definitions/Person"
}
},
"groups": {
"title": "Groups",
"type": "array",
"items": {
"$ref": "#/definitions/Group"
}
},
"type": {
"title": "Type",
"default": "collections",
Expand Down Expand Up @@ -412,13 +507,28 @@
"type": "string"
}
},
"group_ids": {
"title": "Group Ids",
"default": [],
"type": "array",
"items": {
"type": "string"
}
},
"creators": {
"title": "Creators",
"type": "array",
"items": {
"$ref": "#/definitions/Person"
}
},
"groups": {
"title": "Groups",
"type": "array",
"items": {
"$ref": "#/definitions/Group"
}
},
"type": {
"title": "Type",
"default": "files",
Expand Down
Loading
Loading