Merge pull request #47882 from nextcloud/backport/47294/stable30

[stable30] fix(files): Sort tree views correctly by natural order
nextcloud · Sep 12, 2024 · 7776d68 · 7776d68
2 parents e664039 + 5e8df98
commit 7776d68
Show file tree

Hide file tree

Showing 111 changed files with 178 additions and 166 deletions.
diff --git a/apps/files/src/services/FolderTree.ts b/apps/files/src/services/FolderTree.ts
@@ -11,16 +11,19 @@ import axios from '@nextcloud/axios'
 import { generateOcsUrl } from '@nextcloud/router'
 import { getCurrentUser } from '@nextcloud/auth'
 import { dirname, encodePath, joinPaths } from '@nextcloud/paths'
+import { getCanonicalLocale, getLanguage } from '@nextcloud/l10n'
 
 import { getContents as getFiles } from './Files.ts'
 
 // eslint-disable-next-line no-use-before-define
-type Tree = Array<{
+type Tree = TreeNodeData[]
+
+interface TreeNodeData {
 	id: number,
 	basename: string,
 	displayName?: string,
 	children: Tree,
-}>
+}
 
 export interface TreeNode {
 	source: string,
@@ -35,8 +38,19 @@ export const folderTreeId = 'folders'
 
 export const sourceRoot = `${davRemoteURL}/files/${getCurrentUser()?.uid}`
 
+const collator = Intl.Collator(
+	[getLanguage(), getCanonicalLocale()],
+	{
+		numeric: true,
+		usage: 'sort',
+	},
+)
+
+const compareNodes = (a: TreeNodeData, b: TreeNodeData) => collator.compare(a.displayName ?? a.basename, b.displayName ?? b.basename)
+
 const getTreeNodes = (tree: Tree, currentPath: string = '/', nodes: TreeNode[] = []): TreeNode[] => {
-	for (const { id, basename, displayName, children } of tree) {
+	const sortedTree = tree.toSorted(compareNodes)
+	for (const { id, basename, displayName, children } of sortedTree) {
 		const path = joinPaths(currentPath, basename)
 		const source = `${sourceRoot}${path}`
 		const node: TreeNode = {

diff --git a/apps/files/src/views/Navigation.vue b/apps/files/src/views/Navigation.vue
@@ -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)

diff --git a/apps/files/src/views/folderTree.ts b/apps/files/src/views/folderTree.ts
@@ -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),

diff --git a/dist/1762-1762.js.license b/dist/1762-1762.js.license
@@ -112,7 +112,7 @@ This file is generated from multiple sources. Included packages:
 	- version: 3.3.1
 	- license: GPL-3.0-or-later
 - @nextcloud/files
-	- version: 3.8.0
+	- version: 3.9.0
 	- license: AGPL-3.0-or-later
 - @nextcloud/initial-state
 	- version: 2.2.0

diff --git a/dist/3235-3235.js.license b/dist/3235-3235.js.license
@@ -110,7 +110,7 @@ This file is generated from multiple sources. Included packages:
 	- version: 3.3.1
 	- license: GPL-3.0-or-later
 - @nextcloud/files
-	- version: 3.8.0
+	- version: 3.9.0
 	- license: AGPL-3.0-or-later
 - @nextcloud/initial-state
 	- version: 2.2.0

diff --git a/dist/6652-6652.js.license b/dist/6652-6652.js.license
@@ -60,7 +60,7 @@ This file is generated from multiple sources. Included packages:
 	- version: 3.3.1
 	- license: GPL-3.0-or-later
 - @nextcloud/files
-	- version: 3.8.0
+	- version: 3.9.0
 	- license: AGPL-3.0-or-later
 - @nextcloud/initial-state
 	- version: 2.2.0

diff --git a/dist/6818-6818.js.license b/dist/6818-6818.js.license
@@ -88,7 +88,7 @@ This file is generated from multiple sources. Included packages:
 	- version: 3.3.1
 	- license: GPL-3.0-or-later
 - @nextcloud/files
-	- version: 3.8.0
+	- version: 3.9.0
 	- license: AGPL-3.0-or-later
 - @nextcloud/initial-state
 	- version: 2.2.0

diff --git a/dist/6818-6818.js.map b/dist/6818-6818.js.map
diff --git a/dist/802-802.js b/dist/802-802.js
diff --git a/dist/802-802.js.license b/dist/802-802.js.license
@@ -127,7 +127,7 @@ This file is generated from multiple sources. Included packages:
 	- version: 3.3.1
 	- license: GPL-3.0-or-later
 - @nextcloud/files
-	- version: 3.8.0
+	- version: 3.9.0
 	- license: AGPL-3.0-or-later
 - @nextcloud/initial-state
 	- version: 2.2.0

diff --git a/dist/802-802.js.map b/dist/802-802.js.map
diff --git a/dist/9725-9725.js.license b/dist/9725-9725.js.license
@@ -68,7 +68,7 @@ This file is generated from multiple sources. Included packages:
 	- version: 3.3.1
 	- license: GPL-3.0-or-later
 - @nextcloud/files
-	- version: 3.8.0
+	- version: 3.9.0
 	- license: AGPL-3.0-or-later
 - @nextcloud/initial-state
 	- version: 2.2.0

diff --git a/dist/comments-comments-app.js b/dist/comments-comments-app.js
diff --git a/dist/comments-comments-app.js.map b/dist/comments-comments-app.js.map
diff --git a/dist/comments-comments-tab.js b/dist/comments-comments-tab.js
diff --git a/dist/comments-comments-tab.js.map b/dist/comments-comments-tab.js.map
diff --git a/dist/comments-init.js.map b/dist/comments-init.js.map
diff --git a/dist/core-legacy-unified-search.js b/dist/core-legacy-unified-search.js
diff --git a/dist/core-legacy-unified-search.js.map b/dist/core-legacy-unified-search.js.map
diff --git a/dist/core-login.js b/dist/core-login.js
diff --git a/dist/core-login.js.license b/dist/core-login.js.license
@@ -73,7 +73,7 @@ This file is generated from multiple sources. Included packages:
 	- version: 3.3.1
 	- license: GPL-3.0-or-later
 - @nextcloud/files
-	- version: 3.8.0
+	- version: 3.9.0
 	- license: AGPL-3.0-or-later
 - @nextcloud/initial-state
 	- version: 2.2.0

diff --git a/dist/core-login.js.map b/dist/core-login.js.map
diff --git a/dist/core-main.js b/dist/core-main.js
diff --git a/dist/core-main.js.license b/dist/core-main.js.license
@@ -87,7 +87,7 @@ This file is generated from multiple sources. Included packages:
 	- version: 3.3.1
 	- license: GPL-3.0-or-later
 - @nextcloud/files
-	- version: 3.8.0
+	- version: 3.9.0
 	- license: AGPL-3.0-or-later
 - @nextcloud/initial-state
 	- version: 2.2.0

diff --git a/dist/core-main.js.map b/dist/core-main.js.map
diff --git a/dist/core-profile.js b/dist/core-profile.js
diff --git a/dist/core-profile.js.map b/dist/core-profile.js.map
diff --git a/dist/dav-settings-personal-availability.js b/dist/dav-settings-personal-availability.js
diff --git a/dist/dav-settings-personal-availability.js.map b/dist/dav-settings-personal-availability.js.map