diff --git a/packages/web-client/src/webdav/index.ts b/packages/web-client/src/webdav/index.ts index c7431a9799..6e34aab8e0 100644 --- a/packages/web-client/src/webdav/index.ts +++ b/packages/web-client/src/webdav/index.ts @@ -78,7 +78,7 @@ export const webdav = (baseURI: string, headers?: () => Headers): WebDAV => { const { search } = SearchFactory(dav, options) - const { listFavoriteFiles } = ListFavoriteFilesFactory(dav, options) + const { listFavoriteFiles } = ListFavoriteFilesFactory(dav) const { setFavorite } = SetFavoriteFactory(dav, options) return { diff --git a/packages/web-client/src/webdav/listFavoriteFiles.ts b/packages/web-client/src/webdav/listFavoriteFiles.ts index 17ccbb1bea..17efbddf49 100644 --- a/packages/web-client/src/webdav/listFavoriteFiles.ts +++ b/packages/web-client/src/webdav/listFavoriteFiles.ts @@ -1,20 +1,21 @@ -import { urlJoin } from '../utils' -import { WebDavOptions } from './types' import { DAV, DAVRequestOptions } from './client' import { DavProperties, DavPropertyValue } from './constants' -export const ListFavoriteFilesFactory = (dav: DAV, options: WebDavOptions) => { +export const ListFavoriteFilesFactory = (dav: DAV) => { return { - listFavoriteFiles({ + async listFavoriteFiles({ davProperties = DavProperties.Default, - username = '', ...opts - }: { davProperties?: DavPropertyValue[]; username?: string } & DAVRequestOptions = {}) { - return dav.report(urlJoin('files', username), { + }: { davProperties?: DavPropertyValue[] } & DAVRequestOptions = {}) { + const path = '/spaces/' + + const { results } = await dav.report(path, { + pattern: 'is:favorite', properties: davProperties, - filterRules: { favorite: 1 }, ...opts }) + + return results } } } diff --git a/packages/web-pkg/src/services/folder/loaders/loaderFavorites.ts b/packages/web-pkg/src/services/folder/loaders/loaderFavorites.ts index f06b355d2b..77c551a09f 100644 --- a/packages/web-pkg/src/services/folder/loaders/loaderFavorites.ts +++ b/packages/web-pkg/src/services/folder/loaders/loaderFavorites.ts @@ -19,15 +19,14 @@ export class FolderLoaderFavorites implements FolderLoader { } public getTask(context: TaskContext): FolderLoaderTask { - const { resourcesStore, clientService, userStore } = context + const { resourcesStore, clientService } = context // eslint-disable-next-line @typescript-eslint/no-unused-vars - return useTask(function* (signal1, signal2) { + return useTask(function* (signal1) { resourcesStore.clearResourceList() resourcesStore.setAncestorMetaData({}) let resources = yield clientService.webdav.listFavoriteFiles({ - username: userStore.user?.onPremisesSamAccountName, signal: signal1 })