Skip to content

Commit 1d529e5

Browse files
committed
fix(files): sort favorites navigation alphabetically
Signed-off-by: skjnldsv <skjnldsv@protonmail.com>
1 parent c5b3768 commit 1d529e5

1 file changed

Lines changed: 8 additions & 4 deletions

File tree

apps/files/src/views/favorites.ts

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,15 @@
44
*/
55
import type { Folder, Node } from '@nextcloud/files'
66

7+
import { FileType, View, getNavigation } from '@nextcloud/files'
8+
import { getCanonicalLocale, getLanguage, t } from '@nextcloud/l10n'
9+
import { getFavoriteNodes } from '@nextcloud/files/dav'
710
import { subscribe } from '@nextcloud/event-bus'
8-
import { FileType, View, getFavoriteNodes, getNavigation } from '@nextcloud/files'
9-
import { getLanguage, translate as t } from '@nextcloud/l10n'
10-
import { client } from '../services/WebdavClient.ts'
11+
1112
import FolderSvg from '@mdi/svg/svg/folder.svg?raw'
1213
import StarSvg from '@mdi/svg/svg/star.svg?raw'
1314

15+
import { client } from '../services/WebdavClient.ts'
1416
import { getContents } from '../services/Favorites'
1517
import { hashCode } from '../utils/hashUtils'
1618
import logger from '../logger'
@@ -118,7 +120,7 @@ export const registerFavoritesView = async () => {
118120
* update the order property of the existing views
119121
*/
120122
const updateAndSortViews = function() {
121-
favoriteFolders.sort((a, b) => a.path.localeCompare(b.path, getLanguage(), { ignorePunctuation: true }))
123+
favoriteFolders.sort((a, b) => a.basename.localeCompare(b.basename, [getLanguage(), getCanonicalLocale()], { ignorePunctuation: true, numeric: true, usage: 'sort' }))
122124
favoriteFolders.forEach((folder, index) => {
123125
const view = favoriteFoldersViews.find((view) => view.id === generateIdFromPath(folder.path))
124126
if (view) {
@@ -176,4 +178,6 @@ export const registerFavoritesView = async () => {
176178
removePathFromFavorites(favoriteFolder.path)
177179
addToFavorites(node)
178180
}
181+
182+
updateAndSortViews()
179183
}

0 commit comments

Comments
 (0)