Group shares with same source and target #25113

rullzer · 2016-06-15T07:55:41Z

Note that this is a very limited solution and eventually we want smarter
merging!

TODO:

Add intergration tests
Check if permissions are properly accumulated
Check if javascript needs to be fixed

mention-bot · 2016-06-15T07:55:42Z

By analyzing the blame information on this pull request, we identified @icewind1991, @schiessle and @bartv2 to be potential reviewers

rullzer · 2016-06-15T09:05:41Z

Mmmm seems the js side needs more fixing...

PVince81 · 2016-06-15T16:35:45Z

Wasn't there such logic already in the past ? Or did it get discarded through refactorings ?

PVince81 · 2016-06-15T16:37:33Z

@icewind1991 do you remember anything ?

rullzer · 2016-06-15T17:38:29Z

Yes there was such logic. But it had to be discarded for various reasons.

We can't group shares in the providers as there is no (future) guarantee that the current provider division is true for all installations
We can't group shares in the providers since we support pagination. So if you only request the first N shares what to do.

At the same time I think this logic is now in the place where it should be. In the sharedMount/sharedStorage. Since that is the actual place where we group stuff.

PVince81 · 2016-06-20T13:57:21Z

Doesn't help with #25186 which will need a different fix.

PVince81 · 2016-06-20T15:30:52Z

I don't know what to do with this. It feels a bit dangerous to merge that late.
Also, unit tests are missing.

PVince81 · 2016-06-27T09:39:14Z

