Skip to content

Commit 8a644ea

Browse files
committed
feat: add query para
1 parent e1957ab commit 8a644ea

File tree

25 files changed

+242
-117
lines changed

25 files changed

+242
-117
lines changed

package-lock.json

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
"@dnd-kit/sortable": "8.0.0",
1919
"@dnd-kit/utilities": "3.2.2",
2020
"@faker-js/faker": "7.6.0",
21-
"@iqss/dataverse-client-javascript": "2.0.0-alpha.77",
21+
"@iqss/dataverse-client-javascript": "2.1.0-pr395.061ad8e",
2222
"@iqss/dataverse-design-system": "*",
2323
"@istanbuljs/nyc-config-typescript": "1.0.2",
2424
"@tanstack/react-table": "8.9.2",

src/dataset/domain/models/DatasetVersionSummaryInfo.ts

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
export interface DatasetVersionSummarySubset {
2+
summaries: DatasetVersionSummaryInfo[]
3+
totalCount: number
4+
}
5+
16
export interface DatasetVersionSummaryInfo {
27
id: number
38
versionNumber: string

src/dataset/domain/repositories/DatasetRepository.ts

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import { DatasetPaginationInfo } from '../models/DatasetPaginationInfo'
44
import { DatasetDTO } from '../useCases/DTOs/DatasetDTO'
55
import { DatasetsWithCount } from '../models/DatasetsWithCount'
66
import { VersionUpdateType } from '../models/VersionUpdateType'
7-
import { DatasetVersionSummaryInfo } from '../models/DatasetVersionSummaryInfo'
7+
import { DatasetVersionSummarySubset } from '../models/DatasetVersionSummaryInfo'
88
import { DatasetDeaccessionDTO } from '../useCases/DTOs/DatasetDTO'
99
import { DatasetDownloadCount } from '../models/DatasetDownloadCount'
1010
import { FormattedCitation, CitationFormat } from '../models/DatasetCitation'
@@ -44,7 +44,11 @@ export interface DatasetRepository {
4444
paginationInfo: DatasetPaginationInfo
4545
) => Promise<DatasetsWithCount>
4646
publish(persistentId: string, versionUpdateType: VersionUpdateType): Promise<void>
47-
getDatasetVersionsSummaries: (datasetId: number | string) => Promise<DatasetVersionSummaryInfo[]>
47+
getDatasetVersionsSummaries: (
48+
datasetId: number | string,
49+
limit?: number,
50+
offset?: number
51+
) => Promise<DatasetVersionSummarySubset>
4852
getDownloadCount: (
4953
datasetId: string | number,
5054
includeMDC?: boolean
Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
11
import { DatasetRepository } from '../repositories/DatasetRepository'
2-
import { DatasetVersionSummaryInfo } from '../models/DatasetVersionSummaryInfo'
2+
import { DatasetVersionSummarySubset } from '../models/DatasetVersionSummaryInfo'
33

44
export function getDatasetVersionsSummaries(
55
datasetRepository: DatasetRepository,
6-
datasetId: number | string
7-
): Promise<DatasetVersionSummaryInfo[]> {
8-
return datasetRepository.getDatasetVersionsSummaries(datasetId).catch((error) => {
6+
datasetId: number | string,
7+
limit?: number,
8+
offset?: number
9+
): Promise<DatasetVersionSummarySubset> {
10+
return datasetRepository.getDatasetVersionsSummaries(datasetId, limit, offset).catch((error) => {
911
throw error
1012
})
1113
}

src/dataset/infrastructure/repositories/DatasetJSDataverseRepository.ts

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ import { DatasetDTO } from '../../domain/useCases/DTOs/DatasetDTO'
4646
import { DatasetDTOMapper } from '../mappers/DatasetDTOMapper'
4747
import { DatasetsWithCount } from '../../domain/models/DatasetsWithCount'
4848
import { VersionUpdateType } from '../../domain/models/VersionUpdateType'
49-
import { DatasetVersionSummaryInfo } from '@/dataset/domain/models/DatasetVersionSummaryInfo'
49+
import { DatasetVersionSummarySubset } from '@/dataset/domain/models/DatasetVersionSummaryInfo'
5050
import { DatasetDownloadCount } from '@/dataset/domain/models/DatasetDownloadCount'
5151
import { FormattedCitation, CitationFormat } from '@/dataset/domain/models/DatasetCitation'
5252
import { axiosInstance } from '@/axiosInstance'
@@ -373,10 +373,16 @@ export class DatasetJSDataverseRepository implements DatasetRepository {
373373
throw new Error(error.message)
374374
})
375375
}
376-
getDatasetVersionsSummaries(datasetId: number | string): Promise<DatasetVersionSummaryInfo[]> {
377-
return getDatasetVersionsSummaries.execute(datasetId).catch((error: ReadError) => {
378-
throw error
379-
})
376+
getDatasetVersionsSummaries(
377+
datasetId: number | string,
378+
limit?: number,
379+
offset?: number
380+
): Promise<DatasetVersionSummarySubset> {
381+
return getDatasetVersionsSummaries
382+
.execute(datasetId, limit, offset)
383+
.catch((error: ReadError) => {
384+
throw error
385+
})
380386
}
381387
getDownloadCount(
382388
datasetId: string | number,

src/files/domain/models/FileVersionSummaryInfo.ts

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
import { DatasetVersionState } from '@/dataset/domain/models/Dataset'
22

3+
export interface FileVersionSummarySubset {
4+
summaries: FileVersionSummaryInfo[]
5+
totalCount: number
6+
}
7+
38
export interface FileVersionSummaryInfo {
49
datasetVersion: string
510
contributors?: string

src/files/domain/repositories/FileRepository.ts

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import { UploadedFileDTO } from '@iqss/dataverse-client-javascript'
1111
import { FixityAlgorithm } from '../models/FixityAlgorithm'
1212
import { FileMetadataDTO } from '@/files/domain/useCases/DTOs/FileMetadataDTO'
1313
import { RestrictFileDTO } from '../useCases/restrictFileDTO'
14-
import { FileVersionSummaryInfo } from '../models/FileVersionSummaryInfo'
14+
import { FileVersionSummarySubset } from '../models/FileVersionSummaryInfo'
1515

1616
export interface FileRepository {
1717
getAllByDatasetPersistentId: (
@@ -32,7 +32,11 @@ export interface FileRepository {
3232
criteria?: FileCriteria,
3333
includeDeaccessioned?: boolean
3434
) => Promise<number>
35-
getFileVersionSummaries: (fileId: number | string) => Promise<FileVersionSummaryInfo[]>
35+
getFileVersionSummaries: (
36+
fileId: number | string,
37+
limit?: number,
38+
offset?: number
39+
) => Promise<FileVersionSummarySubset>
3640
getById: (id: number, datasetVersionNumber?: string) => Promise<File | undefined>
3741
getMultipleFileDownloadUrl: (ids: number[], downloadMode: FileDownloadMode) => string
3842
getFileDownloadUrl: (id: number, downloadMode: FileDownloadMode) => string
Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
11
import { FileRepository } from '../repositories/FileRepository'
2-
import { FileVersionSummaryInfo } from '../models/FileVersionSummaryInfo'
2+
import { FileVersionSummarySubset } from '../models/FileVersionSummaryInfo'
33

44
export function getFileVersionSummaries(
55
fileRepository: FileRepository,
6-
fileId: number | string
7-
): Promise<FileVersionSummaryInfo[]> {
8-
return fileRepository.getFileVersionSummaries(fileId)
6+
fileId: number | string,
7+
limit?: number,
8+
offset?: number
9+
): Promise<FileVersionSummarySubset> {
10+
return fileRepository.getFileVersionSummaries(fileId, limit, offset)
911
}

src/files/infrastructure/FileJSDataverseRepository.ts

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ import { FixityAlgorithm } from '../domain/models/FixityAlgorithm'
4545
import { RestrictFileDTO } from '../domain/useCases/restrictFileDTO'
4646
import { FileMetadataDTO } from '@/files/domain/useCases/DTOs/FileMetadataDTO'
4747
import { JSDataverseReadErrorHandler } from '@/shared/helpers/JSDataverseReadErrorHandler'
48-
import { FileVersionSummaryInfo } from '../domain/models/FileVersionSummaryInfo'
48+
import { FileVersionSummarySubset } from '../domain/models/FileVersionSummaryInfo'
4949

5050
const includeDeaccessioned = true
5151

@@ -249,8 +249,12 @@ export class FileJSDataverseRepository implements FileRepository {
249249
throw new Error(error.message)
250250
})
251251
}
252-
getFileVersionSummaries(fileId: number | string): Promise<FileVersionSummaryInfo[]> {
253-
return getFileVersionSummaries.execute(fileId)
252+
getFileVersionSummaries(
253+
fileId: number | string,
254+
limit?: number,
255+
offset?: number
256+
): Promise<FileVersionSummarySubset> {
257+
return getFileVersionSummaries.execute(fileId, limit, offset)
254258
}
255259

256260
getById(id: number, datasetVersionNumber?: string): Promise<File> {

0 commit comments

Comments
 (0)