Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

536 remove the hard coded part in getbyprivateurltoken in datasetjsdataverserepo #544

Merged
merged 3 commits into from
Nov 13, 2024
Merged

536 remove the hard coded part in getbyprivateurltoken in datasetjsdataverserepo #544

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5652333
fix: change the hard-coded part in DatasetJSrepo to dynamic
ChengShi-1 Nov 1, 2024
2a8ed75
fix: remove a hardcoded part and add new results
ChengShi-1 Nov 5, 2024
aca17af
Merge branch '536-remove-the-hard-coded-part-in-getbyprivateurltoken-…
ChengShi-1 Nov 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 26 additions & 13 deletions src/dataset/infrastructure/repositories/DatasetJSDataverseRepository.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -200,23 +200,36 @@ export class DatasetJSDataverseRepository implements DatasetRepository {
getDatasetSummaryFieldNames.execute(),
getPrivateUrlDatasetCitation.execute(privateUrlToken)
])
.then(([jsDataset, summaryFieldsNames, citation]: [JSDataset, string[], string]) =>
JSDatasetMapper.toDataset(
.then(async ([jsDataset, summaryFieldsNames, citation]: [JSDataset, string[], string]) => {
const [permissions, locks, originalSize, archivalSize] = await Promise.all([
getDatasetUserPermissions.execute(jsDataset.id),
getDatasetLocks.execute(jsDataset.id),
getDatasetFilesTotalDownloadSize.execute(
jsDataset.id,
DatasetNonNumericVersion.DRAFT,
g-saracca marked this conversation as resolved.
Show resolved Hide resolved
FileDownloadSizeMode.ORIGINAL,
undefined,
includeDeaccessioned
),
getDatasetFilesTotalDownloadSize.execute(
jsDataset.id,
DatasetNonNumericVersion.DRAFT,
FileDownloadSizeMode.ARCHIVAL,
undefined,
includeDeaccessioned
)
])

return JSDatasetMapper.toDataset(
jsDataset,
citation,
summaryFieldsNames,
{
canEditDataset: true,
canPublishDataset: true,
canManageDatasetPermissions: true,
canDeleteDatasetDraft: true,
canViewUnpublishedDataset: true
}, // TODO Connect with JS dataset permissions for privateUrl when it is available in js-dataverse
[], // TODO Connect with JS dataset locks for privateUrl when it is available in js-dataverse
0, // TODO Connect with JS dataset filesTotalDownloadSize for privateUrl when it is available in js-dataverse
0 // TODO Connect with JS dataset filesTotalDownloadSize for privateUrl when it is available in js-dataverse
permissions,
locks,
originalSize,
archivalSize
)
)
})
.catch((error: ReadError) => {
throw new Error(error.message)
})
Expand Down
Loading