[stable22] Extend pending shares list in frontend to include remote shares by backportbot-nextcloud[bot] · Pull Request #28209 · nextcloud/server

backportbot-nextcloud · 2021-07-28T09:56:40Z

~~⚠️ This backport had conflicts and is incomplete ⚠️~~

backport of #27751

PVince81 · 2021-07-28T12:14:57Z

conflict solved, but I need to retest many things and it's currently not working. likely the routing thing

PVince81 · 2021-07-28T12:33:20Z

fixed

PVince81 · 2021-07-28T12:38:18Z

@artonge @juliushaertl please review.

please note that I had to resolve conflicts and did a quick retest.
the conflicts were mainly related to:

the fact that nextcloud/router is older so needs different parameters
the ILogger vs LoggerInterface thing

artonge · 2021-07-29T09:06:39Z

/rebase

artonge

LGTM

artonge · 2021-07-29T09:25:56Z

/compile amend /

PVince81 · 2021-07-29T12:06:01Z

I did this manually, seems there was some kind of clash

PVince81 · 2021-07-29T12:32:05Z

⚠️ don't merge this as we have code freeze and this is too huge for post-RC ⚠️

skjnldsv

Blocking for 22.1.1

juliusknorr · 2021-08-04T16:38:08Z

Needs another rebase 🙈

And adjust the accept/decline actions to use the right endpoint for remote shares. Signed-off-by: Vincent Petry <vincent@nextcloud.com>

Fix pending shares endpoint to consider user-specific sub-entries for group shares whenever a share was accepted or declined. Added unit test for adding remote group shares. Fixed "removeUserShares" to not send a remote request as we never send remote requests for group shares. Signed-off-by: Vincent Petry <vincent@nextcloud.com>

In the list of pending shares, the option for rejecting the share has been removed. Signed-off-by: Vincent Petry <vincent@nextcloud.com>

Instead of just returning false, also log the exception to make debugging database issues easier. Signed-off-by: Vincent Petry <vincent@nextcloud.com>

When accepting a group share, a sub-share entry is created which also has a different id. When accepting or rejecting the sub-share, simply update the "accepted" flag instead of trying to re-insert the entry. Adjust getShare to also properly validate group share membership when called on a sub-share id. Signed-off-by: Vincent Petry <vincent@nextcloud.com>

Only remove reject share for remote group shares Also fix share indicator to appear for remote group shares as well. Fix pending remote share icon to be the one of a share. Signed-off-by: Vincent Petry <vincent@nextcloud.com>

Signed-off-by: Vincent Petry <vincent@nextcloud.com>

Accepting and declining can now be done repeatedly on both the parent group share and sub-share with the same effects. Added unit tests to cover these cases, and also when the same operation is repeated. Signed-off-by: Vincent Petry <vincent@nextcloud.com>

Use query builder with proper matching for finding the group names. Signed-off-by: Vincent Petry <vincent@nextcloud.com>

Signed-off-by: Vincent Petry <vincent@nextcloud.com>

When declining a remote group share through the dialog that appears when notifications are off, the mount point is now correctly saved when re-accepting. Signed-off-by: Vincent Petry <vincent@nextcloud.com>

Signed-off-by: Vincent Petry <vincent@nextcloud.com> Co-authored-by: Carl Schwan <carl@carlschwan.eu>

Signed-off-by: Vincent Petry <vincent@nextcloud.com>

When deleting a user, we should only delete the direct remote user shares or the remote group based subshares. Signed-off-by: Vincent Petry <vincent@nextcloud.com>

PVince81 · 2021-08-10T11:37:54Z

pumped up the (re)base

backportbot-nextcloudBot added enhancement feature: federation labels Jul 28, 2021

backportbot-nextcloudBot added this to the Nextcloud 22.1.0 milestone Jul 28, 2021

backportbot-nextcloudBot requested review from CarlSchwan, PVince81, artonge, blizzz, icewind1991, juliusknorr and skjnldsv July 28, 2021 09:56

PVince81 force-pushed the backport/27751/stable22 branch from 8471c92 to 091881eCompare July 28, 2021 11:49

PVince81 force-pushed the backport/27751/stable22 branch from 091881e to 9636ac9Compare July 28, 2021 12:32

artonge approved these changes Jul 29, 2021
View reviewed changes

nextcloud-command force-pushed the backport/27751/stable22 branch from 3600526 to 29a958aCompare July 29, 2021 09:09

PVince81 force-pushed the backport/27751/stable22 branch from 29a958a to c08d28eCompare July 29, 2021 12:05

skjnldsv approved these changes Jul 29, 2021
View reviewed changes

skjnldsv modified the milestones: Nextcloud 22.1.0, Nextcloud 22.1.1 Jul 29, 2021

