added a backend check where if currentpage or pagesize isnt set for l…

…ist models it will return the full list
gchq · Jan 10, 2025 · b339ea5 · b339ea5
1 parent 5dda340
commit b339ea5
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git 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<GetModelsResponse>) => {
     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
@@ -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<ModelSearchResult> {
   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 }
 }