fix: add pagination object to getDataItemsPanel

Author: ChengShi-1

src/collection/domain/models/MyDataCollectionItemsPaginationInfo.ts

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

src/collection/domain/repositories/CollectionRepository.ts

@@ -13,6 +13,7 @@ import { PublicationStatus } from '@/shared/core/domain/models/PublicationStatus
 import { LinkingObjectType } from '../useCases/getCollectionsForLinking'
 import { CollectionSummary } from '../models/CollectionSummary'
 import { CollectionLinks } from '../models/CollectionLinks'
+import { MyDataCollectionItemsPaginationInfo } from '../models/MyDataCollectionItemsPaginationInfo'
 
 export interface CollectionRepository {
   getById: (id?: string) => Promise<Collection>
@@ -31,8 +32,7 @@ export interface CollectionRepository {
     roleIds: number[],
     collectionItemTypes: CollectionItemType[],
     publicationStatuses: PublicationStatus[],
-    limit?: number,
-    selectedPage?: number,
+    paginationInfo?: MyDataCollectionItemsPaginationInfo,
     searchText?: string,
     otherUserName?: string
   ) => Promise<MyDataCollectionItemSubset>

src/collection/infrastructure/repositories/CollectionJSDataverseRepository.ts

@@ -34,6 +34,7 @@ import { PublicationStatus } from '@/shared/core/domain/models/PublicationStatus
 import { CollectionSummary } from '@/collection/domain/models/CollectionSummary'
 import { LinkingObjectType } from '@/collection/domain/useCases/getCollectionsForLinking'
 import { CollectionLinks } from '@/collection/domain/models/CollectionLinks'
+import { MyDataCollectionItemsPaginationInfo } from '@/collection/domain/models/MyDataCollectionItemsPaginationInfo'
 
 export class CollectionJSDataverseRepository implements CollectionRepository {
   getById(id?: string): Promise<Collection> {
@@ -93,8 +94,7 @@ export class CollectionJSDataverseRepository implements CollectionRepository {
     roleIds: number[],
     collectionItemTypes: CollectionItemType[],
     publicationStatuses: PublicationStatus[],
-    limit?: number,
-    selectedPage?: number,
+    paginationInfo?: MyDataCollectionItemsPaginationInfo,
     searchText?: string,
     otherUserName?: string
   ): Promise<MyDataCollectionItemSubset> {
@@ -103,8 +103,8 @@ export class CollectionJSDataverseRepository implements CollectionRepository {
         roleIds,
         collectionItemTypes,
         publicationStatuses,
-        limit,
-        selectedPage,
+        paginationInfo?.pageSize,
+        paginationInfo?.page,
         searchText,
         otherUserName
       )

src/sections/account/my-data-section/useGetMyDataAccumulatedItems.tsx

@@ -8,6 +8,7 @@ import {
   MyDataCollectionItemSubset,
   PublicationStatusCount
 } from '@/collection/domain/models/MyDataCollectionItemSubset'
+import { MyDataCollectionItemsPaginationInfo } from '@/collection/domain/models/MyDataCollectionItemsPaginationInfo'
 
 export const NO_COLLECTION_ITEMS = 0
 
@@ -120,13 +121,17 @@ async function loadNextItems(
   searchCriteria: MyDataSearchCriteria
 ): Promise<MyDataCollectionItemSubset> {
   const publicationStatuses = searchCriteria.publicationStatuses ?? []
+  const myDataPaginationInfo = new MyDataCollectionItemsPaginationInfo(
+    paginationInfo.page,
+    paginationInfo.pageSize,
+    paginationInfo.totalItems
+  )
   return await getMyDataCollectionItems(
     collectionRepository,
     searchCriteria.roleIds,
     searchCriteria.itemTypes,
     publicationStatuses,
-    paginationInfo.pageSize,
-    paginationInfo.page,
+    myDataPaginationInfo,
     searchCriteria.searchText,
     searchCriteria.otherUserName
   )

src/stories/collection/CollectionMockRepository.ts

@@ -19,6 +19,7 @@ import { CollectionSummary } from '@/collection/domain/models/CollectionSummary'
 import { LinkingObjectType } from '@/collection/domain/useCases/getCollectionsForLinking'
 import { CollectionSummaryMother } from '@tests/component/collection/domain/models/CollectionSummaryMother'
 import { CollectionLinks } from '@/collection/domain/models/CollectionLinks'
+import { MyDataCollectionItemsPaginationInfo } from '@/collection/domain/models/MyDataCollectionItemsPaginationInfo'
 
 export class CollectionMockRepository implements CollectionRepository {
   getById(_id?: string): Promise<Collection> {
@@ -101,14 +102,11 @@ export class CollectionMockRepository implements CollectionRepository {
     _roleIds: number[],
     collectionItemTypes: CollectionItemType[],
     _publicationStatuses: string[],
-    limit?: number,
-    _selectedPage?: number,
+    paginationInfo?: MyDataCollectionItemsPaginationInfo,
     _searchText?: string,
     _otherUserName?: string
   ): Promise<MyDataCollectionItemSubset> {
-    if (!limit) {
-      limit = 10
-    }
+    const limit = paginationInfo?.pageSize ?? 10
     const numberOfCollections = Math.floor(limit / 3)
     const numberOfDatasets = Math.floor(limit / 3)
     const numberOfFiles = limit - numberOfCollections - numberOfDatasets

tests/component/sections/account/MyDataItemsPanel.spec.tsx

@@ -159,8 +159,7 @@ describe('MyDataItemsPanel', () => {
         Cypress.sinon.match.any,
         Cypress.sinon.match.any,
         Cypress.sinon.match.any,
-        10,
-        1,
+        Cypress.sinon.match.has('pageSize', 10).and(Cypress.sinon.match.has('page', 1)),
         undefined,
         otherUsername
       )
@@ -185,8 +184,7 @@ describe('MyDataItemsPanel', () => {
         Cypress.sinon.match.any,
         Cypress.sinon.match.any,
         Cypress.sinon.match.any,
-        10,
-        1,
+        Cypress.sinon.match.has('pageSize', 10).and(Cypress.sinon.match.has('page', 1)),
         undefined,
         'testUserName'
       )