1 files changed, 24 insertions, 29 deletions

diff --git a/apps/files/src/views/favorites.ts b/apps/files/src/views/favorites.ts
index e09587a0d5d..cac776507ef 100644
--- a/apps/files/src/views/favorites.ts
+++ b/apps/files/src/views/favorites.ts
@@ -4,34 +4,30 @@
  */
 import type { Folder, Node } from '@nextcloud/files'
 
-import { subscribe } from '@nextcloud/event-bus'
 import { FileType, View, getNavigation } from '@nextcloud/files'
-import { loadState } from '@nextcloud/initial-state'
-import { getLanguage, translate as t } from '@nextcloud/l10n'
-import { basename } from 'path'
+import { getCanonicalLocale, getLanguage, t } from '@nextcloud/l10n'
+import { getFavoriteNodes } from '@nextcloud/files/dav'
+import { subscribe } from '@nextcloud/event-bus'
+
 import FolderSvg from '@mdi/svg/svg/folder.svg?raw'
-import StarSvg from '@mdi/svg/svg/star.svg?raw'
+import StarSvg from '@mdi/svg/svg/star-outline.svg?raw'
 
+import { client } from '../services/WebdavClient.ts'
 import { getContents } from '../services/Favorites'
 import { hashCode } from '../utils/hashUtils'
 import logger from '../logger'
 
-// The return type of the initial state
-interface IFavoriteFolder {
-	fileid: number
-	path: string
-}
-
-export const generateFavoriteFolderView = function(folder: IFavoriteFolder, index = 0): View {
+const generateFavoriteFolderView = function(folder: Folder, index = 0): View {
 	return new View({
 		id: generateIdFromPath(folder.path),
-		name: basename(folder.path),
+		name: folder.displayname,
 
 		icon: FolderSvg,
 		order: index,
+
 		params: {
 			dir: folder.path,
-			fileid: folder.fileid.toString(),
+			fileid: String(folder.fileid),
 			view: 'favorites',
 		},
 
@@ -43,21 +39,16 @@ export const generateFavoriteFolderView = function(folder: IFavoriteFolder, inde
 	})
 }
 
-export const generateIdFromPath = function(path: string): string {
+const generateIdFromPath = function(path: string): string {
 	return `favorite-${hashCode(path)}`
 }
 
-export default () => {
-	// Load state in function for mock testing purposes
-	const favoriteFolders = loadState<IFavoriteFolder[]>('files', 'favoriteFolders', [])
-	const favoriteFoldersViews = favoriteFolders.map((folder, index) => generateFavoriteFolderView(folder, index)) as View[]
-	logger.debug('Generating favorites view', { favoriteFolders })
-
+export const registerFavoritesView = async () => {
 	const Navigation = getNavigation()
 	Navigation.register(new View({
 		id: 'favorites',
 		name: t('files', 'Favorites'),
-		caption: t('files', 'List of favorites files and folders.'),
+		caption: t('files', 'List of favorite files and folders.'),
 
 		emptyTitle: t('files', 'No favorites yet'),
 		emptyCaption: t('files', 'Files and folders you mark as favorite will show up here'),
@@ -70,10 +61,13 @@ export default () => {
 		getContents,
 	}))
 
+	const favoriteFolders = (await getFavoriteNodes(client)).filter(node => node.type === FileType.Folder) as Folder[]
+	const favoriteFoldersViews = favoriteFolders.map((folder, index) => generateFavoriteFolderView(folder, index)) as View[]
+	logger.debug('Generating favorites view', { favoriteFolders })
 	favoriteFoldersViews.forEach(view => Navigation.register(view))
 
 	/**
-	 * Update favourites navigation when a new folder is added
+	 * Update favorites navigation when a new folder is added
 	 */
 	subscribe('files:favorites:added', (node: Node) => {
 		if (node.type !== FileType.Folder) {
@@ -90,7 +84,7 @@ export default () => {
 	})
 
 	/**
-	 * Remove favourites navigation when a folder is removed
+	 * Remove favorites navigation when a folder is removed
 	 */
 	subscribe('files:favorites:removed', (node: Node) => {
 		if (node.type !== FileType.Folder) {
@@ -107,7 +101,7 @@ export default () => {
 	})
 
 	/**
-	 * Update favourites navigation when a folder is renamed
+	 * Update favorites navigation when a folder is renamed
 	 */
 	subscribe('files:node:renamed', (node: Node) => {
 		if (node.type !== FileType.Folder) {
@@ -126,7 +120,7 @@ export default () => {
 	 * update the order property of the existing views
 	 */
 	const updateAndSortViews = function() {
-		favoriteFolders.sort((a, b) => a.path.localeCompare(b.path, getLanguage(), { ignorePunctuation: true }))
+		favoriteFolders.sort((a, b) => a.basename.localeCompare(b.basename, [getLanguage(), getCanonicalLocale()], { ignorePunctuation: true, numeric: true, usage: 'sort' }))
 		favoriteFolders.forEach((folder, index) => {
 			const view = favoriteFoldersViews.find((view) => view.id === generateIdFromPath(folder.path))
 			if (view) {
@@ -137,8 +131,7 @@ export default () => {
 
 	// Add a folder to the favorites paths array and update the views
 	const addToFavorites = function(node: Folder) {
-		const newFavoriteFolder: IFavoriteFolder = { path: node.path, fileid: node.fileid! }
-		const view = generateFavoriteFolderView(newFavoriteFolder)
+		const view = generateFavoriteFolderView(node)
 
 		// Skip if already exists
 		if (favoriteFolders.find((folder) => folder.path === node.path)) {
@@ -146,7 +139,7 @@ export default () => {
 		}
 
 		// Update arrays
-		favoriteFolders.push(newFavoriteFolder)
+		favoriteFolders.push(node)
 		favoriteFoldersViews.push(view)
 
 		// Update and sort views
@@ -185,4 +178,6 @@ export default () => {
 		removePathFromFavorites(favoriteFolder.path)
 		addToFavorites(node)
 	}
+
+	updateAndSortViews()
 }