Skip to content

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

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

Merged
Pytal merged 4 commits into from
Sep 10, 2024
Merged

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

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a0f2be2
chore(deps): Bump `@nextcloud/files` to v3.9.0
Pytal Sep 9, 2024
6b079e6
fix(files): Sort tree views correctly by natural order
Pytal Sep 9, 2024
060783c
fix(files): Render folders in natural sort order
Pytal Sep 9, 2024
569bd1a
chore(assets): Recompile assets
nextcloud-command Sep 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
fix(files): Sort tree views correctly by natural order 
Signed-off-by: Christopher Ng <[email protected]>
  • Loading branch information
@Pytal
Pytal committed Sep 9, 2024
commit 6b079e67a2b8c428cf3b89b98f1ef2dba514b962
1 change: 0 additions & 1 deletion apps/files/src/views/Navigation.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,6 @@ export default defineComponent({
return this.views
.reduce((map, view) => {
map[view.parent!] = [...(map[view.parent!] || []), view]
// TODO Allow undefined order for natural sort
map[view.parent!].sort((a, b) => {
if (typeof a.order === 'number' || typeof b.order === 'number') {
return (a.order ?? 0) - (b.order ?? 0)
Expand Down
1 change: 0 additions & 1 deletion apps/files/src/views/folderTree.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,6 @@ const registerNodeView = (node: TreeNode | Folder) => {
name: node.displayName ?? node.displayname ?? node.basename,

icon: FolderSvg,
order: 0, // TODO Allow undefined order for natural sort

getContents,
loadChildViews: getLoadChildViews(node),
Expand Down