core/js/shareitemmodel.js

 				}

 				model.set(model.parse({
 					shares: sharesMap,
-					reshare: reshare
+					reshare: reshare,
+					reshares: reshares,


don't add extra commas in JS, this used to break in IE

PVince81 · 2016-07-07T15:24:22Z

Rebased

PVince81 · 2016-07-07T15:50:19Z

Ouch, this breaks sharing: when opening the share panel it always says "Resharing not allowed" even for non-shared folders where I'm the owner.

PVince81 · 2016-07-07T15:53:33Z

Some test cases for later, where "user1" is in "group1" and "group2"

TEST: share folder "test" as outsider to "group1" and "user1" with same permissions
TEST: share folder "test" as outsider to "group1" and "user1" with different permissions
TEST: share folder "test" as outsider to "group1" and "group2" with same permissions
TEST: share folder "test" as outsider to "group1" and "group2" with different permissions
TEST: share folder "test" as outsider to "group1" and "group2" and "user1" (why not!) with different permissions
TEST: share folder "test" as "user1" to "group1"
TEST: share folder "test" as "user1" to "group1" and "group2" with same permissions
TEST: share folder "test" as "user1" to "group1" and "group2" with different permissions

Most of these gave me two folders on v9.0.3 so let's hope this PR covers them all 😄

PVince81 · 2016-07-07T16:07:17Z

After reverting the JS commit locally I'm able to share again, so something to look into.

I did a quick test with the different grouping cases and it seems to work nicely ! Great job !

The hardest part: write integration tests for them.

PVince81 · 2016-07-07T16:10:44Z

@rullzer any reason for the JS fix ? Without the JS there is no duplication in the "Shared with others" and "Shared with you" entries. Unless I missed a case ?

PVince81 · 2016-07-07T16:10:58Z

ah, reshares.. forgot those 😦

PVince81 · 2016-07-11T11:27:21Z

TODO: need repair step to recombine the wrongly duplicated folders (even if they were manually excluded as a workaround)

Sounds like fun.

PVince81 · 2016-07-11T11:37:20Z

TEST: unshare from self for a grouped entry, which one is affected ? => both
TEST: reshare grouped entry => creates a new independent entry

PVince81 · 2016-07-15T14:12:16Z

Rebased for CI

PVince81 · 2016-07-18T12:36:02Z

Rebased and adjusted version for 9.2

PVince81 · 2016-07-18T15:28:20Z

how many timeswill I need to rebase this ?

Fixes #24575 Note that this is a very limited solution and eventually we want smarter merging!

PVince81 · 2016-07-19T15:23:38Z

Close enough for CI => merge

PVince81 · 2016-07-19T16:04:49Z

stable9.1: #25534
stable9: #25543

PVince81 · 2016-07-19T16:33:02Z

Looks like stable9 backport will be tricky, the old code is using old APIs and an old way. Or might require backporting more stuff.

PVince81 · 2016-07-20T13:23:37Z

From what I see a lot of the code would require this commit 6123bad from #23919.

Because on stable9 the MountProvider and SharedStorage still use the old array-style shares instead of the ShareManager style. I'm not sure I want to risk backporting this, so will see if there is a way to make it work with the old code.

PVince81 · 2016-07-20T16:01:14Z

stable9 PR #25543

PVince81 · 2016-07-22T06:17:36Z

Looks like this fix is not enough, there's another scenario that is not covered: #25564
This is getting tiring...

lock · 2019-08-05T04:01:39Z

This thread has been automatically locked since there has not been any recent activity after it was closed. Please open a new issue for related bugs.

rullzer added 2 - Developing feature:sharing regression labels Jun 15, 2016

rullzer added this to the 9.1-current milestone Jun 15, 2016

rullzer mentioned this pull request Jun 23, 2016

Receiving a local share folder from two users deduplication broken #25244

Closed

PVince81 reviewed Jun 27, 2016
View reviewed changes

This was referenced Jun 28, 2016

Group sharing permissions of subfolders are not cumulative #18984

Closed

Issue with sharing to group and user in group #25282

Closed

This was referenced Jul 6, 2016

[stable9] Change order of share creation validation #25360

Merged

Doubled folders when receiving shares through two groups #24575

Closed

PVince81 force-pushed the group_shares branch from 470e151 to 90e58a7 Compare July 7, 2016 15:24

PVince81 modified the milestones: 9.2, 9.1 Jul 7, 2016

PVince81 added the backport-request label Jul 7, 2016

PVince81 force-pushed the group_shares branch from 71f9588 to c00a3d4 Compare July 15, 2016 14:12

PVince81 force-pushed the group_shares branch from c00a3d4 to 0af8d36 Compare July 18, 2016 12:35

rullzer and others added 7 commits July 19, 2016 10:31

Group shares with same source and target

aa42b7b

Fixes #24575 Note that this is a very limited solution and eventually we want smarter merging!

Add integration tests for merging received shares

e5af146

Improved share grouping readability + fixed test

c97bb28

Add repair step for unmerged shares (WIP)

cb683dd

Added more tests for sharing's MountProvider

fb0f186

Group incoming shares for resharing in JS

c4db9ad

Adjust repair version check for unmerged shares

d0244f5

PVince81 force-pushed the group_shares branch from 0af8d36 to d0244f5 Compare July 19, 2016 08:31

PVince81 merged commit a584840 into master Jul 19, 2016

PVince81 deleted the group_shares branch July 19, 2016 15:23

PVince81 modified the milestones: 9.2, 9.1.1 Jul 19, 2016

PVince81 mentioned this pull request Jul 19, 2016

[stable9.1] Group shares with same source and target #25534

Merged

rullzer mentioned this pull request Jul 20, 2016

Group shares with same source and target nextcloud/server#474

Merged

PVince81 mentioned this pull request Jul 20, 2016

[stable9] Group shares with same source and target #25543

Merged

5 tasks

PVince81 mentioned this pull request Jul 22, 2016

Fix RepairUnmergedShares to not skip valid repair cases #25567

Merged

DeepDiver1975 removed the backport-request label Oct 10, 2016

lock bot locked as resolved and limited conversation to collaborators Aug 5, 2019

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Group shares with same source and target #25113

Group shares with same source and target #25113

rullzer commented Jun 15, 2016 •

edited by PVince81

Loading

mention-bot commented Jun 15, 2016

rullzer commented Jun 15, 2016

PVince81 commented Jun 15, 2016

PVince81 commented Jun 15, 2016

rullzer commented Jun 15, 2016

PVince81 commented Jun 20, 2016

PVince81 commented Jun 20, 2016

PVince81 Jun 27, 2016

PVince81 commented Jul 7, 2016

PVince81 commented Jul 7, 2016

PVince81 commented Jul 7, 2016 •

edited

Loading

PVince81 commented Jul 7, 2016

PVince81 commented Jul 7, 2016

PVince81 commented Jul 7, 2016

PVince81 commented Jul 11, 2016 •

edited

Loading

PVince81 commented Jul 11, 2016 •

edited

Loading

PVince81 commented Jul 15, 2016

PVince81 commented Jul 18, 2016

PVince81 commented Jul 18, 2016

PVince81 commented Jul 19, 2016

PVince81 commented Jul 19, 2016 •

edited

Loading

PVince81 commented Jul 19, 2016

PVince81 commented Jul 20, 2016

PVince81 commented Jul 20, 2016

PVince81 commented Jul 22, 2016

lock bot commented Aug 5, 2019

Group shares with same source and target #25113

Group shares with same source and target #25113

Conversation

rullzer commented Jun 15, 2016 • edited by PVince81 Loading

mention-bot commented Jun 15, 2016

rullzer commented Jun 15, 2016

PVince81 commented Jun 15, 2016

PVince81 commented Jun 15, 2016

rullzer commented Jun 15, 2016

PVince81 commented Jun 20, 2016

PVince81 commented Jun 20, 2016

PVince81 Jun 27, 2016

Choose a reason for hiding this comment

PVince81 commented Jul 7, 2016

PVince81 commented Jul 7, 2016

PVince81 commented Jul 7, 2016 • edited Loading

PVince81 commented Jul 7, 2016

PVince81 commented Jul 7, 2016

PVince81 commented Jul 7, 2016

PVince81 commented Jul 11, 2016 • edited Loading

PVince81 commented Jul 11, 2016 • edited Loading

PVince81 commented Jul 15, 2016

PVince81 commented Jul 18, 2016

PVince81 commented Jul 18, 2016

PVince81 commented Jul 19, 2016

PVince81 commented Jul 19, 2016 • edited Loading

PVince81 commented Jul 19, 2016

PVince81 commented Jul 20, 2016

PVince81 commented Jul 20, 2016

PVince81 commented Jul 22, 2016

lock bot commented Aug 5, 2019

rullzer commented Jun 15, 2016 •

edited by PVince81

Loading

PVince81 commented Jul 7, 2016 •

edited

Loading

PVince81 commented Jul 11, 2016 •

edited

Loading

PVince81 commented Jul 11, 2016 •

edited

Loading

PVince81 commented Jul 19, 2016 •

edited

Loading