@strapi/upload 5.51.1 → 5.51.2

package/dist/admin/future/services/assets.js.map

@@ -1 +1 @@
-{"version":3,"file":"assets.js","sources":["../../../../admin/src/future/services/assets.ts"],"sourcesContent":["import { uploadApi } from './api';\n\nimport type {\n  GetFiles,\n  File,\n  Pagination,\n  UploadFileInfo,\n  AssetWithPopulatedCreatedBy,\n} from '../../../../shared/contracts/files';\n\ninterface GetAssetsParams {\n  page?: number;\n  pageSize?: number;\n  folder?: number | null;\n  sort?: string;\n}\n\ninterface GetAssetsResponse {\n  results: File[];\n  pagination: Pagination;\n}\n\ninterface UpdateAssetArgs {\n  id: number;\n  fileInfo: Partial<UploadFileInfo>;\n}\n\ninterface ReplaceAssetArgs {\n  id: number;\n  // `File` is shadowed in this module by the asset-file contract type; the\n  // global browser File is what we need for FormData.\n  file: globalThis.File;\n  fileInfo?: Partial<UploadFileInfo>;\n}\n\nconst assetsApi = uploadApi.injectEndpoints({\n  endpoints: (builder) => ({\n    getAssets: builder.query<GetAssetsResponse, GetAssetsParams | void>({\n      query: (params = {}) => {\n        const { folder, ...rest } = params as GetAssetsParams;\n\n        const queryParams: Record<string, unknown> = { ...rest };\n\n        if (folder != null) {\n          queryParams['filters'] = {\n            $and: [{ folder: { id: folder } }],\n          };\n        } else {\n          queryParams['filters'] = {\n            $and: [{ folder: { id: { $null: true } } }],\n          };\n        }\n\n        return {\n          url: '/upload/files',\n          method: 'GET',\n          config: { params: queryParams },\n        };\n      },\n      transformResponse: (response: GetFiles.Response['data']) => response,\n      providesTags: (result) =>\n        result\n          ? [\n              ...result.results.map(({ id }) => ({ type: 'Asset' as const, id })),\n              { type: 'Asset', id: 'LIST' },\n            ]\n          : [{ type: 'Asset', id: 'LIST' }],\n    }),\n    getAsset: builder.query<AssetWithPopulatedCreatedBy, number>({\n      query: (id) => ({\n        url: `/upload/files/${id}`,\n        method: 'GET',\n      }),\n      providesTags: (_result, _error, id) => [{ type: 'Asset' as const, id }],\n    }),\n    /**\n     * Update the editable metadata of an existing asset.\n     * Hits the legacy `POST /upload?id=<id>` endpoint which dispatches to\n     * `admin-upload.updateFileInfo`.\n     */\n    updateAsset: builder.mutation<AssetWithPopulatedCreatedBy, UpdateAssetArgs>({\n      query: ({ id, fileInfo }) => {\n        const formData = new FormData();\n        formData.append('fileInfo', JSON.stringify(fileInfo));\n\n        return {\n          url: '/upload',\n          method: 'POST',\n          data: formData,\n          config: { params: { id } },\n        };\n      },\n      invalidatesTags: (_result, _error, { id }) => [\n        { type: 'Asset' as const, id },\n        { type: 'Asset' as const, id: 'LIST' },\n      ],\n    }),\n    /**\n     * Replace the binary content of an existing asset.\n     * Hits `POST /upload?id=<id>` with a multipart body — the controller\n     * dispatches to `admin-upload.replaceFile` when a `files` part is present.\n     * Uses the standard axios baseQuery (no streaming) since we only ever\n     * replace one file at a time and don't need per-byte progress here.\n     */\n    replaceAsset: builder.mutation<AssetWithPopulatedCreatedBy, ReplaceAssetArgs>({\n      query: ({ id, file, fileInfo }) => {\n        const formData = new FormData();\n        formData.append('files', file);\n        if (fileInfo) {\n          formData.append('fileInfo', JSON.stringify(fileInfo));\n        }\n        return {\n          url: '/upload',\n          method: 'POST',\n          data: formData,\n          config: { params: { id } },\n        };\n      },\n      invalidatesTags: (_result, _error, { id }) => [\n        { type: 'Asset' as const, id },\n        { type: 'Asset' as const, id: 'LIST' },\n      ],\n    }),\n    /**\n     * Permanently delete an asset by id. Hits the same endpoint as the legacy\n     * `useRemoveAsset` hook so server behaviour is unchanged.\n     */\n    deleteAsset: builder.mutation<unknown, number>({\n      query: (id) => ({\n        url: `/upload/files/${id}`,\n        method: 'DELETE',\n      }),\n      invalidatesTags: (_result, _error, id) => [\n        { type: 'Asset' as const, id },\n        { type: 'Asset' as const, id: 'LIST' },\n      ],\n    }),\n    /**\n     * Permanently delete several assets and/or folders in one request. Same\n     * endpoint as the legacy bulk remove (`POST /upload/actions/bulk-delete`,\n     * handled by `admin-folder-file.deleteMany`) so server behaviour is\n     * unchanged — folder deletion cascades to everything inside.\n     */\n    bulkDeleteItems: builder.mutation<unknown, { fileIds: number[]; folderIds: number[] }>({\n      query: ({ fileIds, folderIds }) => ({\n        url: '/upload/actions/bulk-delete',\n        method: 'POST',\n        data: { fileIds, folderIds },\n      }),\n      invalidatesTags: [\n        { type: 'Asset' as const, id: 'LIST' },\n        { type: 'Folder' as const, id: 'LIST' },\n        // The sidebar FolderTree reads /upload/folder-structure, which carries\n        // its own tag — without it, deleted folders linger in the tree.\n        { type: 'Folder' as const, id: 'STRUCTURE' },\n      ],\n    }),\n  }),\n});\n\nexport const {\n  useGetAssetsQuery,\n  useGetAssetQuery,\n  useUpdateAssetMutation,\n  useReplaceAssetMutation,\n  useDeleteAssetMutation,\n  useBulkDeleteItemsMutation,\n} = assetsApi;\n"],"names":["assetsApi","uploadApi","injectEndpoints","endpoints","builder","getAssets","query","params","folder","rest","queryParams","$and","id","$null","url","method","config","transformResponse","response","providesTags","result","results","map","type","getAsset","_result","_error","updateAsset","mutation","fileInfo","formData","FormData","append","JSON","stringify","data","invalidatesTags","replaceAsset","file","deleteAsset","bulkDeleteItems","fileIds","folderIds","useGetAssetsQuery","useGetAssetQuery","useUpdateAssetMutation","useReplaceAssetMutation","useDeleteAssetMutation","useBulkDeleteItemsMutation"],"mappings":"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"}
+{"version":3,"file":"assets.js","sources":["../../../../admin/src/future/services/assets.ts"],"sourcesContent":["import { encodeSearchQuery } from '../utils/searchQueryParam';\n\nimport { uploadApi } from './api';\n\nimport type {\n  GetFiles,\n  File,\n  Pagination,\n  UploadFileInfo,\n  AssetWithPopulatedCreatedBy,\n} from '../../../../shared/contracts/files';\n\ninterface GetAssetsParams {\n  page?: number;\n  pageSize?: number;\n  folder?: number | null;\n  sort?: string;\n  search?: string;\n  /** Extra `filters[$and]` entries (list filters), AND-ed with the folder/search scope. */\n  filters?: Record<string, unknown>[];\n}\n\ninterface GetAssetsResponse {\n  results: File[];\n  pagination: Pagination;\n}\n\ninterface UpdateAssetArgs {\n  id: number;\n  fileInfo: Partial<UploadFileInfo>;\n}\n\ninterface ReplaceAssetArgs {\n  id: number;\n  // `File` is shadowed in this module by the asset-file contract type; the\n  // global browser File is what we need for FormData.\n  file: globalThis.File;\n  fileInfo?: Partial<UploadFileInfo>;\n}\n\nconst assetsApi = uploadApi.injectEndpoints({\n  endpoints: (builder) => ({\n    getAssets: builder.query<GetAssetsResponse, GetAssetsParams | void>({\n      query: (params = {}) => {\n        // `search` is destructured out so it never reaches the server as-is —\n        // it is re-added below as the `_q` the API actually understands.\n        const { folder, search, filters = [], ...rest } = params as GetAssetsParams;\n\n        const queryParams: Record<string, unknown> = { ...rest };\n\n        // List filters apply in BOTH modes: search composes with them (a\n        // filtered search), only the folder scope is dropped while searching.\n        if (search) {\n          // Search is global: folder scoping is intentionally dropped so results span the whole library.\n          queryParams['_q'] = encodeSearchQuery(search);\n\n          if (filters.length > 0) {\n            queryParams['filters'] = { $and: [...filters] };\n          }\n        } else {\n          const folderScope =\n            folder != null ? { folder: { id: folder } } : { folder: { id: { $null: true } } };\n\n          queryParams['filters'] = {\n            $and: [folderScope, ...filters],\n          };\n        }\n\n        return {\n          url: '/upload/files',\n          method: 'GET',\n          config: { params: queryParams },\n        };\n      },\n      transformResponse: (response: GetFiles.Response['data']) => response,\n      providesTags: (result) =>\n        result\n          ? [\n              ...result.results.map(({ id }) => ({ type: 'Asset' as const, id })),\n              { type: 'Asset', id: 'LIST' },\n            ]\n          : [{ type: 'Asset', id: 'LIST' }],\n    }),\n    getAsset: builder.query<AssetWithPopulatedCreatedBy, number>({\n      query: (id) => ({\n        url: `/upload/files/${id}`,\n        method: 'GET',\n      }),\n      providesTags: (_result, _error, id) => [{ type: 'Asset' as const, id }],\n    }),\n    /**\n     * Update the editable metadata of an existing asset.\n     * Hits the legacy `POST /upload?id=<id>` endpoint which dispatches to\n     * `admin-upload.updateFileInfo`.\n     */\n    updateAsset: builder.mutation<AssetWithPopulatedCreatedBy, UpdateAssetArgs>({\n      query: ({ id, fileInfo }) => {\n        const formData = new FormData();\n        formData.append('fileInfo', JSON.stringify(fileInfo));\n\n        return {\n          url: '/upload',\n          method: 'POST',\n          data: formData,\n          config: { params: { id } },\n        };\n      },\n      invalidatesTags: (_result, _error, { id }) => [\n        { type: 'Asset' as const, id },\n        { type: 'Asset' as const, id: 'LIST' },\n      ],\n    }),\n    /**\n     * Replace the binary content of an existing asset.\n     * Hits `POST /upload?id=<id>` with a multipart body — the controller\n     * dispatches to `admin-upload.replaceFile` when a `files` part is present.\n     * Uses the standard axios baseQuery (no streaming) since we only ever\n     * replace one file at a time and don't need per-byte progress here.\n     */\n    replaceAsset: builder.mutation<AssetWithPopulatedCreatedBy, ReplaceAssetArgs>({\n      query: ({ id, file, fileInfo }) => {\n        const formData = new FormData();\n        formData.append('files', file);\n        if (fileInfo) {\n          formData.append('fileInfo', JSON.stringify(fileInfo));\n        }\n        return {\n          url: '/upload',\n          method: 'POST',\n          data: formData,\n          config: { params: { id } },\n        };\n      },\n      invalidatesTags: (_result, _error, { id }) => [\n        { type: 'Asset' as const, id },\n        { type: 'Asset' as const, id: 'LIST' },\n      ],\n    }),\n    /**\n     * Permanently delete an asset by id. Hits the same endpoint as the legacy\n     * `useRemoveAsset` hook so server behaviour is unchanged.\n     */\n    deleteAsset: builder.mutation<unknown, number>({\n      query: (id) => ({\n        url: `/upload/files/${id}`,\n        method: 'DELETE',\n      }),\n      invalidatesTags: (_result, _error, id) => [\n        { type: 'Asset' as const, id },\n        { type: 'Asset' as const, id: 'LIST' },\n      ],\n    }),\n    /**\n     * Permanently delete several assets and/or folders in one request. Same\n     * endpoint as the legacy bulk remove (`POST /upload/actions/bulk-delete`,\n     * handled by `admin-folder-file.deleteMany`) so server behaviour is\n     * unchanged — folder deletion cascades to everything inside.\n     */\n    bulkDeleteItems: builder.mutation<unknown, { fileIds: number[]; folderIds: number[] }>({\n      query: ({ fileIds, folderIds }) => ({\n        url: '/upload/actions/bulk-delete',\n        method: 'POST',\n        data: { fileIds, folderIds },\n      }),\n      invalidatesTags: [\n        { type: 'Asset' as const, id: 'LIST' },\n        { type: 'Folder' as const, id: 'LIST' },\n        // The sidebar FolderTree reads /upload/folder-structure, which carries\n        // its own tag — without it, deleted folders linger in the tree.\n        { type: 'Folder' as const, id: 'STRUCTURE' },\n      ],\n    }),\n  }),\n});\n\nexport const {\n  useGetAssetsQuery,\n  useGetAssetQuery,\n  useUpdateAssetMutation,\n  useReplaceAssetMutation,\n  useDeleteAssetMutation,\n  useBulkDeleteItemsMutation,\n} = assetsApi;\n\n/**\n * `generateAiMetadata` is defined in `./api` (the upload flows dispatch it directly\n * after each file completes, and this module imports from there) — re-exported here\n * so asset components keep a single import site for asset-related hooks.\n */\nexport { useGenerateAiMetadataMutation } from './api';\n"],"names":["assetsApi","uploadApi","injectEndpoints","endpoints","builder","getAssets","query","params","folder","search","filters","rest","queryParams","encodeSearchQuery","length","$and","folderScope","id","$null","url","method","config","transformResponse","response","providesTags","result","results","map","type","getAsset","_result","_error","updateAsset","mutation","fileInfo","formData","FormData","append","JSON","stringify","data","invalidatesTags","replaceAsset","file","deleteAsset","bulkDeleteItems","fileIds","folderIds","useGetAssetsQuery","useGetAssetQuery","useUpdateAssetMutation","useReplaceAssetMutation","useDeleteAssetMutation","useBulkDeleteItemsMutation"],"mappings":"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"}

