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

fix(files): Sort tree views correctly by natural order #47294

Merged
merged 4 commits into from
Sep 10, 2024
Merged

fix(files): Sort tree views correctly by natural order #47294

merged 4 commits into from
Sep 10, 2024

Conversation

Pytal
Copy link
Member

@Pytal Pytal commented Aug 16, 2024

Summary

  • Correctly sort nodes by natural order instead of order=0 i.e. creating a new folder always appended it to the bottom of the level instead of correct natural order
  • Render nodes by natural order as nodes returned from endpoint have an undefined order

Requires

Checklist

@Pytal Pytal added this to the Nextcloud 31 milestone Aug 16, 2024
@Pytal Pytal self-assigned this Aug 16, 2024
@Pytal Pytal mentioned this pull request Aug 16, 2024
Merged
Pytal added 3 commits September 9, 2024 16:11
@Pytal
chore(deps): Bump @nextcloud/files to v3.9.0
a0f2be2 
Signed-off-by: Christopher Ng <chrng8@gmail.com>
@Pytal
fix(files): Sort tree views correctly by natural order
6b079e6 
Signed-off-by: Christopher Ng <chrng8@gmail.com>
@Pytal
fix(files): Render folders in natural sort order
060783c 
- Nodes are returned from the endpoint in an undefined order

Signed-off-by: Christopher Ng <chrng8@gmail.com>
@Pytal Pytal force-pushed the fix/natural-order-tree branch from c1b04dc to 060783c Compare September 9, 2024 23:13
@Pytal Pytal marked this pull request as ready for review September 9, 2024 23:13
@Pytal Pytal requested a review from skjnldsv as a code owner September 9, 2024 23:13
@Pytal Pytal requested review from susnux and artonge September 9, 2024 23:14
@Pytal Pytal enabled auto-merge September 9, 2024 23:14
@Pytal
Copy link
Member Author

Pytal commented Sep 9, 2024

/compile

susnux
susnux approved these changes Sep 9, 2024
View reviewed changes
apps/files/src/services/FolderTree.ts
@@ -35,8 +38,19 @@ export const folderTreeId = 'folders'

export const sourceRoot = `${davRemoteURL}/files/${getCurrentUser()?.uid}`

const collator = Intl.Collator(
Copy link
Contributor

Choose a reason for hiding this comment

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

Maybe instead simply use orderBy from nextcloud files?

@nextcloud-command
chore(assets): Recompile assets
569bd1a 
Signed-off-by: nextcloud-command <nextcloud-command@users.noreply.github.com>
@Pytal Pytal merged commit d4313c2 into master Sep 10, 2024
116 checks passed
@Pytal Pytal deleted the fix/natural-order-tree branch September 10, 2024 08:00
@Pytal
Copy link
Member Author

Pytal commented Sep 10, 2024

/backport to stable30

@backportbot backportbot bot mentioned this pull request Sep 10, 2024
Merged
2 tasks
@skjnldsv skjnldsv mentioned this pull request Jan 7, 2025
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@susnux susnux susnux approved these changes

@artonge artonge artonge approved these changes

@skjnldsv skjnldsv Awaiting requested review from skjnldsv skjnldsv is a code owner

Assignees

@Pytal Pytal

Labels
3. to review Waiting for reviews bug feature: files
Projects
None yet
Milestone
Nextcloud 31
Development

Successfully merging this pull request may close these issues.
4 participants
@Pytal @susnux @artonge @nextcloud-command