skjnldsv added the 2. developing Work in progress label Jul 29, 2021

skjnldsv requested changes Jul 29, 2021
View reviewed changes

PVince81 added 4. to release Ready to be released and/or waiting for tests to finish and removed 2. developing Work in progress labels Aug 2, 2021

PVince81and others added 14 commits August 10, 2021 13:27

Extend pending shares list to include remote shares
df835ed
And adjust the accept/decline actions to use the right endpoint for remote shares. Signed-off-by: Vincent Petry <vincent@nextcloud.com>

Remove "Reject share" for pending remote shares
13781b0
In the list of pending shares, the option for rejecting the share has been removed. Signed-off-by: Vincent Petry <vincent@nextcloud.com>

Add logging to external shares manager
4d0f009
Instead of just returning false, also log the exception to make debugging database issues easier. Signed-off-by: Vincent Petry <vincent@nextcloud.com>

Pending remote group share fixes
9c0e1d8
Only remove reject share for remote group shares Also fix share indicator to appear for remote group shares as well. Fix pending remote share icon to be the one of a share. Signed-off-by: Vincent Petry <vincent@nextcloud.com>

Disable default actions in pending file list
dde4c9d
Signed-off-by: Vincent Petry <vincent@nextcloud.com>

Fix external share manager with multiple user groups
df0ca2f
Use query builder with proper matching for finding the group names. Signed-off-by: Vincent Petry <vincent@nextcloud.com>

Use mimetype instead of type when defaulting in remote shares
5b11196
Signed-off-by: Vincent Petry <vincent@nextcloud.com>

Fix remote group share decline+accept code path
2e76d98
When declining a remote group share through the dialog that appears when notifications are off, the mount point is now correctly saved when re-accepting. Signed-off-by: Vincent Petry <vincent@nextcloud.com>

Replace ILogger with LoggerInterface in remote share manager
33b0118
Signed-off-by: Vincent Petry <vincent@nextcloud.com> Co-authored-by: Carl Schwan <carl@carlschwan.eu>

Fix route path for pending remote shares
a22ea02
Signed-off-by: Vincent Petry <vincent@nextcloud.com>

Fix remote share deletion when deleting user
f60ea8a
When deleting a user, we should only delete the direct remote user shares or the remote group based subshares. Signed-off-by: Vincent Petry <vincent@nextcloud.com>

PVince81 force-pushed the backport/27751/stable22 branch from c08d28e to f60ea8aCompare August 10, 2021 11:37

MichaIng approved these changes Aug 15, 2021
View reviewed changes

skjnldsv mentioned this pull request Aug 19, 2021
22.1.1 RC1 #28514
Merged
7 tasks

skjnldsv approved these changes Aug 19, 2021
View reviewed changes

skjnldsv merged commit e2a4dc8 into stable22Aug 19, 2021

skjnldsv deleted the backport/27751/stable22 branch August 19, 2021 12:46

Navigation Menu

Uh oh!

Uh oh!

[stable22] Extend pending shares list in frontend to include remote shares - #28209

[stable22] Extend pending shares list in frontend to include remote shares#28209
skjnldsv merged 14 commits into
stable22from
backport/27751/stable22

backportbot-nextcloudBot commented Jul 28, 2021•
edited by PVince81
Loading

Uh oh!

PVince81 commented Jul 28, 2021

Uh oh!

PVince81 commented Jul 28, 2021

Uh oh!

PVince81 commented Jul 28, 2021

Uh oh!

artonge commented Jul 29, 2021

Uh oh!

artonge left a comment

Uh oh!

artonge commented Jul 29, 2021

Uh oh!

PVince81 commented Jul 29, 2021

Uh oh!

PVince81 commented Jul 29, 2021

Uh oh!

skjnldsv left a comment

Uh oh!

juliusknorr commented Aug 4, 2021

Uh oh!

PVince81 commented Aug 10, 2021

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

Uh oh!

Uh oh!

Conversation

backportbot-nextcloudBot commented Jul 28, 2021• edited by PVince81 Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

PVince81 commented Jul 28, 2021

Uh oh!

PVince81 commented Jul 28, 2021

Uh oh!

PVince81 commented Jul 28, 2021

Uh oh!

artonge commented Jul 29, 2021

Uh oh!

artonge left a comment

Choose a reason for hiding this comment

Uh oh!

artonge commented Jul 29, 2021

Uh oh!

PVince81 commented Jul 29, 2021

Uh oh!

PVince81 commented Jul 29, 2021

Uh oh!

skjnldsv left a comment

Choose a reason for hiding this comment

Uh oh!

juliusknorr commented Aug 4, 2021

Uh oh!

PVince81 commented Aug 10, 2021

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

backportbot-nextcloudBot commented Jul 28, 2021•
edited by PVince81
Loading