feat: Add sharing activity for teams #1754
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
susnux
force-pushed
the
feat/activity-for-team-share
branch
from
b5c753a to
0efac00
Compare
Activity
|
||||||||||||||||||||||||||||||||||||||||
| Project |
Activity
|
| Branch Review |
feat/activity-for-team-share
|
| Run status |
|
| Run duration | 01m 16s |
| Commit |
|
| Committer | Ferdinand Thiessen |
| View all properties for this run ↗︎ | |
| Test results | |
|---|---|
Failures
|
2
|
Flaky
|
0
|
Pending
|
0
|
Skipped
|
8
|
Passing
|
0
|
| View all changes introduced in this branch ↗︎ | |
Tests for review
sidebar.cy.ts • 1 failed test • Run E2E
| Test | Artifacts | |
|---|---|---|
| Check activity listing in the sidebar > Has creation activity |
Test Replay
Screenshots
|
|
settings.cy.ts • 1 failed test • Run E2E
| Test | Artifacts | |
|---|---|---|
| Check that user's settings survive a reload > Form survive a reload |
Test Replay
Screenshots
|
|
susnux
force-pushed
the
feat/activity-for-team-share
branch
4 times, most recently
from
b69f982 to
2295c86
Compare
Contributor
Author
|
TIL: |
AndyScherzinger
force-pushed
the
feat/activity-for-team-share
branch
from
2295c86 to
0e06c4f
Compare
This was referenced Jan 14, 2025
artonge
reviewed
Jan 16, 2025
artonge
reviewed
Jan 16, 2025
susnux
force-pushed
the
feat/activity-for-team-share
branch
from
0e06c4f to
af98881
Compare
This adds support for Teams (previously "Circles"), the user notification already work, but the notification for the owner and sharer need support in the `files_sharing` app. Signed-off-by: Ferdinand Thiessen <[email protected]>
susnux
force-pushed
the
feat/activity-for-team-share
branch
from
af98881 to
af19269
Compare
ArtificialOwl
approved these changes
Jan 22, 2025
Contributor
Author
|
/backport to stable31 |
come-nc
reviewed
Mar 18, 2025
Comment on lines
+931
to
+934
| $users = array_map(fn (IUser $user) => $user->getUID(), $users); | ||
| $shouldFlush = $this->startActivityTransaction(); | ||
| while (!empty($users)) { | ||
| $this->addNotificationsForGroupUsers($users, $actionUser, $share->getNodeId(), $share->getNodeType(), $share->getTarget(), (int)$share->getId()); | ||
| $userIds = array_map(fn (IUser $user) => $user->getUID(), $users); |
Contributor
There was a problem hiding this comment.
$users contains string[] after line 931, then you try to convert to string again.
Results in:
Argument #1 ($user) must be of type OCP\IUser, string given in file 'server/server/apps/activity/lib/FilesHooks.php' line 935
Contributor
Author
There was a problem hiding this comment.
Oh seems like a rebase issue or similar, line 931 should be removed...
Contributor
Author
There was a problem hiding this comment.
(or remove 934 to keep the activity transaction as short as possible)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This adds support for Teams (previously "Circles"), the user notification already work, but the notification for the owner and sharer need support in the
files_sharingapp.So if this is merged we can add the required providers in
files_sharing.But one thing to mention: For groups we paginate the members, I did not find a nice way to do this with teams.
So maybe @ArtificialOwl can have a look at the member query if there is something to improve performance wise (e.g. pagination?).