Implement share co-owning #49073
Open
Implement share co-owning #49073
+585
−54
Conversation
This file contains 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
icewind1991
reviewed
Nov 4, 2024
| $shares = []; | ||
| foreach ($providers as $provider) { | ||
| if ($isCoOwner) { | ||
| foreach ($node->getDirectoryListing() as $childNode) { |
There was a problem hiding this comment.
This makes it a lot more expensive, can we tweak getSharesInFolder to make the $user filter optional instead?
There was a problem hiding this comment.
We can't do this without a breaking change, as it would break provider implementations that don't expect to receive null.
Maybe that is fine though, as long as the providers only do database SELECTs where a null value is fine (but that would still result in unexpected results as nothing would be returned instead of everything).
provokateurin
force-pushed
the
feat/files_sharing/co-owner
branch
from
dbee0fb
to
0ee7f19
Compare
provokateurin
requested review from
a team,
ArtificialOwl,
icewind1991 and
come-nc
and removed request for
a team
|
Added tests for everything 🎉 |
provokateurin
added
3. to review
provokateurin
force-pushed
the
feat/files_sharing/co-owner
branch
2 times, most recently
from
58b9fb5
to
4c63eba
Compare
Signed-off-by: provokateurin <[email protected]>
…ath() Signed-off-by: provokateurin <[email protected]>
Signed-off-by: provokateurin <[email protected]>
Signed-off-by: provokateurin <[email protected]>
…es on IShareCoOwnerMount Signed-off-by: provokateurin <[email protected]>
…hare Signed-off-by: provokateurin <[email protected]>
Signed-off-by: provokateurin <[email protected]>
… owner Signed-off-by: provokateurin <[email protected]>
Signed-off-by: provokateurin <[email protected]>
provokateurin
force-pushed
the
feat/files_sharing/co-owner
branch
from
4c63eba
to
cd4dc54
Compare
susnux
reviewed
Nov 14, 2024
| @@ -78,6 +78,11 @@ export default { | |||
| } else if (this.share.type === this.SHARE_TYPES.SHARE_TYPE_GUEST) { | |||
| title += ` (${t('files_sharing', 'guest')})` | |||
| } | |||
| if (!this.isShareOwner && this.share.ownerDisplayName) { | |||
| title += t('files_sharing', ' by {initiator}', { | |||
There was a problem hiding this comment.
leading / trailing spaces in translations are very likely to break
Suggested change
| title += t('files_sharing', ' by {initiator}', { | |
| title += ' ' + t('files_sharing', 'by {initiator}', { |
provokateurin
commented
Nov 14, 2024
| // Ignore share, file is still accessible | ||
| } catch (NotFoundException) { | ||
| // Access lost | ||
| $this->deleteShare($share); |
There was a problem hiding this comment.
This can lead to data loss, e.g. external storage that is temporarily not available.
| @@ -1553,6 +1542,12 @@ protected function canEditShare(IShare $share): bool { | |||
| return true; | |||
| } | |||
|
|
|||
| $userFolder = $this->rootFolder->getUserFolder($this->userId); | |||
| $file = $userFolder->getFirstNodeById($share->getNodeId()); | |||
| if ($file !== null && $file->getMountPoint() instanceof IShareCoOwnerMount && $this->shareProviderResharingRights($this->userId, $share, $file)) { | |||
There was a problem hiding this comment.
maybe if ($file?->getMountPoint() instanceof [...]) {
ArtificialOwl
approved these changes
Nov 14, 2024
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.
Summary
Can be tested with nextcloud/groupfolders#3401
Tests still need to be written, but other than that this is ready.It doesn't work with files_external yet, but I think that is due to permissions (UI says there is no reshare permission).
I'm surprised how little lines had to be changed in the end, but the challenging part was exploring how this can be implemented and where things needs to be changed and fixed to make it work.
Behavior:
Checklist