fix: add pagination object to summeries

Author: ChengShi-1

src/collection/domain/useCases/getMyDataCollectionItems.ts

@@ -2,14 +2,14 @@ import { CollectionRepository } from '../repositories/CollectionRepository'
 import { MyDataCollectionItemSubset } from '../models/MyDataCollectionItemSubset'
 import { PublicationStatus } from '../../../shared/core/domain/models/PublicationStatus'
 import { CollectionItemType } from '@/collection/domain/models/CollectionItemType'
+import { MyDataCollectionItemsPaginationInfo } from '../models/MyDataCollectionItemsPaginationInfo'
 
 export async function getMyDataCollectionItems(
   collectionRepository: CollectionRepository,
   roleIds: number[],
   collectionItemTypes: CollectionItemType[],
   publicationStatuses: PublicationStatus[],
-  limit?: number,
-  selectedPage?: number,
+  paginationInfo?: MyDataCollectionItemsPaginationInfo,
   searchText?: string,
   otherUserName?: string
 ): Promise<MyDataCollectionItemSubset> {
@@ -18,8 +18,7 @@ export async function getMyDataCollectionItems(
       roleIds,
       collectionItemTypes,
       publicationStatuses,
-      limit,
-      selectedPage,
+      paginationInfo,
       searchText,
       otherUserName
     )

src/dataset/domain/models/DatasetVersionPaginationInfo.ts

@@ -0,0 +1,8 @@
+import { PaginationInfo } from '../../../shared/pagination/domain/models/PaginationInfo'
+
+export class DatasetVersionPaginationInfo extends PaginationInfo<DatasetVersionPaginationInfo> {
+  constructor(page = 1, pageSize = 10, totalItems = 0, itemName = 'Version') {
+    super(page, pageSize, totalItems, itemName)
+  }
+}
+

src/dataset/domain/repositories/DatasetRepository.ts

@@ -10,6 +10,7 @@ import { DatasetDownloadCount } from '../models/DatasetDownloadCount'
 import { FormattedCitation, CitationFormat } from '../models/DatasetCitation'
 import { DatasetTemplate } from '../models/DatasetTemplate'
 import { CollectionSummary } from '@/collection/domain/models/CollectionSummary'
+import { DatasetVersionPaginationInfo } from '../models/DatasetVersionPaginationInfo'
 
 export interface DatasetRepository {
   getByPersistentId: (
@@ -46,8 +47,7 @@ export interface DatasetRepository {
   publish(persistentId: string, versionUpdateType: VersionUpdateType): Promise<void>
   getDatasetVersionsSummaries: (
     datasetId: number | string,
-    limit?: number,
-    offset?: number
+    paginationInfo?: DatasetVersionPaginationInfo
   ) => Promise<DatasetVersionSummarySubset>
   getDownloadCount: (
     datasetId: string | number,

src/dataset/domain/useCases/getDatasetVersionsSummaries.ts

@@ -1,13 +1,13 @@
 import { DatasetRepository } from '../repositories/DatasetRepository'
 import { DatasetVersionSummarySubset } from '../models/DatasetVersionSummaryInfo'
+import { DatasetVersionPaginationInfo } from '../models/DatasetVersionPaginationInfo'
 
 export function getDatasetVersionsSummaries(
   datasetRepository: DatasetRepository,
   datasetId: number | string,
-  limit?: number,
-  offset?: number
+  paginationInfo?: DatasetVersionPaginationInfo
 ): Promise<DatasetVersionSummarySubset> {
-  return datasetRepository.getDatasetVersionsSummaries(datasetId, limit, offset).catch((error) => {
+  return datasetRepository.getDatasetVersionsSummaries(datasetId, paginationInfo).catch((error) => {
     throw error
   })
 }

src/dataset/infrastructure/repositories/DatasetJSDataverseRepository.ts

@@ -48,6 +48,7 @@ import { DatasetsWithCount } from '../../domain/models/DatasetsWithCount'
 import { VersionUpdateType } from '../../domain/models/VersionUpdateType'
 import { DatasetVersionSummarySubset } from '@/dataset/domain/models/DatasetVersionSummaryInfo'
 import { DatasetDownloadCount } from '@/dataset/domain/models/DatasetDownloadCount'
+import { DatasetVersionPaginationInfo } from '@/dataset/domain/models/DatasetVersionPaginationInfo'
 import { FormattedCitation, CitationFormat } from '@/dataset/domain/models/DatasetCitation'
 import { axiosInstance } from '@/axiosInstance'
 import { DATAVERSE_BACKEND_URL } from '../../../config'
@@ -375,11 +376,10 @@ export class DatasetJSDataverseRepository implements DatasetRepository {
   }
   getDatasetVersionsSummaries(
     datasetId: number | string,
-    limit?: number,
-    offset?: number
+    paginationInfo?: DatasetVersionPaginationInfo
   ): Promise<DatasetVersionSummarySubset> {
     return getDatasetVersionsSummaries
-      .execute(datasetId, limit, offset)
+      .execute(datasetId, paginationInfo?.pageSize, paginationInfo?.offset)
       .catch((error: ReadError) => {
         throw error
       })

src/files/domain/models/FileVersionPaginationInfo.ts

@@ -0,0 +1,7 @@
+import { PaginationInfo } from '../../../shared/pagination/domain/models/PaginationInfo'
+
+export class FileVersionPaginationInfo extends PaginationInfo<FileVersionPaginationInfo> {
+  constructor(page = 1, pageSize = 10, totalItems = 0, itemName = 'Version') {
+    super(page, pageSize, totalItems, itemName)
+  }
+}

src/files/domain/repositories/FileRepository.ts

@@ -12,6 +12,7 @@ import { FixityAlgorithm } from '../models/FixityAlgorithm'
 import { FileMetadataDTO } from '@/files/domain/useCases/DTOs/FileMetadataDTO'
 import { RestrictFileDTO } from '../useCases/restrictFileDTO'
 import { FileVersionSummarySubset } from '../models/FileVersionSummaryInfo'
+import { FileVersionPaginationInfo } from '../models/FileVersionPaginationInfo'
 
 export interface FileRepository {
   getAllByDatasetPersistentId: (
@@ -34,8 +35,7 @@ export interface FileRepository {
   ) => Promise<number>
   getFileVersionSummaries: (
     fileId: number | string,
-    limit?: number,
-    offset?: number
+    paginationInfo?: FileVersionPaginationInfo
   ) => Promise<FileVersionSummarySubset>
   getById: (id: number, datasetVersionNumber?: string) => Promise<File | undefined>
   getMultipleFileDownloadUrl: (ids: number[], downloadMode: FileDownloadMode) => string

src/files/domain/useCases/getFileVersionSummaries.ts

@@ -1,11 +1,11 @@
 import { FileRepository } from '../repositories/FileRepository'
 import { FileVersionSummarySubset } from '../models/FileVersionSummaryInfo'
+import { FileVersionPaginationInfo } from '../models/FileVersionPaginationInfo'
 
 export function getFileVersionSummaries(
   fileRepository: FileRepository,
   fileId: number | string,
-  limit?: number,
-  offset?: number
+  paginationInfo?: FileVersionPaginationInfo
 ): Promise<FileVersionSummarySubset> {
-  return fileRepository.getFileVersionSummaries(fileId, limit, offset)
+  return fileRepository.getFileVersionSummaries(fileId, paginationInfo)
 }

src/files/infrastructure/FileJSDataverseRepository.ts

@@ -46,6 +46,7 @@ import { RestrictFileDTO } from '../domain/useCases/restrictFileDTO'
 import { FileMetadataDTO } from '@/files/domain/useCases/DTOs/FileMetadataDTO'
 import { JSDataverseReadErrorHandler } from '@/shared/helpers/JSDataverseReadErrorHandler'
 import { FileVersionSummarySubset } from '../domain/models/FileVersionSummaryInfo'
+import { FileVersionPaginationInfo } from '../domain/models/FileVersionPaginationInfo'
 
 const includeDeaccessioned = true
 
@@ -251,10 +252,9 @@ export class FileJSDataverseRepository implements FileRepository {
   }
   getFileVersionSummaries(
     fileId: number | string,
-    limit?: number,
-    offset?: number
+    paginationInfo?: FileVersionPaginationInfo
   ): Promise<FileVersionSummarySubset> {
-    return getFileVersionSummaries.execute(fileId, limit, offset)
+    return getFileVersionSummaries.execute(fileId, paginationInfo?.pageSize, paginationInfo?.offset)
   }
 
   getById(id: number, datasetVersionNumber?: string): Promise<File> {

src/sections/dataset/dataset-versions/useGetDatasetVersionsSummaries.ts

@@ -2,12 +2,13 @@ import { useCallback, useEffect, useState } from 'react'
 import { DatasetVersionSummaryInfo } from '@/dataset/domain/models/DatasetVersionSummaryInfo'
 import { DatasetRepository } from '@/dataset/domain/repositories/DatasetRepository'
 import { getDatasetVersionsSummaries } from '@/dataset/domain/useCases/getDatasetVersionsSummaries'
+import { DatasetVersionPaginationInfo } from '@/dataset/domain/models/DatasetVersionPaginationInfo'
 
 interface UseGetDatasetVersionsSummaries {
   datasetVersionSummaries: DatasetVersionSummaryInfo[] | undefined
   error: string | null
   isLoading: boolean
-  fetchSummaries: (limit?: number, offset?: number) => Promise<void>
+  fetchSummaries: (paginationInfo?: DatasetVersionPaginationInfo) => Promise<void>
 }
 
 interface Props {
@@ -26,16 +27,15 @@ export const useGetDatasetVersionsSummaries = ({
   const [error, setError] = useState<string | null>(null)
 
   const fetchSummaries = useCallback(
-    async (limit?: number, offset?: number) => {
+    async (paginationInfo?: DatasetVersionPaginationInfo) => {
       setIsLoading(true)
       setError(null)
 
       try {
         const versionSummaries = await getDatasetVersionsSummaries(
           datasetRepository,
           persistentId,
-          limit,
-          offset
+          paginationInfo
         )
         setSummaries(versionSummaries.summaries)
       } catch (err) {