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.

Sign up for GitHub

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

Jump to bottom

Changed sort order for collaborators and public links #3136

Merged
merged 1 commit into from
Mar 9, 2020
Merged

Changed sort order for collaborators and public links #3136

merged 1 commit into from
Mar 9, 2020

Conversation

LukasHirt
Copy link
Collaborator

@LukasHirt LukasHirt commented Mar 5, 2020 •
edited
Loading

Related issue:

How Has This Been Tested?

  • test environment: Manually

Types of changes

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to change)
  • Technical debt
  • Tests

Checklist:

  • Code changes
  • Unit tests added
  • Acceptance tests added
  • Documentation ticket raised:

Open tasks:

  • Sort links
  • Remove edit options from indirect shares

@update-docs
Copy link

update-docs bot commented Mar 5, 2020

Thanks for opening this pull request! The maintainers of this repository would appreciate it if you would create a changelog item based on your changes.

@LukasHirt LukasHirt self-assigned this Mar 5, 2020
@LukasHirt LukasHirt force-pushed the feature/sorted-collaborators branch 3 times, most recently from 69ede35 to bcdc35d Compare March 5, 2020 15:28
@LukasHirt LukasHirt marked this pull request as ready for review March 5, 2020 15:28
@LukasHirt LukasHirt requested a review from DeepDiver1975 as a code owner March 5, 2020 15:28
@LukasHirt LukasHirt added Status:Needs-Review Needs review from a maintainer and removed Status:In-Progress labels Mar 5, 2020
@LukasHirt LukasHirt requested a review from PVince81 March 5, 2020 15:41
@LukasHirt LukasHirt force-pushed the feature/sorted-collaborators branch from bcdc35d to 2b82fac Compare March 5, 2020 16:09
@LukasHirt LukasHirt changed the title Sort collaborators by type, direct, name, creation time Changed sort order for collaborators and public links Mar 5, 2020
@LukasHirt LukasHirt mentioned this pull request Mar 5, 2020
Closed
@LukasHirt
Copy link
Collaborator Author

Raised issue for unit tests - #3139

@LukasHirt
Copy link
Collaborator Author

@PVince81 Ready for review 🙏

@PVince81
Copy link
Contributor

PVince81 commented Mar 6, 2020

Please add a link to the original ticket, I can't find it by simply scrolling through this PR

PVince81
PVince81 approved these changes Mar 6, 2020
View reviewed changes
Copy link
Contributor

@PVince81 PVince81 left a comment

Choose a reason for hiding this comment

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

👍 looks good

See my comment about some confusion.
I assume that we'll address adding icons for differentiating user from groups separately, I don't think we had a concrete design for that yet.

apps/files/src/components/FileSharingSidebar.vue Outdated Show resolved Hide resolved
@LukasHirt
Change sort order for collaborators and public links
f1a82f6 
Adjusted order of collaborators

Sort public links and disable edit options for indirect shares

Added indirect key
@LukasHirt LukasHirt force-pushed the feature/sorted-collaborators branch from 2b82fac to f1a82f6 Compare March 8, 2020 20:47
@LukasHirt
Copy link
Collaborator Author

Issue link added and confusion addressed. Pls re-review @PVince81

PVince81
PVince81 approved these changes Mar 9, 2020
View reviewed changes
Copy link
Contributor

@PVince81 PVince81 left a comment

Choose a reason for hiding this comment

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

Thanks for adjusting 👍

@PVince81 PVince81 merged commit 12f19d2 into master Mar 9, 2020
@delete-merged-branch delete-merged-branch bot deleted the feature/sorted-collaborators branch March 9, 2020 07:28
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@PVince81 PVince81 PVince81 approved these changes

@DeepDiver1975 DeepDiver1975 Awaiting requested review from DeepDiver1975

Assignees

@LukasHirt LukasHirt

Labels
Status:Needs-Review Needs review from a maintainer
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@LukasHirt @PVince81