diff --git a/packages/core/upload/admin/src/hooks/useAssets.js b/packages/core/upload/admin/src/hooks/useAssets.js index 7b79a2a788..60d647f233 100644 --- a/packages/core/upload/admin/src/hooks/useAssets.js +++ b/packages/core/upload/admin/src/hooks/useAssets.js @@ -16,6 +16,7 @@ export const useAssets = ({ skipWhen = false, query = {} } = {}) => { const params = { ...paramsExceptFolder, filters: { + ...query?.filters, folder: { id: query?.folder ?? { $null: true, diff --git a/packages/core/upload/admin/src/hooks/useFolders.js b/packages/core/upload/admin/src/hooks/useFolders.js index aad93aa567..b36ff1d064 100644 --- a/packages/core/upload/admin/src/hooks/useFolders.js +++ b/packages/core/upload/admin/src/hooks/useFolders.js @@ -19,6 +19,7 @@ export const useFolders = ({ enabled = true, query = {} }) => { pageSize: -1, }, filters: { + ...query?.filters, parent: { id: query?.folder ?? { $null: true,