fix: getMyDataCollectionItems, and update changelog

Author: ChengShi-1

CHANGELOG.md

@@ -16,7 +16,7 @@ This changelog follows the principles of [Keep a Changelog](https://keepachangel
 ### Changed
 
 - Add pagination support to the Dataset Version Summaries and File Version Summaries use cases by introducing optional pagination object. #885
-
+- Refactored pagination to use consistent `CollectionItemsPaginationInfo` object in getMyDataColletionItems, instead of individual limit/selectedPage parameters.
 - Use of the new `sourceLastUpdateTime` query parameter from update dataset and file metadata endpoints to support optimistic concurrency control during editing operations. See [Edit Dataset Metadata](https://guides.dataverse.org/en/6.8/api/native-api.html#edit-dataset-metadata) and [Updating File Metadata](https://guides.dataverse.org/en/6.8/api/native-api.html#updating-file-metadata) guides for more details.
 - Changed the way we were handling DATE type metadata field validation to better match the backend validation and give users better error messages. For example, for an input like “foo AD”, we now show “Production Date is not a valid date. The AD year must be numeric.“. For an input like “99999 AD”, we now show “Production Date is not a valid date. The AD year cant be higher than 9999.“. For an input like “[-9999?], we now show “Production Date is not a valid date. The year in brackets cannot be negative.“, etc.
 

src/collection/domain/models/MyDataCollectionItemsPaginationInfo.ts

@@ -13,7 +13,6 @@ 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>
@@ -32,7 +31,7 @@ export interface CollectionRepository {
     roleIds: number[],
     collectionItemTypes: CollectionItemType[],
     publicationStatuses: PublicationStatus[],
-    paginationInfo?: MyDataCollectionItemsPaginationInfo,
+    paginationInfo?: CollectionItemsPaginationInfo,
     searchText?: string,
     otherUserName?: string
   ) => Promise<MyDataCollectionItemSubset>

src/collection/domain/repositories/CollectionRepository.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'
+import { CollectionItemsPaginationInfo } from '../models/CollectionItemsPaginationInfo'
 
 export async function getMyDataCollectionItems(
   collectionRepository: CollectionRepository,
   roleIds: number[],
   collectionItemTypes: CollectionItemType[],
   publicationStatuses: PublicationStatus[],
-  paginationInfo?: MyDataCollectionItemsPaginationInfo,
+  paginationInfo?: CollectionItemsPaginationInfo,
   searchText?: string,
   otherUserName?: string
 ): Promise<MyDataCollectionItemSubset> {

src/collection/domain/useCases/getMyDataCollectionItems.ts

@@ -34,7 +34,6 @@ 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> {
@@ -94,7 +93,7 @@ export class CollectionJSDataverseRepository implements CollectionRepository {
     roleIds: number[],
     collectionItemTypes: CollectionItemType[],
     publicationStatuses: PublicationStatus[],
-    paginationInfo?: MyDataCollectionItemsPaginationInfo,
+    paginationInfo?: CollectionItemsPaginationInfo,
     searchText?: string,
     otherUserName?: string
   ): Promise<MyDataCollectionItemSubset> {

src/collection/infrastructure/repositories/CollectionJSDataverseRepository.ts

@@ -8,7 +8,6 @@ import {
   MyDataCollectionItemSubset,
   PublicationStatusCount
 } from '@/collection/domain/models/MyDataCollectionItemSubset'
-import { MyDataCollectionItemsPaginationInfo } from '@/collection/domain/models/MyDataCollectionItemsPaginationInfo'
 
 export const NO_COLLECTION_ITEMS = 0
 
@@ -121,17 +120,12 @@ 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,
-    myDataPaginationInfo,
+    paginationInfo,
     searchCriteria.searchText,
     searchCriteria.otherUserName
   )

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

@@ -19,7 +19,6 @@ 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> {
@@ -102,7 +101,7 @@ export class CollectionMockRepository implements CollectionRepository {
     _roleIds: number[],
     collectionItemTypes: CollectionItemType[],
     _publicationStatuses: string[],
-    paginationInfo?: MyDataCollectionItemsPaginationInfo,
+    paginationInfo?: CollectionItemsPaginationInfo,
     _searchText?: string,
     _otherUserName?: string
   ): Promise<MyDataCollectionItemSubset> {