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.

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

fix(files): fix unshare action and merge duplicate shares #42584

Merged
merged 4 commits into from
Jan 11, 2024

Conversation

skjnldsv
Copy link
Member

@skjnldsv skjnldsv commented Jan 4, 2024

Fix unshare action

The delete action now properly adjust itself depending on the selectcion

  • Delete
  • Unshare
  • Delete and unshare if shares and files are mixed in the selection

cc @nextcloud/designers for wording validation
image

Fix #14437

Merge duplicates shares in the views

The sharing views will group the same nodes coming from the same source ⚠️
This can happen if a user share a folder with different groups and you're a member of them. The same file will appear multiple times in the Shared with you section.
We ONLY MERGE entries with the same location on the user file system, which means, if you have two different shares but they are in different folders (moved) and therefore are matching different shares, we will NOT group them, and their actions will both target different shares.

image

cc @nextcloud/designers for wording validation and icon choice

@skjnldsv skjnldsv added this to the Nextcloud 29 milestone Jan 4, 2024
@skjnldsv skjnldsv requested a review from a team January 4, 2024 13:54
@skjnldsv skjnldsv self-assigned this Jan 4, 2024
@skjnldsv skjnldsv requested review from Fenn-CS, szaimen and sorbaugh and removed request for a team January 4, 2024 13:54
@skjnldsv skjnldsv changed the title fix(files): fix unshare action fix(files): fix unshare action and merge duplicate shares Jan 4, 2024
@skjnldsv skjnldsv requested a review from artonge January 4, 2024 13:57
@skjnldsv
Copy link
Member Author

skjnldsv commented Jan 9, 2024

@nimishavijay
Copy link
Member

Delete and unshare if shares and files are mixed in the selection

Would all the files be deleted? or would the not-shared files be deleted and shared files be unshared? I'm wondering if it makes sense to just show Delete and Unshare as 2 separate actions if the files are mixed. ccing @jancborchardt because he was involved in the issue :)

Merge duplicates shares in the views
Shared multiple times with different users

We are moving away from "users" in the wording. So Shared multiple times with different people or Shared multiple times with different accounts (no strong preference there, if I had to pick I'd go with "people")

@skjnldsv
Copy link
Member Author

skjnldsv commented Jan 9, 2024

I'm wondering if it makes sense to just show Delete and Unshare as 2 separate actions if the files are mixed.

Technically not possible. We do not show actions if they only target a specific subset of the selection. Considering a selection with share and owned-files, it would shown neither options as none of the two actions can be executed on the current selection

We are moving away from "users" in the wording. So Shared multiple times with different people or Shared multiple times with different accounts (no strong preference there, if I had to pick I'd go with "people")

Done :)

Copy link
Contributor

@szaimen szaimen left a comment

Choose a reason for hiding this comment

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

LGTM from design perspective but didnt test

@skjnldsv skjnldsv force-pushed the fix/files-sharing-various branch 2 times, most recently from 6cbcfdb to 022c2ee Compare January 11, 2024 08:30
@skjnldsv skjnldsv added 4. to release Ready to be released and/or waiting for tests to finish and removed 3. to review Waiting for reviews labels Jan 11, 2024
@skjnldsv
Copy link
Member Author

Failure not related

Signed-off-by: John Molakvoæ <skjnldsv@protonmail.com>
Signed-off-by: John Molakvoæ <skjnldsv@protonmail.com>
Signed-off-by: John Molakvoæ <skjnldsv@protonmail.com>
Signed-off-by: John Molakvoæ <skjnldsv@protonmail.com>
@skjnldsv skjnldsv merged commit 733176e into master Jan 11, 2024
8 of 10 checks passed
@skjnldsv skjnldsv deleted the fix/files-sharing-various branch January 11, 2024 10:59
@blizzz blizzz mentioned this pull request Mar 5, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
4. to release Ready to be released and/or waiting for tests to finish bug feature: files feature: sharing
Projects
Status: Done
Development

Successfully merging this pull request may close these issues.

Share overview should allow to unshare
4 participants