Skip to content
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

Jump to bottom

feat: add support for teams in usergroup column #1326

Merged
merged 8 commits into from
Jan 10, 2025
Merged

feat: add support for teams in usergroup column #1326

merged 8 commits into from
Jan 10, 2025

Conversation

enjeck
Copy link
Contributor

@enjeck enjeck commented Aug 29, 2024

Fixes #1304

@enjeck enjeck self-assigned this Aug 29, 2024
@enjeck enjeck added the 2. developing Work in progress label Aug 29, 2024
@juliusknorr juliusknorr added the enhancement New feature or request label Aug 29, 2024
@enjeck enjeck force-pushed the feat/1304 branch 2 times, most recently from cced61d to a4cf3b0 Compare September 4, 2024 07:43
@enjeck enjeck marked this pull request as ready for review September 4, 2024 07:43
@enjeck enjeck added 3. to review Waiting for reviews and removed 2. developing Work in progress labels Sep 4, 2024
@enjeck
Copy link
Contributor Author

enjeck commented Sep 4, 2024

Demo

2024-09-04_08-24-21.mp4

@enjeck enjeck force-pushed the feat/1304 branch 2 times, most recently from 98fa8eb to daed40a Compare October 2, 2024 15:08
@enjeck enjeck force-pushed the feat/1304 branch 2 times, most recently from a2bb27a to 42b32dc Compare October 23, 2024 18:08
@enjeck
Copy link
Contributor Author

enjeck commented Dec 5, 2024 •
edited
Loading

TODO:

  • Hide Teams option if app is disabled

@enjeck enjeck marked this pull request as draft December 29, 2024 11:52
@enjeck
Copy link
Contributor Author

enjeck commented Dec 29, 2024 •
edited
Loading

This relies on #142 to provide the isCirclesEnabled functionality. So I'm changing the base branch.

@enjeck enjeck changed the base branch from main to share-with-teams December 29, 2024 11:58
@enjeck enjeck marked this pull request as ready for review December 30, 2024 05:50
@hweihwang hweihwang force-pushed the share-with-teams branch 3 times, most recently from ad53267 to 5dacb82 Compare January 7, 2025 11:52
Base automatically changed from share-with-teams to main January 9, 2025 15:17
@juliusknorr
Copy link
Member

Rebased after merge of #1465

enjeck and others added 8 commits January 10, 2025 13:38
@enjeck @juliusknorr
feat: add support for teams in usergroup column
a0f1045 
Signed-off-by: Cleopatra Enjeck M <patrathewhiz@gmail.com>
@enjeck @juliusknorr
enh: improve formatting
b0332d2 
Signed-off-by: Cleopatra Enjeck M <patrathewhiz@gmail.com>
@enjeck @juliusknorr
fix: update openapi spec
67e608d 
Signed-off-by: Cleopatra Enjeck M <patrathewhiz@gmail.com>
@enjeck @juliusknorr
fix: Add teams usergroup value to column DTO
c3c97cf 
Signed-off-by: Cleopatra Enjeck M <patrathewhiz@gmail.com>
@enjeck @juliusknorr
fix: update tests to include teams usergroup option
4462d58 
Signed-off-by: Cleopatra Enjeck M <patrathewhiz@gmail.com>
@enjeck @juliusknorr
enh: check that Circles is enabled for usergroup
dd393c9 
Signed-off-by: Cleopatra Enjeck M. <patrathewhiz@gmail.com>
@juliusknorr
fix: Store update of team checkbox
36cc074 
Signed-off-by: Julius Knorr <jus@bitgrid.net>
@juliusknorr
ci: Add circles to cypress tests
d9bc80c 
Signed-off-by: Julius Knorr <jus@bitgrid.net>
blizzz
blizzz reviewed Jan 10, 2025
View reviewed changes
tests/integration/features/APIv2.feature
@@ -918,6 +928,7 @@ Feature: APIv2
| usergroupMultipleItems | true |
| usergroupSelectUsers | true |
| usergroupSelectGroups | false |
| usergroupSelectTeams | false |
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

one case where it was true would be nice in the aftermath

@blizzz blizzz merged commit 648a567 into main Jan 10, 2025
54 checks passed
@blizzz blizzz deleted the feat/1304 branch January 10, 2025 14:09
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@juliusknorr juliusknorr juliusknorr approved these changes

@blizzz blizzz blizzz approved these changes

@elzody elzody Awaiting requested review from elzody

@luka-nextcloud luka-nextcloud Awaiting requested review from luka-nextcloud

Assignees

@enjeck enjeck

Labels
3. to review Waiting for reviews enhancement New feature or request
Projects
📝 Office team
Status: ☑️ Done
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Add support for teams in the user/group column
3 participants
@enjeck @juliusknorr @blizzz