merged main

gchq · Jan 10, 2025 · 5dda340 · 5dda340
1 parent 33b95fe
commit 5dda340
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 13 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 = 0, pageSize = 10 },
+      query: { kind, libraries, filters, search, task, allowTemplating, schemaId, currentPage = 1, pageSize = 10 },
     } = parse(req, getModelsSearchSchema)
 
     const foundModels = await searchModels(

diff --git a/frontend/actions/model.ts b/frontend/actions/model.ts
@@ -7,7 +7,7 @@ import { ErrorInfo, fetcher } from '../utils/fetcher'
 const emptyModelList = []
 
 export interface EntrySearchResults {
-  models: EntrySearchResult[]
+  results: EntrySearchResult[]
   totalEntries: number
 }
 
@@ -52,7 +52,7 @@ export function useListModels(
 
   return {
     mutateModels: mutate,
-    models: data ? data.models : emptyModelList,
+    models: data ? data.results : emptyModelList,
     totalModels: data ? data.totalEntries : 0,
     isModelsLoading: isLoading,
     isModelsError: error,

diff --git a/frontend/pages/index.tsx b/frontend/pages/index.tsx
@@ -126,8 +126,10 @@ export default function Marketplace() {
 
   const handleCurrentPageChange = useCallback(
     (newPage: number) => {
-      setCurrentPage(newPage)
-      updateQueryParams('currentPage', newPage.toString())
+      if (newPage > 0) {
+        setCurrentPage(newPage)
+        updateQueryParams('currentPage', newPage.toString())
+      }
     },
     [updateQueryParams],
   )
@@ -275,13 +277,6 @@ export default function Marketplace() {
                 </Tabs>
               </Box>
               <Stack spacing={2}>
-                <PaginationSelector
-                  currentPage={currentPage}
-                  onCurrentPageChange={(newValue) => handleCurrentPageChange(newValue)}
-                  totalEntries={totalModels}
-                  pageSize={pageSize}
-                  onPageSizeChange={(newValue) => handlePageSizeChange(newValue)}
-                />
                 {(isModelsLoading || isDataCardsLoading) && <Loading />}
                 {!isModelsLoading && selectedTab === EntryKind.MODEL && (
                   <div data-test='modelListBox'>

diff --git a/frontend/src/common/PaginationSelector.tsx b/frontend/src/common/PaginationSelector.tsx
@@ -73,7 +73,13 @@ export default function PaginationSelector({
   }, [lastPage])
 
   return (
-    <Stack spacing={2} direction='row' sx={{ width: '100%', p: 2 }} justifyContent='center' alignItems='center'>
+    <Stack
+      spacing={2}
+      direction={{ xs: 'column', sm: 'row' }}
+      sx={{ py: 2 }}
+      justifyContent='center'
+      alignItems='center'
+    >
       <IconButton size='small' color='primary' onClick={handleBackPage}>
         <ArrowBack />
       </IconButton>