Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 4 additions & 4 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"@dnd-kit/sortable": "8.0.0",
"@dnd-kit/utilities": "3.2.2",
"@faker-js/faker": "7.6.0",
"@iqss/dataverse-client-javascript": "2.0.0-alpha.52",
"@iqss/dataverse-client-javascript": "2.0.0-alpha.53",
"@iqss/dataverse-design-system": "*",
"@istanbuljs/nyc-config-typescript": "1.0.2",
"@tanstack/react-table": "8.9.2",
Expand Down
43 changes: 28 additions & 15 deletions src/files/infrastructure/FileJSDataverseRepository.ts
Original file line number Diff line number Diff line change
Expand Up @@ -252,20 +252,29 @@ export class FileJSDataverseRepository implements FileRepository {
}

getById(id: number, datasetVersionNumber?: string): Promise<File> {
return getFileAndDataset
.execute(id, datasetVersionNumber)
.then(([jsFile, jsDataset]) =>
Promise.all([
jsFile,
jsDataset,
getDatasetCitation.execute(jsDataset.id, datasetVersionNumber, includeDeaccessioned),
FileJSDataverseRepository.getCitationById(jsFile.id, datasetVersionNumber),
FileJSDataverseRepository.getDownloadCountById(jsFile.id, jsFile.publicationDate),
FileJSDataverseRepository.getPermissionsById(jsFile.id),
FileJSDataverseRepository.getThumbnailById(jsFile.id),
FileJSDataverseRepository.getTabularDataById(jsFile.id, jsFile.tabularData)
])
)
return FileJSDataverseRepository.getPermissionsById(id)
.then((permissions) => {
const includeDeaccessioned = permissions?.canEditOwnerDataset

return getFileAndDataset
.execute(id, datasetVersionNumber, includeDeaccessioned)
.then(([jsFile, jsDataset]) => {
return Promise.all([
jsFile,
jsDataset,
getDatasetCitation.execute(jsDataset.id, datasetVersionNumber, includeDeaccessioned),
FileJSDataverseRepository.getCitationById(
jsFile.id,
datasetVersionNumber,
includeDeaccessioned
),
FileJSDataverseRepository.getDownloadCountById(jsFile.id, jsFile.publicationDate),
Promise.resolve(permissions),
FileJSDataverseRepository.getThumbnailById(jsFile.id),
FileJSDataverseRepository.getTabularDataById(jsFile.id, jsFile.tabularData)
])
})
})
.then(
([
jsFile,
Expand Down Expand Up @@ -293,7 +302,11 @@ export class FileJSDataverseRepository implements FileRepository {
})
}

private static getCitationById(id: number, datasetVersionNumber?: string): Promise<string> {
private static getCitationById(
id: number,
datasetVersionNumber?: string,
includeDeaccessioned?: boolean
): Promise<string> {
return getFileCitation
.execute(id, datasetVersionNumber, includeDeaccessioned)
.catch((error: ReadError) => {
Expand Down
3 changes: 2 additions & 1 deletion src/sections/file/file-version/FileVersions.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,8 @@ export function FileVersions({
const isCurrentVersion = fileVersion.datasetVersion === displayVersion
const isLinkable =
fileVersion.versionState === DatasetVersionState.RELEASED ||
fileVersion.versionState === DatasetVersionState.DEACCESSIONED ||
(fileVersion.versionState === DatasetVersionState.DEACCESSIONED &&
canEditOwnerDataset) ||
(fileVersion.versionState === DatasetVersionState.DRAFT && canEditOwnerDataset)

return (
Expand Down
23 changes: 23 additions & 0 deletions tests/component/sections/file/file-version/FileVersions.spec.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,29 @@ describe('FileVersions', () => {
)
})

it('disables the link button for deaccessioned versions without permission', () => {
const deaccessionedFile = [
{
...fileVersionSummaries[0],
datasetVersion: '1.2',
versionState: DatasetVersionState.DEACCESSIONED
}
]
fileRepository.getFileVersionSummaries = cy.stub().resolves(deaccessionedFile)
cy.customMount(
<FileVersions
fileId={1}
datasetVersionNumber={'2.0'}
fileRepository={fileRepository}
canEditOwnerDataset={false}
isInView
/>
)

cy.get('span').contains('1.2').should('exist')
cy.findByTestId('file-version-link-1.2').should('not.exist')
})

it('disables the link button for draft version without permission', () => {
const draftFile = [
{
Expand Down
Loading