From b339ea5c24f5f35acf0e492aee53e761217a4ded Mon Sep 17 00:00:00 2001 From: araddcc002 Date: Fri, 10 Jan 2025 14:16:17 +0000 Subject: [PATCH] added a backend check where if currentpage or pagesize isnt set for list models it will return the full list --- backend/src/routes/v2/model/getModelsSearch.ts | 2 +- backend/src/services/model.ts | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/backend/src/routes/v2/model/getModelsSearch.ts b/backend/src/routes/v2/model/getModelsSearch.ts index c7420aaaf..09d906bb7 100644 --- a/backend/src/routes/v2/model/getModelsSearch.ts +++ b/backend/src/routes/v2/model/getModelsSearch.ts @@ -74,7 +74,7 @@ export const getModelsSearch = [ async (req: Request, res: Response) => { req.audit = AuditInfo.SearchModels const { - query: { kind, libraries, filters, search, task, allowTemplating, schemaId, currentPage = 1, pageSize = 10 }, + query: { kind, libraries, filters, search, task, allowTemplating, schemaId, currentPage, pageSize }, } = parse(req, getModelsSearchSchema) const foundModels = await searchModels( diff --git a/backend/src/services/model.ts b/backend/src/services/model.ts index f4fc536be..077a9482c 100644 --- a/backend/src/services/model.ts +++ b/backend/src/services/model.ts @@ -123,8 +123,8 @@ export async function searchModels( task?: string, allowTemplating?: boolean, schemaId?: string, - currentPage: number = 0, - pageSize: number = 10, + currentPage?: number, + pageSize?: number, ): Promise { const query: any = {} @@ -181,6 +181,9 @@ export async function searchModels( // match the query first, and then filter them based on pagination. const auths = await authorisation.models(user, results, ModelAction.View) const authorisedResults = results.filter((_, i) => auths[i].success) + if (!pageSize || !currentPage) { + return { results: authorisedResults, totalEntries: authorisedResults.length } + } const paginatedResults = authorisedResults.slice((currentPage - 1) * pageSize, currentPage * pageSize) return { results: paginatedResults, totalEntries: authorisedResults.length } }