package/dist/admin/future/services/assets.mjs

@@ -1,33 +1,45 @@
+import { encodeSearchQuery } from '../utils/searchQueryParam.mjs';
 import { uploadApi } from './api.mjs';
+export { useGenerateAiMetadataMutation } from './api.mjs';
 
 const assetsApi = uploadApi.injectEndpoints({
     endpoints: (builder)=>({
             getAssets: builder.query({
                 query: (params = {})=>{
-                    const { folder, ...rest } = params;
+                    // `search` is destructured out so it never reaches the server as-is —
+                    // it is re-added below as the `_q` the API actually understands.
+                    const { folder, search, filters = [], ...rest } = params;
                     const queryParams = {
                         ...rest
                     };
-                    if (folder != null) {
-                        queryParams['filters'] = {
-                            $and: [
-                                {
-                                    folder: {
-                                        id: folder
-                                    }
+                    // List filters apply in BOTH modes: search composes with them (a
+                    // filtered search), only the folder scope is dropped while searching.
+                    if (search) {
+                        // Search is global: folder scoping is intentionally dropped so results span the whole library.
+                        queryParams['_q'] = encodeSearchQuery(search);
+                        if (filters.length > 0) {
+                            queryParams['filters'] = {
+                                $and: [
+                                    ...filters
+                                ]
+                            };
+                        }
+                    } else {
+                        const folderScope = folder != null ? {
+                            folder: {
+                                id: folder
+                            }
+                        } : {
+                            folder: {
+                                id: {
+                                    $null: true
                                 }
-                            ]
+                            }
                         };
-                    } else {
                         queryParams['filters'] = {
                             $and: [
-                                {
-                                    folder: {
-                                        id: {
-                                            $null: true
-                                        }
-                                    }
-                                }
+                                folderScope,
+                                ...filters
                             ]
                         };
                     }

package/dist/admin/future/services/assets.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"assets.mjs","sources":["../../../../admin/src/future/services/assets.ts"],"sourcesContent":["import { uploadApi } from './api';\n\nimport type {\n  GetFiles,\n  File,\n  Pagination,\n  UploadFileInfo,\n  AssetWithPopulatedCreatedBy,\n} from '../../../../shared/contracts/files';\n\ninterface GetAssetsParams {\n  page?: number;\n  pageSize?: number;\n  folder?: number | null;\n  sort?: string;\n}\n\ninterface GetAssetsResponse {\n  results: File[];\n  pagination: Pagination;\n}\n\ninterface UpdateAssetArgs {\n  id: number;\n  fileInfo: Partial<UploadFileInfo>;\n}\n\ninterface ReplaceAssetArgs {\n  id: number;\n  // `File` is shadowed in this module by the asset-file contract type; the\n  // global browser File is what we need for FormData.\n  file: globalThis.File;\n  fileInfo?: Partial<UploadFileInfo>;\n}\n\nconst assetsApi = uploadApi.injectEndpoints({\n  endpoints: (builder) => ({\n    getAssets: builder.query<GetAssetsResponse, GetAssetsParams | void>({\n      query: (params = {}) => {\n        const { folder, ...rest } = params as GetAssetsParams;\n\n        const queryParams: Record<string, unknown> = { ...rest };\n\n        if (folder != null) {\n          queryParams['filters'] = {\n            $and: [{ folder: { id: folder } }],\n          };\n        } else {\n          queryParams['filters'] = {\n            $and: [{ folder: { id: { $null: true } } }],\n          };\n        }\n\n        return {\n          url: '/upload/files',\n          method: 'GET',\n          config: { params: queryParams },\n        };\n      },\n      transformResponse: (response: GetFiles.Response['data']) => response,\n      providesTags: (result) =>\n        result\n          ? [\n              ...result.results.map(({ id }) => ({ type: 'Asset' as const, id })),\n              { type: 'Asset', id: 'LIST' },\n            ]\n          : [{ type: 'Asset', id: 'LIST' }],\n    }),\n    getAsset: builder.query<AssetWithPopulatedCreatedBy, number>({\n      query: (id) => ({\n        url: `/upload/files/${id}`,\n        method: 'GET',\n      }),\n      providesTags: (_result, _error, id) => [{ type: 'Asset' as const, id }],\n    }),\n    /**\n     * Update the editable metadata of an existing asset.\n     * Hits the legacy `POST /upload?id=<id>` endpoint which dispatches to\n     * `admin-upload.updateFileInfo`.\n     */\n    updateAsset: builder.mutation<AssetWithPopulatedCreatedBy, UpdateAssetArgs>({\n      query: ({ id, fileInfo }) => {\n        const formData = new FormData();\n        formData.append('fileInfo', JSON.stringify(fileInfo));\n\n        return {\n          url: '/upload',\n          method: 'POST',\n          data: formData,\n          config: { params: { id } },\n        };\n      },\n      invalidatesTags: (_result, _error, { id }) => [\n        { type: 'Asset' as const, id },\n        { type: 'Asset' as const, id: 'LIST' },\n      ],\n    }),\n    /**\n     * Replace the binary content of an existing asset.\n     * Hits `POST /upload?id=<id>` with a multipart body — the controller\n     * dispatches to `admin-upload.replaceFile` when a `files` part is present.\n     * Uses the standard axios baseQuery (no streaming) since we only ever\n     * replace one file at a time and don't need per-byte progress here.\n     */\n    replaceAsset: builder.mutation<AssetWithPopulatedCreatedBy, ReplaceAssetArgs>({\n      query: ({ id, file, fileInfo }) => {\n        const formData = new FormData();\n        formData.append('files', file);\n        if (fileInfo) {\n          formData.append('fileInfo', JSON.stringify(fileInfo));\n        }\n        return {\n          url: '/upload',\n          method: 'POST',\n          data: formData,\n          config: { params: { id } },\n        };\n      },\n      invalidatesTags: (_result, _error, { id }) => [\n        { type: 'Asset' as const, id },\n        { type: 'Asset' as const, id: 'LIST' },\n      ],\n    }),\n    /**\n     * Permanently delete an asset by id. Hits the same endpoint as the legacy\n     * `useRemoveAsset` hook so server behaviour is unchanged.\n     */\n    deleteAsset: builder.mutation<unknown, number>({\n      query: (id) => ({\n        url: `/upload/files/${id}`,\n        method: 'DELETE',\n      }),\n      invalidatesTags: (_result, _error, id) => [\n        { type: 'Asset' as const, id },\n        { type: 'Asset' as const, id: 'LIST' },\n      ],\n    }),\n    /**\n     * Permanently delete several assets and/or folders in one request. Same\n     * endpoint as the legacy bulk remove (`POST /upload/actions/bulk-delete`,\n     * handled by `admin-folder-file.deleteMany`) so server behaviour is\n     * unchanged — folder deletion cascades to everything inside.\n     */\n    bulkDeleteItems: builder.mutation<unknown, { fileIds: number[]; folderIds: number[] }>({\n      query: ({ fileIds, folderIds }) => ({\n        url: '/upload/actions/bulk-delete',\n        method: 'POST',\n        data: { fileIds, folderIds },\n      }),\n      invalidatesTags: [\n        { type: 'Asset' as const, id: 'LIST' },\n        { type: 'Folder' as const, id: 'LIST' },\n        // The sidebar FolderTree reads /upload/folder-structure, which carries\n        // its own tag — without it, deleted folders linger in the tree.\n        { type: 'Folder' as const, id: 'STRUCTURE' },\n      ],\n    }),\n  }),\n});\n\nexport const {\n  useGetAssetsQuery,\n  useGetAssetQuery,\n  useUpdateAssetMutation,\n  useReplaceAssetMutation,\n  useDeleteAssetMutation,\n  useBulkDeleteItemsMutation,\n} = assetsApi;\n"],"names":["assetsApi","uploadApi","injectEndpoints","endpoints","builder","getAssets","query","params","folder","rest","queryParams","$and","id","$null","url","method","config","transformResponse","response","providesTags","result","results","map","type","getAsset","_result","_error","updateAsset","mutation","fileInfo","formData","FormData","append","JSON","stringify","data","invalidatesTags","replaceAsset","file","deleteAsset","bulkDeleteItems","fileIds","folderIds","useGetAssetsQuery","useGetAssetQuery","useUpdateAssetMutation","useReplaceAssetMutation","useDeleteAssetMutation","useBulkDeleteItemsMutation"],"mappings":"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"}
+{"version":3,"file":"assets.mjs","sources":["../../../../admin/src/future/services/assets.ts"],"sourcesContent":["import { encodeSearchQuery } from '../utils/searchQueryParam';\n\nimport { uploadApi } from './api';\n\nimport type {\n  GetFiles,\n  File,\n  Pagination,\n  UploadFileInfo,\n  AssetWithPopulatedCreatedBy,\n} from '../../../../shared/contracts/files';\n\ninterface GetAssetsParams {\n  page?: number;\n  pageSize?: number;\n  folder?: number | null;\n  sort?: string;\n  search?: string;\n  /** Extra `filters[$and]` entries (list filters), AND-ed with the folder/search scope. */\n  filters?: Record<string, unknown>[];\n}\n\ninterface GetAssetsResponse {\n  results: File[];\n  pagination: Pagination;\n}\n\ninterface UpdateAssetArgs {\n  id: number;\n  fileInfo: Partial<UploadFileInfo>;\n}\n\ninterface ReplaceAssetArgs {\n  id: number;\n  // `File` is shadowed in this module by the asset-file contract type; the\n  // global browser File is what we need for FormData.\n  file: globalThis.File;\n  fileInfo?: Partial<UploadFileInfo>;\n}\n\nconst assetsApi = uploadApi.injectEndpoints({\n  endpoints: (builder) => ({\n    getAssets: builder.query<GetAssetsResponse, GetAssetsParams | void>({\n      query: (params = {}) => {\n        // `search` is destructured out so it never reaches the server as-is —\n        // it is re-added below as the `_q` the API actually understands.\n        const { folder, search, filters = [], ...rest } = params as GetAssetsParams;\n\n        const queryParams: Record<string, unknown> = { ...rest };\n\n        // List filters apply in BOTH modes: search composes with them (a\n        // filtered search), only the folder scope is dropped while searching.\n        if (search) {\n          // Search is global: folder scoping is intentionally dropped so results span the whole library.\n          queryParams['_q'] = encodeSearchQuery(search);\n\n          if (filters.length > 0) {\n            queryParams['filters'] = { $and: [...filters] };\n          }\n        } else {\n          const folderScope =\n            folder != null ? { folder: { id: folder } } : { folder: { id: { $null: true } } };\n\n          queryParams['filters'] = {\n            $and: [folderScope, ...filters],\n          };\n        }\n\n        return {\n          url: '/upload/files',\n          method: 'GET',\n          config: { params: queryParams },\n        };\n      },\n      transformResponse: (response: GetFiles.Response['data']) => response,\n      providesTags: (result) =>\n        result\n          ? [\n              ...result.results.map(({ id }) => ({ type: 'Asset' as const, id })),\n              { type: 'Asset', id: 'LIST' },\n            ]\n          : [{ type: 'Asset', id: 'LIST' }],\n    }),\n    getAsset: builder.query<AssetWithPopulatedCreatedBy, number>({\n      query: (id) => ({\n        url: `/upload/files/${id}`,\n        method: 'GET',\n      }),\n      providesTags: (_result, _error, id) => [{ type: 'Asset' as const, id }],\n    }),\n    /**\n     * Update the editable metadata of an existing asset.\n     * Hits the legacy `POST /upload?id=<id>` endpoint which dispatches to\n     * `admin-upload.updateFileInfo`.\n     */\n    updateAsset: builder.mutation<AssetWithPopulatedCreatedBy, UpdateAssetArgs>({\n      query: ({ id, fileInfo }) => {\n        const formData = new FormData();\n        formData.append('fileInfo', JSON.stringify(fileInfo));\n\n        return {\n          url: '/upload',\n          method: 'POST',\n          data: formData,\n          config: { params: { id } },\n        };\n      },\n      invalidatesTags: (_result, _error, { id }) => [\n        { type: 'Asset' as const, id },\n        { type: 'Asset' as const, id: 'LIST' },\n      ],\n    }),\n    /**\n     * Replace the binary content of an existing asset.\n     * Hits `POST /upload?id=<id>` with a multipart body — the controller\n     * dispatches to `admin-upload.replaceFile` when a `files` part is present.\n     * Uses the standard axios baseQuery (no streaming) since we only ever\n     * replace one file at a time and don't need per-byte progress here.\n     */\n    replaceAsset: builder.mutation<AssetWithPopulatedCreatedBy, ReplaceAssetArgs>({\n      query: ({ id, file, fileInfo }) => {\n        const formData = new FormData();\n        formData.append('files', file);\n        if (fileInfo) {\n          formData.append('fileInfo', JSON.stringify(fileInfo));\n        }\n        return {\n          url: '/upload',\n          method: 'POST',\n          data: formData,\n          config: { params: { id } },\n        };\n      },\n      invalidatesTags: (_result, _error, { id }) => [\n        { type: 'Asset' as const, id },\n        { type: 'Asset' as const, id: 'LIST' },\n      ],\n    }),\n    /**\n     * Permanently delete an asset by id. Hits the same endpoint as the legacy\n     * `useRemoveAsset` hook so server behaviour is unchanged.\n     */\n    deleteAsset: builder.mutation<unknown, number>({\n      query: (id) => ({\n        url: `/upload/files/${id}`,\n        method: 'DELETE',\n      }),\n      invalidatesTags: (_result, _error, id) => [\n        { type: 'Asset' as const, id },\n        { type: 'Asset' as const, id: 'LIST' },\n      ],\n    }),\n    /**\n     * Permanently delete several assets and/or folders in one request. Same\n     * endpoint as the legacy bulk remove (`POST /upload/actions/bulk-delete`,\n     * handled by `admin-folder-file.deleteMany`) so server behaviour is\n     * unchanged — folder deletion cascades to everything inside.\n     */\n    bulkDeleteItems: builder.mutation<unknown, { fileIds: number[]; folderIds: number[] }>({\n      query: ({ fileIds, folderIds }) => ({\n        url: '/upload/actions/bulk-delete',\n        method: 'POST',\n        data: { fileIds, folderIds },\n      }),\n      invalidatesTags: [\n        { type: 'Asset' as const, id: 'LIST' },\n        { type: 'Folder' as const, id: 'LIST' },\n        // The sidebar FolderTree reads /upload/folder-structure, which carries\n        // its own tag — without it, deleted folders linger in the tree.\n        { type: 'Folder' as const, id: 'STRUCTURE' },\n      ],\n    }),\n  }),\n});\n\nexport const {\n  useGetAssetsQuery,\n  useGetAssetQuery,\n  useUpdateAssetMutation,\n  useReplaceAssetMutation,\n  useDeleteAssetMutation,\n  useBulkDeleteItemsMutation,\n} = assetsApi;\n\n/**\n * `generateAiMetadata` is defined in `./api` (the upload flows dispatch it directly\n * after each file completes, and this module imports from there) — re-exported here\n * so asset components keep a single import site for asset-related hooks.\n */\nexport { useGenerateAiMetadataMutation } from './api';\n"],"names":["assetsApi","uploadApi","injectEndpoints","endpoints","builder","getAssets","query","params","folder","search","filters","rest","queryParams","encodeSearchQuery","length","$and","folderScope","id","$null","url","method","config","transformResponse","response","providesTags","result","results","map","type","getAsset","_result","_error","updateAsset","mutation","fileInfo","formData","FormData","append","JSON","stringify","data","invalidatesTags","replaceAsset","file","deleteAsset","bulkDeleteItems","fileIds","folderIds","useGetAssetsQuery","useGetAssetQuery","useUpdateAssetMutation","useReplaceAssetMutation","useDeleteAssetMutation","useBulkDeleteItemsMutation"],"mappings":"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"}

package/dist/admin/future/services/folders.js

@@ -1,5 +1,6 @@
 'use strict';
 
+var searchQueryParam = require('../utils/searchQueryParam.js');
 var api = require('./api.js');
 
 const isDataEnvelope = (response)=>typeof response === 'object' && response !== null && 'data' in response;
@@ -8,31 +9,42 @@ const foldersApi = api.uploadApi.injectEndpoints({
     endpoints: (builder)=>({
             getFolders: builder.query({
                 query: (params = {})=>{
-                    const { parentId, sort } = params;
+                    const { parentId, sort, search, filters = [] } = params;
                     const queryParams = {
                         // Default matches sidebar FolderTree order (server getStructure uses sortBy('name')).
                         sort: sort ?? 'name:ASC'
                     };
-                    if (parentId != null) {
-                        queryParams['filters'] = {
-                            $and: [
-                                {
-                                    parent: {
-                                        id: parentId
-                                    }
+                    // List filters (dates) apply in BOTH modes — search composes with them,
+                    // only the parent scope is dropped while searching.
+                    if (search) {
+                        // Search is global: the parent filter is dropped so matching folders
+                        // anywhere in the library surface. The endpoint is unpaginated — it
+                        // returns every match — so callers can treat the array length as the
+                        // true total. Bounding it is a separate decision.
+                        queryParams['_q'] = searchQueryParam.encodeSearchQuery(search);
+                        if (filters.length > 0) {
+                            queryParams['filters'] = {
+                                $and: [
+                                    ...filters
+                                ]
+                            };
+                        }
+                    } else {
+                        const parentScope = parentId != null ? {
+                            parent: {
+                                id: parentId
+                            }
+                        } : {
+                            parent: {
+                                id: {
+                                    $null: true
                                 }
-                            ]
+                            }
                         };
-                    } else {
                         queryParams['filters'] = {
                             $and: [
-                                {
-                                    parent: {
-                                        id: {
-                                            $null: true
-                                        }
-                                    }
-                                }
+                                parentScope,
+                                ...filters
                             ]
                         };
                     }

package/dist/admin/future/services/folders.js.map

@@ -1 +1 @@
-{"version":3,"file":"folders.js","sources":["../../../../admin/src/future/services/folders.ts"],"sourcesContent":["import { uploadApi } from './api';\n\nimport type {\n  Folder,\n  FolderNode,\n  CreateFolders,\n  GetFolder,\n  GetFolders,\n  GetFolderStructure,\n  BulkMoveFolders,\n} from '../../../../shared/contracts/folders';\n\nexport type FolderWithCounts = Omit<Folder, 'children' | 'files'> & {\n  children?: { count: number };\n  files?: { count: number };\n};\n\ninterface GetFoldersParams {\n  parentId?: number | null;\n  /** Comma-separated rules, e.g. `updatedAt:DESC,name:ASC`. Defaults to alphabetical. */\n  sort?: string;\n}\n\ninterface BulkMoveParams {\n  fileIds?: number[];\n  folderIds?: number[];\n  /** `null` moves the items to the root of the Media Library. */\n  destinationFolderId: number | null;\n}\n\ntype DataEnvelope<T> = {\n  data: T;\n};\n\nconst isDataEnvelope = <T>(response: T | DataEnvelope<T>): response is DataEnvelope<T> =>\n  typeof response === 'object' && response !== null && 'data' in response;\n\nconst unwrapData = <T>(response: T | DataEnvelope<T>): T =>\n  isDataEnvelope(response) ? response.data : response;\n\nconst foldersApi = uploadApi.injectEndpoints({\n  endpoints: (builder) => ({\n    getFolders: builder.query<Folder[], GetFoldersParams | void>({\n      query: (params = {}) => {\n        const { parentId, sort } = params as GetFoldersParams;\n\n        const queryParams: Record<string, unknown> = {\n          // Default matches sidebar FolderTree order (server getStructure uses sortBy('name')).\n          sort: sort ?? 'name:ASC',\n        };\n\n        if (parentId != null) {\n          queryParams['filters'] = {\n            $and: [{ parent: { id: parentId } }],\n          };\n        } else {\n          queryParams['filters'] = {\n            $and: [{ parent: { id: { $null: true } } }],\n          };\n        }\n\n        return {\n          url: '/upload/folders',\n          method: 'GET',\n          config: { params: queryParams },\n        };\n      },\n      transformResponse: (response: GetFolders.Response['data']) =>\n        unwrapData<GetFolders.Response['data']>(response),\n      providesTags: (results) => {\n        if (results) {\n          return [\n            ...results.map(({ id }) => ({ type: 'Folder' as const, id })),\n            { type: 'Folder', id: 'LIST' },\n          ];\n        }\n        return [{ type: 'Folder', id: 'LIST' }];\n      },\n    }),\n    createFolder: builder.mutation<CreateFolders.Response['data'], CreateFolders.Request['body']>({\n      query: (body) => ({\n        url: '/upload/folders',\n        method: 'POST',\n        data: body,\n      }),\n      transformResponse: (response: CreateFolders.Response) => response.data,\n      invalidatesTags: [\n        { type: 'Folder', id: 'LIST' },\n        { type: 'Folder', id: 'STRUCTURE' },\n      ],\n    }),\n    /**\n     * Hierarchical folder tree used by the FolderTree sidebar. Returned as a\n     * single nested array — the server walks the folders table once and\n     * assembles parent/child relationships.\n     *\n     * TODO: filter results like `admin-folder.find` for folder-scoped roles\n     * (v1 returns all folders; relies on global `plugin::upload.read`).\n     */\n    getFolderStructure: builder.query<FolderNode[], void>({\n      query: () => ({\n        url: '/upload/folder-structure',\n        method: 'GET',\n      }),\n      // TODO: align GetFolderStructure contract with the real /upload/folder-structure\n      // envelope and drop this defensive unwrap (data[] vs { data: [] }).\n      transformResponse: (response: GetFolderStructure.Response['data']) =>\n        ((response as unknown as { data: FolderNode[] })?.data ??\n          (response as unknown as FolderNode[]) ??\n          []) as FolderNode[],\n      providesTags: [{ type: 'Folder', id: 'STRUCTURE' }],\n    }),\n    /**\n     * Flat list of every folder, used to populate the \"Location\" select in the\n     * asset details drawer. No parent filter — we want the entire tree in one\n     * query so the select can render any destination folder.\n     */\n    getAllFolders: builder.query<Folder[], void>({\n      query: () => ({\n        url: '/upload/folders',\n        method: 'GET',\n      }),\n      transformResponse: (response: GetFolders.Response['data']) =>\n        unwrapData<GetFolders.Response['data']>(response ?? []),\n      providesTags: (results) => {\n        if (results) {\n          return [\n            ...results.map(({ id }) => ({ type: 'Folder' as const, id })),\n            { type: 'Folder' as const, id: 'LIST' },\n          ];\n        }\n        return [{ type: 'Folder' as const, id: 'LIST' }];\n      },\n    }),\n    getFolder: builder.query<FolderWithCounts, { id: number }>({\n      query: ({ id }) => ({\n        url: `/upload/folders/${id}`,\n        method: 'GET',\n        config: {\n          params: {\n            populate: {\n              parent: {\n                populate: {\n                  parent: '*',\n                },\n              },\n              children: { count: true },\n              files: { count: true },\n            },\n          },\n        },\n      }),\n      transformResponse: (response: GetFolder.Response) =>\n        response.data as unknown as FolderWithCounts,\n      providesTags: (_result, _error, { id }) => [{ type: 'Folder', id }],\n    }),\n    bulkMove: builder.mutation<BulkMoveFolders.Response['data'], BulkMoveParams>({\n      query: ({ fileIds = [], folderIds = [], destinationFolderId }) => ({\n        url: '/upload/actions/bulk-move',\n        method: 'POST',\n        data: { fileIds, folderIds, destinationFolderId },\n      }),\n      transformResponse: (response: BulkMoveFolders.Response) => response.data,\n      invalidatesTags: [\n        { type: 'Asset', id: 'LIST' },\n        { type: 'Folder', id: 'LIST' },\n        { type: 'Folder', id: 'STRUCTURE' },\n      ],\n    }),\n  }),\n});\n\nexport const {\n  useCreateFolderMutation,\n  useGetFoldersQuery,\n  useGetFolderQuery,\n  useGetAllFoldersQuery,\n  useGetFolderStructureQuery,\n  useBulkMoveMutation,\n} = foldersApi;\n"],"names":["isDataEnvelope","response","unwrapData","data","foldersApi","uploadApi","injectEndpoints","endpoints","builder","getFolders","query","params","parentId","sort","queryParams","$and","parent","id","$null","url","method","config","transformResponse","providesTags","results","map","type","createFolder","mutation","body","invalidatesTags","getFolderStructure","getAllFolders","getFolder","populate","children","count","files","_result","_error","bulkMove","fileIds","folderIds","destinationFolderId","useCreateFolderMutation","useGetFoldersQuery","useGetFolderQuery","useGetAllFoldersQuery","useGetFolderStructureQuery","useBulkMoveMutation"],"mappings":"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"}
+{"version":3,"file":"folders.js","sources":["../../../../admin/src/future/services/folders.ts"],"sourcesContent":["import { encodeSearchQuery } from '../utils/searchQueryParam';\n\nimport { uploadApi } from './api';\n\nimport type {\n  Folder,\n  FolderNode,\n  CreateFolders,\n  GetFolder,\n  GetFolders,\n  GetFolderStructure,\n  BulkMoveFolders,\n} from '../../../../shared/contracts/folders';\n\nexport type FolderWithCounts = Omit<Folder, 'children' | 'files'> & {\n  children?: { count: number };\n  files?: { count: number };\n};\n\ninterface GetFoldersParams {\n  parentId?: number | null;\n  /** Comma-separated rules, e.g. `updatedAt:DESC,name:ASC`. Defaults to alphabetical. */\n  sort?: string;\n  search?: string;\n  /** Extra `filters[$and]` entries (list filters), AND-ed with the parent/search scope. */\n  filters?: Record<string, unknown>[];\n}\n\ninterface BulkMoveParams {\n  fileIds?: number[];\n  folderIds?: number[];\n  /** `null` moves the items to the root of the Media Library. */\n  destinationFolderId: number | null;\n}\n\ntype DataEnvelope<T> = {\n  data: T;\n};\n\nconst isDataEnvelope = <T>(response: T | DataEnvelope<T>): response is DataEnvelope<T> =>\n  typeof response === 'object' && response !== null && 'data' in response;\n\nconst unwrapData = <T>(response: T | DataEnvelope<T>): T =>\n  isDataEnvelope(response) ? response.data : response;\n\nconst foldersApi = uploadApi.injectEndpoints({\n  endpoints: (builder) => ({\n    getFolders: builder.query<Folder[], GetFoldersParams | void>({\n      query: (params = {}) => {\n        const { parentId, sort, search, filters = [] } = params as GetFoldersParams;\n\n        const queryParams: Record<string, unknown> = {\n          // Default matches sidebar FolderTree order (server getStructure uses sortBy('name')).\n          sort: sort ?? 'name:ASC',\n        };\n\n        // List filters (dates) apply in BOTH modes — search composes with them,\n        // only the parent scope is dropped while searching.\n        if (search) {\n          // Search is global: the parent filter is dropped so matching folders\n          // anywhere in the library surface. The endpoint is unpaginated — it\n          // returns every match — so callers can treat the array length as the\n          // true total. Bounding it is a separate decision.\n          queryParams['_q'] = encodeSearchQuery(search);\n\n          if (filters.length > 0) {\n            queryParams['filters'] = { $and: [...filters] };\n          }\n        } else {\n          const parentScope =\n            parentId != null ? { parent: { id: parentId } } : { parent: { id: { $null: true } } };\n\n          queryParams['filters'] = {\n            $and: [parentScope, ...filters],\n          };\n        }\n\n        return {\n          url: '/upload/folders',\n          method: 'GET',\n          config: { params: queryParams },\n        };\n      },\n      transformResponse: (response: GetFolders.Response['data']) =>\n        unwrapData<GetFolders.Response['data']>(response),\n      providesTags: (results) => {\n        if (results) {\n          return [\n            ...results.map(({ id }) => ({ type: 'Folder' as const, id })),\n            { type: 'Folder', id: 'LIST' },\n          ];\n        }\n        return [{ type: 'Folder', id: 'LIST' }];\n      },\n    }),\n    createFolder: builder.mutation<CreateFolders.Response['data'], CreateFolders.Request['body']>({\n      query: (body) => ({\n        url: '/upload/folders',\n        method: 'POST',\n        data: body,\n      }),\n      transformResponse: (response: CreateFolders.Response) => response.data,\n      invalidatesTags: [\n        { type: 'Folder', id: 'LIST' },\n        { type: 'Folder', id: 'STRUCTURE' },\n      ],\n    }),\n    /**\n     * Hierarchical folder tree used by the FolderTree sidebar. Returned as a\n     * single nested array — the server walks the folders table once and\n     * assembles parent/child relationships.\n     *\n     * TODO: filter results like `admin-folder.find` for folder-scoped roles\n     * (v1 returns all folders; relies on global `plugin::upload.read`).\n     */\n    getFolderStructure: builder.query<FolderNode[], void>({\n      query: () => ({\n        url: '/upload/folder-structure',\n        method: 'GET',\n      }),\n      // TODO: align GetFolderStructure contract with the real /upload/folder-structure\n      // envelope and drop this defensive unwrap (data[] vs { data: [] }).\n      transformResponse: (response: GetFolderStructure.Response['data']) =>\n        ((response as unknown as { data: FolderNode[] })?.data ??\n          (response as unknown as FolderNode[]) ??\n          []) as FolderNode[],\n      providesTags: [{ type: 'Folder', id: 'STRUCTURE' }],\n    }),\n    /**\n     * Flat list of every folder, used to populate the \"Location\" select in the\n     * asset details drawer. No parent filter — we want the entire tree in one\n     * query so the select can render any destination folder.\n     */\n    getAllFolders: builder.query<Folder[], void>({\n      query: () => ({\n        url: '/upload/folders',\n        method: 'GET',\n      }),\n      transformResponse: (response: GetFolders.Response['data']) =>\n        unwrapData<GetFolders.Response['data']>(response ?? []),\n      providesTags: (results) => {\n        if (results) {\n          return [\n            ...results.map(({ id }) => ({ type: 'Folder' as const, id })),\n            { type: 'Folder' as const, id: 'LIST' },\n          ];\n        }\n        return [{ type: 'Folder' as const, id: 'LIST' }];\n      },\n    }),\n    getFolder: builder.query<FolderWithCounts, { id: number }>({\n      query: ({ id }) => ({\n        url: `/upload/folders/${id}`,\n        method: 'GET',\n        config: {\n          params: {\n            populate: {\n              parent: {\n                populate: {\n                  parent: '*',\n                },\n              },\n              children: { count: true },\n              files: { count: true },\n            },\n          },\n        },\n      }),\n      transformResponse: (response: GetFolder.Response) =>\n        response.data as unknown as FolderWithCounts,\n      providesTags: (_result, _error, { id }) => [{ type: 'Folder', id }],\n    }),\n    bulkMove: builder.mutation<BulkMoveFolders.Response['data'], BulkMoveParams>({\n      query: ({ fileIds = [], folderIds = [], destinationFolderId }) => ({\n        url: '/upload/actions/bulk-move',\n        method: 'POST',\n        data: { fileIds, folderIds, destinationFolderId },\n      }),\n      transformResponse: (response: BulkMoveFolders.Response) => response.data,\n      invalidatesTags: [\n        { type: 'Asset', id: 'LIST' },\n        { type: 'Folder', id: 'LIST' },\n        { type: 'Folder', id: 'STRUCTURE' },\n      ],\n    }),\n  }),\n});\n\nexport const {\n  useCreateFolderMutation,\n  useGetFoldersQuery,\n  useGetFolderQuery,\n  useGetAllFoldersQuery,\n  useGetFolderStructureQuery,\n  useBulkMoveMutation,\n} = foldersApi;\n"],"names":["isDataEnvelope","response","unwrapData","data","foldersApi","uploadApi","injectEndpoints","endpoints","builder","getFolders","query","params","parentId","sort","search","filters","queryParams","encodeSearchQuery","length","$and","parentScope","parent","id","$null","url","method","config","transformResponse","providesTags","results","map","type","createFolder","mutation","body","invalidatesTags","getFolderStructure","getAllFolders","getFolder","populate","children","count","files","_result","_error","bulkMove","fileIds","folderIds","destinationFolderId","useCreateFolderMutation","useGetFoldersQuery","useGetFolderQuery","useGetAllFoldersQuery","useGetFolderStructureQuery","useBulkMoveMutation"],"mappings":";;;;;AAuCA,MAAMA,cAAAA,GAAiB,CAAIC,QAAAA,GACzB,OAAOA,aAAa,QAAA,IAAYA,QAAAA,KAAa,QAAQ,MAAA,IAAUA,QAAAA;AAEjE,MAAMC,aAAa,CAAID,QAAAA,GACrBD,eAAeC,QAAAA,CAAAA,GAAYA,QAAAA,CAASE,IAAI,GAAGF,QAAAA;AAE7C,MAAMG,UAAAA,GAAaC,aAAAA,CAAUC,eAAe,CAAC;IAC3CC,SAAAA,EAAW,CAACC,WAAa;YACvBC,UAAAA,EAAYD,OAAAA,CAAQE,KAAK,CAAoC;gBAC3DA,KAAAA,EAAO,CAACC,MAAAA,GAAS,EAAE,GAAA;oBACjB,MAAM,EAAEC,QAAQ,EAAEC,IAAI,EAAEC,MAAM,EAAEC,OAAAA,GAAU,EAAE,EAAE,GAAGJ,MAAAA;AAEjD,oBAAA,MAAMK,WAAAA,GAAuC;;AAE3CH,wBAAAA,IAAAA,EAAMA,IAAAA,IAAQ;AAChB,qBAAA;;;AAIA,oBAAA,IAAIC,MAAAA,EAAQ;;;;;wBAKVE,WAAW,CAAC,IAAA,CAAK,GAAGC,kCAAAA,CAAkBH,MAAAA,CAAAA;wBAEtC,IAAIC,OAAAA,CAAQG,MAAM,GAAG,CAAA,EAAG;4BACtBF,WAAW,CAAC,UAAU,GAAG;gCAAEG,IAAAA,EAAM;AAAIJ,oCAAAA,GAAAA;AAAQ;AAAC,6BAAA;AAChD,wBAAA;oBACF,CAAA,MAAO;wBACL,MAAMK,WAAAA,GACJR,YAAY,IAAA,GAAO;4BAAES,MAAAA,EAAQ;gCAAEC,EAAAA,EAAIV;AAAS;yBAAE,GAAI;4BAAES,MAAAA,EAAQ;gCAAEC,EAAAA,EAAI;oCAAEC,KAAAA,EAAO;AAAK;AAAE;AAAE,yBAAA;wBAEtFP,WAAW,CAAC,UAAU,GAAG;4BACvBG,IAAAA,EAAM;AAACC,gCAAAA,WAAAA;AAAgBL,gCAAAA,GAAAA;AAAQ;AACjC,yBAAA;AACF,oBAAA;oBAEA,OAAO;wBACLS,GAAAA,EAAK,iBAAA;wBACLC,MAAAA,EAAQ,KAAA;wBACRC,MAAAA,EAAQ;4BAAEf,MAAAA,EAAQK;AAAY;AAChC,qBAAA;AACF,gBAAA,CAAA;gBACAW,iBAAAA,EAAmB,CAAC1B,WAClBC,UAAAA,CAAwCD,QAAAA,CAAAA;AAC1C2B,gBAAAA,YAAAA,EAAc,CAACC,OAAAA,GAAAA;AACb,oBAAA,IAAIA,OAAAA,EAAS;wBACX,OAAO;AACFA,4BAAAA,GAAAA,OAAAA,CAAQC,GAAG,CAAC,CAAC,EAAER,EAAE,EAAE,IAAM;oCAAES,IAAAA,EAAM,QAAA;AAAmBT,oCAAAA;iCAAG,CAAA,CAAA;AAC1D,4BAAA;gCAAES,IAAAA,EAAM,QAAA;gCAAUT,EAAAA,EAAI;AAAO;AAC9B,yBAAA;AACH,oBAAA;oBACA,OAAO;AAAC,wBAAA;4BAAES,IAAAA,EAAM,QAAA;4BAAUT,EAAAA,EAAI;AAAO;AAAE,qBAAA;AACzC,gBAAA;AACF,aAAA,CAAA;YACAU,YAAAA,EAAcxB,OAAAA,CAAQyB,QAAQ,CAAgE;gBAC5FvB,KAAAA,EAAO,CAACwB,QAAU;wBAChBV,GAAAA,EAAK,iBAAA;wBACLC,MAAAA,EAAQ,MAAA;wBACRtB,IAAAA,EAAM+B;qBACR,CAAA;gBACAP,iBAAAA,EAAmB,CAAC1B,QAAAA,GAAqCA,QAAAA,CAASE,IAAI;gBACtEgC,eAAAA,EAAiB;AACf,oBAAA;wBAAEJ,IAAAA,EAAM,QAAA;wBAAUT,EAAAA,EAAI;AAAO,qBAAA;AAC7B,oBAAA;wBAAES,IAAAA,EAAM,QAAA;wBAAUT,EAAAA,EAAI;AAAY;AACnC;AACH,aAAA,CAAA;AACA;;;;;;;QAQAc,kBAAAA,EAAoB5B,OAAAA,CAAQE,KAAK,CAAqB;AACpDA,gBAAAA,KAAAA,EAAO,KAAO;wBACZc,GAAAA,EAAK,0BAAA;wBACLC,MAAAA,EAAQ;qBACV,CAAA;;;AAGAE,gBAAAA,iBAAAA,EAAmB,CAAC1B,QAAAA,GAChBA,QAAAA,EAAgDE,IAAAA,IAC/CF,YACD,EAAE;gBACN2B,YAAAA,EAAc;AAAC,oBAAA;wBAAEG,IAAAA,EAAM,QAAA;wBAAUT,EAAAA,EAAI;AAAY;AAAE;AACrD,aAAA,CAAA;AACA;;;;QAKAe,aAAAA,EAAe7B,OAAAA,CAAQE,KAAK,CAAiB;AAC3CA,gBAAAA,KAAAA,EAAO,KAAO;wBACZc,GAAAA,EAAK,iBAAA;wBACLC,MAAAA,EAAQ;qBACV,CAAA;AACAE,gBAAAA,iBAAAA,EAAmB,CAAC1B,QAAAA,GAClBC,UAAAA,CAAwCD,QAAAA,IAAY,EAAE,CAAA;AACxD2B,gBAAAA,YAAAA,EAAc,CAACC,OAAAA,GAAAA;AACb,oBAAA,IAAIA,OAAAA,EAAS;wBACX,OAAO;AACFA,4BAAAA,GAAAA,OAAAA,CAAQC,GAAG,CAAC,CAAC,EAAER,EAAE,EAAE,IAAM;oCAAES,IAAAA,EAAM,QAAA;AAAmBT,oCAAAA;iCAAG,CAAA,CAAA;AAC1D,4BAAA;gCAAES,IAAAA,EAAM,QAAA;gCAAmBT,EAAAA,EAAI;AAAO;AACvC,yBAAA;AACH,oBAAA;oBACA,OAAO;AAAC,wBAAA;4BAAES,IAAAA,EAAM,QAAA;4BAAmBT,EAAAA,EAAI;AAAO;AAAE,qBAAA;AAClD,gBAAA;AACF,aAAA,CAAA;YACAgB,SAAAA,EAAW9B,OAAAA,CAAQE,KAAK,CAAmC;AACzDA,gBAAAA,KAAAA,EAAO,CAAC,EAAEY,EAAE,EAAE,IAAM;wBAClBE,GAAAA,EAAK,CAAC,gBAAgB,EAAEF,EAAAA,CAAAA,CAAI;wBAC5BG,MAAAA,EAAQ,KAAA;wBACRC,MAAAA,EAAQ;4BACNf,MAAAA,EAAQ;gCACN4B,QAAAA,EAAU;oCACRlB,MAAAA,EAAQ;wCACNkB,QAAAA,EAAU;4CACRlB,MAAAA,EAAQ;AACV;AACF,qCAAA;oCACAmB,QAAAA,EAAU;wCAAEC,KAAAA,EAAO;AAAK,qCAAA;oCACxBC,KAAAA,EAAO;wCAAED,KAAAA,EAAO;AAAK;AACvB;AACF;AACF;qBACF,CAAA;gBACAd,iBAAAA,EAAmB,CAAC1B,QAAAA,GAClBA,QAAAA,CAASE,IAAI;AACfyB,gBAAAA,YAAAA,EAAc,CAACe,OAAAA,EAASC,MAAAA,EAAQ,EAAEtB,EAAE,EAAE,GAAK;AAAC,wBAAA;4BAAES,IAAAA,EAAM,QAAA;AAAUT,4BAAAA;AAAG;AAAE;AACrE,aAAA,CAAA;YACAuB,QAAAA,EAAUrC,OAAAA,CAAQyB,QAAQ,CAAmD;gBAC3EvB,KAAAA,EAAO,CAAC,EAAEoC,OAAAA,GAAU,EAAE,EAAEC,SAAAA,GAAY,EAAE,EAAEC,mBAAmB,EAAE,IAAM;wBACjExB,GAAAA,EAAK,2BAAA;wBACLC,MAAAA,EAAQ,MAAA;wBACRtB,IAAAA,EAAM;AAAE2C,4BAAAA,OAAAA;AAASC,4BAAAA,SAAAA;AAAWC,4BAAAA;AAAoB;qBAClD,CAAA;gBACArB,iBAAAA,EAAmB,CAAC1B,QAAAA,GAAuCA,QAAAA,CAASE,IAAI;gBACxEgC,eAAAA,EAAiB;AACf,oBAAA;wBAAEJ,IAAAA,EAAM,OAAA;wBAAST,EAAAA,EAAI;AAAO,qBAAA;AAC5B,oBAAA;wBAAES,IAAAA,EAAM,QAAA;wBAAUT,EAAAA,EAAI;AAAO,qBAAA;AAC7B,oBAAA;wBAAES,IAAAA,EAAM,QAAA;wBAAUT,EAAAA,EAAI;AAAY;AACnC;AACH,aAAA;SACF;AACF,CAAA,CAAA;AAEO,MAAM,EACX2B,uBAAuB,EACvBC,kBAAkB,EAClBC,iBAAiB,EACjBC,qBAAqB,EACrBC,0BAA0B,EAC1BC,mBAAmB,EACpB,GAAGlD;;;;;;;;;"}

package/dist/admin/future/services/folders.mjs

@@ -1,3 +1,4 @@
+import { encodeSearchQuery } from '../utils/searchQueryParam.mjs';
 import { uploadApi } from './api.mjs';
 
 const isDataEnvelope = (response)=>typeof response === 'object' && response !== null && 'data' in response;
@@ -6,31 +7,42 @@ const foldersApi = uploadApi.injectEndpoints({
     endpoints: (builder)=>({
             getFolders: builder.query({
                 query: (params = {})=>{
-                    const { parentId, sort } = params;
+                    const { parentId, sort, search, filters = [] } = params;
                     const queryParams = {
                         // Default matches sidebar FolderTree order (server getStructure uses sortBy('name')).
                         sort: sort ?? 'name:ASC'
                     };
-                    if (parentId != null) {
-                        queryParams['filters'] = {
-                            $and: [
-                                {
-                                    parent: {
-                                        id: parentId
-                                    }
+                    // List filters (dates) apply in BOTH modes — search composes with them,
+                    // only the parent scope is dropped while searching.
+                    if (search) {
+                        // Search is global: the parent filter is dropped so matching folders
+                        // anywhere in the library surface. The endpoint is unpaginated — it
+                        // returns every match — so callers can treat the array length as the
+                        // true total. Bounding it is a separate decision.
+                        queryParams['_q'] = encodeSearchQuery(search);
+                        if (filters.length > 0) {
+                            queryParams['filters'] = {
+                                $and: [
+                                    ...filters
+                                ]
+                            };
+                        }
+                    } else {
+                        const parentScope = parentId != null ? {
+                            parent: {
+                                id: parentId
+                            }
+                        } : {
+                            parent: {
+                                id: {
+                                    $null: true
                                 }
-                            ]
+                            }
                         };
-                    } else {
                         queryParams['filters'] = {
                             $and: [
-                                {
-                                    parent: {
-                                        id: {
-                                            $null: true
-                                        }
-                                    }
-                                }
+                                parentScope,
+                                ...filters
                             ]
                         };
                     }

package/dist/admin/future/services/folders.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"folders.mjs","sources":["../../../../admin/src/future/services/folders.ts"],"sourcesContent":["import { uploadApi } from './api';\n\nimport type {\n  Folder,\n  FolderNode,\n  CreateFolders,\n  GetFolder,\n  GetFolders,\n  GetFolderStructure,\n  BulkMoveFolders,\n} from '../../../../shared/contracts/folders';\n\nexport type FolderWithCounts = Omit<Folder, 'children' | 'files'> & {\n  children?: { count: number };\n  files?: { count: number };\n};\n\ninterface GetFoldersParams {\n  parentId?: number | null;\n  /** Comma-separated rules, e.g. `updatedAt:DESC,name:ASC`. Defaults to alphabetical. */\n  sort?: string;\n}\n\ninterface BulkMoveParams {\n  fileIds?: number[];\n  folderIds?: number[];\n  /** `null` moves the items to the root of the Media Library. */\n  destinationFolderId: number | null;\n}\n\ntype DataEnvelope<T> = {\n  data: T;\n};\n\nconst isDataEnvelope = <T>(response: T | DataEnvelope<T>): response is DataEnvelope<T> =>\n  typeof response === 'object' && response !== null && 'data' in response;\n\nconst unwrapData = <T>(response: T | DataEnvelope<T>): T =>\n  isDataEnvelope(response) ? response.data : response;\n\nconst foldersApi = uploadApi.injectEndpoints({\n  endpoints: (builder) => ({\n    getFolders: builder.query<Folder[], GetFoldersParams | void>({\n      query: (params = {}) => {\n        const { parentId, sort } = params as GetFoldersParams;\n\n        const queryParams: Record<string, unknown> = {\n          // Default matches sidebar FolderTree order (server getStructure uses sortBy('name')).\n          sort: sort ?? 'name:ASC',\n        };\n\n        if (parentId != null) {\n          queryParams['filters'] = {\n            $and: [{ parent: { id: parentId } }],\n          };\n        } else {\n          queryParams['filters'] = {\n            $and: [{ parent: { id: { $null: true } } }],\n          };\n        }\n\n        return {\n          url: '/upload/folders',\n          method: 'GET',\n          config: { params: queryParams },\n        };\n      },\n      transformResponse: (response: GetFolders.Response['data']) =>\n        unwrapData<GetFolders.Response['data']>(response),\n      providesTags: (results) => {\n        if (results) {\n          return [\n            ...results.map(({ id }) => ({ type: 'Folder' as const, id })),\n            { type: 'Folder', id: 'LIST' },\n          ];\n        }\n        return [{ type: 'Folder', id: 'LIST' }];\n      },\n    }),\n    createFolder: builder.mutation<CreateFolders.Response['data'], CreateFolders.Request['body']>({\n      query: (body) => ({\n        url: '/upload/folders',\n        method: 'POST',\n        data: body,\n      }),\n      transformResponse: (response: CreateFolders.Response) => response.data,\n      invalidatesTags: [\n        { type: 'Folder', id: 'LIST' },\n        { type: 'Folder', id: 'STRUCTURE' },\n      ],\n    }),\n    /**\n     * Hierarchical folder tree used by the FolderTree sidebar. Returned as a\n     * single nested array — the server walks the folders table once and\n     * assembles parent/child relationships.\n     *\n     * TODO: filter results like `admin-folder.find` for folder-scoped roles\n     * (v1 returns all folders; relies on global `plugin::upload.read`).\n     */\n    getFolderStructure: builder.query<FolderNode[], void>({\n      query: () => ({\n        url: '/upload/folder-structure',\n        method: 'GET',\n      }),\n      // TODO: align GetFolderStructure contract with the real /upload/folder-structure\n      // envelope and drop this defensive unwrap (data[] vs { data: [] }).\n      transformResponse: (response: GetFolderStructure.Response['data']) =>\n        ((response as unknown as { data: FolderNode[] })?.data ??\n          (response as unknown as FolderNode[]) ??\n          []) as FolderNode[],\n      providesTags: [{ type: 'Folder', id: 'STRUCTURE' }],\n    }),\n    /**\n     * Flat list of every folder, used to populate the \"Location\" select in the\n     * asset details drawer. No parent filter — we want the entire tree in one\n     * query so the select can render any destination folder.\n     */\n    getAllFolders: builder.query<Folder[], void>({\n      query: () => ({\n        url: '/upload/folders',\n        method: 'GET',\n      }),\n      transformResponse: (response: GetFolders.Response['data']) =>\n        unwrapData<GetFolders.Response['data']>(response ?? []),\n      providesTags: (results) => {\n        if (results) {\n          return [\n            ...results.map(({ id }) => ({ type: 'Folder' as const, id })),\n            { type: 'Folder' as const, id: 'LIST' },\n          ];\n        }\n        return [{ type: 'Folder' as const, id: 'LIST' }];\n      },\n    }),\n    getFolder: builder.query<FolderWithCounts, { id: number }>({\n      query: ({ id }) => ({\n        url: `/upload/folders/${id}`,\n        method: 'GET',\n        config: {\n          params: {\n            populate: {\n              parent: {\n                populate: {\n                  parent: '*',\n                },\n              },\n              children: { count: true },\n              files: { count: true },\n            },\n          },\n        },\n      }),\n      transformResponse: (response: GetFolder.Response) =>\n        response.data as unknown as FolderWithCounts,\n      providesTags: (_result, _error, { id }) => [{ type: 'Folder', id }],\n    }),\n    bulkMove: builder.mutation<BulkMoveFolders.Response['data'], BulkMoveParams>({\n      query: ({ fileIds = [], folderIds = [], destinationFolderId }) => ({\n        url: '/upload/actions/bulk-move',\n        method: 'POST',\n        data: { fileIds, folderIds, destinationFolderId },\n      }),\n      transformResponse: (response: BulkMoveFolders.Response) => response.data,\n      invalidatesTags: [\n        { type: 'Asset', id: 'LIST' },\n        { type: 'Folder', id: 'LIST' },\n        { type: 'Folder', id: 'STRUCTURE' },\n      ],\n    }),\n  }),\n});\n\nexport const {\n  useCreateFolderMutation,\n  useGetFoldersQuery,\n  useGetFolderQuery,\n  useGetAllFoldersQuery,\n  useGetFolderStructureQuery,\n  useBulkMoveMutation,\n} = foldersApi;\n"],"names":["isDataEnvelope","response","unwrapData","data","foldersApi","uploadApi","injectEndpoints","endpoints","builder","getFolders","query","params","parentId","sort","queryParams","$and","parent","id","$null","url","method","config","transformResponse","providesTags","results","map","type","createFolder","mutation","body","invalidatesTags","getFolderStructure","getAllFolders","getFolder","populate","children","count","files","_result","_error","bulkMove","fileIds","folderIds","destinationFolderId","useCreateFolderMutation","useGetFoldersQuery","useGetFolderQuery","useGetAllFoldersQuery","useGetFolderStructureQuery","useBulkMoveMutation"],"mappings":"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"}
+{"version":3,"file":"folders.mjs","sources":["../../../../admin/src/future/services/folders.ts"],"sourcesContent":["import { encodeSearchQuery } from '../utils/searchQueryParam';\n\nimport { uploadApi } from './api';\n\nimport type {\n  Folder,\n  FolderNode,\n  CreateFolders,\n  GetFolder,\n  GetFolders,\n  GetFolderStructure,\n  BulkMoveFolders,\n} from '../../../../shared/contracts/folders';\n\nexport type FolderWithCounts = Omit<Folder, 'children' | 'files'> & {\n  children?: { count: number };\n  files?: { count: number };\n};\n\ninterface GetFoldersParams {\n  parentId?: number | null;\n  /** Comma-separated rules, e.g. `updatedAt:DESC,name:ASC`. Defaults to alphabetical. */\n  sort?: string;\n  search?: string;\n  /** Extra `filters[$and]` entries (list filters), AND-ed with the parent/search scope. */\n  filters?: Record<string, unknown>[];\n}\n\ninterface BulkMoveParams {\n  fileIds?: number[];\n  folderIds?: number[];\n  /** `null` moves the items to the root of the Media Library. */\n  destinationFolderId: number | null;\n}\n\ntype DataEnvelope<T> = {\n  data: T;\n};\n\nconst isDataEnvelope = <T>(response: T | DataEnvelope<T>): response is DataEnvelope<T> =>\n  typeof response === 'object' && response !== null && 'data' in response;\n\nconst unwrapData = <T>(response: T | DataEnvelope<T>): T =>\n  isDataEnvelope(response) ? response.data : response;\n\nconst foldersApi = uploadApi.injectEndpoints({\n  endpoints: (builder) => ({\n    getFolders: builder.query<Folder[], GetFoldersParams | void>({\n      query: (params = {}) => {\n        const { parentId, sort, search, filters = [] } = params as GetFoldersParams;\n\n        const queryParams: Record<string, unknown> = {\n          // Default matches sidebar FolderTree order (server getStructure uses sortBy('name')).\n          sort: sort ?? 'name:ASC',\n        };\n\n        // List filters (dates) apply in BOTH modes — search composes with them,\n        // only the parent scope is dropped while searching.\n        if (search) {\n          // Search is global: the parent filter is dropped so matching folders\n          // anywhere in the library surface. The endpoint is unpaginated — it\n          // returns every match — so callers can treat the array length as the\n          // true total. Bounding it is a separate decision.\n          queryParams['_q'] = encodeSearchQuery(search);\n\n          if (filters.length > 0) {\n            queryParams['filters'] = { $and: [...filters] };\n          }\n        } else {\n          const parentScope =\n            parentId != null ? { parent: { id: parentId } } : { parent: { id: { $null: true } } };\n\n          queryParams['filters'] = {\n            $and: [parentScope, ...filters],\n          };\n        }\n\n        return {\n          url: '/upload/folders',\n          method: 'GET',\n          config: { params: queryParams },\n        };\n      },\n      transformResponse: (response: GetFolders.Response['data']) =>\n        unwrapData<GetFolders.Response['data']>(response),\n      providesTags: (results) => {\n        if (results) {\n          return [\n            ...results.map(({ id }) => ({ type: 'Folder' as const, id })),\n            { type: 'Folder', id: 'LIST' },\n          ];\n        }\n        return [{ type: 'Folder', id: 'LIST' }];\n      },\n    }),\n    createFolder: builder.mutation<CreateFolders.Response['data'], CreateFolders.Request['body']>({\n      query: (body) => ({\n        url: '/upload/folders',\n        method: 'POST',\n        data: body,\n      }),\n      transformResponse: (response: CreateFolders.Response) => response.data,\n      invalidatesTags: [\n        { type: 'Folder', id: 'LIST' },\n        { type: 'Folder', id: 'STRUCTURE' },\n      ],\n    }),\n    /**\n     * Hierarchical folder tree used by the FolderTree sidebar. Returned as a\n     * single nested array — the server walks the folders table once and\n     * assembles parent/child relationships.\n     *\n     * TODO: filter results like `admin-folder.find` for folder-scoped roles\n     * (v1 returns all folders; relies on global `plugin::upload.read`).\n     */\n    getFolderStructure: builder.query<FolderNode[], void>({\n      query: () => ({\n        url: '/upload/folder-structure',\n        method: 'GET',\n      }),\n      // TODO: align GetFolderStructure contract with the real /upload/folder-structure\n      // envelope and drop this defensive unwrap (data[] vs { data: [] }).\n      transformResponse: (response: GetFolderStructure.Response['data']) =>\n        ((response as unknown as { data: FolderNode[] })?.data ??\n          (response as unknown as FolderNode[]) ??\n          []) as FolderNode[],\n      providesTags: [{ type: 'Folder', id: 'STRUCTURE' }],\n    }),\n    /**\n     * Flat list of every folder, used to populate the \"Location\" select in the\n     * asset details drawer. No parent filter — we want the entire tree in one\n     * query so the select can render any destination folder.\n     */\n    getAllFolders: builder.query<Folder[], void>({\n      query: () => ({\n        url: '/upload/folders',\n        method: 'GET',\n      }),\n      transformResponse: (response: GetFolders.Response['data']) =>\n        unwrapData<GetFolders.Response['data']>(response ?? []),\n      providesTags: (results) => {\n        if (results) {\n          return [\n            ...results.map(({ id }) => ({ type: 'Folder' as const, id })),\n            { type: 'Folder' as const, id: 'LIST' },\n          ];\n        }\n        return [{ type: 'Folder' as const, id: 'LIST' }];\n      },\n    }),\n    getFolder: builder.query<FolderWithCounts, { id: number }>({\n      query: ({ id }) => ({\n        url: `/upload/folders/${id}`,\n        method: 'GET',\n        config: {\n          params: {\n            populate: {\n              parent: {\n                populate: {\n                  parent: '*',\n                },\n              },\n              children: { count: true },\n              files: { count: true },\n            },\n          },\n        },\n      }),\n      transformResponse: (response: GetFolder.Response) =>\n        response.data as unknown as FolderWithCounts,\n      providesTags: (_result, _error, { id }) => [{ type: 'Folder', id }],\n    }),\n    bulkMove: builder.mutation<BulkMoveFolders.Response['data'], BulkMoveParams>({\n      query: ({ fileIds = [], folderIds = [], destinationFolderId }) => ({\n        url: '/upload/actions/bulk-move',\n        method: 'POST',\n        data: { fileIds, folderIds, destinationFolderId },\n      }),\n      transformResponse: (response: BulkMoveFolders.Response) => response.data,\n      invalidatesTags: [\n        { type: 'Asset', id: 'LIST' },\n        { type: 'Folder', id: 'LIST' },\n        { type: 'Folder', id: 'STRUCTURE' },\n      ],\n    }),\n  }),\n});\n\nexport const {\n  useCreateFolderMutation,\n  useGetFoldersQuery,\n  useGetFolderQuery,\n  useGetAllFoldersQuery,\n  useGetFolderStructureQuery,\n  useBulkMoveMutation,\n} = foldersApi;\n"],"names":["isDataEnvelope","response","unwrapData","data","foldersApi","uploadApi","injectEndpoints","endpoints","builder","getFolders","query","params","parentId","sort","search","filters","queryParams","encodeSearchQuery","length","$and","parentScope","parent","id","$null","url","method","config","transformResponse","providesTags","results","map","type","createFolder","mutation","body","invalidatesTags","getFolderStructure","getAllFolders","getFolder","populate","children","count","files","_result","_error","bulkMove","fileIds","folderIds","destinationFolderId","useCreateFolderMutation","useGetFoldersQuery","useGetFolderQuery","useGetAllFoldersQuery","useGetFolderStructureQuery","useBulkMoveMutation"],"mappings":"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"}

package/dist/admin/future/services/settings.js

@@ -4,7 +4,14 @@ var api = require('./api.js');
 
 const settingsApi = api.uploadApi.injectEndpoints({
     endpoints: (builder)=>({
-            getSettings: builder.query({
+            // Deliberately NOT named `getSettings`. Every plugin's admin API is built on
+            // the same shared `adminApi` instance — one endpoint registry keyed by name,
+            // under `reducerPath: 'adminApi'` — and `injectEndpoints` silently keeps the
+            // FIRST registration of a duplicate name and discards later ones. The i18n
+            // plugin already registers a `getSettings`, so a generic name here would,
+            // depending on module load order, resolve this hook to i18n's cache entry
+            // (`/i18n/settings`) instead of `/upload/settings` — non-deterministically.
+            getUploadSettings: builder.query({
                 query: ()=>({
                         url: '/upload/settings',
                         method: 'GET'
@@ -12,7 +19,7 @@ const settingsApi = api.uploadApi.injectEndpoints({
             })
         })
 });
-const { useGetSettingsQuery } = settingsApi;
+const { useGetUploadSettingsQuery } = settingsApi;
 
-exports.useGetSettingsQuery = useGetSettingsQuery;
+exports.useGetUploadSettingsQuery = useGetUploadSettingsQuery;
 //# sourceMappingURL=settings.js.map

package/dist/admin/future/services/settings.js.map

@@ -1 +1 @@
-{"version":3,"file":"settings.js","sources":["../../../../admin/src/future/services/settings.ts"],"sourcesContent":["import { uploadApi } from './api';\n\nimport type { GetSettings } from '../../../../shared/contracts/settings';\n\nconst settingsApi = uploadApi.injectEndpoints({\n  endpoints: (builder) => ({\n    getSettings: builder.query<GetSettings.Response['data'], void>({\n      query: () => ({\n        url: '/upload/settings',\n        method: 'GET',\n      }),\n    }),\n  }),\n});\n\nconst { useGetSettingsQuery } = settingsApi;\n\nexport { useGetSettingsQuery };\n"],"names":["settingsApi","uploadApi","injectEndpoints","endpoints","builder","getSettings","query","url","method","useGetSettingsQuery"],"mappings":";;;;AAIA,MAAMA,WAAAA,GAAcC,aAAAA,CAAUC,eAAe,CAAC;IAC5CC,SAAAA,EAAW,CAACC,WAAa;YACvBC,WAAAA,EAAaD,OAAAA,CAAQE,KAAK,CAAqC;AAC7DA,gBAAAA,KAAAA,EAAO,KAAO;wBACZC,GAAAA,EAAK,kBAAA;wBACLC,MAAAA,EAAQ;qBACV;AACF,aAAA;SACF;AACF,CAAA,CAAA;AAEA,MAAM,EAAEC,mBAAmB,EAAE,GAAGT;;;;"}
+{"version":3,"file":"settings.js","sources":["../../../../admin/src/future/services/settings.ts"],"sourcesContent":["import { uploadApi } from './api';\n\nimport type { GetSettings } from '../../../../shared/contracts/settings';\n\nconst settingsApi = uploadApi.injectEndpoints({\n  endpoints: (builder) => ({\n    // Deliberately NOT named `getSettings`. Every plugin's admin API is built on\n    // the same shared `adminApi` instance — one endpoint registry keyed by name,\n    // under `reducerPath: 'adminApi'` — and `injectEndpoints` silently keeps the\n    // FIRST registration of a duplicate name and discards later ones. The i18n\n    // plugin already registers a `getSettings`, so a generic name here would,\n    // depending on module load order, resolve this hook to i18n's cache entry\n    // (`/i18n/settings`) instead of `/upload/settings` — non-deterministically.\n    getUploadSettings: builder.query<GetSettings.Response['data'], void>({\n      query: () => ({\n        url: '/upload/settings',\n        method: 'GET',\n      }),\n    }),\n  }),\n});\n\nconst { useGetUploadSettingsQuery } = settingsApi;\n\nexport { useGetUploadSettingsQuery };\n"],"names":["settingsApi","uploadApi","injectEndpoints","endpoints","builder","getUploadSettings","query","url","method","useGetUploadSettingsQuery"],"mappings":";;;;AAIA,MAAMA,WAAAA,GAAcC,aAAAA,CAAUC,eAAe,CAAC;IAC5CC,SAAAA,EAAW,CAACC,WAAa;;;;;;;;YAQvBC,iBAAAA,EAAmBD,OAAAA,CAAQE,KAAK,CAAqC;AACnEA,gBAAAA,KAAAA,EAAO,KAAO;wBACZC,GAAAA,EAAK,kBAAA;wBACLC,MAAAA,EAAQ;qBACV;AACF,aAAA;SACF;AACF,CAAA,CAAA;AAEA,MAAM,EAAEC,yBAAyB,EAAE,GAAGT;;;;"}

package/dist/admin/future/services/settings.mjs

@@ -2,7 +2,14 @@ import { uploadApi } from './api.mjs';
 
 const settingsApi = uploadApi.injectEndpoints({
     endpoints: (builder)=>({
-            getSettings: builder.query({
+            // Deliberately NOT named `getSettings`. Every plugin's admin API is built on
+            // the same shared `adminApi` instance — one endpoint registry keyed by name,
+            // under `reducerPath: 'adminApi'` — and `injectEndpoints` silently keeps the
+            // FIRST registration of a duplicate name and discards later ones. The i18n
+            // plugin already registers a `getSettings`, so a generic name here would,
+            // depending on module load order, resolve this hook to i18n's cache entry
+            // (`/i18n/settings`) instead of `/upload/settings` — non-deterministically.
+            getUploadSettings: builder.query({
                 query: ()=>({
                         url: '/upload/settings',
                         method: 'GET'
@@ -10,7 +17,7 @@ const settingsApi = uploadApi.injectEndpoints({
             })
         })
 });
-const { useGetSettingsQuery } = settingsApi;
+const { useGetUploadSettingsQuery } = settingsApi;
 
-export { useGetSettingsQuery };
+export { useGetUploadSettingsQuery };
 //# sourceMappingURL=settings.mjs.map

package/dist/admin/future/services/settings.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"settings.mjs","sources":["../../../../admin/src/future/services/settings.ts"],"sourcesContent":["import { uploadApi } from './api';\n\nimport type { GetSettings } from '../../../../shared/contracts/settings';\n\nconst settingsApi = uploadApi.injectEndpoints({\n  endpoints: (builder) => ({\n    getSettings: builder.query<GetSettings.Response['data'], void>({\n      query: () => ({\n        url: '/upload/settings',\n        method: 'GET',\n      }),\n    }),\n  }),\n});\n\nconst { useGetSettingsQuery } = settingsApi;\n\nexport { useGetSettingsQuery };\n"],"names":["settingsApi","uploadApi","injectEndpoints","endpoints","builder","getSettings","query","url","method","useGetSettingsQuery"],"mappings":";;AAIA,MAAMA,WAAAA,GAAcC,SAAAA,CAAUC,eAAe,CAAC;IAC5CC,SAAAA,EAAW,CAACC,WAAa;YACvBC,WAAAA,EAAaD,OAAAA,CAAQE,KAAK,CAAqC;AAC7DA,gBAAAA,KAAAA,EAAO,KAAO;wBACZC,GAAAA,EAAK,kBAAA;wBACLC,MAAAA,EAAQ;qBACV;AACF,aAAA;SACF;AACF,CAAA,CAAA;AAEA,MAAM,EAAEC,mBAAmB,EAAE,GAAGT;;;;"}
+{"version":3,"file":"settings.mjs","sources":["../../../../admin/src/future/services/settings.ts"],"sourcesContent":["import { uploadApi } from './api';\n\nimport type { GetSettings } from '../../../../shared/contracts/settings';\n\nconst settingsApi = uploadApi.injectEndpoints({\n  endpoints: (builder) => ({\n    // Deliberately NOT named `getSettings`. Every plugin's admin API is built on\n    // the same shared `adminApi` instance — one endpoint registry keyed by name,\n    // under `reducerPath: 'adminApi'` — and `injectEndpoints` silently keeps the\n    // FIRST registration of a duplicate name and discards later ones. The i18n\n    // plugin already registers a `getSettings`, so a generic name here would,\n    // depending on module load order, resolve this hook to i18n's cache entry\n    // (`/i18n/settings`) instead of `/upload/settings` — non-deterministically.\n    getUploadSettings: builder.query<GetSettings.Response['data'], void>({\n      query: () => ({\n        url: '/upload/settings',\n        method: 'GET',\n      }),\n    }),\n  }),\n});\n\nconst { useGetUploadSettingsQuery } = settingsApi;\n\nexport { useGetUploadSettingsQuery };\n"],"names":["settingsApi","uploadApi","injectEndpoints","endpoints","builder","getUploadSettings","query","url","method","useGetUploadSettingsQuery"],"mappings":";;AAIA,MAAMA,WAAAA,GAAcC,SAAAA,CAAUC,eAAe,CAAC;IAC5CC,SAAAA,EAAW,CAACC,WAAa;;;;;;;;YAQvBC,iBAAAA,EAAmBD,OAAAA,CAAQE,KAAK,CAAqC;AACnEA,gBAAAA,KAAAA,EAAO,KAAO;wBACZC,GAAAA,EAAK,kBAAA;wBACLC,MAAAA,EAAQ;qBACV;AACF,aAAA;SACF;AACF,CAAA,CAAA;AAEA,MAAM,EAAEC,yBAAyB,EAAE,GAAGT;;;;"}